diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 16:27:02 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 16:27:02 +0000 |
| commit | 69ac2cd6afd8309a981053bae45da34bfeb7938b (patch) | |
| tree | 4bdc88dcb3509ce37016ef2f0ad5e9767f67643c /xmloff | |
| parent | f54a6d864ec800a154be85e48189576c3af7f9d8 (diff) | |
INTEGRATION: CWS aw038 (1.16.48); FILE MERGED
2006/12/07 17:23:58 cl 1.16.48.1: #i68101# use elements for title and description, not attributes
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/ximpgrp.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 5e699c42b3ff..183d9a03a0cf 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ximpgrp.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2006-09-17 10:31:34 $ + * last change: $Author: ihi $ $Date: 2006-12-19 17:27:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,12 +55,11 @@ #ifndef _XMLOFF_EVENTIMP_HXX #include "eventimp.hxx" #endif +#include "descriptionimp.hxx" using namespace ::rtl; using namespace ::com::sun::star; -using ::xmloff::token::IsXMLToken; -using ::xmloff::token::XML_EVENT_LISTENERS; -using ::xmloff::token::XML_GLUE_POINT; +using namespace ::xmloff::token; ////////////////////////////////////////////////////////////////////////////// @@ -90,7 +89,13 @@ SvXMLImportContext* SdXMLGroupShapeContext::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 ); } |