INTEGRATION: CWS oasis (1.7.270); FILE MERGED

2004/06/23 08:10:20 cl 1.7.270.3: fixed merge conflict
2004/05/11 11:11:24 mib 1.7.270.2: - #i20153#: encode/decode style names finished
2004/05/07 11:59:57 mib 1.7.270.1: - #i20153#: encode/decode style names (ooo2oasis missing)

xmloff/source/style/MarkerStyle.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MarkerStyle.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2004-06-17 15:00:32 $
+ *  last change: $Author: rt $ $Date: 2004-07-13 08:32:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -132,6 +132,7 @@ sal_Bool XMLMarkerStyleImport::importXML(
 {
     sal_Bool bHasViewBox    = sal_False;
     sal_Bool bHasPathData   = sal_False;
+    OUString aDisplayName;
 
     SdXMLImExViewBox* pViewBox = NULL;
 
@@ -152,6 +153,10 @@ sal_Bool XMLMarkerStyleImport::importXML(
         {
             rStrName = aStrValue;
         }
+        else if( IsXMLToken( aStrAttrName, XML_DISPLAY_NAME ) )
+        {
+            aDisplayName = aStrValue;
+        }
         else if( IsXMLToken( aStrAttrName, XML_VIEWBOX ) )
         {
             pViewBox = new SdXMLImExViewBox( aStrValue, rUnitConverter );
@@ -203,6 +208,14 @@ sal_Bool XMLMarkerStyleImport::importXML(
 
             rValue <<= aSourcePolyPolygon;
         }
+
+        if( aDisplayName.getLength() )
+        {
+            rImport.AddStyleDisplayName( XML_STYLE_FAMILY_SD_MARKER_ID, rStrName,
+                                        aDisplayName );
+            rStrName = aDisplayName;
+        }
+
     }
 
     if( pViewBox )
@@ -247,8 +260,14 @@ sal_Bool XMLMarkerStyleExport::exportXML(
 
             /////////////////
             // Name
+            sal_Bool bEncoded = sal_False;
             OUString aStrName( rStrName );
-            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStrName );
+            rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME,
+                                  rExport.EncodeStyleName( aStrName,
+                                                           &bEncoded ) );
+            if( bEncoded )
+                rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY_NAME,
+                                      aStrName );
 
             /////////////////
             // Viewbox (viewBox="0 0 1500 1000")