diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-04-28 13:58:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-04-28 13:58:07 +0000 |
| commit | 47532fe30ae0e6a43a354022b9e5adf242d688cd (patch) | |
| tree | 7e4ce1038a39123f5e713ac67dcb1c8d13685566 /xmloff/source/draw/ximpshap.cxx | |
| parent | 59537281b376dde3509e8b2b335c46cc9283e451 (diff) | |
INTEGRATION: CWS impress93 (1.110.34); FILE MERGED
2006/04/20 12:33:35 cl 1.110.34.1: #i58712# correctly import image map at the draw:frame element
Diffstat (limited to 'xmloff/source/draw/ximpshap.cxx')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 0be074583cc0..73fcb064b39e 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ximpshap.cxx,v $ * - * $Revision: 1.111 $ + * $Revision: 1.112 $ * - * last change: $Author: kz $ $Date: 2006-04-26 20:43:42 $ + * last change: $Author: rt $ $Date: 2006-04-28 14:58:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2381,17 +2381,7 @@ SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext( { SvXMLImportContext* pContext = NULL; - if ( (XML_NAMESPACE_DRAW == nPrefix) && - IsXMLToken( rLocalName, XML_IMAGE_MAP ) ) - { - uno::Reference< beans::XPropertySet > xPropSet(mxShape,uno::UNO_QUERY); - if (xPropSet.is()) - { - pContext = new XMLImageMapContext(GetImport(), nPrefix, - rLocalName, xPropSet); - } - } - else if( (XML_NAMESPACE_OFFICE == nPrefix) && + if( (XML_NAMESPACE_OFFICE == nPrefix) && xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) ) { if( !maURL.getLength() && !mxBase64Stream.is() ) @@ -3296,6 +3286,18 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( USHORT nPrefix, pContext = PTR_CAST( SdXMLShapeContext, pImplContext )->CreateChildContext( nPrefix, rLocalName, xAttrList ); } + else if ( (XML_NAMESPACE_DRAW == nPrefix) && IsXMLToken( rLocalName, XML_IMAGE_MAP ) ) + { + SdXMLShapeContext *pSContext = dynamic_cast< SdXMLShapeContext* >( &mxImplContext ); + if( pSContext ) + { + uno::Reference < beans::XPropertySet > xPropSet( pSContext->getShape(), uno::UNO_QUERY ); + if (xPropSet.is()) + { + pContext = new XMLImageMapContext(GetImport(), nPrefix, rLocalName, xPropSet); + } + } + } // call parent for content if(!pContext) |