sal_Char->char in sd

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

13 files changed, 33 insertions, 33 deletions

diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 78452a763f01..8f1436a340eb 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -600,7 +600,7 @@ void SdOOXMLExportTest2::testExportTransitionsPPTX()
 void SdOOXMLExportTest2::testPresetShapesExport()
 {
     ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/preset-shapes-export.odp"), ODP);
-    const sal_Char *sShapeTypeAndValues[] =
+    const char *sShapeTypeAndValues[] =
     {
         "wedgeEllipseCallout",
         "adj1","val 45310",
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 5bc0809fc6a6..29f4134aff97 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -52,7 +52,7 @@ namespace {
 struct deprecated_FadeEffect_conversion_table_entry
 {
     FadeEffect const  meFadeEffect;
-    const sal_Char* mpPresetId;
+    const char* mpPresetId;
 };
 
 }
@@ -222,8 +222,8 @@ namespace {
 struct deprecated_AnimationEffect_conversion_table_entry
 {
     AnimationEffect const meEffect;
-    const sal_Char* mpPresetId;
-    const sal_Char* mpPresetSubType;
+    const char* mpPresetId;
+    const char* mpPresetSubType;
 };
 
 }
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 9ceab36e4bec..58a2ad938db6 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -106,12 +106,12 @@ static void ImplTranslateAttribute( OUString& rString, const TranslateMode eTran
     }
     else if ( eTranslateMode & TRANSLATE_MEASURE )
     {
-        const sal_Char* pDest[] = { "#ppt_x", "#ppt_y", "#ppt_w", "#ppt_h", nullptr };
-        const sal_Char* pSource[] = { "x", "y", "width", "height", nullptr };
+        const char* pDest[] = { "#ppt_x", "#ppt_y", "#ppt_w", "#ppt_h", nullptr };
+        const char* pSource[] = { "x", "y", "width", "height", nullptr };
         sal_Int32 nIndex = 0;
 
-        const sal_Char** ps = pSource;
-        const sal_Char** pd = pDest;
+        const char** ps = pSource;
+        const char** pd = pDest;
 
         while( *ps )
         {
@@ -215,9 +215,9 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl
     return nPresetSubType;
 }
 
-const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection )
+const char* AnimationExporter::FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection )
 {
-    const sal_Char* pRet = nullptr;
+    const char* pRet = nullptr;
     int             nFit = 0;
 
     const oox::ppt::transition* p = oox::ppt::transition::getList();
@@ -1519,7 +1519,7 @@ sal_uInt32 AnimationExporter::GetValueTypeForAttributeName( const OUString& rAtt
 
     struct Entry
     {
-        const sal_Char* pName;
+        const char* pName;
         sal_uInt8 nType;
     };
     static const Entry lcl_attributeMap[] =
@@ -1879,7 +1879,7 @@ void AnimationExporter::exportTransitionFilter( SvStream& rStrm, const Reference
         rStrm.WriteUInt32( nBits )
              .WriteUInt32( nTransition );
     }
-    const sal_Char* pFilter = FindTransitionName( xFilter->getTransition(), xFilter->getSubtype(), xFilter->getDirection() );
+    const char* pFilter = FindTransitionName( xFilter->getTransition(), xFilter->getSubtype(), xFilter->getDirection() );
     if ( pFilter )
     {
         const OUString aStr( OUString::createFromAscii( pFilter ) );
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index 6bdd0eeb0bc9..99cff57b844c 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -127,7 +127,7 @@ public:
         static sal_uInt32 GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, bool& bPresetId );
         static sal_uInt32 GetValueTypeForAttributeName( const OUString& rAttributeName );
 
-    static const sal_Char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection );
+    static const char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection );
     static css::uno::Reference< css::drawing::XShape > getTargetElementShape( const css::uno::Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, bool& rParagraphTarget );
 };
 } // namespace ppt
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index b140e930749f..8ee778b8944b 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1039,7 +1039,7 @@ SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage const * pPage)
 OUString HtmlExport::CreateMetaCharset()
 {
     OUString aStr;
-    const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 );
+    const char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 );
     if ( pCharSet )
     {
         aStr = "  <meta HTTP-EQUIV=CONTENT-TYPE CONTENT=\"text/html; charset=" +
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index ab80510d07b8..1aaf42064a8c 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -105,7 +105,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
             {
                 try
                 {
-                    std::unique_ptr<sal_Char[]> pString( new sal_Char[ nItemSize ] );
+                    std::unique_ptr<char[]> pString( new char[ nItemSize ] );
                     if ( mnTextEnc == RTL_TEXTENCODING_UCS2 )
                     {
                         nItemSize >>= 1;
@@ -292,7 +292,7 @@ void Section::GetDictionary(Dictionary& rDict)
             }
             else
             {
-                std::unique_ptr<sal_Char[]> pString( new sal_Char[nSize] );
+                std::unique_ptr<char[]> pString( new char[nSize] );
                 aStream.ReadBytes(pString.get(), nSize);
                 aString = OUString(pString.get(), lcl_getMaxSafeStrLen(nSize), mnTextEnc);
             }
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 90e0e4f120fa..7a5d446e5d97 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -130,16 +130,16 @@ namespace {
 
 struct XML_SERVICEMAP
 {
-    const sal_Char* mpService;
-    const sal_Char* mpStream;
+    const char* mpService;
+    const char* mpStream;
 };
 
 struct XML_SERVICES
 {
-    const sal_Char* mpMeta;
-    const sal_Char* mpStyles;
-    const sal_Char* mpContent;
-    const sal_Char* mpSettings;
+    const char* mpMeta;
+    const char* mpStyles;
+    const char* mpContent;
+    const char* mpSettings;
 };
 
 }
@@ -180,7 +180,7 @@ ErrCode ReadThroughComponent(
     const Reference<XComponent>& xModelComponent,
     const OUString& rStreamName,
     Reference<uno::XComponentContext> const & rxContext,
-    const sal_Char* pFilterName,
+    const char* pFilterName,
     const Sequence<Any>& rFilterArguments,
     const OUString& rName,
     bool bMustBeSuccessfull,
@@ -311,10 +311,10 @@ ErrCode ReadThroughComponent(
 ErrCode ReadThroughComponent(
     const uno::Reference < embed::XStorage >& xStorage,
     const Reference<XComponent>& xModelComponent,
-    const sal_Char* pStreamName,
-    const sal_Char* pCompatibilityStreamName,
+    const char* pStreamName,
+    const char* pCompatibilityStreamName,
     Reference<uno::XComponentContext> const & rxContext,
-    const sal_Char* pFilterName,
+    const char* pFilterName,
     const Sequence<Any>& rFilterArguments,
     const OUString& rName,
     bool bMustBeSuccessfull )
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index c39adf26d126..ab9ecddd7be0 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -150,7 +150,7 @@ void ConfigurationClassifier::CopyResources (
 #if DEBUG_SD_CONFIGURATION_TRACE
 
 void ConfigurationClassifier::TraceResourceIdVector (
-    const sal_Char* pMessage,
+    const char* pMessage,
     const ResourceIdVector& rResources)
 {
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
index 25b07f1bdcb3..8753c4a73d59 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
@@ -89,7 +89,7 @@ public:
     const ResourceIdVector& GetC1andC2() const { return maC1andC2;}
 
     static void TraceResourceIdVector (
-        const sal_Char* pMessage,
+        const char* pMessage,
         const ResourceIdVector& rResources);
 
 #endif
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index 9314a60b4fe2..6fffe8a3bec5 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -61,7 +61,7 @@ extern "C"
 {
 
 SAL_DLLPUBLIC_EXPORT void * sd_component_getFactory(
-    const sal_Char * pImplName,
+    const char * pImplName,
     void           * pServiceManager,
     void           *  )
 {
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index f478a828e8e5..e728f0fb9e05 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -100,7 +100,7 @@ enum WID_PAGE
 
 }
 
-static sal_Char const sEmptyPageName[sizeof("page")] = "page";
+static char const sEmptyPageName[sizeof("page")] = "page";
 
 // this function stores the property maps for draw pages in impress and draw
 static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind ePageKind )
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 30fe413e5d83..17e225e7c1c8 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -240,7 +240,7 @@ namespace {
             bDefaultValue is returned.  Otherwise <FALSE/> is returned.
         */
         bool GetBoolValue (
-            const sal_Char* pName,
+            const char* pName,
             const bool bDefaultValue) const
         {
             bool bValue = mrProperties.getBoolValue( pName, bDefaultValue );
@@ -252,7 +252,7 @@ namespace {
             returned.
         */
         bool GetBoolValue (
-            const sal_Char* pName,
+            const char* pName,
             const sal_Int32 nTriggerValue) const
         {
             sal_Int32 nValue = static_cast<sal_Int32>(mrProperties.getIntValue( pName, 0 ));
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 97592f5c6a69..7bbc8946e3db 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -124,7 +124,7 @@ static void ImpAddPrintableCharactersToTextEdit(SfxRequest const & rReq, ::sd::V
     {
         for(sal_Int32 a(0); a < aInputString.getLength(); a++)
         {
-            sal_Char aChar = static_cast<sal_Char>(aInputString[a]);
+            char aChar = static_cast<char>(aInputString[a]);
             vcl::KeyCode aKeyCode;
             KeyEvent aKeyEvent(aChar, aKeyCode);