sal_Char->char in sw

Change-Id: I63fb87a8e8eaf9c9da7bf7b8b6f5706222ffcc07
Reviewed-on: https://gerrit.libreoffice.org/85730
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

19 files changed, 410 insertions, 410 deletions

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index b801f67e9811..709da0fbc878 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -161,21 +161,21 @@ static Writer& OutCSS1_SwFormatLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt
 namespace
 {
 
-const sal_Char sCSS1_rule_end[] = " }";
-const sal_Char sCSS1_span_tag_end[] = "\">";
-const sal_Char cCSS1_style_opt_end  = '\"';
+const char sCSS1_rule_end[] = " }";
+const char sCSS1_span_tag_end[] = "\">";
+const char cCSS1_style_opt_end  = '\"';
 
-const sal_Char* const sHTML_FTN_fontheight = "57%";
+const char* const sHTML_FTN_fontheight = "57%";
 
 OString lclConvToHex(sal_uInt16 nHex)
 {
-    sal_Char aNToABuf[] = "00";
+    char aNToABuf[] = "00";
 
     // set pointer to end of buffer
-    sal_Char *pStr = aNToABuf + (sizeof(aNToABuf)-1);
+    char *pStr = aNToABuf + (sizeof(aNToABuf)-1);
     for( sal_uInt8 n = 0; n < 2; ++n )
     {
-        *(--pStr) = static_cast<sal_Char>(nHex & 0xf ) + 48;
+        *(--pStr) = static_cast<char>(nHex & 0xf ) + 48;
         if( *pStr > '9' )
             *pStr += 39;
         nHex >>= 4;
@@ -234,8 +234,8 @@ public:
 
 }
 
-void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
-                                     const sal_Char *pVal,
+void SwHTMLWriter::OutCSS1_Property( const char *pProp,
+                                     const char *pVal,
                                      const OUString *pSVal )
 {
     if (IgnorePropertyForReqIF(mbReqIF, pProp))
@@ -370,7 +370,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
     long nMul = 1000;
     long nDiv = 1;
     long nFac = 100;
-    const sal_Char *pUnit;
+    const char *pUnit;
     switch( eUnit )
     {
     case FieldUnit::MM_100TH:
@@ -486,14 +486,14 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
     rOut.append(pUnit);
 }
 
-void SwHTMLWriter::OutCSS1_UnitProperty( const sal_Char *pProp, long nVal )
+void SwHTMLWriter::OutCSS1_UnitProperty( const char *pProp, long nVal )
 {
     OStringBuffer sOut;
     AddUnitPropertyValue(sOut, nVal, m_eCSS1Unit);
     OutCSS1_PropertyAscii(pProp, sOut.makeStringAndClear());
 }
 
-void SwHTMLWriter::OutCSS1_PixelProperty( const sal_Char *pProp, long nVal,
+void SwHTMLWriter::OutCSS1_PixelProperty( const char *pProp, long nVal,
                                           bool bVert )
 {
     OString sOut(OString::number(ToPixel(nVal,bVert)) + sCSS1_UNIT_px);
@@ -1148,7 +1148,7 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem,
 
     if( !bContainsKeyword && bGeneric )
     {
-        const sal_Char *pStr = nullptr;
+        const char *pStr = nullptr;
         switch( rFontItem.GetFamily() )
         {
         case FAMILY_ROMAN:      pStr = sCSS1_PV_serif;      break;
@@ -1650,7 +1650,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
 
     if( bPseudo )
     {
-        const sal_Char *pPseudo = nullptr;
+        const char *pPseudo = nullptr;
         switch( rPageDesc.GetPoolFormatId() )
         {
         case RES_POOLPAGE_FIRST:    pPseudo = sCSS1_first;  break;
@@ -1909,7 +1909,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
                 if( !(nFrameOpts & HtmlFrmOpts::Align) )
                 {
                     // float
-                    const sal_Char *pStr = text::HoriOrientation::RIGHT==rHoriOri.GetHoriOrient()
+                    const char *pStr = text::HoriOrientation::RIGHT==rHoriOri.GetHoriOrient()
                             ? sCSS1_PV_right
                             : sCSS1_PV_left;
                     OutCSS1_PropertyAscii( sCSS1_P_float, pStr );
@@ -2245,7 +2245,7 @@ static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt,
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
     bool bNone = false;
 
-    const sal_Char *pUStr = nullptr;
+    const char *pUStr = nullptr;
     if( pUItem )
     {
         switch( pUItem->GetLineStyle() )
@@ -2268,7 +2268,7 @@ static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt,
         }
     }
 
-    const sal_Char *pOStr = nullptr;
+    const char *pOStr = nullptr;
     if( pOItem )
     {
         switch( pOItem->GetLineStyle() )
@@ -2291,7 +2291,7 @@ static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt,
         }
     }
 
-    const sal_Char *pCOStr = nullptr;
+    const char *pCOStr = nullptr;
     if( pCOItem )
     {
         switch( pCOItem->GetStrikeout() )
@@ -2314,7 +2314,7 @@ static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt,
         }
     }
 
-    const sal_Char *pBStr = nullptr;
+    const char *pBStr = nullptr;
     if( pBItem )
     {
         if( !pBItem->GetValue() )
@@ -2495,7 +2495,7 @@ static Writer& OutCSS1_SvxPosture( Writer& rWrt, const SfxPoolItem& rHt )
     if( !rHTMLWrt.IsCSS1Script( nScript ) )
         return rWrt;
 
-    const sal_Char *pStr = nullptr;
+    const char *pStr = nullptr;
     switch( static_cast<const SvxPostureItem&>(rHt).GetPosture() )
     {
     case ITALIC_NONE:       pStr = sCSS1_PV_normal;     break;
@@ -2629,7 +2629,7 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt )
     if( !rHTMLWrt.IsCSS1Script( nScript ) )
         return rWrt;
 
-    const sal_Char *pStr = nullptr;
+    const char *pStr = nullptr;
     switch( static_cast<const SvxWeightItem&>(rHt).GetWeight() )
     {
     case WEIGHT_ULTRALIGHT: pStr = sCSS1_PV_extra_light;    break;
@@ -2733,7 +2733,7 @@ static Writer& OutCSS1_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
         !rHTMLWrt.m_bNoAlign)
         return rWrt;
 
-    const sal_Char* pStr = nullptr;
+    const char* pStr = nullptr;
     switch( static_cast<const SvxAdjustItem&>(rHt).GetAdjust() )
     {
     case SvxAdjust::Left:   pStr = sCSS1_PV_left;       break;
@@ -2754,7 +2754,7 @@ static Writer& OutCSS1_SvxFormatSplit( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const sal_Char *pStr = static_cast<const SvxFormatSplitItem&>(rHt).GetValue()
+    const char *pStr = static_cast<const SvxFormatSplitItem&>(rHt).GetValue()
                             ? sCSS1_PV_auto
                             : sCSS1_PV_avoid;
     rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_page_break_inside, pStr );
@@ -2766,7 +2766,7 @@ static Writer& OutCSS1_SwFormatLayoutSplit( Writer& rWrt, const SfxPoolItem& rHt
 {
     SwHTMLWriter & rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const sal_Char *pStr = static_cast<const SwFormatLayoutSplit&>(rHt).GetValue()
+    const char *pStr = static_cast<const SwFormatLayoutSplit&>(rHt).GetValue()
                             ? sCSS1_PV_auto
                             : sCSS1_PV_avoid;
     rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_page_break_inside, pStr );
@@ -3028,8 +3028,8 @@ static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt,
     if( !rHTMLWrt.IsHTMLMode(HTMLMODE_PRINT_EXT) )
         return rWrt;
 
-    const sal_Char *pBreakBefore = nullptr;
-    const sal_Char *pBreakAfter = nullptr;
+    const char *pBreakBefore = nullptr;
+    const char *pBreakAfter = nullptr;
 
     if( pKeepItem )
     {
@@ -3190,7 +3190,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
         return rWrt;
 
     // if necessary, add the orientation of the Graphic
-    const sal_Char *pRepeat = nullptr, *pHori = nullptr, *pVert = nullptr;
+    const char *pRepeat = nullptr, *pHori = nullptr, *pVert = nullptr;
     if( pGrf || !aLink.isEmpty() )
     {
         if( GPOS_TILED==ePos )
@@ -3310,7 +3310,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
 }
 
 static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
-                                   const sal_Char *pProperty,
+                                   const char *pProperty,
                                    const SvxBorderLine *pLine )
 {
     if( !pLine || pLine->isEmpty() )
@@ -3467,7 +3467,7 @@ static Writer& OutCSS1_SvxFrameDirection( Writer& rWrt, const SfxPoolItem& rHt )
 
     SvxFrameDirection nDir =
         static_cast< const SvxFrameDirectionItem& >( rHt ).GetValue();
-    const sal_Char* pStr = nullptr;
+    const char* pStr = nullptr;
     switch( nDir )
     {
     case SvxFrameDirection::Horizontal_LR_TB:
diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx
index 0f7a2862b073..a99b5929a5ed 100644
--- a/sw/source/filter/html/css1kywd.cxx
+++ b/sw/source/filter/html/css1kywd.cxx
@@ -19,225 +19,225 @@
 
 #include "css1kywd.hxx"
 
-const sal_Char* const sCSS_mimetype = "text/css";
+const char* const sCSS_mimetype = "text/css";
 
-const sal_Char* const sCSS1_import = "import";
+const char* const sCSS1_import = "import";
 
-const sal_Char* const sCSS1_page = "page";
-//const sal_Char* const sCSS1_media = "media";
+const char* const sCSS1_page = "page";
+//const char* const sCSS1_media = "media";
 
-const sal_Char* const sCSS1_important = "important";
+const char* const sCSS1_important = "important";
 
-const sal_Char* const sCSS1_link = "link";
-const sal_Char* const sCSS1_visited = "visited";
-const sal_Char* const sCSS1_first_letter = "first-letter";
+const char* const sCSS1_link = "link";
+const char* const sCSS1_visited = "visited";
+const char* const sCSS1_first_letter = "first-letter";
 
-const sal_Char* const sCSS1_left = "left";
-const sal_Char* const sCSS1_right = "right";
-const sal_Char* const sCSS1_first = "first";
+const char* const sCSS1_left = "left";
+const char* const sCSS1_right = "right";
+const char* const sCSS1_first = "first";
 
-const sal_Char* const sCSS1_url = "url";
-const sal_Char* const sCSS1_rgb = "rgb";
+const char* const sCSS1_url = "url";
+const char* const sCSS1_rgb = "rgb";
 
-const sal_Char* const sCSS1_UNIT_pt = "pt";
-const sal_Char* const sCSS1_UNIT_mm = "mm";
-const sal_Char* const sCSS1_UNIT_cm = "cm";
-const sal_Char* const sCSS1_UNIT_pc = "pc";
-const sal_Char* const sCSS1_UNIT_inch = "in";
-const sal_Char* const sCSS1_UNIT_px = "px";
-const sal_Char* const sCSS1_UNIT_em = "em";
-const sal_Char* const sCSS1_UNIT_ex = "ex";
+const char* const sCSS1_UNIT_pt = "pt";
+const char* const sCSS1_UNIT_mm = "mm";
+const char* const sCSS1_UNIT_cm = "cm";
+const char* const sCSS1_UNIT_pc = "pc";
+const char* const sCSS1_UNIT_inch = "in";
+const char* const sCSS1_UNIT_px = "px";
+const char* const sCSS1_UNIT_em = "em";
+const char* const sCSS1_UNIT_ex = "ex";
 
 // Strings for font properties
 
-const sal_Char* const sCSS1_P_font_family = "font-family";
+const char* const sCSS1_P_font_family = "font-family";
 
-const sal_Char* const sCSS1_PV_serif = "serif";
-const sal_Char* const sCSS1_PV_sans_serif = "sans-serif";
-const sal_Char* const sCSS1_PV_cursive = "cursive";
-const sal_Char* const sCSS1_PV_fantasy = "fantasy";
-const sal_Char* const sCSS1_PV_monospace = "monospace";
+const char* const sCSS1_PV_serif = "serif";
+const char* const sCSS1_PV_sans_serif = "sans-serif";
+const char* const sCSS1_PV_cursive = "cursive";
+const char* const sCSS1_PV_fantasy = "fantasy";
+const char* const sCSS1_PV_monospace = "monospace";
 
-const sal_Char* const sCSS1_P_font_style = "font-style";
+const char* const sCSS1_P_font_style = "font-style";
 
-const sal_Char* const sCSS1_PV_normal = "normal";
-const sal_Char* const sCSS1_PV_italic = "italic";
-const sal_Char* const sCSS1_PV_oblique = "oblique";
+const char* const sCSS1_PV_normal = "normal";
+const char* const sCSS1_PV_italic = "italic";
+const char* const sCSS1_PV_oblique = "oblique";
 
-const sal_Char* const sCSS1_P_font_variant = "font-variant";
+const char* const sCSS1_P_font_variant = "font-variant";
 
-//const sal_Char* const sCSS1_PV_normal = "normal";
-const sal_Char* const sCSS1_PV_small_caps = "small-caps";
+//const char* const sCSS1_PV_normal = "normal";
+const char* const sCSS1_PV_small_caps = "small-caps";
 
-const sal_Char* const sCSS1_P_font_weight = "font-weight";
+const char* const sCSS1_P_font_weight = "font-weight";
 
-const sal_Char* const sCSS1_PV_extra_light = "extra-light";
-const sal_Char* const sCSS1_PV_light = "light";
-const sal_Char* const sCSS1_PV_demi_light = "demi-light";
-//const sal_Char* const sCSS1_PV_medium = "medium";
-const sal_Char* const sCSS1_PV_demi_bold = "demi-bold";
-const sal_Char* const sCSS1_PV_bold = "bold";
-const sal_Char* const sCSS1_PV_extra_bold = "extra-bold";
-const sal_Char* const sCSS1_PV_lighter = "lighter";
-const sal_Char* const sCSS1_PV_bolder = "bolder";
+const char* const sCSS1_PV_extra_light = "extra-light";
+const char* const sCSS1_PV_light = "light";
+const char* const sCSS1_PV_demi_light = "demi-light";
+//const char* const sCSS1_PV_medium = "medium";
+const char* const sCSS1_PV_demi_bold = "demi-bold";
+const char* const sCSS1_PV_bold = "bold";
+const char* const sCSS1_PV_extra_bold = "extra-bold";
+const char* const sCSS1_PV_lighter = "lighter";
+const char* const sCSS1_PV_bolder = "bolder";
 
-const sal_Char* const sCSS1_P_text_transform = "text-transform";
+const char* const sCSS1_P_text_transform = "text-transform";
 
-const sal_Char* const sCSS1_PV_capitalize = "capitalize";
-const sal_Char* const sCSS1_PV_uppercase = "uppercase";
-const sal_Char* const sCSS1_PV_lowercase = "lowercase";
+const char* const sCSS1_PV_capitalize = "capitalize";
+const char* const sCSS1_PV_uppercase = "uppercase";
+const char* const sCSS1_PV_lowercase = "lowercase";
 
-const sal_Char* const sCSS1_P_font_size = "font-size";
+const char* const sCSS1_P_font_size = "font-size";
 
-const sal_Char* const sCSS1_PV_xx_small = "xx-small";
-const sal_Char* const sCSS1_PV_x_small = "x-small";
-const sal_Char* const sCSS1_PV_small = "small";
-const sal_Char* const sCSS1_PV_medium = "medium";
-const sal_Char* const sCSS1_PV_large = "large";
-const sal_Char* const sCSS1_PV_x_large = "x-large";
-const sal_Char* const sCSS1_PV_xx_large = "xx-large";
+const char* const sCSS1_PV_xx_small = "xx-small";
+const char* const sCSS1_PV_x_small = "x-small";
+const char* const sCSS1_PV_small = "small";
+const char* const sCSS1_PV_medium = "medium";
+const char* const sCSS1_PV_large = "large";
+const char* const sCSS1_PV_x_large = "x-large";
+const char* const sCSS1_PV_xx_large = "xx-large";
 
-const sal_Char* const sCSS1_PV_larger = "larger";
-const sal_Char* const sCSS1_PV_smaller = "smaller";
+const char* const sCSS1_PV_larger = "larger";
+const char* const sCSS1_PV_smaller = "smaller";
 
-const sal_Char* const sCSS1_P_font = "font";
+const char* const sCSS1_P_font = "font";
 
 // Strings for color and background properties
 
-const sal_Char* const sCSS1_P_color = "color";
+const char* const sCSS1_P_color = "color";
 
-const sal_Char* const sCSS1_P_background = "background";
-const sal_Char* const sCSS1_P_background_color = "background-color";
+const char* const sCSS1_P_background = "background";
+const char* const sCSS1_P_background_color = "background-color";
 
-const sal_Char* const sCSS1_PV_transparent = "transparent";
+const char* const sCSS1_PV_transparent = "transparent";
 
-const sal_Char* const sCSS1_PV_repeat = "repeat";
-const sal_Char* const sCSS1_PV_repeat_x = "repeat-x";
-const sal_Char* const sCSS1_PV_repeat_y = "repeat-y";
-const sal_Char* const sCSS1_PV_no_repeat = "no-repeat";
+const char* const sCSS1_PV_repeat = "repeat";
+const char* const sCSS1_PV_repeat_x = "repeat-x";
+const char* const sCSS1_PV_repeat_y = "repeat-y";
+const char* const sCSS1_PV_no_repeat = "no-repeat";
 
-const sal_Char* const sCSS1_PV_top = "top";
-const sal_Char* const sCSS1_PV_middle = "middle";
-const sal_Char* const sCSS1_PV_bottom = "bottom";
+const char* const sCSS1_PV_top = "top";
+const char* const sCSS1_PV_middle = "middle";
+const char* const sCSS1_PV_bottom = "bottom";
 
-const sal_Char* const sCSS1_PV_scroll = "scroll";
+const char* const sCSS1_PV_scroll = "scroll";
 
 // Strings for text properties
 
-const sal_Char* const sCSS1_P_letter_spacing = "letter-spacing";
+const char* const sCSS1_P_letter_spacing = "letter-spacing";
 
-const sal_Char* const sCSS1_P_text_decoration = "text-decoration";
+const char* const sCSS1_P_text_decoration = "text-decoration";
 
-const sal_Char* const sCSS1_PV_none = "none";
-const sal_Char* const sCSS1_PV_underline = "underline";
-const sal_Char* const sCSS1_PV_overline = "overline";
-const sal_Char* const sCSS1_PV_line_through = "line-through";
-const sal_Char* const sCSS1_PV_blink = "blink";
+const char* const sCSS1_PV_none = "none";
+const char* const sCSS1_PV_underline = "underline";
+const char* const sCSS1_PV_overline = "overline";
+const char* const sCSS1_PV_line_through = "line-through";
+const char* const sCSS1_PV_blink = "blink";
 
-const sal_Char* const sCSS1_P_text_align = "text-align";
+const char* const sCSS1_P_text_align = "text-align";
 
-const sal_Char* const sCSS1_PV_left = "left";
-const sal_Char* const sCSS1_PV_center = "center";
-const sal_Char* const sCSS1_PV_right = "right";
-const sal_Char* const sCSS1_PV_justify = "justify";
+const char* const sCSS1_PV_left = "left";
+const char* const sCSS1_PV_center = "center";
+const char* const sCSS1_PV_right = "right";
+const char* const sCSS1_PV_justify = "justify";
 
-const sal_Char* const sCSS1_P_text_indent = "text-indent";
+const char* const sCSS1_P_text_indent = "text-indent";
 
-const sal_Char* const sCSS1_P_line_height = "line-height";
-const sal_Char* const sCSS1_P_list_style_type = "list-style-type";
+const char* const sCSS1_P_line_height = "line-height";
+const char* const sCSS1_P_list_style_type = "list-style-type";
 
 // Strings for box properties
 
-const sal_Char* const sCSS1_P_margin_left = "margin-left";
-const sal_Char* const sCSS1_P_margin_right = "margin-right";
-const sal_Char* const sCSS1_P_margin_top = "margin-top";
-const sal_Char* const sCSS1_P_margin_bottom = "margin-bottom";
-const sal_Char* const sCSS1_P_margin = "margin";
-
-const sal_Char* const sCSS1_P_padding_top = "padding-top";
-const sal_Char* const sCSS1_P_padding_bottom = "padding-bottom";
-const sal_Char* const sCSS1_P_padding_left = "padding-left";
-const sal_Char* const sCSS1_P_padding_right = "padding-right";
-const sal_Char* const sCSS1_P_padding = "padding";
-
-const sal_Char* const sCSS1_PV_auto = "auto";
-
-const sal_Char* const sCSS1_P_border_left_width = "border-left-width";
-const sal_Char* const sCSS1_P_border_right_width = "border-right-width";
-const sal_Char* const sCSS1_P_border_top_width = "border-top-width";
-const sal_Char* const sCSS1_P_border_bottom_width = "border-bottom-width";
-const sal_Char* const sCSS1_P_border_width = "border-width";
-const sal_Char* const sCSS1_P_border_color = "border-color";
-const sal_Char* const sCSS1_P_border_style = "border-style";
-const sal_Char* const sCSS1_P_border_left = "border-left";
-const sal_Char* const sCSS1_P_border_right = "border-right";
-const sal_Char* const sCSS1_P_border_top = "border-top";
-const sal_Char* const sCSS1_P_border_bottom = "border-bottom";
-const sal_Char* const sCSS1_P_border = "border";
-
-const sal_Char* const sCSS1_PV_thin = "thin";
-//const sal_Char* const sCSS1_PV_medium = "medium";
-const sal_Char* const sCSS1_PV_thick = "thick";
-
-//const sal_Char* const sCSS1_PV_none = "none";
-const sal_Char* const sCSS1_PV_dotted = "dotted";
-const sal_Char* const sCSS1_PV_dashed = "dashed";
-const sal_Char* const sCSS1_PV_solid = "solid";
-const sal_Char* const sCSS1_PV_double = "double";
-const sal_Char* const sCSS1_PV_groove = "groove";
-const sal_Char* const sCSS1_PV_ridge = "ridge";
-const sal_Char* const sCSS1_PV_inset = "inset";
-const sal_Char* const sCSS1_PV_outset = "outset";
-
-const sal_Char* const sCSS1_P_width = "width";
-const sal_Char* const sCSS1_P_max_width = "max-width";
-
-const sal_Char* const sCSS1_P_height = "height";
-
-const sal_Char* const sCSS1_P_float = "float";
-
-const sal_Char* const sCSS1_P_column_count = "column-count";
+const char* const sCSS1_P_margin_left = "margin-left";
+const char* const sCSS1_P_margin_right = "margin-right";
+const char* const sCSS1_P_margin_top = "margin-top";
+const char* const sCSS1_P_margin_bottom = "margin-bottom";
+const char* const sCSS1_P_margin = "margin";
+
+const char* const sCSS1_P_padding_top = "padding-top";
+const char* const sCSS1_P_padding_bottom = "padding-bottom";
+const char* const sCSS1_P_padding_left = "padding-left";
+const char* const sCSS1_P_padding_right = "padding-right";
+const char* const sCSS1_P_padding = "padding";
+
+const char* const sCSS1_PV_auto = "auto";
+
+const char* const sCSS1_P_border_left_width = "border-left-width";
+const char* const sCSS1_P_border_right_width = "border-right-width";
+const char* const sCSS1_P_border_top_width = "border-top-width";
+const char* const sCSS1_P_border_bottom_width = "border-bottom-width";
+const char* const sCSS1_P_border_width = "border-width";
+const char* const sCSS1_P_border_color = "border-color";
+const char* const sCSS1_P_border_style = "border-style";
+const char* const sCSS1_P_border_left = "border-left";
+const char* const sCSS1_P_border_right = "border-right";
+const char* const sCSS1_P_border_top = "border-top";
+const char* const sCSS1_P_border_bottom = "border-bottom";
+const char* const sCSS1_P_border = "border";
+
+const char* const sCSS1_PV_thin = "thin";
+//const char* const sCSS1_PV_medium = "medium";
+const char* const sCSS1_PV_thick = "thick";
+
+//const char* const sCSS1_PV_none = "none";
+const char* const sCSS1_PV_dotted = "dotted";
+const char* const sCSS1_PV_dashed = "dashed";
+const char* const sCSS1_PV_solid = "solid";
+const char* const sCSS1_PV_double = "double";
+const char* const sCSS1_PV_groove = "groove";
+const char* const sCSS1_PV_ridge = "ridge";
+const char* const sCSS1_PV_inset = "inset";
+const char* const sCSS1_PV_outset = "outset";
+
+const char* const sCSS1_P_width = "width";
+const char* const sCSS1_P_max_width = "max-width";
+
+const char* const sCSS1_P_height = "height";
+
+const char* const sCSS1_P_float = "float";
+
+const char* const sCSS1_P_column_count = "column-count";
 
 // Strings for positioning
 
-const sal_Char* const sCSS1_P_position = "position";
+const char* const sCSS1_P_position = "position";
 
-const sal_Char* const sCSS1_PV_absolute = "absolute";
-const sal_Char* const sCSS1_PV_relative = "relative";
-const sal_Char* const sCSS1_PV_static = "static";
+const char* const sCSS1_PV_absolute = "absolute";
+const char* const sCSS1_PV_relative = "relative";
+const char* const sCSS1_PV_static = "static";
 
-const sal_Char* const sCSS1_P_left = "left";
+const char* const sCSS1_P_left = "left";
 
-const sal_Char* const sCSS1_P_top = "top";
+const char* const sCSS1_P_top = "top";
 
 // Strings for printing extensions
 
-const sal_Char* const sCSS1_P_page_break_before = "page-break-before";
-const sal_Char* const sCSS1_P_page_break_after = "page-break-after";
-const sal_Char* const sCSS1_P_page_break_inside = "page-break-inside";
-const sal_Char* const sCSS1_P_size = "size";
-const sal_Char* const sCSS1_P_widows = "widows";
-const sal_Char* const sCSS1_P_orphans = "orphans";
-//const sal_Char* const sCSS1_P_marks = "marks";
+const char* const sCSS1_P_page_break_before = "page-break-before";
+const char* const sCSS1_P_page_break_after = "page-break-after";
+const char* const sCSS1_P_page_break_inside = "page-break-inside";
+const char* const sCSS1_P_size = "size";
+const char* const sCSS1_P_widows = "widows";
+const char* const sCSS1_P_orphans = "orphans";
+//const char* const sCSS1_P_marks = "marks";
 
-const sal_Char* const sCSS1_PV_always = "always";
-const sal_Char* const sCSS1_PV_avoid = "avoid";
+const char* const sCSS1_PV_always = "always";
+const char* const sCSS1_PV_avoid = "avoid";
 
-const sal_Char* const sCSS1_PV_portrait = "portrait";
-const sal_Char* const sCSS1_PV_landscape = "landscape";
+const char* const sCSS1_PV_portrait = "portrait";
+const char* const sCSS1_PV_landscape = "landscape";
 
-//const sal_Char* const sCSS1_PV_crop = "crop";
-//const sal_Char* const sCSS1_PV_cross = "cross";
+//const char* const sCSS1_PV_crop = "crop";
+//const char* const sCSS1_PV_cross = "cross";
 
-const sal_Char* const sCSS1_class_abs_pos = "sd-abs-pos";
+const char* const sCSS1_class_abs_pos = "sd-abs-pos";
 
-const sal_Char* const sCSS1_P_so_language = "so-language";
+const char* const sCSS1_P_so_language = "so-language";
 
-const sal_Char* const sCSS1_P_direction = "direction";
-const sal_Char* const sCSS1_PV_ltr = "ltr";
-const sal_Char* const sCSS1_PV_rtl = "rtl";
-const sal_Char* const sCSS1_PV_inherit = "inherit";
+const char* const sCSS1_P_direction = "direction";
+const char* const sCSS1_PV_ltr = "ltr";
+const char* const sCSS1_PV_rtl = "rtl";
+const char* const sCSS1_PV_inherit = "inherit";
 
-const sal_Char* const sCSS1_P_display = "display";
+const char* const 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 982fddc89c3d..00de608c0af9 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -22,226 +22,226 @@
 
 #include <sal/types.h>
 
-extern const sal_Char* const sCSS_mimetype;
+extern const char* const sCSS_mimetype;
 
-extern const sal_Char* const sCSS1_import;
+extern const char* const sCSS1_import;
 
-extern const sal_Char* const sCSS1_page;
+extern const char* const sCSS1_page;
 
-extern const sal_Char* const sCSS1_important;
+extern const char* const sCSS1_important;
 
-extern const sal_Char* const sCSS1_link;
-extern const sal_Char* const sCSS1_visited;
-extern const sal_Char* const sCSS1_first_letter;
+extern const char* const sCSS1_link;
+extern const char* const sCSS1_visited;
+extern const char* const sCSS1_first_letter;
 
-extern const sal_Char* const sCSS1_left;
-extern const sal_Char* const sCSS1_right;
-extern const sal_Char* const sCSS1_first;
+extern const char* const sCSS1_left;
+extern const char* const sCSS1_right;
+extern const char* const sCSS1_first;
 
-extern const sal_Char* const sCSS1_url;
-extern const sal_Char* const sCSS1_rgb;
+extern const char* const sCSS1_url;
+extern const char* const sCSS1_rgb;
 
-extern const sal_Char* const sCSS1_UNIT_pt;
-extern const sal_Char* const sCSS1_UNIT_mm;
-extern const sal_Char* const sCSS1_UNIT_cm;
-extern const sal_Char* const sCSS1_UNIT_pc;
-extern const sal_Char* const sCSS1_UNIT_inch;
-extern const sal_Char* const sCSS1_UNIT_px;
-extern const sal_Char* const sCSS1_UNIT_em;
-extern const sal_Char* const sCSS1_UNIT_ex;
+extern const char* const sCSS1_UNIT_pt;
+extern const char* const sCSS1_UNIT_mm;
+extern const char* const sCSS1_UNIT_cm;
+extern const char* const sCSS1_UNIT_pc;
+extern const char* const sCSS1_UNIT_inch;
+extern const char* const sCSS1_UNIT_px;
+extern const char* const sCSS1_UNIT_em;
+extern const char* const sCSS1_UNIT_ex;
 
 // Strings for font properties
 
-extern const sal_Char* const sCSS1_P_font_family;
+extern const char* const sCSS1_P_font_family;
 
-extern const sal_Char* const sCSS1_PV_serif;
-extern const sal_Char* const sCSS1_PV_sans_serif;
-extern const sal_Char* const sCSS1_PV_cursive;
-extern const sal_Char* const sCSS1_PV_fantasy;
-extern const sal_Char* const sCSS1_PV_monospace;
+extern const char* const sCSS1_PV_serif;
+extern const char* const sCSS1_PV_sans_serif;
+extern const char* const sCSS1_PV_cursive;
+extern const char* const sCSS1_PV_fantasy;
+extern const char* const sCSS1_PV_monospace;
 
-extern const sal_Char* const sCSS1_P_font_style;
+extern const char* const sCSS1_P_font_style;
 
-extern const sal_Char* const sCSS1_PV_normal;
-extern const sal_Char* const sCSS1_PV_italic;
-extern const sal_Char* const sCSS1_PV_oblique;
+extern const char* const sCSS1_PV_normal;
+extern const char* const sCSS1_PV_italic;
+extern const char* const sCSS1_PV_oblique;
 
-extern const sal_Char* const sCSS1_P_font_variant;
+extern const char* const sCSS1_P_font_variant;
 
-//extern const sal_Char* const sCSS1_PV_normal;
-extern const sal_Char* const sCSS1_PV_small_caps;
+//extern const char* const sCSS1_PV_normal;
+extern const char* const sCSS1_PV_small_caps;
 
-extern const sal_Char* const sCSS1_P_text_transform;
+extern const char* const sCSS1_P_text_transform;
 
-extern const sal_Char* const sCSS1_PV_capitalize;
-extern const sal_Char* const sCSS1_PV_uppercase;
-extern const sal_Char* const sCSS1_PV_lowercase;
+extern const char* const sCSS1_PV_capitalize;
+extern const char* const sCSS1_PV_uppercase;
+extern const char* const sCSS1_PV_lowercase;
 
-extern const sal_Char* const sCSS1_P_font_weight;
+extern const char* const sCSS1_P_font_weight;
 
-extern const sal_Char* const sCSS1_PV_extra_light;
-extern const sal_Char* const sCSS1_PV_light;
-extern const sal_Char* const sCSS1_PV_demi_light;
-//extern const sal_Char* const sCSS1_PV_medium;
-extern const sal_Char* const sCSS1_PV_demi_bold;
-extern const sal_Char* const sCSS1_PV_bold;
-extern const sal_Char* const sCSS1_PV_extra_bold;
-extern const sal_Char* const sCSS1_PV_lighter;
-extern const sal_Char* const sCSS1_PV_bolder;
+extern const char* const sCSS1_PV_extra_light;
+extern const char* const sCSS1_PV_light;
+extern const char* const sCSS1_PV_demi_light;
+//extern const char* const sCSS1_PV_medium;
+extern const char* const sCSS1_PV_demi_bold;
+extern const char* const sCSS1_PV_bold;
+extern const char* const sCSS1_PV_extra_bold;
+extern const char* const sCSS1_PV_lighter;
+extern const char* const sCSS1_PV_bolder;
 
-extern const sal_Char* const sCSS1_P_font_size;
+extern const char* const sCSS1_P_font_size;
 
-extern const sal_Char* const sCSS1_PV_xx_small;
-extern const sal_Char* const sCSS1_PV_x_small;
-extern const sal_Char* const sCSS1_PV_small;
-extern const sal_Char* const sCSS1_PV_medium;
-extern const sal_Char* const sCSS1_PV_large;
-extern const sal_Char* const sCSS1_PV_x_large;
-extern const sal_Char* const sCSS1_PV_xx_large;
+extern const char* const sCSS1_PV_xx_small;
+extern const char* const sCSS1_PV_x_small;
+extern const char* const sCSS1_PV_small;
+extern const char* const sCSS1_PV_medium;
+extern const char* const sCSS1_PV_large;
+extern const char* const sCSS1_PV_x_large;
+extern const char* const sCSS1_PV_xx_large;
 
-extern const sal_Char* const sCSS1_PV_larger;
-extern const sal_Char* const sCSS1_PV_smaller;
+extern const char* const sCSS1_PV_larger;
+extern const char* const sCSS1_PV_smaller;
 
-extern const sal_Char* const sCSS1_P_font;
+extern const char* const sCSS1_P_font;
 
 // Strings for color and background properties
 
-extern const sal_Char* const sCSS1_P_color;
+extern const char* const sCSS1_P_color;
 
-extern const sal_Char* const sCSS1_P_background;
-extern const sal_Char* const sCSS1_P_background_color;
+extern const char* const sCSS1_P_background;
+extern const char* const sCSS1_P_background_color;
 
-extern const sal_Char* const sCSS1_PV_transparent;
+extern const char* const sCSS1_PV_transparent;
 
-extern const sal_Char* const sCSS1_PV_repeat;
-extern const sal_Char* const sCSS1_PV_repeat_x;
-extern const sal_Char* const sCSS1_PV_repeat_y;
-extern const sal_Char* const sCSS1_PV_no_repeat;
+extern const char* const sCSS1_PV_repeat;
+extern const char* const sCSS1_PV_repeat_x;
+extern const char* const sCSS1_PV_repeat_y;
+extern const char* const sCSS1_PV_no_repeat;
 
-extern const sal_Char* const sCSS1_PV_top;
-extern const sal_Char* const sCSS1_PV_middle;
-extern const sal_Char* const sCSS1_PV_bottom;
+extern const char* const sCSS1_PV_top;
+extern const char* const sCSS1_PV_middle;
+extern const char* const sCSS1_PV_bottom;
 
-extern const sal_Char* const sCSS1_PV_scroll;
+extern const char* const sCSS1_PV_scroll;
 
 // Strings for text properties
 
-extern const sal_Char* const sCSS1_P_letter_spacing;
+extern const char* const sCSS1_P_letter_spacing;
 
-extern const sal_Char* const sCSS1_P_text_decoration;
+extern const char* const sCSS1_P_text_decoration;
 
-extern const sal_Char* const sCSS1_PV_none;
-extern const sal_Char* const sCSS1_PV_underline;
-extern const sal_Char* const sCSS1_PV_overline;
-extern const sal_Char* const sCSS1_PV_line_through;
-extern const sal_Char* const sCSS1_PV_blink;
+extern const char* const sCSS1_PV_none;
+extern const char* const sCSS1_PV_underline;
+extern const char* const sCSS1_PV_overline;
+extern const char* const sCSS1_PV_line_through;
+extern const char* const sCSS1_PV_blink;
 
-extern const sal_Char* const sCSS1_P_text_align;
+extern const char* const sCSS1_P_text_align;
 
-extern const sal_Char* const sCSS1_PV_left;
-extern const sal_Char* const sCSS1_PV_center;
-extern const sal_Char* const sCSS1_PV_right;
-extern const sal_Char* const sCSS1_PV_justify;
+extern const char* const sCSS1_PV_left;
+extern const char* const sCSS1_PV_center;
+extern const char* const sCSS1_PV_right;
+extern const char* const sCSS1_PV_justify;
 
-extern const sal_Char* const sCSS1_P_text_indent;
+extern const char* const sCSS1_P_text_indent;
 
-extern const sal_Char* const sCSS1_P_line_height;
+extern const char* const sCSS1_P_line_height;
 
-extern const sal_Char* const sCSS1_P_list_style_type;
+extern const char* const sCSS1_P_list_style_type;
 
 // Strings for box properties
 
-extern const sal_Char* const sCSS1_P_margin_left;
-extern const sal_Char* const sCSS1_P_margin_right;
-extern const sal_Char* const sCSS1_P_margin_top;
-extern const sal_Char* const sCSS1_P_margin_bottom;
-extern const sal_Char* const sCSS1_P_margin;
-
-extern const sal_Char* const sCSS1_P_padding_top;
-extern const sal_Char* const sCSS1_P_padding_bottom;
-extern const sal_Char* const sCSS1_P_padding_left;
-extern const sal_Char* const sCSS1_P_padding_right;
-extern const sal_Char* const sCSS1_P_padding;
-
-extern const sal_Char* const sCSS1_PV_auto;
-
-extern const sal_Char* const sCSS1_P_border_left_width;
-extern const sal_Char* const sCSS1_P_border_right_width;
-extern const sal_Char* const sCSS1_P_border_top_width;
-extern const sal_Char* const sCSS1_P_border_bottom_width;
-extern const sal_Char* const sCSS1_P_border_width;
-extern const sal_Char* const sCSS1_P_border_color;
-extern const sal_Char* const sCSS1_P_border_style;
-extern const sal_Char* const sCSS1_P_border_left;
-extern const sal_Char* const sCSS1_P_border_right;
-extern const sal_Char* const sCSS1_P_border_top;
-extern const sal_Char* const sCSS1_P_border_bottom;
-extern const sal_Char* const sCSS1_P_border;
-
-extern const sal_Char* const sCSS1_PV_thin;
-//extern const sal_Char* const sCSS1_PV_medium;
-extern const sal_Char* const sCSS1_PV_thick;
-
-//extern const sal_Char* const sCSS1_PV_none;
-extern const sal_Char* const sCSS1_PV_dotted;
-extern const sal_Char* const sCSS1_PV_dashed;
-extern const sal_Char* const sCSS1_PV_solid;
-extern const sal_Char* const sCSS1_PV_double;
-extern const sal_Char* const sCSS1_PV_groove;
-extern const sal_Char* const sCSS1_PV_ridge;
-extern const sal_Char* const sCSS1_PV_inset;
-extern const sal_Char* const sCSS1_PV_outset;
-
-extern const sal_Char* const sCSS1_P_width;
-extern const sal_Char* const sCSS1_P_max_width;
-
-extern const sal_Char* const sCSS1_P_height;
-
-extern const sal_Char* const sCSS1_P_float;
-
-extern const sal_Char* const sCSS1_P_column_count;
+extern const char* const sCSS1_P_margin_left;
+extern const char* const sCSS1_P_margin_right;
+extern const char* const sCSS1_P_margin_top;
+extern const char* const sCSS1_P_margin_bottom;
+extern const char* const sCSS1_P_margin;
+
+extern const char* const sCSS1_P_padding_top;
+extern const char* const sCSS1_P_padding_bottom;
+extern const char* const sCSS1_P_padding_left;
+extern const char* const sCSS1_P_padding_right;
+extern const char* const sCSS1_P_padding;
+
+extern const char* const sCSS1_PV_auto;
+
+extern const char* const sCSS1_P_border_left_width;
+extern const char* const sCSS1_P_border_right_width;
+extern const char* const sCSS1_P_border_top_width;
+extern const char* const sCSS1_P_border_bottom_width;
+extern const char* const sCSS1_P_border_width;
+extern const char* const sCSS1_P_border_color;
+extern const char* const sCSS1_P_border_style;
+extern const char* const sCSS1_P_border_left;
+extern const char* const sCSS1_P_border_right;
+extern const char* const sCSS1_P_border_top;
+extern const char* const sCSS1_P_border_bottom;
+extern const char* const sCSS1_P_border;
+
+extern const char* const sCSS1_PV_thin;
+//extern const char* const sCSS1_PV_medium;
+extern const char* const sCSS1_PV_thick;
+
+//extern const char* const sCSS1_PV_none;
+extern const char* const sCSS1_PV_dotted;
+extern const char* const sCSS1_PV_dashed;
+extern const char* const sCSS1_PV_solid;
+extern const char* const sCSS1_PV_double;
+extern const char* const sCSS1_PV_groove;
+extern const char* const sCSS1_PV_ridge;
+extern const char* const sCSS1_PV_inset;
+extern const char* const sCSS1_PV_outset;
+
+extern const char* const sCSS1_P_width;
+extern const char* const sCSS1_P_max_width;
+
+extern const char* const sCSS1_P_height;
+
+extern const char* const sCSS1_P_float;
+
+extern const char* const sCSS1_P_column_count;
 
 // Strings for positioning
 
-extern const sal_Char* const sCSS1_P_position;
+extern const char* const sCSS1_P_position;
 
-extern const sal_Char* const sCSS1_PV_absolute;
-extern const sal_Char* const sCSS1_PV_relative;
-extern const sal_Char* const sCSS1_PV_static;
+extern const char* const sCSS1_PV_absolute;
+extern const char* const sCSS1_PV_relative;
+extern const char* const sCSS1_PV_static;
 
-extern const sal_Char* const sCSS1_P_left;
+extern const char* const sCSS1_P_left;
 
-extern const sal_Char* const sCSS1_P_top;
+extern const char* const sCSS1_P_top;
 
 // Strings for printing extensions
 
-extern const sal_Char* const sCSS1_P_page_break_before;
-extern const sal_Char* const sCSS1_P_page_break_after;
-extern const sal_Char* const sCSS1_P_page_break_inside;
-extern const sal_Char* const sCSS1_P_size;
-extern const sal_Char* const sCSS1_P_widows;
-extern const sal_Char* const sCSS1_P_orphans;
-//extern const sal_Char* const sCSS1_P_marks;
+extern const char* const sCSS1_P_page_break_before;
+extern const char* const sCSS1_P_page_break_after;
+extern const char* const sCSS1_P_page_break_inside;
+extern const char* const sCSS1_P_size;
+extern const char* const sCSS1_P_widows;
+extern const char* const sCSS1_P_orphans;
+//extern const char* const sCSS1_P_marks;
 
-extern const sal_Char* const sCSS1_PV_always;
-extern const sal_Char* const sCSS1_PV_avoid;
+extern const char* const sCSS1_PV_always;
+extern const char* const sCSS1_PV_avoid;
 
-extern const sal_Char* const sCSS1_PV_portrait;
-extern const sal_Char* const sCSS1_PV_landscape;
+extern const char* const sCSS1_PV_portrait;
+extern const char* const sCSS1_PV_landscape;
 
-//extern const sal_Char* const sCSS1_PV_crop;
-//extern const sal_Char* const sCSS1_PV_cross;
+//extern const char* const sCSS1_PV_crop;
+//extern const char* const sCSS1_PV_cross;
 
 
-extern const sal_Char* const sCSS1_class_abs_pos;
+extern const char* const sCSS1_class_abs_pos;
 
-extern const sal_Char* const sCSS1_P_so_language;
-extern const sal_Char* const sCSS1_P_direction;
-extern const sal_Char* const sCSS1_PV_ltr;
-extern const sal_Char* const sCSS1_PV_rtl;
-extern const sal_Char* const sCSS1_PV_inherit;
+extern const char* const sCSS1_P_so_language;
+extern const char* const sCSS1_P_direction;
+extern const char* const sCSS1_PV_ltr;
+extern const char* const sCSS1_PV_rtl;
+extern const char* const sCSS1_PV_inherit;
 
-extern const sal_Char* const sCSS1_P_display;
+extern const char* const sCSS1_P_display;
 
 #endif
 
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index d21caceb42ea..7c1258ae90bd 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2545,7 +2545,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
 
     if( rHTMLWrt.m_bClearLeft || rHTMLWrt.m_bClearRight )
     {
-        const sal_Char* pString;
+        const char* pString;
         if( rHTMLWrt.m_bClearLeft )
         {
             if( rHTMLWrt.m_bClearRight )
@@ -2974,7 +2974,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat,
     if( bScriptDependent )
     {
         sOut += " " OOO_STRING_SVTOOLS_HTML_O_class "=\"";
-        const sal_Char* pStr = nullptr;
+        const char* pStr = nullptr;
         switch( rHTMLWrt.m_nCSS1Script )
         {
         case CSS1_OUTMODE_WESTERN:
@@ -3172,7 +3172,7 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
         return  rWrt;
 
     const SvxAdjustItem& rAdjust = static_cast<const SvxAdjustItem&>(rHt);
-    const sal_Char* pStr = nullptr;
+    const char* pStr = nullptr;
     switch( rAdjust.GetAdjust() )
     {
     case SvxAdjust::Center: pStr = OOO_STRING_SVTOOLS_HTML_AL_center; break;
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 3dba704e9954..3a0c5cb34aae 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1125,7 +1125,7 @@ SwCharFormat* SwCSS1Parser::GetChrFormat( HtmlTokenId nToken2, const OUString& r
 {
     // search the corresponding style
     sal_uInt16 nPoolId = 0;
-    const sal_Char* sName = nullptr;
+    const char* sName = nullptr;
     switch( nToken2 )
     {
     case HtmlTokenId::EMPHASIS_ON:      nPoolId = RES_POOLCHR_HTML_EMPHASIS;    break;
@@ -1691,7 +1691,7 @@ bool SwHTMLParser::FileDownload( const OUString& rURL,
         SvMemoryStream aStream;
         aStream.WriteStream( *pStream );
 
-        rStr = OUString(static_cast<const sal_Char *>(aStream.GetData()), aStream.TellEnd(),
+        rStr = OUString(static_cast<const char *>(aStream.GetData()), aStream.TellEnd(),
             GetSrcEncoding());
     }
 
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index 7418be69fa9a..a1b6f6aa094b 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -140,7 +140,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
             SdrTextAniKind::Slide==eAniKind,
             "Text-Draw-Object not suitable for marquee" );
 
-    const sal_Char *pStr = nullptr;
+    const char *pStr = nullptr;
     switch( eAniKind )
     {
     case SdrTextAniKind::Scroll:     pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_scroll;        break;
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index b3873dc92145..2d8a71082cee 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -42,7 +42,7 @@ namespace {
 
 struct HTMLNumFormatTableEntry
 {
-    const sal_Char *pName;
+    const char *pName;
     NfIndexTableOffset const eFormat;
 };
 
@@ -583,7 +583,7 @@ void SwHTMLParser::InsertFieldText()
     }
 }
 
-void SwHTMLParser::InsertCommentText( const sal_Char *pTag )
+void SwHTMLParser::InsertCommentText( const char *pTag )
 {
     bool bEmpty = m_aContents.isEmpty();
     if( !bEmpty )
@@ -596,7 +596,7 @@ void SwHTMLParser::InsertCommentText( const sal_Char *pTag )
     }
 }
 
-void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag )
+void SwHTMLParser::InsertComment( const OUString& rComment, const char *pTag )
 {
     OUString aComment( rComment );
     if( pTag )
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 2f058945196d..33014b6dddef 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -39,9 +39,9 @@
 
 using namespace nsSwDocInfoSubType;
 
-const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFormat )
+const char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFormat )
 {
-    const sal_Char *pFormatStr = nullptr;
+    const char *pFormatStr = nullptr;
 
     switch( static_cast<SvxNumType>(nFormat) )
     {
@@ -71,7 +71,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
     SwFieldIds nField = pFieldTyp->Which();
     sal_uLong nFormat = pField->GetFormat();
 
-    const sal_Char *pTypeStr=nullptr, // TYPE
+    const char *pTypeStr=nullptr, // TYPE
                       *pSubStr=nullptr,   // SUBTYPE
                    *pFormatStr=nullptr;  // FORMAT (SW)
     OUString aValue;              // VALUE (SW)
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index c9f1d06ded86..93c948f76013 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -529,7 +529,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
     if( (nFrameOpts & (HtmlFrmOpts::Id|HtmlFrmOpts::Name)) &&
         !rFrameFormat.GetName().isEmpty() )
     {
-        const sal_Char *pStr =
+        const char *pStr =
             (nFrameOpts & HtmlFrmOpts::Id) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name;
         sOut.append(' ').append(pStr).
             append("=\"");
@@ -557,7 +557,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
     }
 
     // ALIGN
-    const sal_Char *pStr = nullptr;
+    const char *pStr = nullptr;
     RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId();
     if( (nFrameOpts & HtmlFrmOpts::Align) &&
         ((RndStdIds::FLY_AT_PARA == eAnchorId) || (RndStdIds::FLY_AT_CHAR == eAnchorId)) )
@@ -810,7 +810,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
     if( (nFrameOptions & (HtmlFrmOpts::Id|HtmlFrmOpts::Name)) &&
         !rFrameFormat.GetName().isEmpty() && !bReplacement)
     {
-        const sal_Char* pAttributeName = (nFrameOptions & HtmlFrmOpts::Id) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name;
+        const char* pAttributeName = (nFrameOptions & HtmlFrmOpts::Id) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name;
         aHtml.attribute(pAttributeName, rFrameFormat.GetName());
     }
 
@@ -829,7 +829,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
     }
 
     // align
-    const sal_Char* pAlignString = nullptr;
+    const char* pAlignString = nullptr;
     RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId();
     if( (nFrameOptions & HtmlFrmOpts::Align) &&
         ((RndStdIds::FLY_AT_PARA == eAnchorId) || (RndStdIds::FLY_AT_CHAR == eAnchorId)) && !bReplacement)
@@ -1002,7 +1002,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
          (RndStdIds::FLY_AT_CHAR == rFrameFormat.GetAnchor().GetAnchorId())) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem ))
     {
-        const sal_Char* pSurroundString = nullptr;
+        const char* pSurroundString = nullptr;
 
         const SwFormatSurround* pSurround = static_cast<const SwFormatSurround*>(pItem);
         sal_Int16 eHoriOri = rFrameFormat.GetHoriOrient().GetHoriOrient();
@@ -1160,7 +1160,7 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
         rHTMLWrt.m_aImgMapNames.push_back(aIMapName);
 
         OString aIndMap, aIndArea;
-        const sal_Char *pIndArea = nullptr, *pIndMap = nullptr;
+        const char *pIndArea = nullptr, *pIndMap = nullptr;
 
         if (rHTMLWrt.m_bLFPossible)
         {
@@ -1201,7 +1201,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
                        const OUString& rGraphicURL,
                        Graphic const & rGraphic, const OUString& rAlternateText,
                        const Size &rRealSize, HtmlFrmOpts nFrameOpts,
-                       const sal_Char *pMarkType,
+                       const char *pMarkType,
                        const ImageMap *pAltImgMap,
                        const OUString& rMimeType )
 {
@@ -1449,7 +1449,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
 }
 
 Writer& OutHTML_BulletImage( Writer& rWrt,
-                             const sal_Char *pTag,
+                             const char *pTag,
                              const SvxBrushItem* pBrush,
                              const OUString &rGraphicURL)
 {
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 21631bb9ad12..b89807242701 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -129,7 +129,7 @@ static SvMacroItemId aEventTypeTable[] =
     SvMacroItemId::NONE
 };
 
-const sal_Char * aEventListenerTable[] =
+const char * aEventListenerTable[] =
 {
     "XSubmitListener",
     "XResetListener",
@@ -141,7 +141,7 @@ const sal_Char * aEventListenerTable[] =
     ""
 };
 
-const sal_Char * aEventMethodTable[] =
+const char * aEventMethodTable[] =
 {
     "approveSubmit",
     "approveReset",
@@ -153,7 +153,7 @@ const sal_Char * aEventMethodTable[] =
     ""
 };
 
-const sal_Char * aEventSDOptionTable[] =
+const char * aEventSDOptionTable[] =
 {
     OOO_STRING_SVTOOLS_HTML_O_SDonsubmit,
     OOO_STRING_SVTOOLS_HTML_O_SDonreset,
@@ -165,7 +165,7 @@ const sal_Char * aEventSDOptionTable[] =
     nullptr
 };
 
-const sal_Char * aEventOptionTable[] =
+const char * aEventOptionTable[] =
 {
     OOO_STRING_SVTOOLS_HTML_O_onsubmit,
     OOO_STRING_SVTOOLS_HTML_O_onreset,
@@ -1545,7 +1545,7 @@ void SwHTMLParser::InsertInput()
     }
 
     // Default is HTMLInputType::Text
-    const sal_Char *pType = "TextField";
+    const char *pType = "TextField";
     bool bKeepCRLFInValue = false;
     switch( eType )
     {
diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx
index 562bb65089d7..5564a7d29315 100644
--- a/sw/source/filter/html/htmlform.hxx
+++ b/sw/source/filter/html/htmlform.hxx
@@ -22,10 +22,10 @@
 
 #include <sal/types.h>
 
-extern const sal_Char * aEventListenerTable[];
-extern const sal_Char * aEventMethodTable[];
-extern const sal_Char * aEventSDOptionTable[];
-extern const sal_Char * aEventOptionTable[];
+extern const char * aEventListenerTable[];
+extern const char * aEventMethodTable[];
+extern const char * aEventSDOptionTable[];
+extern const char * aEventOptionTable[];
 
 #endif
 
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 371daae0a26e..4b00a5b57705 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -150,7 +150,7 @@ static void lcl_html_outEvents( SvStream& rStrm,
         }
         OUString sMethod( rDesc.EventMethod );
 
-        const sal_Char *pOpt = nullptr;
+        const char *pOpt = nullptr;
         for( int j=0; aEventListenerTable[j]; j++ )
         {
             if( sListener.equalsAscii( aEventListenerTable[j] ) &&
@@ -487,7 +487,7 @@ void SwHTMLWriter::OutForm( bool bOn,
     aTmp = xFormPropSet->getPropertyValue( "SubmitEncoding" );
     if( auto eEncType = o3tl::tryAccess<form::FormSubmitEncoding>(aTmp) )
     {
-        const sal_Char *pStr = nullptr;
+        const char *pStr = nullptr;
         switch( *eEncType )
         {
         case form::FormSubmitEncoding_MULTIPART:
@@ -840,7 +840,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
                     (aTmp.getValueType() == cppu::UnoType<bool>::get() &&
                     !*o3tl::forceAccess<bool>(aTmp)) )
                 {
-                    const sal_Char *pWrapStr = nullptr;
+                    const char *pWrapStr = nullptr;
                     auto aTmp2 = xPropSet->getPropertyValue( "HardLineBreaks" );
                     auto b = o3tl::tryAccess<bool>(aTmp2);
                     pWrapStr = (b && *b) ? OOO_STRING_SVTOOLS_HTML_WW_hard
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 79c61648ab98..a55b3801cc01 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -460,7 +460,7 @@ static int lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
     sal_Int16 eFormat = rInfo.aFormat.GetNumberingType();
     if( (bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC) != eFormat )
     {
-        const sal_Char *pStr = SwHTMLWriter::GetNumFormat( eFormat );
+        const char *pStr = SwHTMLWriter::GetNumFormat( eFormat );
         if( pStr )
         {
             pParts[0] = OUString::createFromAscii( pStr );
@@ -487,7 +487,7 @@ static int lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
 }
 
 static void lcl_html_outFootEndNoteInfo( Writer& rWrt, OUString const *pParts,
-                                  int nParts, const sal_Char *pName )
+                                  int nParts, const char *pName )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index 9658b510a3a4..8977e0dbf684 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -183,7 +183,7 @@ Writer& OutHTML_NumberBulletListStart( SwHTMLWriter& rWrt,
             sOut += OString(OOO_STRING_SVTOOLS_HTML_unorderlist);
 
             // determine the type by the bullet character
-            const sal_Char *pStr = nullptr;
+            const char *pStr = nullptr;
             switch( rNumFormat.GetBulletChar() )
             {
             case HTML_BULLETCHAR_DISC:
@@ -218,7 +218,7 @@ Writer& OutHTML_NumberBulletListStart( SwHTMLWriter& rWrt,
             sOut += OString(OOO_STRING_SVTOOLS_HTML_orderlist);
 
             // determine the type by the format
-            sal_Char cType = 0;
+            char cType = 0;
             switch( eType )
             {
                 case SVX_NUM_CHARS_UPPER_LETTER:
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index ba436978a9d7..8527410527fc 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -389,7 +389,7 @@ CSS1Token CSS1Parser::GetNextToken()
                         aIdent += sTmpBuffer2;
 
                         // Is it a unit?
-                        const sal_Char *pCmp1 = nullptr, *pCmp2 = nullptr, *pCmp3 = nullptr;
+                        const char *pCmp1 = nullptr, *pCmp2 = nullptr, *pCmp3 = nullptr;
                         double nScale1 = 1., nScale2 = 1.;
                         CSS1Token nToken1 = CSS1_LENGTH,
                                   nToken2 = CSS1_LENGTH,
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index bb4dc73ae525..cb871452569c 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -85,7 +85,7 @@ namespace o3tl {
 
 struct CSS1PropertyEnum
 {
-    const sal_Char *pName;  // property value
+    const char *pName;  // property value
     sal_uInt16 const nEnum;       // and the corresponding value of enum
 };
 
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index c8d58de80b6a..07f7e87c41e8 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -720,8 +720,8 @@ private:
     // insert bookmark
     void InsertBookmark( const OUString& rName );
 
-    void InsertCommentText( const sal_Char *pTag );
-    void InsertComment( const OUString& rName, const sal_Char *pTag = nullptr );
+    void InsertCommentText( const char *pTag );
+    void InsertComment( const OUString& rName, const char *pTag = nullptr );
 
     // Has the current paragraph bookmarks?
     bool HasCurrentParaBookmarks( bool bIgnoreStack=false ) const;
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 401c279895ef..91dc026ba61a 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -86,7 +86,7 @@
 
 using namespace css;
 
-static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] =
+static char sIndentTabs[MAX_INDENT_LEVEL+2] =
     "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
 
 SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL, const OUString& rFilterOptions )
@@ -302,7 +302,7 @@ ErrCode SwHTMLWriter::WriteStream()
 
     bool bWriteUTF8 = m_bWriteClipboardDoc;
     m_eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : rHtmlOptions.GetTextEncoding();
-    const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( m_eDestEnc );
+    const char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( m_eDestEnc );
     m_eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
 
     // Only for the MS-IE we favour the export of styles.
@@ -642,7 +642,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
         HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aEncURL,
                                   rHTMLWrt.m_eDestEnc,
                                   &rHTMLWrt.m_aNonConvertableCharacters );
-        const sal_Char* const pDelim = "&#255;";
+        const char* const pDelim = "&#255;";
         if( !aFilter.isEmpty() || !aSection.isEmpty() || bURLContainsDelim )
             rHTMLWrt.Strm().WriteCharPtr( pDelim );
         if( !aFilter.isEmpty() )
@@ -865,7 +865,7 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
 }
 
 // write the StyleTable, general data, header/footer/footnotes
-static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat,
+static void OutBodyColor( const char* pTag, const SwFormat *pFormat,
                           SwHTMLWriter& rHWrt )
 {
     const SwFormat *pRefFormat = nullptr;
@@ -1214,7 +1214,7 @@ void SwHTMLWriter::OutPointFieldmarks( const SwPosition& rPos )
 }
 
 void SwHTMLWriter::OutImplicitMark( const OUString& rMark,
-                                    const sal_Char *pMarkType )
+                                    const char *pMarkType )
 {
     if( !rMark.isEmpty() && !m_aImplicitMarks.empty() )
     {
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index b0b6b96ad104..27304b8705da 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -418,7 +418,7 @@ public:
     void OutAnchor( const OUString& rName );
     void OutBookmarks();
     void OutPointFieldmarks( const SwPosition& rPos );
-    void OutImplicitMark( const OUString& rMark, const sal_Char *pMarkType );
+    void OutImplicitMark( const OUString& rMark, const char *pMarkType );
 
     OUString convertHyperlinkHRefValue(const OUString& rURL);
 
@@ -451,15 +451,15 @@ public:
 
     void OutStyleSheet( const SwPageDesc& rPageDesc );
 
-    inline void OutCSS1_PropertyAscii( const sal_Char *pProp,
-                                       const sal_Char *pVal );
-    inline void OutCSS1_PropertyAscii( const sal_Char *pProp,
+    inline void OutCSS1_PropertyAscii( const char *pProp,
+                                       const char *pVal );
+    inline void OutCSS1_PropertyAscii( const char *pProp,
                                        const OString& rVal );
-    inline void OutCSS1_Property( const sal_Char *pProp, const OUString& rVal );
-    void OutCSS1_Property( const sal_Char *pProp, const sal_Char *pVal,
+    inline void OutCSS1_Property( const char *pProp, const OUString& rVal );
+    void OutCSS1_Property( const char *pProp, const char *pVal,
                            const OUString *pSVal );
-    void OutCSS1_UnitProperty( const sal_Char *pProp, long nVal );
-    void OutCSS1_PixelProperty( const sal_Char *pProp, long nVal, bool bVert );
+    void OutCSS1_UnitProperty( const char *pProp, long nVal );
+    void OutCSS1_PixelProperty( const char *pProp, long nVal, bool bVert );
     void OutCSS1_SfxItemSet( const SfxItemSet& rItemSet, bool bDeep=true );
 
     // events of BODY tag from SFX configuration
@@ -574,7 +574,7 @@ public:
     inline bool IsCSS1Source( sal_uInt16 n ) const;
     inline bool IsCSS1Script( sal_uInt16 n ) const;
 
-    static const sal_Char *GetNumFormat( sal_uInt16 nFormat );
+    static const char *GetNumFormat( sal_uInt16 nFormat );
     static void PrepareFontList( const SvxFontItem& rFontItem, OUString& rNames,
                                  sal_Unicode cQuote, bool bGeneric );
     static sal_uInt16 GetCSS1ScriptForScriptType( sal_uInt16 nScriptType );
@@ -599,19 +599,19 @@ inline bool SwHTMLWriter::IsCSS1Script( sal_uInt16 n ) const
     return CSS1_OUTMODE_ANY_SCRIPT == nScript || n == nScript;
 }
 
-inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp,
-                                                 const sal_Char *pVal )
+inline void SwHTMLWriter::OutCSS1_PropertyAscii( const char *pProp,
+                                                 const char *pVal )
 {
     OutCSS1_Property( pProp, pVal, nullptr );
 }
 
-inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp,
+inline void SwHTMLWriter::OutCSS1_PropertyAscii( const char *pProp,
                                                  const OString& rVal )
 {
     OutCSS1_Property( pProp, rVal.getStr(), nullptr );
 }
 
-inline void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
+inline void SwHTMLWriter::OutCSS1_Property( const char *pProp,
                                             const OUString& rVal )
 {
     OutCSS1_Property( pProp, nullptr, &rVal );
@@ -666,11 +666,11 @@ Writer& OutHTML_Image( Writer&, const SwFrameFormat& rFormat,
                        const OUString& rGraphicURL,
                        Graphic const & rGraphic, const OUString& rAlternateText,
                        const Size& rRealSize, HtmlFrmOpts nFrameOpts,
-                       const sal_Char *pMarkType,
+                       const char *pMarkType,
                        const ImageMap *pGenImgMap,
                        const OUString& rMimeType = OUString() );
 
-Writer& OutHTML_BulletImage( Writer& rWrt, const sal_Char *pTag,
+Writer& OutHTML_BulletImage( Writer& rWrt, const char *pTag,
                              const SvxBrushItem* pBrush,
                              const OUString& rGraphicURL);