diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 16:26:48 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 16:26:48 +0000 |
| commit | f54a6d864ec800a154be85e48189576c3af7f9d8 (patch) | |
| tree | 98659c59d91a70ceb7f21eeb34dfc7b370e01434 /xmloff | |
| parent | ee1e020b216a74dab6adc43298fbff224513e7b2 (diff) | |
INTEGRATION: CWS aw038 (1.20.4); FILE MERGED
2006/12/07 17:23:58 cl 1.20.4.2: #i68101# use elements for title and description, not attributes
2006/12/01 17:40:20 aw 1.20.4.1: #i68101# XML support for svg:title and svg:desc for shapes
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/ximp3dscene.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 0439df0779d3..986fcb545ea7 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ximp3dscene.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 14:15:52 $ + * last change: $Author: ihi $ $Date: 2006-12-19 17:26:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,6 +67,7 @@ #ifndef _XMLOFF_EVENTIMP_HXX #include "eventimp.hxx" #endif +#include "descriptionimp.hxx" using namespace ::rtl; using namespace ::com::sun::star; @@ -215,7 +216,13 @@ SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( USHORT nPrefix { SvXMLImportContext* pContext = 0L; - if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) ) + // #i68101# + if( nPrefix == XML_NAMESPACE_SVG && + (IsXMLToken( rLocalName, XML_TITLE ) || IsXMLToken( rLocalName, XML_DESC ) ) ) + { + pContext = new SdXMLDescriptionContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); + } + else if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) ) { pContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); } |