sw html: get rid of macro - use const sal_Char* constant instead

Change-Id: I2b3b264d40cd61507e0b3a1957f89f4f681c6f61

3 files changed, 313 insertions, 325 deletions

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 22b38d0eb0d3..8cf12872ecb0 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -110,11 +110,11 @@ using ::editeng::SvxBorderLine;
 #define CSS1_FRMSIZE_ANYHEIGHT  0x0e
 #define CSS1_FRMSIZE_PIXEL      0x10
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" );
-const sal_Char cCSS1_style_opt_end = '\"';
+const sal_Char* sCSS1_rule_end      = " }";
+const sal_Char* sCSS1_span_tag_end  = "\">";
+const sal_Char cCSS1_style_opt_end  = '\"';
 
-sal_Char CSS1_CONSTASCII_DEF( sHTML_FTN_fontheight, "57%" );
+const sal_Char* sHTML_FTN_fontheight = "57%";
 
 extern SwAttrFnTab aCSS1AttrFnTab;
 
@@ -3486,7 +3486,7 @@ static Writer& OutCSS1_SvxFrameDirection( Writer& rWrt, const SfxPoolItem& rHt )
 
     sal_uInt16 nDir =
         static_cast< const SvxFrameDirectionItem& >( rHt ).GetValue();
-    sal_Char *pStr = 0;
+    const sal_Char* pStr = NULL;
     switch( nDir )
     {
     case FRMDIR_HORI_LEFT_TOP:
diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx
index 0ac6b283bba8..e5bc4c5e3082 100644
--- a/sw/source/filter/html/css1kywd.cxx
+++ b/sw/source/filter/html/css1kywd.cxx
@@ -3,8 +3,8 @@
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * License = v. 2.0. If a copy of the MPL was not distributed with this
+ * file = You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * This file incorporates work covered by the following license notice:
  *
@@ -12,240 +12,240 @@
  *   contributor license agreements. See the NOTICE file distributed
  *   with this work for additional information regarding copyright
  *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
+ *   License = Version 2.0 (the "License"); you may not use this file
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
 #include "css1kywd.hxx"
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS_mimetype, "text/css" );
+const sal_Char* sCSS_mimetype = "text/css";
 
 // ein par allgemeine Strings
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_import, "import" );
+const sal_Char* sCSS1_import = "import";
 
 // Feature: PrintExt
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_page, "page" );
-//sal_Char CSS1_CONSTASCII_DEF( sCSS1_media, "media" );
+const sal_Char* sCSS1_page = "page";
+//const sal_Char* sCSS1_media = "media";
 // /Feature: PrintExt
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_important, "important" );
+const sal_Char* sCSS1_important = "important";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_link, "link" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_visited, "visited" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_first_letter, "first-letter" );
+const sal_Char* sCSS1_link = "link";
+const sal_Char* sCSS1_visited = "visited";
+const sal_Char* sCSS1_first_letter = "first-letter";
 
 // Feature: PrintExt
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_left, "left" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_right, "right" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_first, "first" );
+const sal_Char* sCSS1_left = "left";
+const sal_Char* sCSS1_right = "right";
+const sal_Char* sCSS1_first = "first";
 // /Feature: PrintExt
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_url, "url" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_rgb, "rgb" );
+const sal_Char* sCSS1_url = "url";
+const sal_Char* sCSS1_rgb = "rgb";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_pt, "pt" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_mm, "mm" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_cm, "cm" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_pc, "pc" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_inch, "in" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_px, "px" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_em, "em" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_ex, "ex" );
+const sal_Char* sCSS1_UNIT_pt = "pt";
+const sal_Char* sCSS1_UNIT_mm = "mm";
+const sal_Char* sCSS1_UNIT_cm = "cm";
+const sal_Char* sCSS1_UNIT_pc = "pc";
+const sal_Char* sCSS1_UNIT_inch = "in";
+const sal_Char* sCSS1_UNIT_px = "px";
+const sal_Char* sCSS1_UNIT_em = "em";
+const sal_Char* sCSS1_UNIT_ex = "ex";
 
 // Strings fuer Font-Properties
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_family, "font-family" );
+const sal_Char* sCSS1_P_font_family = "font-family";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_serif, "serif" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_sans_serif, "sans-serif" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cursive, "cursive" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_fantasy, "fantasy" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_monospace, "monospace" );
+const sal_Char* sCSS1_PV_serif = "serif";
+const sal_Char* sCSS1_PV_sans_serif = "sans-serif";
+const sal_Char* sCSS1_PV_cursive = "cursive";
+const sal_Char* sCSS1_PV_fantasy = "fantasy";
+const sal_Char* sCSS1_PV_monospace = "monospace";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_style, "font-style" );
+const sal_Char* sCSS1_P_font_style = "font-style";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_italic, "italic" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_oblique, "oblique" );
+const sal_Char* sCSS1_PV_normal = "normal";
+const sal_Char* sCSS1_PV_italic = "italic";
+const sal_Char* sCSS1_PV_oblique = "oblique";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_variant, "font-variant" );
+const sal_Char* sCSS1_P_font_variant = "font-variant";
 
-//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small_caps, "small-caps" );
+//const sal_Char* sCSS1_PV_normal = "normal";
+const sal_Char* sCSS1_PV_small_caps = "small-caps";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_weight, "font-weight" );
+const sal_Char* sCSS1_P_font_weight = "font-weight";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_light, "extra-light" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_light, "light" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_demi_light, "demi-light" );
-//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_demi_bold, "demi-bold" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bold, "bold" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_bold, "extra-bold" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_lighter, "lighter" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bolder, "bolder" );
+const sal_Char* sCSS1_PV_extra_light = "extra-light";
+const sal_Char* sCSS1_PV_light = "light";
+const sal_Char* sCSS1_PV_demi_light = "demi-light";
+//const sal_Char* sCSS1_PV_medium = "medium";
+const sal_Char* sCSS1_PV_demi_bold = "demi-bold";
+const sal_Char* sCSS1_PV_bold = "bold";
+const sal_Char* sCSS1_PV_extra_bold = "extra-bold";
+const sal_Char* sCSS1_PV_lighter = "lighter";
+const sal_Char* sCSS1_PV_bolder = "bolder";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_transform, "text-transform" );
+const sal_Char* sCSS1_P_text_transform = "text-transform";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_capitalize, "capitalize" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_uppercase, "uppercase" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_lowercase, "lowercase" );
+const sal_Char* sCSS1_PV_capitalize = "capitalize";
+const sal_Char* sCSS1_PV_uppercase = "uppercase";
+const sal_Char* sCSS1_PV_lowercase = "lowercase";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_size, "font-size" );
+const sal_Char* sCSS1_P_font_size = "font-size";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_small, "xx-small" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_x_small, "x-small" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small, "small" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_large, "large" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_x_large, "x-large" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_large, "xx-large" );
+const sal_Char* sCSS1_PV_xx_small = "xx-small";
+const sal_Char* sCSS1_PV_x_small = "x-small";
+const sal_Char* sCSS1_PV_small = "small";
+const sal_Char* sCSS1_PV_medium = "medium";
+const sal_Char* sCSS1_PV_large = "large";
+const sal_Char* sCSS1_PV_x_large = "x-large";
+const sal_Char* sCSS1_PV_xx_large = "xx-large";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_larger, "larger" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_smaller, "smaller" );
+const sal_Char* sCSS1_PV_larger = "larger";
+const sal_Char* sCSS1_PV_smaller = "smaller";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" );
+const sal_Char* sCSS1_P_font = "font";
 
 // Strings fuer Farb- und Hintergrund-Properties
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_color, "color" );
+const sal_Char* sCSS1_P_color = "color";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background, "background" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background_color, "background-color" );
+const sal_Char* sCSS1_P_background = "background";
+const sal_Char* sCSS1_P_background_color = "background-color";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_transparent, "transparent" );
+const sal_Char* sCSS1_PV_transparent = "transparent";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat, "repeat" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_x, "repeat-x" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_y, "repeat-y" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_no_repeat, "no-repeat" );
+const sal_Char* sCSS1_PV_repeat = "repeat";
+const sal_Char* sCSS1_PV_repeat_x = "repeat-x";
+const sal_Char* sCSS1_PV_repeat_y = "repeat-y";
+const sal_Char* sCSS1_PV_no_repeat = "no-repeat";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_top, "top" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_middle, "middle" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bottom, "bottom" );
+const sal_Char* sCSS1_PV_top = "top";
+const sal_Char* sCSS1_PV_middle = "middle";
+const sal_Char* sCSS1_PV_bottom = "bottom";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_scroll, "scroll" );
+const sal_Char* sCSS1_PV_scroll = "scroll";
 
 // Strings fuer Text-Properties
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_letter_spacing, "letter-spacing" );
+const sal_Char* sCSS1_P_letter_spacing = "letter-spacing";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_decoration, "text-decoration" );
+const sal_Char* sCSS1_P_text_decoration = "text-decoration";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_underline, "underline" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_overline, "overline" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_line_through, "line-through" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_blink, "blink" );
+const sal_Char* sCSS1_PV_none = "none";
+const sal_Char* sCSS1_PV_underline = "underline";
+const sal_Char* sCSS1_PV_overline = "overline";
+const sal_Char* sCSS1_PV_line_through = "line-through";
+const sal_Char* sCSS1_PV_blink = "blink";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_align, "text-align" );
+const sal_Char* sCSS1_P_text_align = "text-align";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_left, "left" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_center, "center" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_right, "right" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_justify, "justify" );
+const sal_Char* sCSS1_PV_left = "left";
+const sal_Char* sCSS1_PV_center = "center";
+const sal_Char* sCSS1_PV_right = "right";
+const sal_Char* sCSS1_PV_justify = "justify";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_indent, "text-indent" );
+const sal_Char* sCSS1_P_text_indent = "text-indent";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_line_height, "line-height" );
+const sal_Char* sCSS1_P_line_height = "line-height";
 
 // Strings fuer Box-Properties
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_left, "margin-left" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_right, "margin-right" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_top, "margin-top" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_bottom, "margin-bottom" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin, "margin" );
-
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_top, "padding-top" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_bottom, "padding-bottom" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_left, "padding-left" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_right, "padding-right" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding, "padding" );
-
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_auto, "auto" );
-
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_left_width, "border-left-width" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_right_width, "border-right-width" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_top_width, "border-top-width" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom_width, "border-bottom-width" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_width, "border-width" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_color, "border-color" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_style, "border-style" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_left, "border-left" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_right, "border-right" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_top, "border-top" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom, "border-bottom" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border, "border" );
-
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_thin, "thin" );
-//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_thick, "thick" );
-
-//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_dotted, "dotted" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_dashed, "dashed" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_solid, "solid" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_double, "double" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_groove, "groove" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_ridge, "ridge" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_inset, "inset" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_outset, "outset" );
-
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_width, "width" );
-
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_height, "height" );
-
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_float, "float" );
-
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_column_count, "column-count" );
+const sal_Char* sCSS1_P_margin_left = "margin-left";
+const sal_Char* sCSS1_P_margin_right = "margin-right";
+const sal_Char* sCSS1_P_margin_top = "margin-top";
+const sal_Char* sCSS1_P_margin_bottom = "margin-bottom";
+const sal_Char* sCSS1_P_margin = "margin";
+
+const sal_Char* sCSS1_P_padding_top = "padding-top";
+const sal_Char* sCSS1_P_padding_bottom = "padding-bottom";
+const sal_Char* sCSS1_P_padding_left = "padding-left";
+const sal_Char* sCSS1_P_padding_right = "padding-right";
+const sal_Char* sCSS1_P_padding = "padding";
+
+const sal_Char* sCSS1_PV_auto = "auto";
+
+const sal_Char* sCSS1_P_border_left_width = "border-left-width";
+const sal_Char* sCSS1_P_border_right_width = "border-right-width";
+const sal_Char* sCSS1_P_border_top_width = "border-top-width";
+const sal_Char* sCSS1_P_border_bottom_width = "border-bottom-width";
+const sal_Char* sCSS1_P_border_width = "border-width";
+const sal_Char* sCSS1_P_border_color = "border-color";
+const sal_Char* sCSS1_P_border_style = "border-style";
+const sal_Char* sCSS1_P_border_left = "border-left";
+const sal_Char* sCSS1_P_border_right = "border-right";
+const sal_Char* sCSS1_P_border_top = "border-top";
+const sal_Char* sCSS1_P_border_bottom = "border-bottom";
+const sal_Char* sCSS1_P_border = "border";
+
+const sal_Char* sCSS1_PV_thin = "thin";
+//const sal_Char* sCSS1_PV_medium = "medium";
+const sal_Char* sCSS1_PV_thick = "thick";
+
+//const sal_Char* sCSS1_PV_none = "none";
+const sal_Char* sCSS1_PV_dotted = "dotted";
+const sal_Char* sCSS1_PV_dashed = "dashed";
+const sal_Char* sCSS1_PV_solid = "solid";
+const sal_Char* sCSS1_PV_double = "double";
+const sal_Char* sCSS1_PV_groove = "groove";
+const sal_Char* sCSS1_PV_ridge = "ridge";
+const sal_Char* sCSS1_PV_inset = "inset";
+const sal_Char* sCSS1_PV_outset = "outset";
+
+const sal_Char* sCSS1_P_width = "width";
+
+const sal_Char* sCSS1_P_height = "height";
+
+const sal_Char* sCSS1_P_float = "float";
+
+const sal_Char* sCSS1_P_column_count = "column-count";
 
 // Strings fuer Positioning
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_position, "position" );
+const sal_Char* sCSS1_P_position = "position";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_absolute, "absolute" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_relative, "relative" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_static, "static" );
+const sal_Char* sCSS1_PV_absolute = "absolute";
+const sal_Char* sCSS1_PV_relative = "relative";
+const sal_Char* sCSS1_PV_static = "static";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_left, "left" );
+const sal_Char* sCSS1_P_left = "left";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" );
+const sal_Char* sCSS1_P_top = "top";
 
 // Feature: PrintExt
 
 // Strings fuer Printing Extensions
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_before, "page-break-before" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_after, "page-break-after" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_inside, "page-break-inside" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_size, "size" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_widows, "widows" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_orphans, "orphans" );
-//sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_marks, "marks" );
+const sal_Char* sCSS1_P_page_break_before = "page-break-before";
+const sal_Char* sCSS1_P_page_break_after = "page-break-after";
+const sal_Char* sCSS1_P_page_break_inside = "page-break-inside";
+const sal_Char* sCSS1_P_size = "size";
+const sal_Char* sCSS1_P_widows = "widows";
+const sal_Char* sCSS1_P_orphans = "orphans";
+//const sal_Char* sCSS1_P_marks = "marks";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_always, "always" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_avoid, "avoid" );
+const sal_Char* sCSS1_PV_always = "always";
+const sal_Char* sCSS1_PV_avoid = "avoid";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_portrait, "portrait" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_landscape, "landscape" );
+const sal_Char* sCSS1_PV_portrait = "portrait";
+const sal_Char* sCSS1_PV_landscape = "landscape";
 
-//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_crop, "crop" );
-//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cross, "cross" );
+//const sal_Char* sCSS1_PV_crop = "crop";
+//const sal_Char* sCSS1_PV_cross = "cross";
 
 // /Feature: PrintExt
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_class_abs_pos, "sd-abs-pos" );
+const sal_Char* sCSS1_class_abs_pos = "sd-abs-pos";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_so_language, "so-language" );
+const sal_Char* sCSS1_P_so_language = "so-language";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_direction, "direction" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_ltr, "ltr" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_rtl, "rtl" );
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_inherit, "inherit" );
+const sal_Char* sCSS1_P_direction = "direction";
+const sal_Char* sCSS1_PV_ltr = "ltr";
+const sal_Char* sCSS1_PV_rtl = "rtl";
+const sal_Char* sCSS1_PV_inherit = "inherit";
 
-sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_display, "display" );
+const sal_Char* sCSS1_P_display = "display";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx
index 755d0de9bd83..aed4b38f7cc7 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -22,240 +22,228 @@
 
 #include <sal/types.h>
 
-#ifndef CSS1_CONSTASCII_DECL
-#define CSS1_CONSTASCII_DECL( n, s ) n[sizeof(s)]
-#endif
-#ifndef CSS1_CONSTASCII_DEF
-#define CSS1_CONSTASCII_DEF( n, s ) n[sizeof(s)] = s
-#endif
-
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS_mimetype, "text/css" );
+extern const sal_Char* sCSS_mimetype;
 
 // ein par allgemeine Strings
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_import, "import" );
+extern const sal_Char* sCSS1_import;
 
-// Feature: PrintExt
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_page, "page" );
-//sal_Char CSS1_CONSTASCII_DECL( sCSS1_media, "media" );
-// /Feature: PrintExt
+extern const sal_Char* sCSS1_page;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_important, "important" );
+extern const sal_Char* sCSS1_important;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_link, "link" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_visited, "visited" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_first_letter, "first-letter" );
+extern const sal_Char* sCSS1_link;
+extern const sal_Char* sCSS1_visited;
+extern const sal_Char* sCSS1_first_letter;
 
-// Feature: PrintExt
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_left, "left" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_right, "right" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_first, "first" );
-// /Feature: PrintExt
+extern const sal_Char* sCSS1_left;
+extern const sal_Char* sCSS1_right;
+extern const sal_Char* sCSS1_first;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_url, "url" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_rgb, "rgb" );
+extern const sal_Char* sCSS1_url;
+extern const sal_Char* sCSS1_rgb;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_pt, "pt" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_mm, "mm" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_cm, "cm" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_pc, "pc" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_inch, "in" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_px, "px" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_em, "em" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_ex, "ex" );
+extern const sal_Char* sCSS1_UNIT_pt;
+extern const sal_Char* sCSS1_UNIT_mm;
+extern const sal_Char* sCSS1_UNIT_cm;
+extern const sal_Char* sCSS1_UNIT_pc;
+extern const sal_Char* sCSS1_UNIT_inch;
+extern const sal_Char* sCSS1_UNIT_px;
+extern const sal_Char* sCSS1_UNIT_em;
+extern const sal_Char* sCSS1_UNIT_ex;
 
 // Strings fuer Font-Properties
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_family, "font-family" );
+extern const sal_Char* sCSS1_P_font_family;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_serif, "serif" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_sans_serif, "sans-serif" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cursive, "cursive" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_fantasy, "fantasy" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_monospace, "monospace" );
+extern const sal_Char* sCSS1_PV_serif;
+extern const sal_Char* sCSS1_PV_sans_serif;
+extern const sal_Char* sCSS1_PV_cursive;
+extern const sal_Char* sCSS1_PV_fantasy;
+extern const sal_Char* sCSS1_PV_monospace;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_style, "font-style" );
+extern const sal_Char* sCSS1_P_font_style;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_italic, "italic" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_oblique, "oblique" );
+extern const sal_Char* sCSS1_PV_normal;
+extern const sal_Char* sCSS1_PV_italic;
+extern const sal_Char* sCSS1_PV_oblique;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_variant, "font-variant" );
+extern const sal_Char* sCSS1_P_font_variant;
 
 //sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_small_caps, "small-caps" );
+extern const sal_Char* sCSS1_PV_small_caps;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_transform, "text-transform" );
+extern const sal_Char* sCSS1_P_text_transform;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_capitalize, "capitalize" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_uppercase, "uppercase" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_lowercase, "lowercase" );
+extern const sal_Char* sCSS1_PV_capitalize;
+extern const sal_Char* sCSS1_PV_uppercase;
+extern const sal_Char* sCSS1_PV_lowercase;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_weight, "font-weight" );
+extern const sal_Char* sCSS1_P_font_weight;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_light, "extra-light" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_light, "light" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_demi_light, "demi-light" );
+extern const sal_Char* sCSS1_PV_extra_light;
+extern const sal_Char* sCSS1_PV_light;
+extern const sal_Char* sCSS1_PV_demi_light;
 //sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_demi_bold, "demi-bold" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bold, "bold" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_bold, "extra-bold" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_lighter, "lighter" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bolder, "bolder" );
+extern const sal_Char* sCSS1_PV_demi_bold;
+extern const sal_Char* sCSS1_PV_bold;
+extern const sal_Char* sCSS1_PV_extra_bold;
+extern const sal_Char* sCSS1_PV_lighter;
+extern const sal_Char* sCSS1_PV_bolder;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_size, "font-size" );
+extern const sal_Char* sCSS1_P_font_size;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_small, "xx-small" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_x_small, "x-small" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_small, "small" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_large, "large" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_x_large, "x-large" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_large, "xx-large" );
+extern const sal_Char* sCSS1_PV_xx_small;
+extern const sal_Char* sCSS1_PV_x_small;
+extern const sal_Char* sCSS1_PV_small;
+extern const sal_Char* sCSS1_PV_medium;
+extern const sal_Char* sCSS1_PV_large;
+extern const sal_Char* sCSS1_PV_x_large;
+extern const sal_Char* sCSS1_PV_xx_large;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_larger, "larger" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_smaller, "smaller" );
+extern const sal_Char* sCSS1_PV_larger;
+extern const sal_Char* sCSS1_PV_smaller;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" );
+extern const sal_Char* sCSS1_P_font;
 
 // Strings fuer Farb- und Hintergrund-Properties
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_color, "color" );
+extern const sal_Char* sCSS1_P_color;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background, "background" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background_color, "background-color" );
+extern const sal_Char* sCSS1_P_background;
+extern const sal_Char* sCSS1_P_background_color;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_transparent, "transparent" );
+extern const sal_Char* sCSS1_PV_transparent;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat, "repeat" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_x, "repeat-x" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_y, "repeat-y" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_no_repeat, "no-repeat" );
+extern const sal_Char* sCSS1_PV_repeat;
+extern const sal_Char* sCSS1_PV_repeat_x;
+extern const sal_Char* sCSS1_PV_repeat_y;
+extern const sal_Char* sCSS1_PV_no_repeat;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_top, "top" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_middle, "middle" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bottom, "bottom" );
+extern const sal_Char* sCSS1_PV_top;
+extern const sal_Char* sCSS1_PV_middle;
+extern const sal_Char* sCSS1_PV_bottom;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_scroll, "scroll" );
+extern const sal_Char* sCSS1_PV_scroll;
 
 // Strings fuer Text-Properties
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_letter_spacing, "letter-spacing" );
+extern const sal_Char* sCSS1_P_letter_spacing;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_decoration, "text-decoration" );
+extern const sal_Char* sCSS1_P_text_decoration;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_underline, "underline" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_overline, "overline" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_line_through, "line-through" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_blink, "blink" );
+extern const sal_Char* sCSS1_PV_none;
+extern const sal_Char* sCSS1_PV_underline;
+extern const sal_Char* sCSS1_PV_overline;
+extern const sal_Char* sCSS1_PV_line_through;
+extern const sal_Char* sCSS1_PV_blink;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_align, "text-align" );
+extern const sal_Char* sCSS1_P_text_align;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_left, "left" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_center, "center" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_right, "right" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_justify, "justify" );
+extern const sal_Char* sCSS1_PV_left;
+extern const sal_Char* sCSS1_PV_center;
+extern const sal_Char* sCSS1_PV_right;
+extern const sal_Char* sCSS1_PV_justify;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_indent, "text-indent" );
+extern const sal_Char* sCSS1_P_text_indent;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_line_height, "line-height" );
+extern const sal_Char* sCSS1_P_line_height;
 
 // Strings fuer Box-Properties
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_left, "margin-left" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_right, "margin-right" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_top, "margin-top" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_bottom, "margin-bottom" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin, "margin" );
-
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_top, "padding-top" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_bottom, "padding-bottom" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_left, "padding-left" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_right, "padding-right" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding, "padding" );
-
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_auto, "auto" );
-
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_left_width, "border-left-width" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_right_width, "border-right-width" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_top_width, "border-top-width" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom_width, "border-bottom-width" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_width, "border-width" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_color, "border-color" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_style, "border-style" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_left, "border-left" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_right, "border-right" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_top, "border-top" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom, "border-bottom" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border, "border" );
-
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_thin, "thin" );
+extern const sal_Char* sCSS1_P_margin_left;
+extern const sal_Char* sCSS1_P_margin_right;
+extern const sal_Char* sCSS1_P_margin_top;
+extern const sal_Char* sCSS1_P_margin_bottom;
+extern const sal_Char* sCSS1_P_margin;
+
+extern const sal_Char* sCSS1_P_padding_top;
+extern const sal_Char* sCSS1_P_padding_bottom;
+extern const sal_Char* sCSS1_P_padding_left;
+extern const sal_Char* sCSS1_P_padding_right;
+extern const sal_Char* sCSS1_P_padding;
+
+extern const sal_Char* sCSS1_PV_auto;
+
+extern const sal_Char* sCSS1_P_border_left_width;
+extern const sal_Char* sCSS1_P_border_right_width;
+extern const sal_Char* sCSS1_P_border_top_width;
+extern const sal_Char* sCSS1_P_border_bottom_width;
+extern const sal_Char* sCSS1_P_border_width;
+extern const sal_Char* sCSS1_P_border_color;
+extern const sal_Char* sCSS1_P_border_style;
+extern const sal_Char* sCSS1_P_border_left;
+extern const sal_Char* sCSS1_P_border_right;
+extern const sal_Char* sCSS1_P_border_top;
+extern const sal_Char* sCSS1_P_border_bottom;
+extern const sal_Char* sCSS1_P_border;
+
+extern const sal_Char* sCSS1_PV_thin;
 //sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_thick, "thick" );
+extern const sal_Char* sCSS1_PV_thick;
 
 //sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_dotted, "dotted" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_dashed, "dashed" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_solid, "solid" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_double, "double" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_groove, "groove" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ridge, "ridge" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_inset, "inset" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_outset, "outset" );
+extern const sal_Char* sCSS1_PV_dotted;
+extern const sal_Char* sCSS1_PV_dashed;
+extern const sal_Char* sCSS1_PV_solid;
+extern const sal_Char* sCSS1_PV_double;
+extern const sal_Char* sCSS1_PV_groove;
+extern const sal_Char* sCSS1_PV_ridge;
+extern const sal_Char* sCSS1_PV_inset;
+extern const sal_Char* sCSS1_PV_outset;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_width, "width" );
+extern const sal_Char* sCSS1_P_width;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_height, "height" );
+extern const sal_Char* sCSS1_P_height;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_float, "float" );
+extern const sal_Char* sCSS1_P_float;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_column_count, "column-count" );
+extern const sal_Char* sCSS1_P_column_count;
 
 // Strings fuer Positioning
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_position, "position" );
+extern const sal_Char* sCSS1_P_position;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_absolute, "absolute" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_relative, "relative" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_static, "static" );
+extern const sal_Char* sCSS1_PV_absolute;
+extern const sal_Char* sCSS1_PV_relative;
+extern const sal_Char* sCSS1_PV_static;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_left, "left" );
+extern const sal_Char* sCSS1_P_left;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" );
+extern const sal_Char* sCSS1_P_top;
 
 // Feature: PrintExt
 
 // Strings fuer Printing Extensions
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_before, "page-break-before" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_after, "page-break-after" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_inside, "page-break-inside" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_size, "size" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_widows, "widows" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_orphans, "orphans" );
+extern const sal_Char* sCSS1_P_page_break_before;
+extern const sal_Char* sCSS1_P_page_break_after;
+extern const sal_Char* sCSS1_P_page_break_inside;
+extern const sal_Char* sCSS1_P_size;
+extern const sal_Char* sCSS1_P_widows;
+extern const sal_Char* sCSS1_P_orphans;
 //sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_marks, "marks" );
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_always, "always" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_avoid, "avoid" );
+extern const sal_Char* sCSS1_PV_always;
+extern const sal_Char* sCSS1_PV_avoid;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_portrait, "portrait" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_landscape, "landscape" );
+extern const sal_Char* sCSS1_PV_portrait;
+extern const sal_Char* sCSS1_PV_landscape;
 
 //sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_crop, "crop" );
 //sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cross, "cross" );
 
 // /Feature: PrintExt
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_class_abs_pos, "sd-abs-pos" );
+extern const sal_Char* sCSS1_class_abs_pos;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_so_language, "so-language" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_direction, "direction" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_rtl, "rtl" );
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_inherit, "inherit" );
+extern const sal_Char* sCSS1_P_so_language;
+extern const sal_Char* sCSS1_P_direction;
+extern const sal_Char* sCSS1_PV_ltr;
+extern const sal_Char* sCSS1_PV_rtl;
+extern const sal_Char* sCSS1_PV_inherit;
 
-extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_display, "display" );
+extern const sal_Char* sCSS1_P_display;
 
 #endif