sal_Char->char in sc

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

9 files changed, 43 insertions, 43 deletions

diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index de64bcef7a75..a0e3974caafb 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -445,7 +445,7 @@ TokenId TokenPool::Store( const sal_uInt16 nIndex )
 
 TokenId TokenPool::Store( const OUString& rString )
 {
-    // mostly copied to Store( const sal_Char* ), to avoid a temporary string
+    // mostly copied to Store( const char* ), to avoid a temporary string
     if (!CheckElementOrGrow())
         return static_cast<const TokenId>(nElementCurrent+1);
 
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 44325e4804aa..65fa3f896e31 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1224,7 +1224,7 @@ void XclExpNote::Save( XclExpStream& rStrm )
         case EXC_BIFF5:
         {
             // write the NOTE record directly, there may be the need to create more than one
-            const sal_Char* pcBuffer = maNoteText.getStr();
+            const char* pcBuffer = maNoteText.getStr();
             sal_uInt16 nCharsLeft = static_cast< sal_uInt16 >( maNoteText.getLength() );
 
             while( nCharsLeft )
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index 70df7cde57ca..80a89af7a25d 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -146,7 +146,7 @@ void XclExpString::AppendByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc )
 {
     if( !cChar )
     {
-        sal_Char cByteChar = 0;
+        char cByteChar = 0;
         BuildAppend( &cByteChar, 1 );
     }
     else
@@ -473,13 +473,13 @@ void XclExpString::CharsToBuffer( const sal_Unicode* pcSource, sal_Int32 nBegin,
         mbWrapped = ::std::find( aBeg, aEnd, EXC_LF ) != aEnd;
 }
 
-void XclExpString::CharsToBuffer( const sal_Char* pcSource, sal_Int32 nBegin, sal_Int32 nLen )
+void XclExpString::CharsToBuffer( const char* pcSource, sal_Int32 nBegin, sal_Int32 nLen )
 {
     OSL_ENSURE( maCharBuffer.size() >= static_cast< size_t >( nBegin + nLen ),
         "XclExpString::CharsToBuffer - char buffer invalid" );
     ScfUInt8Vec::iterator aBeg = maCharBuffer.begin() + nBegin;
     ScfUInt8Vec::iterator aEnd = aBeg + nLen;
-    const sal_Char* pcSrcChar = pcSource;
+    const char* pcSrcChar = pcSource;
     for( ScfUInt8Vec::iterator aIt = aBeg; aIt != aEnd; ++aIt, ++pcSrcChar )
         *aIt = static_cast< sal_uInt8 >( *pcSrcChar );
     mbIsUnicode = false;
@@ -518,7 +518,7 @@ void XclExpString::Build( const sal_Unicode* pcSource, sal_Int32 nCurrLen, XclSt
     CharsToBuffer( pcSource, 0, mnLen );
 }
 
-void XclExpString::Build( const sal_Char* pcSource, sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMaxLen )
+void XclExpString::Build( const char* pcSource, sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMaxLen )
 {
     Init( nCurrLen, nFlags, nMaxLen, false );
     CharsToBuffer( pcSource, 0, mnLen );
@@ -544,7 +544,7 @@ void XclExpString::BuildAppend( const sal_Unicode* pcSource, sal_Int32 nAddLen )
     }
 }
 
-void XclExpString::BuildAppend( const sal_Char* pcSource, sal_Int32 nAddLen )
+void XclExpString::BuildAppend( const char* pcSource, sal_Int32 nAddLen )
 {
     OSL_ENSURE( !mbIsBiff8, "XclExpString::BuildAppend - must not be called at unicode strings" );
     if( !mbIsBiff8 )
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 47ca45d10f25..d654f38ab133 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2916,7 +2916,7 @@ OUString XclImpPictureObj::GetOleStorageName() const
     if( (mbEmbedded || mbLinked) && !mbControl && (mnStorageId > 0) )
     {
         aStrgName = mbEmbedded ? OUStringLiteral(EXC_STORAGE_OLE_EMBEDDED) : OUStringLiteral(EXC_STORAGE_OLE_LINKED);
-        static const sal_Char spcHexChars[] = "0123456789ABCDEF";
+        static const char spcHexChars[] = "0123456789ABCDEF";
         for( sal_uInt8 nIndex = 32; nIndex > 0; nIndex -= 4 )
             aStrgName.append(OUStringChar( spcHexChars[ ::extract_value< sal_uInt8 >( mnStorageId, nIndex - 4, 4 ) ] ));
     }
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index a0293e69dd6e..0904903da3c0 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -944,7 +944,7 @@ void XclImpStream::IgnoreUniString( sal_uInt16 nChars )
 OUString XclImpStream::ReadRawByteString( sal_uInt16 nChars )
 {
     nChars = GetMaxRawReadSize(nChars);
-    std::unique_ptr<sal_Char[]> pcBuffer(new sal_Char[ nChars + 1 ]);
+    std::unique_ptr<char[]> pcBuffer(new char[ nChars + 1 ]);
     sal_uInt16 nCharsRead = ReadRawData( pcBuffer.get(), nChars );
     pcBuffer[ nCharsRead ] = '\0';
     OUString aRet( pcBuffer.get(), strlen(pcBuffer.get()), mrRoot.GetTextEncoding() );
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index a51ecefd74f6..b3a388ce7fb2 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -454,16 +454,16 @@ const XclChFormatInfo& XclChFormatInfoProvider::GetFormatInfo( XclChObjectType e
 namespace {
 
 // chart type service names
-const sal_Char SERVICE_CHART2_AREA[]      = "com.sun.star.chart2.AreaChartType";
-const sal_Char SERVICE_CHART2_CANDLE[]    = "com.sun.star.chart2.CandleStickChartType";
-const sal_Char SERVICE_CHART2_COLUMN[]    = "com.sun.star.chart2.ColumnChartType";
-const sal_Char SERVICE_CHART2_LINE[]      = "com.sun.star.chart2.LineChartType";
-const sal_Char SERVICE_CHART2_NET[]       = "com.sun.star.chart2.NetChartType";
-const sal_Char SERVICE_CHART2_FILLEDNET[] = "com.sun.star.chart2.FilledNetChartType";
-const sal_Char SERVICE_CHART2_PIE[]       = "com.sun.star.chart2.PieChartType";
-const sal_Char SERVICE_CHART2_SCATTER[]   = "com.sun.star.chart2.ScatterChartType";
-const sal_Char SERVICE_CHART2_BUBBLE[]    = "com.sun.star.chart2.BubbleChartType";
-const sal_Char SERVICE_CHART2_SURFACE[]   = "com.sun.star.chart2.ColumnChartType";    // Todo
+const char SERVICE_CHART2_AREA[]      = "com.sun.star.chart2.AreaChartType";
+const char SERVICE_CHART2_CANDLE[]    = "com.sun.star.chart2.CandleStickChartType";
+const char SERVICE_CHART2_COLUMN[]    = "com.sun.star.chart2.ColumnChartType";
+const char SERVICE_CHART2_LINE[]      = "com.sun.star.chart2.LineChartType";
+const char SERVICE_CHART2_NET[]       = "com.sun.star.chart2.NetChartType";
+const char SERVICE_CHART2_FILLEDNET[] = "com.sun.star.chart2.FilledNetChartType";
+const char SERVICE_CHART2_PIE[]       = "com.sun.star.chart2.PieChartType";
+const char SERVICE_CHART2_SCATTER[]   = "com.sun.star.chart2.ScatterChartType";
+const char SERVICE_CHART2_BUBBLE[]    = "com.sun.star.chart2.BubbleChartType";
+const char SERVICE_CHART2_SURFACE[]   = "com.sun.star.chart2.ColumnChartType";    // Todo
 
 namespace csscd = css::chart::DataLabelPlacement;
 
@@ -606,29 +606,29 @@ OUString XclChObjectTable::InsertObject(const uno::Any& rObj)
 namespace {
 
 /** Property names for line style in common objects. */
-const sal_Char* const sppcLineNamesCommon[] =
+const char* const sppcLineNamesCommon[] =
     { "LineStyle", "LineWidth", "LineColor", "LineTransparence", "LineDashName", nullptr };
 /** Property names for line style in linear series objects. */
-const sal_Char* const sppcLineNamesLinear[] =
+const char* const sppcLineNamesLinear[] =
     { "LineStyle", "LineWidth", "Color", "Transparency", "LineDashName", nullptr };
 /** Property names for line style in filled series objects. */
-const sal_Char* const sppcLineNamesFilled[] =
+const char* const sppcLineNamesFilled[] =
     { "BorderStyle", "BorderWidth", "BorderColor", "BorderTransparency", "BorderDashName", nullptr };
 
 /** Property names for solid area style in common objects. */
-const sal_Char* const sppcAreaNamesCommon[] = { "FillStyle", "FillColor", "FillTransparence", nullptr };
+const char* const sppcAreaNamesCommon[] = { "FillStyle", "FillColor", "FillTransparence", nullptr };
 /** Property names for solid area style in filled series objects. */
-const sal_Char* const sppcAreaNamesFilled[] = { "FillStyle", "Color", "Transparency", nullptr };
+const char* const sppcAreaNamesFilled[] = { "FillStyle", "Color", "Transparency", nullptr };
 /** Property names for gradient area style in common objects. */
-const sal_Char* const sppcGradNamesCommon[] = {  "FillStyle", "FillGradientName", nullptr };
+const char* const sppcGradNamesCommon[] = {  "FillStyle", "FillGradientName", nullptr };
 /** Property names for gradient area style in filled series objects. */
-const sal_Char* const sppcGradNamesFilled[] = {  "FillStyle", "GradientName", nullptr };
+const char* const sppcGradNamesFilled[] = {  "FillStyle", "GradientName", nullptr };
 /** Property names for hatch area style in common objects. */
-const sal_Char* const sppcHatchNamesCommon[] = { "FillStyle", "FillHatchName", "FillColor", "FillBackground", nullptr };
+const char* const sppcHatchNamesCommon[] = { "FillStyle", "FillHatchName", "FillColor", "FillBackground", nullptr };
 /** Property names for hatch area style in filled series objects. */
-const sal_Char* const sppcHatchNamesFilled[] = { "FillStyle", "HatchName", "Color", "FillBackground", nullptr };
+const char* const sppcHatchNamesFilled[] = { "FillStyle", "HatchName", "Color", "FillBackground", nullptr };
 /** Property names for bitmap area style. */
-const sal_Char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "FillBitmapMode", nullptr };
+const char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "FillBitmapMode", nullptr };
 
 } // namespace
 
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 283c8e60a019..45bcbbc753a8 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -298,8 +298,8 @@ namespace {
 
 static const struct
 {
-    const sal_Char*     mpcListenerType;
-    const sal_Char*     mpcEventMethod;
+    const char*     mpcListenerType;
+    const char*     mpcEventMethod;
 }
 spTbxListenerData[] =
 {
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 8d769042642a..cf87e8aeafd0 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -534,41 +534,41 @@ bool operator==( const XclFontData& rLeft, const XclFontData& rRight )
 namespace {
 
 /** Property names for common font settings. */
-const sal_Char *const sppcPropNamesChCommon[] =
+const char *const sppcPropNamesChCommon[] =
 {
     "CharUnderline", "CharStrikeout", "CharColor", "CharContoured", "CharShadowed", nullptr
 };
 /** Property names for Western font settings. */
-const sal_Char *const sppcPropNamesChWstrn[] =
+const char *const sppcPropNamesChWstrn[] =
 {
     "CharFontName", "CharHeight", "CharPosture", "CharWeight", nullptr
 };
 /** Property names for Asian font settings. */
-const sal_Char *const sppcPropNamesChAsian[] =
+const char *const sppcPropNamesChAsian[] =
 {
     "CharFontNameAsian", "CharHeightAsian", "CharPostureAsian", "CharWeightAsian", nullptr
 };
 /** Property names for Complex font settings. */
-const sal_Char *const sppcPropNamesChCmplx[] =
+const char *const sppcPropNamesChCmplx[] =
 {
     "CharFontNameComplex", "CharHeightComplex", "CharPostureComplex", "CharWeightComplex", nullptr
 };
 /** Property names for escapement. */
-const sal_Char *const sppcPropNamesChEscapement[] =
+const char *const sppcPropNamesChEscapement[] =
 {
     "CharEscapement", "CharEscapementHeight", nullptr
 };
 const sal_Int8 EXC_API_ESC_HEIGHT           = 58;   /// Default escapement font height.
 
 /** Property names for Western font settings without font name. */
-const sal_Char *const *const sppcPropNamesChWstrnNoName = sppcPropNamesChWstrn + 1;
+const char *const *const sppcPropNamesChWstrnNoName = sppcPropNamesChWstrn + 1;
 /** Property names for Asian font settings without font name. */
-const sal_Char *const *const sppcPropNamesChAsianNoName = sppcPropNamesChAsian + 1;
+const char *const *const sppcPropNamesChAsianNoName = sppcPropNamesChAsian + 1;
 /** Property names for Complex font settings without font name. */
-const sal_Char *const *const sppcPropNamesChCmplxNoName = sppcPropNamesChCmplx + 1;
+const char *const *const sppcPropNamesChCmplxNoName = sppcPropNamesChCmplx + 1;
 
 /** Property names for font settings in form controls. */
-const sal_Char *const sppcPropNamesControl[] =
+const char *const sppcPropNamesControl[] =
 {
     "FontName", "FontFamily", "FontCharset", "FontHeight", "FontSlant",
     "FontWeight", "FontLineStyle", "FontStrikeout", "TextColor", nullptr
@@ -771,7 +771,7 @@ constexpr LanguageType PRV_LANGUAGE_ASIAN_PRIM = primary(LANGUAGE_CHINESE);
 struct XclBuiltInFormat
 {
     sal_uInt16          mnXclNumFmt;    /// Excel built-in index.
-    const sal_Char*     mpFormat;       /// Format string, may be 0 (meOffset used then).
+    const char*     mpFormat;       /// Format string, may be 0 (meOffset used then).
     NfIndexTableOffset const  meOffset;       /// SvNumberFormatter format index, if mpFormat==0.
     sal_uInt16 const          mnXclReuseFmt;  /// Use this Excel format, if meOffset==PRV_NF_INDEX_REUSE.
 };
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 2a531a70da61..9c94d10765c1 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -435,7 +435,7 @@ OUString XclTools::GetXclFontName( const OUString& rFontName )
 static const char maDefNamePrefix[]    = "Excel_BuiltIn_"; /// Prefix for built-in defined names.
 static const char maDefNamePrefixXml[] = "_xlnm.";         /// Prefix for built-in defined names for OOX
 
-static const sal_Char* const ppcDefNames[] =
+static const char* const ppcDefNames[] =
 {
     "Consolidate_Area",
     "Auto_Open",
@@ -509,7 +509,7 @@ sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName )
 static const char maStyleNamePrefix1[] = "Excel_BuiltIn_";  /// Prefix for built-in cell style names.
 static const char maStyleNamePrefix2[] = "Excel Built-in "; /// Prefix for built-in cell style names from OOX filter.
 
-static const sal_Char* const ppcStyleNames[] =
+static const char* const ppcStyleNames[] =
 {
     "",                 // "Normal" not used directly, but localized "Default"
     "RowLevel_",        // outline level will be appended