diff options
Diffstat (limited to 'xmloff/source/draw/shapeimport.cxx')
| -rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index bf0b1d7a951b..2ac15ae78ed5 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -112,10 +112,10 @@ struct XMLShapeImportHelperImpl bool mbIsPresentationShapesSupported; }; -const std::u16string_view gsStartShape(u"StartShape"); -const std::u16string_view gsEndShape(u"EndShape"); -const std::u16string_view gsStartGluePointIndex(u"StartGluePointIndex"); -const std::u16string_view gsEndGluePointIndex(u"EndGluePointIndex"); +const OUStringLiteral gsStartShape(u"StartShape"); +const OUStringLiteral gsEndShape(u"EndShape"); +const OUStringLiteral gsStartGluePointIndex(u"StartGluePointIndex"); +const OUStringLiteral gsEndGluePointIndex(u"EndGluePointIndex"); XMLShapeImportHelper::XMLShapeImportHelper( SvXMLImport& rImporter, @@ -819,10 +819,16 @@ void XMLShapeImportHelper::restoreConnections() mrImporter.getInterfaceToIdentifierMapper().getReference( rHint.aDestShapeId ), uno::UNO_QUERY ); if( xShape.is() ) { - xConnector->setPropertyValue( rHint.bStart ? gsStartShape : gsEndShape, uno::Any(xShape) ); + if (rHint.bStart) + xConnector->setPropertyValue( gsStartShape, uno::Any(xShape) ); + else + xConnector->setPropertyValue( gsEndShape, uno::Any(xShape) ); sal_Int32 nGlueId = rHint.nDestGlueId < 4 ? rHint.nDestGlueId : getGluePointId( xShape, rHint.nDestGlueId ); - xConnector->setPropertyValue( rHint.bStart ? gsStartGluePointIndex : gsEndGluePointIndex, uno::Any(nGlueId) ); + if(rHint.bStart) + xConnector->setPropertyValue( gsStartGluePointIndex, uno::Any(nGlueId) ); + else + xConnector->setPropertyValue( gsEndGluePointIndex, uno::Any(nGlueId) ); } // #86637# restore line deltas |