diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-17 07:59:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-17 07:59:32 +0000 |
| commit | 452edc201b2c9f9ba6a15c8d13e44e18c04d1f57 (patch) | |
| tree | afdde220493744c4d041c4632871d0641dc22e21 /xmloff/source/draw/shapeexport2.cxx | |
| parent | cd1e25e1d5a65e7d7bd3b6c6affa594a5e13f9d3 (diff) | |
INTEGRATION: CWS aw026 (1.42.54); FILE MERGED
2005/02/02 15:37:58 aw 1.42.54.2: RESYNC: (1.42-1.43); FILE MERGED
2005/01/28 19:09:16 aw 1.42.54.1: #i39320#
Diffstat (limited to 'xmloff/source/draw/shapeexport2.cxx')
| -rw-r--r-- | xmloff/source/draw/shapeexport2.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 4007d3e99ab0..d3bbd7d76c5d 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeexport2.cxx,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: rt $ $Date: 2005-01-27 11:09:19 $ + * last change: $Author: vg $ $Date: 2005-02-17 08:59:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1393,13 +1393,15 @@ void XMLShapeExport::ImpExportConnectorShape( aStr = sStringBuffer.makeStringAndClear(); rExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr); - uno::Reference< uno::XInterface > xRef; + // #i39320# + uno::Reference< uno::XInterface > xRefS; + uno::Reference< uno::XInterface > xRefE; // export start connection - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartShape") ) ) >>= xRef; - if( xRef.is() ) + xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartShape") ) ) >>= xRefS; + if( xRefS.is() ) { - const OUString& rShapeId = rExport.getInterfaceToIdentifierMapper().getIdentifier( xRef ); + const OUString& rShapeId = rExport.getInterfaceToIdentifierMapper().getIdentifier( xRefS ); rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_SHAPE, rShapeId); aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartGluePointIndex")) ); @@ -1414,10 +1416,10 @@ void XMLShapeExport::ImpExportConnectorShape( } // export end connection - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndShape")) ) >>= xRef; - if( xRef.is() ) + xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndShape")) ) >>= xRefE; + if( xRefE.is() ) { - const OUString& rShapeId = rExport.getInterfaceToIdentifierMapper().getIdentifier( xRef ); + const OUString& rShapeId = rExport.getInterfaceToIdentifierMapper().getIdentifier( xRefE ); rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_SHAPE, rShapeId); aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndGluePointIndex")) ); |