diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-06-11 13:52:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-06-11 13:52:50 +0000 |
| commit | e7478d09037383d5cb7457f25f62000e678622fd (patch) | |
| tree | aa4b5a6fc4bd18dedf459194bf1e2025d3154de9 /xmloff | |
| parent | 90d922b696ee9c1c83d78d8b77fbdd855b166686 (diff) | |
INTEGRATION: CWS chart05 (1.38.82); FILE MERGED
2007/05/29 09:35:41 bm 1.38.82.1: #124507# UserDefinedAttributes
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/style/xmlimppr.cxx | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index b41fffba1721..b4cbd81cf195 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlimppr.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: rt $ $Date: 2006-12-01 15:27:45 $ + * last change: $Author: obo $ $Date: 2007-06-11 14:52:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -317,11 +317,26 @@ void SvXMLImportPropertyMapper::importXML( xAttrContainer = xNew; // find map entry and create new property state - nIndex = maPropMapper->FindEntryIndex( "UserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) ); if( -1 == nIndex ) - nIndex = maPropMapper->FindEntryIndex( "ParaUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) ); - if( -1 == nIndex ) - nIndex = maPropMapper->FindEntryIndex( "TextUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) ); + { + switch( nPropType ) + { + case XML_TYPE_PROP_CHART: + nIndex = maPropMapper->FindEntryIndex( "ChartUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) ); + break; + case XML_TYPE_PROP_PARAGRAPH: + nIndex = maPropMapper->FindEntryIndex( "ParaUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) ); + break; + case XML_TYPE_PROP_TEXT: + nIndex = maPropMapper->FindEntryIndex( "TextUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) ); + break; + default: + break; + } + // other property type or property not found + if( -1 == nIndex ) + nIndex = maPropMapper->FindEntryIndex( "UserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) ); + } // #106963#; use userdefined attribute only if it is in the specified property range if( nIndex != -1 && nIndex >= nStartIdx && nIndex < nEndIdx) |