The DiagramModel uses 4 mandatory and three optional XMLDoms for it's data. These get imported, but to get to a roundtrip we will need to be able to create & save these again. Last changes prepared this by deleting XMLDoms which were no longer valid dependent of changes done to that DiagramModel. When exporting the availability of these gets checked and if all are there, it gets exported as Diagram (in MSO format, not yet in ODF). If nothing was changed the original Doms get exported - untouched. That test will now try - if e.g. the most important XMLDom OOXData is missing - to re-create this in that action. The 1st one which I now implemented that is the OOXData which homes the Point/Connections/BGFill data (and some more). Due to this needing testing I for now encapsulated this to a EnvVar called ACTIVATE_RECREATE_DIAGRAM_DATADOMS, so this will for now only happen when this is set. Anyways all that stuff is still behind the 'experimental features' wall. This is and stays experimental for now. These are already deep changes which need to get tested and get to master, opening the path to experiment with it and refine it. Due to the EnvVar gate no real changes should happen in master, but due to the changes around it this will need to be checked this way. Change-Id: Iabba69b19387e45f1028843a25f3bae1fc4f8fe8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197676 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
560 lines
20 KiB
C++
560 lines
20 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include "datamodel_oox.hxx"
|
|
|
|
#include <rtl/ustrbuf.hxx>
|
|
#include <sal/log.hxx>
|
|
#include <drawingml/fillproperties.hxx>
|
|
#include <drawingml/textbody.hxx>
|
|
#include <drawingml/textparagraph.hxx>
|
|
#include <drawingml/textrun.hxx>
|
|
#include <oox/drawingml/shape.hxx>
|
|
#include <com/sun/star/beans/XPropertyState.hpp>
|
|
#include <com/sun/star/drawing/FillStyle.hpp>
|
|
#include <com/sun/star/drawing/LineStyle.hpp>
|
|
#include <com/sun/star/drawing/XShapes.hpp>
|
|
#include <editeng/unoprnms.hxx>
|
|
#include <svx/svdobj.hxx>
|
|
#include <oox/token/namespaces.hxx>
|
|
#include <oox/export/drawingml.hxx>
|
|
|
|
#include <unordered_set>
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
namespace oox::drawingml {
|
|
|
|
Shape* DiagramData_oox::getOrCreateAssociatedShape(const svx::diagram::Point& rPoint, bool bCreateOnDemand) const
|
|
{
|
|
if(maPointShapeMap.end() == maPointShapeMap.find(rPoint.msModelId))
|
|
{
|
|
const_cast<DiagramData_oox*>(this)->maPointShapeMap[rPoint.msModelId] = ShapePtr();
|
|
}
|
|
|
|
const ShapePtr& rShapePtr = maPointShapeMap.find(rPoint.msModelId)->second;
|
|
|
|
if(!rShapePtr && bCreateOnDemand)
|
|
{
|
|
const_cast<ShapePtr&>(rShapePtr) = std::make_shared<Shape>();
|
|
|
|
// If we did create a new oox::drawingml::Shape, directly apply
|
|
// available data from the Diagram ModelData to it as preparation
|
|
restoreDataFromModelToShapeAfterReCreation(rPoint, *rShapePtr);
|
|
}
|
|
|
|
return rShapePtr.get();
|
|
}
|
|
|
|
void DiagramData_oox::restoreDataFromModelToShapeAfterReCreation(const svx::diagram::Point& rPoint, Shape& rNewShape)
|
|
{
|
|
// If we did create a new oox::drawingml::Shape, directly apply
|
|
// available data from the Diagram ModelData to it as preparation
|
|
|
|
// This is e.g. the Text, but may get more (styles?)
|
|
if(!rPoint.msTextBody->msText.isEmpty())
|
|
{
|
|
TextBodyPtr aNewTextBody(std::make_shared<TextBody>());
|
|
rNewShape.setTextBody(aNewTextBody);
|
|
TextRunPtr pTextRun = std::make_shared<TextRun>();
|
|
pTextRun->getText() = rPoint.msTextBody->msText;
|
|
aNewTextBody->addParagraph().addRun(pTextRun);
|
|
|
|
if(!rPoint.msTextBody->maTextProps.empty())
|
|
{
|
|
oox::PropertyMap& rTargetMap(aNewTextBody->getTextProperties().maPropertyMap);
|
|
|
|
for (auto const& prop : rPoint.msTextBody->maTextProps)
|
|
{
|
|
const sal_Int32 nPropId(oox::PropertyMap::getPropertyId(prop.first));
|
|
if(nPropId > 0)
|
|
rTargetMap.setAnyProperty(nPropId, prop.second);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void DiagramData_oox::writeDiagramData(oox::core::XmlFilterBase& rFB, sax_fastparser::FSHelperPtr& rTarget, const css::uno::Reference<css::drawing::XShape>& rXShape)
|
|
{
|
|
if (!rTarget)
|
|
return;
|
|
|
|
// write header infos
|
|
const OUString aNsDmlDiagram(rFB.getNamespaceURL(OOX_NS(dmlDiagram)));
|
|
const OUString aNsDml(rFB.getNamespaceURL(NMSP_dmlDiagram));
|
|
rTarget->startElementNS(XML_dgm, XML_dataModel,
|
|
FSNS(XML_xmlns, XML_dgm), aNsDmlDiagram,
|
|
FSNS(XML_xmlns, XML_a), aNsDml);
|
|
|
|
// write PointList
|
|
rTarget->startElementNS(XML_dgm, XML_ptLst);
|
|
for (auto& rPoint : getPoints())
|
|
rPoint.writeDiagramData(rTarget);
|
|
rTarget->endElementNS(XML_dgm, XML_ptLst);
|
|
|
|
// write ConnectorList
|
|
rTarget->startElementNS(XML_dgm, XML_cxnLst);
|
|
for (auto& rConnection : getConnections())
|
|
rConnection.writeDiagramData(rTarget);
|
|
rTarget->endElementNS(XML_dgm, XML_cxnLst);
|
|
|
|
// write BGFill
|
|
rTarget->startElementNS(XML_dgm, XML_bg);
|
|
|
|
// there is *no* export for oox::drawingml::FillProperties which we have in mpBackgroundShapeFillProperties.
|
|
// searching for 'XML_.*XML_noFill' shows that there is also a pretty direct export for FillStyle in Chart2,
|
|
// maybe that could be adapted for general use.
|
|
// But there is DrawingML::WriteFill, that needs the XShape, sax_fastparser::FSHelper and a XmlFilterBase. We
|
|
// can organize all that and then export from XShape model data.
|
|
// For The BGShape is is okay since in MSO Diagram data no shape for that exists anyways, it's just
|
|
// FillAttributes and a XShape for BG needs to exist in DrawObject model anytime anyways, see
|
|
// Diagram::createShapeHierarchyFromModel. This will also allow to use existing stuff like standard dialogs
|
|
// and more for later offering changing the Background of a Diagram.
|
|
// Note that an incarnation of BG as XShape is also needed to 'carry' the correct Size for that Diagram.
|
|
uno::Reference<drawing::XShape> xBgShape;
|
|
uno::Reference<drawing::XShapes> xGroup(rXShape, uno::UNO_QUERY);
|
|
if (xGroup.is() && 0 != xGroup->getCount())
|
|
{
|
|
// access the BGShape, it *should* always exist and be the 1st shape (to *be* in the BG)
|
|
uno::Reference<drawing::XShape> xCandidate(xGroup->getByIndex(0), uno::UNO_QUERY);
|
|
if (xCandidate.is())
|
|
{
|
|
// check comparing the DiagramDataModelID created at BackgroundSHape creation for the oox::Shape
|
|
// that got transferend to the XShape when it was created
|
|
SdrObject* pCandidate(SdrObject::getSdrObjectFromXShape(xCandidate));
|
|
if (nullptr != pCandidate && pCandidate->getDiagramDataModelID() == getBackgroundShapeModelID())
|
|
xBgShape = xCandidate;
|
|
}
|
|
}
|
|
|
|
if (xBgShape.is())
|
|
{
|
|
// if we have the BGShape as XShape, export using a temp DrawingML which uses
|
|
// the target file combined with the XmlFilterBase representing the ongoing Diagram export
|
|
DrawingML aTempML(rTarget, &rFB);
|
|
uno::Reference<beans::XPropertySet> xProps(xBgShape, uno::UNO_QUERY);
|
|
aTempML.WriteFill( xProps, xBgShape->getSize());
|
|
}
|
|
|
|
rTarget->endElementNS(XML_dgm, XML_bg);
|
|
|
|
rTarget->singleElementNS(XML_dgm, XML_whole);
|
|
|
|
// write ExtList & it's contents
|
|
// Note: I *tried* to use XML_dsp and xmlns:dsp, but these are not defined, thus
|
|
// for this case where the only relevant data is the 'relId' entzry I will allow
|
|
// to construct the XML statement by own string concatenation
|
|
rTarget->startElementNS(XML_dgm, XML_extLst);
|
|
const OUString rNsDsp(rFB.getNamespaceURL(OOX_NS(dsp)));
|
|
rTarget->startElementNS(XML_a, XML_ext, XML_uri, rNsDsp);
|
|
OUString aDspLine("<dsp:dataModelExt xmlns:dsp=\"" + rNsDsp + "\" ");
|
|
if (!getExtDrawings().empty())
|
|
{
|
|
aDspLine += "relId=\"" + getExtDrawings().front() + "\" ";
|
|
}
|
|
aDspLine += "minVer=\"" + aNsDml + "\"/>";
|
|
rTarget->write(aDspLine);
|
|
rTarget->endElementNS(XML_a, XML_ext);
|
|
rTarget->endElementNS(XML_dgm, XML_extLst);
|
|
|
|
rTarget->endElementNS(XML_dgm, XML_dataModel);
|
|
rTarget->endDocument();
|
|
}
|
|
|
|
static void addProperty(const OUString& rName,
|
|
const css::uno::Reference< css::beans::XPropertySetInfo >& xInfo,
|
|
std::vector< std::pair< OUString, css::uno::Any >>& rTarget,
|
|
const css::uno::Reference< css::beans::XPropertySet >& xPropSet )
|
|
{
|
|
if(xInfo->hasPropertyByName(rName))
|
|
rTarget.push_back(std::pair(OUString(rName), xPropSet->getPropertyValue(rName)));
|
|
}
|
|
|
|
void DiagramData_oox::secureStyleDataFromShapeToModel(::oox::drawingml::Shape& rShape)
|
|
{
|
|
const std::vector< ShapePtr >& rChildren(rShape.getChildren());
|
|
|
|
if(!rChildren.empty())
|
|
{
|
|
// group shape
|
|
for (auto& child : rChildren)
|
|
{
|
|
secureStyleDataFromShapeToModel(*child);
|
|
}
|
|
|
|
// if group shape we are done. Do not secure properties for group shapes
|
|
return;
|
|
}
|
|
|
|
// we need a XShape
|
|
const css::uno::Reference< css::drawing::XShape > &rXShape(rShape.getXShape());
|
|
if(!rXShape)
|
|
return;
|
|
|
|
// we need a ModelID for association
|
|
if(rShape.getDiagramDataModelID().isEmpty())
|
|
return;
|
|
|
|
// define target to save to
|
|
svx::diagram::PointStyle* pTarget(nullptr);
|
|
const bool bIsBackgroundShape(rShape.getDiagramDataModelID() == getBackgroundShapeModelID());
|
|
|
|
if(bIsBackgroundShape)
|
|
{
|
|
// if BackgroundShape, create properties & set as target
|
|
if(!maBackgroundShapeStyle)
|
|
maBackgroundShapeStyle = std::make_shared< svx::diagram::PointStyle >();
|
|
pTarget = maBackgroundShapeStyle.get();
|
|
}
|
|
else
|
|
{
|
|
// if Shape, seek association
|
|
for (auto & point : maPoints)
|
|
{
|
|
if(point.msModelId == rShape.getDiagramDataModelID())
|
|
{
|
|
// found - create properties & set as target
|
|
pTarget = point.msPointStylePtr.get();
|
|
|
|
// we are done, there is no 2nd shape with the same ModelID by definition
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
// no target -> nothing to do
|
|
if(nullptr == pTarget)
|
|
return;
|
|
|
|
#ifdef DBG_UTIL
|
|
// to easier decide which additional properties may/should be preserved,
|
|
// create a full list of set properties to browse/decide (in debugger)
|
|
const css::uno::Reference< css::beans::XPropertyState > xAllPropStates(rXShape, css::uno::UNO_QUERY);
|
|
const css::uno::Reference< css::beans::XPropertySet > xAllPropSet( rXShape, css::uno::UNO_QUERY );
|
|
const css::uno::Sequence< css::beans::Property > allSequence(xAllPropSet->getPropertySetInfo()->getProperties());
|
|
std::vector< std::pair< OUString, css::uno::Any >> allSetProps;
|
|
for (auto& rProp : allSequence)
|
|
{
|
|
try
|
|
{
|
|
if (xAllPropStates->getPropertyState(rProp.Name) == css::beans::PropertyState::PropertyState_DIRECT_VALUE)
|
|
{
|
|
css::uno::Any aValue(xAllPropSet->getPropertyValue(rProp.Name));
|
|
if(aValue.hasValue())
|
|
allSetProps.push_back(std::pair(rProp.Name, aValue));
|
|
}
|
|
}
|
|
catch (...)
|
|
{
|
|
}
|
|
}
|
|
#endif
|
|
|
|
const css::uno::Reference< css::beans::XPropertySet > xPropSet( rXShape, css::uno::UNO_QUERY );
|
|
if(!xPropSet)
|
|
return;
|
|
|
|
const css::uno::Reference< css::lang::XServiceInfo > xServiceInfo( rXShape, css::uno::UNO_QUERY );
|
|
if(!xServiceInfo)
|
|
return;
|
|
|
|
const css::uno::Reference< css::beans::XPropertySetInfo > xInfo(xPropSet->getPropertySetInfo());
|
|
if (!xInfo.is())
|
|
return;
|
|
|
|
// Note: The Text may also be secured here, so it may also be possible to
|
|
// secure/store it at PointStyle instead of at TextBody, same maybe evaluated
|
|
// for the text attributes - where when securing here the attributes would be
|
|
// in our UNO API format already.
|
|
// if(xServiceInfo->supportsService("com.sun.star.drawing.Text"))
|
|
// {
|
|
// css::uno::Reference< css::text::XText > xText(rXShape, css::uno::UNO_QUERY);
|
|
// const OUString aText(xText->getString());
|
|
//
|
|
// if(!aText.isEmpty())
|
|
// {
|
|
// }
|
|
// }
|
|
|
|
// Add all kinds of properties that are needed to re-create the XShape.
|
|
// For now this is a minimal example-selection, it will need to be extended
|
|
// over time for all kind of cases/properties
|
|
|
|
// text properties
|
|
if(!bIsBackgroundShape
|
|
&& xServiceInfo->supportsService(u"com.sun.star.drawing.TextProperties"_ustr))
|
|
{
|
|
addProperty(UNO_NAME_CHAR_COLOR, xInfo, pTarget->maProperties, xPropSet);
|
|
addProperty(UNO_NAME_CHAR_HEIGHT, xInfo, pTarget->maProperties, xPropSet);
|
|
addProperty(UNO_NAME_CHAR_SHADOWED, xInfo, pTarget->maProperties, xPropSet);
|
|
addProperty(UNO_NAME_CHAR_WEIGHT, xInfo, pTarget->maProperties, xPropSet);
|
|
}
|
|
|
|
// fill properties
|
|
if(xServiceInfo->supportsService(u"com.sun.star.drawing.FillProperties"_ustr))
|
|
{
|
|
css::drawing::FillStyle eFillStyle(css::drawing::FillStyle_NONE);
|
|
if (xInfo->hasPropertyByName(UNO_NAME_FILLSTYLE))
|
|
xPropSet->getPropertyValue(UNO_NAME_FILLSTYLE) >>= eFillStyle;
|
|
|
|
if(css::drawing::FillStyle_NONE != eFillStyle)
|
|
{
|
|
addProperty(UNO_NAME_FILLSTYLE, xInfo, pTarget->maProperties, xPropSet);
|
|
|
|
switch(eFillStyle)
|
|
{
|
|
case css::drawing::FillStyle_SOLID:
|
|
{
|
|
addProperty(UNO_NAME_FILLCOLOR, xInfo, pTarget->maProperties, xPropSet);
|
|
break;
|
|
}
|
|
default:
|
|
case css::drawing::FillStyle_NONE:
|
|
case css::drawing::FillStyle_GRADIENT:
|
|
case css::drawing::FillStyle_HATCH:
|
|
case css::drawing::FillStyle_BITMAP:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
// line properties
|
|
if(!bIsBackgroundShape
|
|
&& xServiceInfo->supportsService(u"com.sun.star.drawing.LineProperties"_ustr))
|
|
{
|
|
css::drawing::LineStyle eLineStyle(css::drawing::LineStyle_NONE);
|
|
if (xInfo->hasPropertyByName(UNO_NAME_LINESTYLE))
|
|
xPropSet->getPropertyValue(UNO_NAME_LINESTYLE) >>= eLineStyle;
|
|
|
|
if(css::drawing::LineStyle_NONE != eLineStyle)
|
|
{
|
|
addProperty(UNO_NAME_LINESTYLE, xInfo, pTarget->maProperties, xPropSet);
|
|
addProperty(UNO_NAME_LINECOLOR, xInfo, pTarget->maProperties, xPropSet);
|
|
addProperty(UNO_NAME_LINEWIDTH, xInfo, pTarget->maProperties, xPropSet);
|
|
|
|
switch(eLineStyle)
|
|
{
|
|
case css::drawing::LineStyle_SOLID:
|
|
break;
|
|
default:
|
|
case css::drawing::LineStyle_NONE:
|
|
case css::drawing::LineStyle_DASH:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void DiagramData_oox::secureDataFromShapeToModelAfterDiagramImport(::oox::drawingml::Shape& rRootShape)
|
|
{
|
|
const std::vector< ShapePtr >& rChildren(rRootShape.getChildren());
|
|
|
|
for (auto& child : rChildren)
|
|
{
|
|
secureStyleDataFromShapeToModel(*child);
|
|
}
|
|
|
|
// After Diagram import, parts of the Diagram ModelData is at the
|
|
// oox::drawingml::Shape. Since these objects are temporary helpers,
|
|
// secure that data at the Diagram ModelData by copying.
|
|
|
|
// This is currently mainly the Text, but may get more (styles?)
|
|
for (auto & point : maPoints)
|
|
{
|
|
Shape* pShapeCandidate(getOrCreateAssociatedShape(point));
|
|
|
|
if(nullptr != pShapeCandidate)
|
|
{
|
|
if(pShapeCandidate->getTextBody() && !pShapeCandidate->getTextBody()->isEmpty())
|
|
{
|
|
point.msTextBody->msText = pShapeCandidate->getTextBody()->toString();
|
|
|
|
const uno::Sequence< beans::PropertyValue > aTextProps(
|
|
pShapeCandidate->getTextBody()->getTextProperties().maPropertyMap.makePropertyValueSequence());
|
|
|
|
for (auto const& prop : aTextProps)
|
|
point.msTextBody->maTextProps.push_back(std::pair(prop.Name, prop.Value));
|
|
}
|
|
|
|
// At this place a mechanism to find missing data should be added:
|
|
// Create a Shape from so-far secured data & compare it with the
|
|
// imported one. Report differences to allow extending the mechanism
|
|
// more easily.
|
|
#ifdef DBG_UTIL
|
|
// The original is pShapeCandidate, re-create potential new oox::drawingml::Shape
|
|
// as aNew to be able to compare these
|
|
ShapePtr aNew(std::make_shared<Shape>());
|
|
restoreDataFromModelToShapeAfterReCreation(point, *aNew);
|
|
|
|
// Unfortunately oox::drawingml::Shape has no operator==. I tried to add
|
|
// one, but that is too expensive. I stopped at oox::drawingml::Color.
|
|
// To compare it is necessary to use the debugger, or for single aspects
|
|
// of the oox data it might be possible to call local dump() methods at
|
|
// both instances to compare them/their output
|
|
|
|
// bool bSame(aNew.get() == pShapeCandidate);
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
void DiagramData_oox::restoreStyleDataFromShapeToModel(::oox::drawingml::Shape& rShape)
|
|
{
|
|
const std::vector< ShapePtr >& rChildren(rShape.getChildren());
|
|
|
|
if(!rChildren.empty())
|
|
{
|
|
// group shape
|
|
for (auto& child : rChildren)
|
|
{
|
|
restoreStyleDataFromShapeToModel(*child);
|
|
}
|
|
|
|
// if group shape we are done. Do not restore properties for group shapes
|
|
return;
|
|
}
|
|
|
|
// we need a XShape
|
|
const css::uno::Reference< css::drawing::XShape > &rXShape(rShape.getXShape());
|
|
if(!rXShape)
|
|
return;
|
|
|
|
// we need a ModelID for association
|
|
if(rShape.getDiagramDataModelID().isEmpty())
|
|
return;
|
|
|
|
// define source to save to
|
|
svx::diagram::PointStyle* pSource(nullptr);
|
|
|
|
if(rShape.getDiagramDataModelID() == getBackgroundShapeModelID())
|
|
{
|
|
// if BackgroundShape, set BackgroundShapeStyle as source
|
|
if(maBackgroundShapeStyle)
|
|
pSource = maBackgroundShapeStyle.get();
|
|
}
|
|
else
|
|
{
|
|
// if Shape, seek association
|
|
for (auto & point : maPoints)
|
|
{
|
|
if(point.msModelId == rShape.getDiagramDataModelID())
|
|
{
|
|
// found - create properties & set as source
|
|
pSource = point.msPointStylePtr.get();
|
|
|
|
// we are done, there is no 2nd shape with the same ModelID by definition
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
// no source -> nothing to do
|
|
if(nullptr == pSource)
|
|
return;
|
|
|
|
// get target PropertySet of new XShape
|
|
css::uno::Reference<css::beans::XPropertySet> xPropSet(rXShape, css::uno::UNO_QUERY);
|
|
if(!xPropSet)
|
|
return;
|
|
|
|
// apply properties
|
|
for (auto const& prop : pSource->maProperties)
|
|
{
|
|
xPropSet->setPropertyValue(prop.first, prop.second);
|
|
}
|
|
}
|
|
|
|
void DiagramData_oox::restoreDataFromShapeToModelAfterDiagramImport(::oox::drawingml::Shape& rRootShape)
|
|
{
|
|
const std::vector< ShapePtr >& rChildren(rRootShape.getChildren());
|
|
|
|
for (auto& child : rChildren)
|
|
{
|
|
restoreStyleDataFromShapeToModel(*child);
|
|
}
|
|
}
|
|
|
|
DiagramData_oox::DiagramData_oox()
|
|
: svx::diagram::DiagramData_svx()
|
|
, mpBackgroundShapeFillProperties( std::make_shared<FillProperties>() )
|
|
{
|
|
}
|
|
|
|
DiagramData_oox::~DiagramData_oox()
|
|
{
|
|
}
|
|
|
|
static void Connection_dump(const svx::diagram::Connection& rConnection)
|
|
{
|
|
SAL_INFO(
|
|
"oox.drawingml",
|
|
"cnx modelId " << rConnection.msModelId << ", srcId " << rConnection.msSourceId << ", dstId "
|
|
<< rConnection.msDestId << ", parTransId " << rConnection.msParTransId << ", presId "
|
|
<< rConnection.msPresId << ", sibTransId " << rConnection.msSibTransId << ", srcOrd "
|
|
<< rConnection.mnSourceOrder << ", dstOrd " << rConnection.mnDestOrder);
|
|
}
|
|
|
|
static void Point_dump(const svx::diagram::Point& rPoint, const Shape* pShape)
|
|
{
|
|
SAL_INFO(
|
|
"oox.drawingml",
|
|
"pt text " << pShape << ", cnxId " << rPoint.msCnxId << ", modelId "
|
|
<< rPoint.msModelId << ", type " << rPoint.mnXMLType);
|
|
}
|
|
|
|
void DiagramData_oox::dump() const
|
|
{
|
|
SAL_INFO("oox.drawingml", "Dgm: DiagramData_oox # of cnx: " << maConnections.size() );
|
|
for (const auto& rConnection : maConnections)
|
|
Connection_dump(rConnection);
|
|
|
|
SAL_INFO("oox.drawingml", "Dgm: DiagramData_oox # of pt: " << maPoints.size() );
|
|
for (const auto& rPoint : maPoints)
|
|
Point_dump(rPoint, getOrCreateAssociatedShape(rPoint));
|
|
}
|
|
|
|
void DiagramData_oox::buildDiagramDataModel(bool bClearOoxShapes)
|
|
{
|
|
if(bClearOoxShapes)
|
|
{
|
|
// Delete/remove all existing oox::drawingml::Shape
|
|
maPointShapeMap.clear();
|
|
}
|
|
|
|
// call parent
|
|
svx::diagram::DiagramData_svx::buildDiagramDataModel(bClearOoxShapes);
|
|
|
|
if(bClearOoxShapes)
|
|
{
|
|
// re-create all existing oox::drawingml::Shape
|
|
svx::diagram::Points& rPoints = getPoints();
|
|
|
|
for (auto & point : rPoints)
|
|
{
|
|
// Create/get shape. Re-create here, that may also set needed
|
|
// and available data from the Diagram ModelData at the Shape
|
|
getOrCreateAssociatedShape(point, true);
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|