sal_Char->char in avmedia..basic

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

7 files changed, 29 insertions, 29 deletions

diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index f309cc13f00a..635da6e5ec0c 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -57,7 +57,7 @@ void MacroSnippet::LoadSourceFromFile( const OUString& sMacroFileURL )
             {
                 if(size == size_read)
                 {
-                    OUString sCode(static_cast<sal_Char*>(buffer), size, RTL_TEXTENCODING_UTF8);
+                    OUString sCode(static_cast<char*>(buffer), size, RTL_TEXTENCODING_UTF8);
                     sSource = sCode;
                 }
             }
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index d138b77ce5e6..582e462ab93e 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -61,10 +61,10 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer
 
     virtual void onNewRootStorage() override;
 
-    virtual const sal_Char*    getInfoFileName() const override;
-    virtual const sal_Char*    getOldInfoFileName() const override;
-    virtual const sal_Char*    getLibElementFileExtension() const override;
-    virtual const sal_Char*    getLibrariesDir() const override;
+    virtual const char*    getInfoFileName() const override;
+    virtual const char*    getOldInfoFileName() const override;
+    virtual const char*    getLibElementFileExtension() const override;
+    virtual const char*    getLibrariesDir() const override;
 
 public:
     SfxDialogLibraryContainer();
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index d07bfafbfbaf..3a86f059c839 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -308,10 +308,10 @@ protected:
     void init( const OUString& rInitialDocumentURL,
                const css::uno::Reference< css::embed::XStorage >& _rxInitialStorage );
 
-    virtual const sal_Char*    getInfoFileName() const = 0;
-    virtual const sal_Char*    getOldInfoFileName() const = 0;
-    virtual const sal_Char*    getLibElementFileExtension() const = 0;
-    virtual const sal_Char*    getLibrariesDir() const = 0;
+    virtual const char*    getInfoFileName() const = 0;
+    virtual const char*    getOldInfoFileName() const = 0;
+    virtual const char*    getLibElementFileExtension() const = 0;
+    virtual const char*    getLibrariesDir() const = 0;
 
     // Handle maLibInfoFileURL and maStorageURL correctly
     void checkStorageURL
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index bdf0a0248ad3..98fce14b6040 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -79,10 +79,10 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
     // OldBasicPassword interface
     virtual void setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword ) override;
 
-    virtual const sal_Char*    getInfoFileName() const override;
-    virtual const sal_Char*    getOldInfoFileName() const override;
-    virtual const sal_Char*    getLibElementFileExtension() const override;
-    virtual const sal_Char*    getLibrariesDir() const override;
+    virtual const char*    getInfoFileName() const override;
+    virtual const char*    getOldInfoFileName() const override;
+    virtual const char*    getLibElementFileExtension() const override;
+    virtual const char*    getLibrariesDir() const override;
 
 public:
     SfxScriptLibraryContainer();
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 93a8e877497c..8d2ecb974d45 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -324,7 +324,7 @@ static void implChr( SbxArray& rPar, bool bChrW )
         OUString aStr;
         if( !bChrW && SbiRuntime::isVBAEnabled() )
         {
-            sal_Char c = static_cast<sal_Char>(pArg->GetByte());
+            char c = static_cast<char>(pArg->GetByte());
             aStr = OUString(&c, 1, osl_getThreadTextEncoding());
         }
         else
@@ -2527,10 +2527,10 @@ void SbRtl_IsMissing(StarBASIC *, SbxArray & rPar, bool)
 // Function looks for wildcards, removes them and always returns the pure path
 static OUString implSetupWildcard(const OUString& rFileParam, SbiRTLData& rRTLData)
 {
-    static const sal_Char cDelim1 = '/';
-    static const sal_Char cDelim2 = '\\';
-    static const sal_Char cWild1 = '*';
-    static const sal_Char cWild2 = '?';
+    static const char cDelim1 = '/';
+    static const char cDelim2 = '\\';
+    static const char cWild1 = '*';
+    static const char cWild2 = '?';
 
     rRTLData.pWildCard.reset();
     rRTLData.sFullNameToBeChecked.clear();
@@ -4178,10 +4178,10 @@ void SbRtl_StrConv(StarBASIC *, SbxArray & rPar, bool)
         // convert the string to byte string, preserving unicode (2 bytes per character)
         sal_Int32 nSize = aNewStr.getLength()*2;
         const sal_Unicode* pSrc = aNewStr.getStr();
-        std::unique_ptr<sal_Char[]> pChar(new sal_Char[nSize+1]);
+        std::unique_ptr<char[]> pChar(new char[nSize+1]);
         for( sal_Int32 i=0; i < nSize; i++ )
         {
-            pChar[i] = static_cast< sal_Char >( (i%2) ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
+            pChar[i] = static_cast< char >( (i%2) ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
             if( i%2 )
             {
                 pSrc++;
@@ -4199,7 +4199,7 @@ void SbRtl_StrConv(StarBASIC *, SbxArray & rPar, bool)
     {
         // there is no concept about default codepage in unix. so it is incorrectly in unix
         OString aOStr = OUStringToOString(aNewStr,osl_getThreadTextEncoding());
-        const sal_Char* pChar = aOStr.getStr();
+        const char* pChar = aOStr.getStr();
         sal_Int32 nArraySize = aOStr.getLength();
         SbxDimArray* pArray = new SbxDimArray(SbxBYTE);
         bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index e066b000a078..a3f8fd6f565e 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -62,10 +62,10 @@ using com::sun::star::uno::Reference;
 
 // Implementation class SfxDialogLibraryContainer
 
-const sal_Char* SfxDialogLibraryContainer::getInfoFileName() const { return "dialog"; }
-const sal_Char* SfxDialogLibraryContainer::getOldInfoFileName() const { return "dialogs"; }
-const sal_Char* SfxDialogLibraryContainer::getLibElementFileExtension() const { return "xdl"; }
-const sal_Char* SfxDialogLibraryContainer::getLibrariesDir() const { return "Dialogs"; }
+const char* SfxDialogLibraryContainer::getInfoFileName() const { return "dialog"; }
+const char* SfxDialogLibraryContainer::getOldInfoFileName() const { return "dialogs"; }
+const char* SfxDialogLibraryContainer::getLibElementFileExtension() const { return "xdl"; }
+const char* SfxDialogLibraryContainer::getLibrariesDir() const { return "Dialogs"; }
 
 // Ctor for service
 SfxDialogLibraryContainer::SfxDialogLibraryContainer()
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 18f2dfd3baa0..cf55c7ed28af 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -66,10 +66,10 @@ using namespace osl;
 
 // Implementation class SfxScriptLibraryContainer
 
-const sal_Char* SfxScriptLibraryContainer::getInfoFileName() const { return "script"; }
-const sal_Char* SfxScriptLibraryContainer::getOldInfoFileName() const { return "script"; }
-const sal_Char* SfxScriptLibraryContainer::getLibElementFileExtension() const { return "xba"; }
-const sal_Char* SfxScriptLibraryContainer::getLibrariesDir() const { return "Basic"; }
+const char* SfxScriptLibraryContainer::getInfoFileName() const { return "script"; }
+const char* SfxScriptLibraryContainer::getOldInfoFileName() const { return "script"; }
+const char* SfxScriptLibraryContainer::getLibElementFileExtension() const { return "xba"; }
+const char* SfxScriptLibraryContainer::getLibrariesDir() const { return "Basic"; }
 
 // OldBasicPassword interface
 void SfxScriptLibraryContainer::setLibraryPassword( const OUString& rLibraryName, const OUString& rPassword )