sal_Char->char in oox..registry

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

6 files changed, 16 insertions, 16 deletions

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 1895c2f2aad6..f2f95224cf61 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -102,12 +102,12 @@ class OOX_DLLPUBLIC Shape
 {
 public:
 
-    explicit Shape( const sal_Char* pServiceType = nullptr, bool bDefaultHeight = true );
+    explicit Shape( const char* pServiceType = nullptr, bool bDefaultHeight = true );
     explicit Shape( const ShapePtr& pSourceShape );
     virtual ~Shape();
 
     OUString&                  getServiceName(){ return msServiceName; }
-    void                            setServiceName( const sal_Char* pServiceName );
+    void                            setServiceName( const char* pServiceName );
 
     PropertyMap&                    getShapeProperties(){ return maShapeProperties; }
 
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 32dea6fca6f3..bab76313fe69 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -377,11 +377,11 @@ class String : public OUString
 public:
                  String() {}
     /*implicit*/ String( const OUString& rStr ) : OUString( rStr ) {}
-    /*implicit*/ String( const sal_Char* pcStr ) : OUString( OUString::createFromAscii( pcStr ? pcStr : "" ) ) {}
+    /*implicit*/ String( const char* pcStr ) : OUString( OUString::createFromAscii( pcStr ? pcStr : "" ) ) {}
     /*implicit*/ String( sal_Unicode cChar ) : OUString( cChar ) {}
 
     bool         has() const { return getLength() > 0; }
-    OUString operator()( const sal_Char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); }
+    OUString operator()( const char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); }
 };
 
 static const String EMPTY_STRING;
@@ -722,7 +722,7 @@ class NameListWrapper
 public:
                  NameListWrapper() {}
     /*implicit*/ NameListWrapper( const OUString& rListName ) : maName( rListName ) {}
-    /*implicit*/ NameListWrapper( const sal_Char* pcListName ) : maName( pcListName ) {}
+    /*implicit*/ NameListWrapper( const char* pcListName ) : maName( pcListName ) {}
     /*implicit*/ NameListWrapper( const NameListRef& rxList ) : mxList( rxList ) {}
 
     bool         isEmpty() const { return !mxList && !maName.has(); }
@@ -833,10 +833,10 @@ class Config : public Base
 {
 public:
     explicit            Config(
-                            const sal_Char* pcEnvVar,
+                            const char* pcEnvVar,
                             const ::oox::core::FilterBase& rFilter );
     explicit            Config(
-                            const sal_Char* pcEnvVar,
+                            const char* pcEnvVar,
                             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
                             const OUString& rSysFileName );
@@ -875,10 +875,10 @@ public:
 protected:
                         Config() {}
     void                construct(
-                            const sal_Char* pcEnvVar,
+                            const char* pcEnvVar,
                             const ::oox::core::FilterBase& rFilter );
     void                construct(
-                            const sal_Char* pcEnvVar,
+                            const char* pcEnvVar,
                             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const StorageRef& rxRootStrg,
                             const OUString& rSysFileName );
@@ -954,7 +954,7 @@ public:
     void                endMultiItems();
 
     void                writeChar( sal_Unicode cChar, sal_Int32 nCount = 1 );
-    void                writeAscii( const sal_Char* pcStr );
+    void                writeAscii( const char* pcStr );
     void                writeString( const OUString& rStr );
     void                writeArray( const sal_uInt8* pnData, std::size_t nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
     void                writeBool( bool bData );
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index 6fdcc2ba5bd2..c1c4e78d357f 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -322,7 +322,7 @@ protected:
     sal_uInt8    dumpImageSizeModeProperty() { return dumpDecProperty< sal_uInt8 >( 0, "AX-IMAGESIZEMODE" ); }
     sal_uInt8    dumpImageAlignProperty() { return dumpDecProperty< sal_uInt8 >( 2, "AX-IMAGEALIGN" ); }
 
-    sal_uInt32          dumpFlagsProperty( sal_uInt32 nDefault, const sal_Char* pcNameList = "AX-FLAGS" );
+    sal_uInt32          dumpFlagsProperty( sal_uInt32 nDefault, const char* pcNameList = "AX-FLAGS" );
     sal_uInt32          dumpColorProperty( sal_uInt32 nDefault );
     sal_Unicode         dumpUnicodeProperty();
     void                dumpUnknownProperty();
diff --git a/include/oox/ppt/pptfilterhelpers.hxx b/include/oox/ppt/pptfilterhelpers.hxx
index 0d13043cc718..2c2bab5f71bd 100644
--- a/include/oox/ppt/pptfilterhelpers.hxx
+++ b/include/oox/ppt/pptfilterhelpers.hxx
@@ -52,7 +52,7 @@ namespace oox { namespace ppt {
 
     struct OOX_DLLPUBLIC transition
     {
-        const sal_Char* mpName;
+        const char* mpName;
         sal_Int16 const mnType;
         sal_Int16 const mnSubType;
         bool const mbDirection; // true: default geometric direction
@@ -64,7 +64,7 @@ namespace oox { namespace ppt {
     struct OOX_DLLPUBLIC convert_subtype
     {
         sal_Int32 const mnID;
-        const sal_Char* mpStrSubType;
+        const char* mpStrSubType;
 
         static const convert_subtype* getList();
     };
@@ -73,7 +73,7 @@ namespace oox { namespace ppt {
     {
         sal_Int32   mnPresetClass;
         sal_Int32   mnPresetId;
-        const sal_Char* mpStrPresetId;
+        const char* mpStrPresetId;
 
         static const preset_mapping* getList();
     };
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index fac28f7616c3..040851494cde 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -55,7 +55,7 @@ class PPTShape final : public oox::drawingml::Shape
 public:
 
     PPTShape( const oox::ppt::ShapeLocation eShapeLocation,
-                const sal_Char* pServiceType );
+                const char* pServiceType );
     virtual ~PPTShape() override;
 
     using oox::drawingml::Shape::addShape;
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index b5c14f20749b..91fa5cdb0967 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -66,7 +66,7 @@ public:
         // 50% of OOXML tokens are primarily 1 lower-case character, a-z
         if( nLength == 1)
         {
-            sal_Char c = pToken[0];
+            char c = pToken[0];
             if (c >= 'a' && c <= 'z')
                 return mnAlphaTokens[ c - 'a' ];
         }