summaryrefslogtreecommitdiff
path: root/xmloff/source/style/xmlimppr.cxx
diff options
context:
space:
mode:
authorChristian Lippka <cl@openoffice.org>2001-10-12 15:19:53 +0000
committerChristian Lippka <cl@openoffice.org>2001-10-12 15:19:53 +0000
commit864d0c8cdc63814e16a27938e7d168e06dc96cd3 (patch)
treea654300466ec43ce3dc3b2ff0578d7a074fd77fc /xmloff/source/style/xmlimppr.cxx
parentcf2c31077672f8ad16c3bdfb14b090a0b69e0575 (diff)
#91486# added xml alien attributes
Diffstat (limited to 'xmloff/source/style/xmlimppr.cxx')
-rw-r--r--xmloff/source/style/xmlimppr.cxx31
1 files changed, 20 insertions, 11 deletions
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index e276cfa8325f..9b6fc06df79b 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmlimppr.cxx,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: sab $ $Date: 2001-10-04 15:59:13 $
+ * last change: $Author: cl $ $Date: 2001-10-12 16:16:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -309,16 +309,25 @@ void SvXMLImportPropertyMapper::importXML(
xAttrContainer = xNew;
// find map entry and create new property state
- sal_Int32 nTextIndex = maPropMapper->FindEntryIndex( "TextUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) );
- sal_Int32 nUserIndex = maPropMapper->FindEntryIndex( "UserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) );
- if ((nTextIndex > -1) && (nUserIndex > -1))
- nIndex = (nTextIndex < nUserIndex) ? nTextIndex : nUserIndex;
- else if (nTextIndex > -1)
- nIndex = nTextIndex;
- else if (nUserIndex > -1)
- nIndex = nUserIndex;
+ sal_Int32 nShapeIndex = maPropMapper->FindEntryIndex( "ShapeUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) );
+ if( nShapeIndex > -1 )
+ {
+ nIndex = nShapeIndex;
+ }
else
- DBG_ERROR("not able to store alien attribute");
+ {
+ sal_Int32 nTextIndex = maPropMapper->FindEntryIndex( "TextUserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) );
+ sal_Int32 nUserIndex = maPropMapper->FindEntryIndex( "UserDefinedAttributes", XML_NAMESPACE_TEXT, GetXMLToken(XML_XMLNS) );
+
+ if ((nTextIndex > -1) && (nUserIndex > -1))
+ nIndex = (nTextIndex < nUserIndex) ? nTextIndex : nUserIndex;
+ else if (nTextIndex > -1)
+ nIndex = nTextIndex;
+ else if (nUserIndex > -1)
+ nIndex = nUserIndex;
+ else
+ DBG_ERROR("not able to store alien attribute");
+ }
Any aAny;
aAny <<= xAttrContainer;