#86004# replaces sal_Char* in SvXMLEnumMapEntry arrays with token constants

3 files changed, 104 insertions, 94 deletions

diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx
index 18c1dcad53d5..7940fa6d8c7b 100644
--- a/svx/source/items/frmitems.cxx
+++ b/svx/source/items/frmitems.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmitems.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: os $ $Date: 2001-05-31 07:20:19 $
+ *  last change: $Author: dvo $ $Date: 2001-06-15 10:43:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,6 +120,9 @@
 #ifndef _XMLOFF_XMLKYWD_HXX
 #include <xmloff/xmlkywd.hxx>
 #endif
+#ifndef _XMLOFF_XMLTOKEN_HXX
+#include <xmloff/xmltoken.hxx>
+#endif
 #ifndef _XMLOFF_XMLUCONV_HXX
 #include <xmloff/xmluconv.hxx>
 #endif
@@ -223,6 +226,7 @@
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
+using namespace ::xmloff::token;
 
 
 // Konvertierung fuer UNO
@@ -2396,25 +2400,25 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 SvXMLEnumMapEntry psXML_BorderStyles[] =
 {
-    { sXML_none,                SVX_XML_BORDER_STYLE_NONE   },
-    { sXML_hidden,              SVX_XML_BORDER_STYLE_NONE   },
-    { sXML_solid,               SVX_XML_BORDER_STYLE_SOLID  },
-    { sXML_double,              SVX_XML_BORDER_STYLE_DOUBLE },
-    { sXML_dotted,              SVX_XML_BORDER_STYLE_SOLID  },
-    { sXML_dashed,              SVX_XML_BORDER_STYLE_SOLID  },
-    { sXML_groove,              SVX_XML_BORDER_STYLE_SOLID  },
-    { sXML_ridge,               SVX_XML_BORDER_STYLE_SOLID  },
-    { sXML_inset,               SVX_XML_BORDER_STYLE_SOLID  },
-    { sXML_outset,              SVX_XML_BORDER_STYLE_SOLID  },
-    { 0,        0 }
+    { XML_NONE,                 SVX_XML_BORDER_STYLE_NONE   },
+    { XML_HIDDEN,               SVX_XML_BORDER_STYLE_NONE   },
+    { XML_SOLID,                SVX_XML_BORDER_STYLE_SOLID  },
+    { XML_DOUBLE,               SVX_XML_BORDER_STYLE_DOUBLE },
+    { XML_DOTTED,               SVX_XML_BORDER_STYLE_SOLID  },
+    { XML_DASHED,               SVX_XML_BORDER_STYLE_SOLID  },
+    { XML_GROOVE,               SVX_XML_BORDER_STYLE_SOLID  },
+    { XML_RIDGE,                SVX_XML_BORDER_STYLE_SOLID  },
+    { XML_INSET,                SVX_XML_BORDER_STYLE_SOLID  },
+    { XML_OUTSET,               SVX_XML_BORDER_STYLE_SOLID  },
+    { XML_TOKEN_INVALID, 0 }
 };
 
 SvXMLEnumMapEntry psXML_NamedBorderWidths[] =
 {
-    { sXML_thin,    SVX_XML_BORDER_WIDTH_THIN   },
-    { sXML_middle,  SVX_XML_BORDER_WIDTH_MIDDLE },
-    { sXML_thick,   SVX_XML_BORDER_WIDTH_THICK  },
-    { 0,        0 }
+    { XML_THIN,     SVX_XML_BORDER_WIDTH_THIN   },
+    { XML_MIDDLE,   SVX_XML_BORDER_WIDTH_MIDDLE },
+    { XML_THICK,    SVX_XML_BORDER_WIDTH_THICK  },
+    { XML_TOKEN_INVALID, 0 }
 };
 // mapping tables to map external xml input to intarnal box line widths
 
@@ -3788,12 +3792,12 @@ sal_Bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 #ifndef SVX_LIGHT
 SvXMLEnumMapEntry psXML_BreakType[] =
 {
-    { sXML_auto,    0 },
-    { sXML_column, 1 },
-    { sXML_page,   2 },
-    { sXML_even_page, 2 },
-    { sXML_odd_page, 2 },
-    { 0, 0}
+    { XML_AUTO,         0 },
+    { XML_COLUMN,       1 },
+    { XML_PAGE,         2 },
+    { XML_EVEN_PAGE,    2 },
+    { XML_ODD_PAGE,     2 },
+    { XML_TOKEN_INVALID, 0}
 };
 #endif
 
@@ -4612,24 +4616,24 @@ sal_Bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 SvXMLEnumMapEntry psXML_BrushRepeat[] =
 {
-    { sXML_background_repeat,       GPOS_TILED  },
-    { sXML_background_no_repeat,    GPOS_MM     },
-    { sXML_background_stretch,      GPOS_AREA   },
-    { 0,                            0           }
+    { XML_BACKGROUND_REPEAT,        GPOS_TILED  },
+    { XML_BACKGROUND_NO_REPEAT,     GPOS_MM     },
+    { XML_BACKGROUND_STRETCH,       GPOS_AREA   },
+    { XML_TOKEN_INVALID, 0 }
 };
 
 SvXMLEnumMapEntry psXML_BrushHoriPos[] =
 {
-    { sXML_left,        GPOS_LM },
-    { sXML_right,       GPOS_RM },
-    { 0,                            0           }
+    { XML_LEFT,         GPOS_LM },
+    { XML_RIGHT,        GPOS_RM },
+    { XML_TOKEN_INVALID, 0 }
 };
 
 SvXMLEnumMapEntry psXML_BrushVertPos[] =
 {
-    { sXML_top,         GPOS_MT },
-    { sXML_bottom,      GPOS_MB },
-    { 0,                            0           }
+    { XML_TOP,          GPOS_MT },
+    { XML_BOTTOM,       GPOS_MB },
+    { XML_TOKEN_INVALID, 0 }
 };
 
 void lcl_frmitems_MergeXMLHoriPos( SvxGraphicPosition& ePos,
diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx
index 057a3d49ee65..b31d5e7de7aa 100644
--- a/svx/source/items/paraitem.cxx
+++ b/svx/source/items/paraitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paraitem.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: er $ $Date: 2001-05-13 03:29:15 $
+ *  last change: $Author: dvo $ $Date: 2001-06-15 10:43:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -125,6 +125,9 @@ using namespace ::com::sun::star;
 #ifndef _XMLOFF_XMLKYWD_HXX
 #include <xmloff/xmlkywd.hxx>
 #endif
+#ifndef _XMLOFF_XMLTOKEN_HXX
+#include <xmloff/xmltoken.hxx>
+#endif
 #ifndef _XMLOFF_XMLUCONV_HXX
 #include <xmloff/xmluconv.hxx>
 #endif
@@ -145,6 +148,7 @@ using namespace ::com::sun::star;
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
+using namespace ::xmloff::token;
 
 // Konvertierung fuer UNO
 #define TWIP_TO_MM100(TWIP)     ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
@@ -590,21 +594,21 @@ sal_Bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
 #ifndef SVX_LIGHT
 SvXMLEnumMapEntry pXML_para_adjust_enums[] =
 {
-    { sXML_start,       SVX_ADJUST_LEFT },
-    { sXML_end,         SVX_ADJUST_RIGHT },
-    { sXML_center,      SVX_ADJUST_CENTER },
-    { sXML_justify,     SVX_ADJUST_BLOCK },
-    { sXML_justified,   SVX_ADJUST_BLOCK },
-    { 0, 0 }
+    { XML_START,        SVX_ADJUST_LEFT },
+    { XML_END,          SVX_ADJUST_RIGHT },
+    { XML_CENTER,       SVX_ADJUST_CENTER },
+    { XML_JUSTIFY,      SVX_ADJUST_BLOCK },
+    { XML_JUSTIFIED,    SVX_ADJUST_BLOCK },
+    { XML_TOKEN_INVALID, 0 }
 };
 
 SvXMLEnumMapEntry pXML_para_align_last_enums[] =
 {
-    { sXML_start,       SVX_ADJUST_LEFT },
-    { sXML_center,      SVX_ADJUST_CENTER },
-    { sXML_justify,     SVX_ADJUST_BLOCK },
-    { sXML_justified,   SVX_ADJUST_BLOCK },
-    { 0, 0 }
+    { XML_START,        SVX_ADJUST_LEFT },
+    { XML_CENTER,       SVX_ADJUST_CENTER },
+    { XML_JUSTIFY,      SVX_ADJUST_BLOCK },
+    { XML_JUSTIFIED,    SVX_ADJUST_BLOCK },
+    { XML_TOKEN_INVALID, 0 }
 };
 #endif
 
@@ -663,7 +667,7 @@ sal_Bool SvxAdjustItem::exportXML( OUString& rValue, sal_uInt16 nMemberId, const
     case MID_PARA_ADJUST:
         bOk = rUnitConverter.convertEnum( aOut,
                                           GetAdjust(),
-                                          pXML_para_adjust_enums, sXML_start );
+                                          pXML_para_adjust_enums, XML_START );
         break;
     case MID_LAST_LINE_ADJUST:
         {
diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx
index 5b3d501f3c37..20930902fe1d 100644
--- a/svx/source/items/textitem.cxx
+++ b/svx/source/items/textitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textitem.cxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: sab $ $Date: 2001-05-30 16:35:50 $
+ *  last change: $Author: dvo $ $Date: 2001-06-15 10:43:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -233,6 +233,7 @@
 using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::text;
+using namespace ::xmloff::token;
 
 // Konvertierung fuer UNO
 #define TWIP_TO_MM100(TWIP)     ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
@@ -470,22 +471,22 @@ void xml_in_font_family_impl( SvxFontItem& rItem, const OUString& rValue )
 
 static SvXMLEnumMapEntry __READONLY_DATA aFontFamilyGenericMap[] =
 {
-    { sXML_decorative,  FAMILY_DECORATIVE },
+    { XML_DECORATIVE,   FAMILY_DECORATIVE },
 
-    { sXML_modern,      FAMILY_MODERN   },
-    { sXML_roman,       FAMILY_ROMAN    },
-    { sXML_script,      FAMILY_SCRIPT   },
-    { sXML_swiss,       FAMILY_SWISS    },
-    { sXML_system,      FAMILY_SYSTEM   },
-    { 0,                0               }
+    { XML_MODERN,       FAMILY_MODERN   },
+    { XML_ROMAN,        FAMILY_ROMAN    },
+    { XML_SCRIPT,       FAMILY_SCRIPT   },
+    { XML_SWISS,        FAMILY_SWISS    },
+    { XML_SYSTEM,       FAMILY_SYSTEM   },
+    { XML_TOKEN_INVALID, 0 }
 };
 
 static SvXMLEnumMapEntry __READONLY_DATA aFontPitchMap[] =
 {
-    { sXML_fixed,       PITCH_FIXED     },
+    { XML_FIXED,        PITCH_FIXED     },
 
-    { sXML_variable,    PITCH_VARIABLE  },
-    { 0,                0               }
+    { XML_VARIABLE,     PITCH_VARIABLE  },
+    { XML_TOKEN_INVALID, 0 }
 };
 #endif
 
@@ -634,7 +635,7 @@ sal_Bool SvxFontItem::exportXML( OUString& rValue, USHORT nMemberId, const SvXML
 
     case MID_FONT_PITCH:
         if( PITCH_DONTKNOW != ePitch )
-            bOk = rUnitConverter.convertEnum( aOut, ePitch, aFontPitchMap, sXML_fixed );
+            bOk = rUnitConverter.convertEnum( aOut, ePitch, aFontPitchMap, XML_FIXED );
         break;
     }
 
@@ -869,10 +870,10 @@ sal_Bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 #ifndef SVX_LIGHT
 static SvXMLEnumMapEntry __READONLY_DATA aPostureGenericMap[] =
 {
-    { sXML_posture_normal,      ITALIC_NONE     },
-    { sXML_posture_italic,      ITALIC_NORMAL   },
-    { sXML_posture_oblique,     ITALIC_OBLIQUE  },
-    { 0,                        0               }
+    { XML_POSTURE_NORMAL,       ITALIC_NONE     },
+    { XML_POSTURE_ITALIC,       ITALIC_NORMAL   },
+    { XML_POSTURE_OBLIQUE,      ITALIC_OBLIQUE  },
+    { XML_TOKEN_INVALID, 0 }
 };
 #endif
 
@@ -1855,25 +1856,25 @@ int SvxUnderlineItem::operator==( const SfxPoolItem& rItem ) const
 
 SvXMLEnumMapEntry pXML_underline_enums[] =
 {
-    { sXML_underline_none,              UNDERLINE_NONE },
-    { sXML_underline_single,            UNDERLINE_SINGLE },
-    { sXML_underline_double,            UNDERLINE_DOUBLE },
-    { sXML_underline_dotted,            UNDERLINE_DOTTED },
-    { sXML_underline_dash,              UNDERLINE_DASH },
-    { sXML_underline_long_dash,         UNDERLINE_LONGDASH },
-    { sXML_underline_dot_dash,          UNDERLINE_DASHDOT },
-    { sXML_underline_dot_dot_dash,      UNDERLINE_DASHDOTDOT },
-    { sXML_underline_wave,              UNDERLINE_WAVE },
-    { sXML_underline_bold,              UNDERLINE_BOLD },
-    { sXML_underline_bold_dotted,       UNDERLINE_BOLDDOTTED },
-    { sXML_underline_bold_dash,         UNDERLINE_BOLDDASH },
-    { sXML_underline_bold_long_dash,    UNDERLINE_BOLDLONGDASH },
-    { sXML_underline_bold_dot_dash,     UNDERLINE_BOLDDASHDOT },
-    { sXML_underline_bold_dot_dot_dash, UNDERLINE_BOLDDASHDOTDOT },
-    { sXML_underline_bold_wave,         UNDERLINE_BOLDWAVE },
-    { sXML_underline_double_wave,       UNDERLINE_DOUBLEWAVE },
-    { sXML_underline_small_wave,        UNDERLINE_SMALLWAVE },
-    { 0,                                0 }
+    { XML_UNDERLINE_NONE,               UNDERLINE_NONE },
+    { XML_UNDERLINE_SINGLE,             UNDERLINE_SINGLE },
+    { XML_UNDERLINE_DOUBLE,             UNDERLINE_DOUBLE },
+    { XML_UNDERLINE_DOTTED,             UNDERLINE_DOTTED },
+    { XML_UNDERLINE_DASH,               UNDERLINE_DASH },
+    { XML_UNDERLINE_LONG_DASH,          UNDERLINE_LONGDASH },
+    { XML_UNDERLINE_DOT_DASH,           UNDERLINE_DASHDOT },
+    { XML_UNDERLINE_DOT_DOT_DASH,       UNDERLINE_DASHDOTDOT },
+    { XML_UNDERLINE_WAVE,               UNDERLINE_WAVE },
+    { XML_UNDERLINE_BOLD,               UNDERLINE_BOLD },
+    { XML_UNDERLINE_BOLD_DOTTED,        UNDERLINE_BOLDDOTTED },
+    { XML_UNDERLINE_BOLD_DASH,          UNDERLINE_BOLDDASH },
+    { XML_UNDERLINE_BOLD_LONG_DASH,     UNDERLINE_BOLDLONGDASH },
+    { XML_UNDERLINE_BOLD_DOT_DASH,      UNDERLINE_BOLDDASHDOT },
+    { XML_UNDERLINE_BOLD_DOT_DOT_DASH,  UNDERLINE_BOLDDASHDOTDOT },
+    { XML_UNDERLINE_BOLD_WAVE,          UNDERLINE_BOLDWAVE },
+    { XML_UNDERLINE_DOUBLE_WAVE,        UNDERLINE_DOUBLEWAVE },
+    { XML_UNDERLINE_SMALL_WAVE,         UNDERLINE_SMALLWAVE },
+    { XML_TOKEN_INVALID, 0 }
 };
 #endif
 
@@ -2079,12 +2080,13 @@ sal_Bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 #ifndef SVX_LIGHT
 SvXMLEnumMapEntry pXML_crossedout_enums[] =
 {
-    { sXML_crossedout_none,      STRIKEOUT_NONE },
-    { sXML_crossedout_single,    STRIKEOUT_SINGLE },
-    { sXML_crossedout_double,    STRIKEOUT_DOUBLE },
-    { sXML_crossedout_thick,     STRIKEOUT_BOLD },
-    { sXML_crossedout_slash,     STRIKEOUT_SLASH },
-    { sXML_crossedout_cross,     STRIKEOUT_X }
+    { XML_CROSSEDOUT_NONE,      STRIKEOUT_NONE },
+    { XML_CROSSEDOUT_SINGLE,    STRIKEOUT_SINGLE },
+    { XML_CROSSEDOUT_DOUBLE,    STRIKEOUT_DOUBLE },
+    { XML_CROSSEDOUT_THICK,     STRIKEOUT_BOLD },
+    { XML_CROSSEDOUT_SLASH,     STRIKEOUT_SLASH },
+    { XML_CROSSEDOUT_CROSS,     STRIKEOUT_X },
+    { XML_TOKEN_INVALID, 0 }
 };
 #endif
 
@@ -2998,11 +3000,11 @@ sal_Bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 #ifndef SVX_LIGHT
 static SvXMLEnumMapEntry pXML_casemap_enums[] =
 {
-    { sXML_none,                SVX_CASEMAP_NOT_MAPPED },
-    { sXML_casemap_lowercase,   SVX_CASEMAP_GEMEINE },
-    { sXML_casemap_uppercase,   SVX_CASEMAP_VERSALIEN },
-    { sXML_casemap_capitalize,  SVX_CASEMAP_TITEL },
-    { 0,0 }
+    { XML_NONE,                 SVX_CASEMAP_NOT_MAPPED },
+    { XML_CASEMAP_LOWERCASE,    SVX_CASEMAP_GEMEINE },
+    { XML_CASEMAP_UPPERCASE,    SVX_CASEMAP_VERSALIEN },
+    { XML_CASEMAP_CAPITALIZE,   SVX_CASEMAP_TITEL },
+    { XML_TOKEN_INVALID, 0 }
 };
 #endif