diff options
Diffstat (limited to 'xmloff/source/draw/shapeimport.cxx')
| -rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 762fc3e38bc8..dff86d74b63a 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -100,19 +100,18 @@ struct XMLShapeImportHelperImpl bool mbIsPresentationShapesSupported; }; +static const OUStringLiteral gsStartShape("StartShape"); +static const OUStringLiteral gsEndShape("EndShape"); +static const OUStringLiteral gsStartGluePointIndex("StartGluePointIndex"); +static const OUStringLiteral gsEndGluePointIndex("EndGluePointIndex"); + XMLShapeImportHelper::XMLShapeImportHelper( SvXMLImport& rImporter, const uno::Reference< frame::XModel>& rModel, SvXMLImportPropertyMapper *pExtMapper ) : mpImpl( new XMLShapeImportHelperImpl ), - mpPropertySetMapper(nullptr), mpPresPagePropsMapper(nullptr), - msStartShape("StartShape"), - msEndShape("EndShape"), - msStartGluePointIndex("StartGluePointIndex"), - msEndGluePointIndex("EndGluePointIndex"), - mrImporter( rImporter ) { mpImpl->mpSortContext = nullptr; @@ -941,10 +940,10 @@ void XMLShapeImportHelper::restoreConnections() mrImporter.getInterfaceToIdentifierMapper().getReference( rHint.aDestShapeId ), uno::UNO_QUERY ); if( xShape.is() ) { - xConnector->setPropertyValue( rHint.bStart ? msStartShape : msEndShape, uno::Any(xShape) ); + xConnector->setPropertyValue( rHint.bStart ? gsStartShape : gsEndShape, uno::Any(xShape) ); sal_Int32 nGlueId = rHint.nDestGlueId < 4 ? rHint.nDestGlueId : getGluePointId( xShape, rHint.nDestGlueId ); - xConnector->setPropertyValue( rHint.bStart ? msStartGluePointIndex : msEndGluePointIndex, uno::Any(nGlueId) ); + xConnector->setPropertyValue( rHint.bStart ? gsStartGluePointIndex : gsEndGluePointIndex, uno::Any(nGlueId) ); } // #86637# restore line deltas |