sal_Char->char in desktop..dtrans

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

17 files changed, 25 insertions, 25 deletions

diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h
index 236a9ee18f2c..1ed5b3e5e1ce 100644
--- a/desktop/inc/dp_misc.h
+++ b/desktop/inc/dp_misc.h
@@ -34,8 +34,8 @@
 
 namespace dp_misc {
 
-const sal_Char CR = 0x0d;
-const sal_Char LF = 0x0a;
+const char CR = 0x0d;
+const char LF = 0x0a;
 
 
 class MutexHolder
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 4afbed28e6b3..7fd35ee3d574 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -593,7 +593,7 @@ bool Desktop::QueryExit()
     {
     }
 
-    const sal_Char SUSPEND_QUICKSTARTVETO[] = "SuspendQuickstartVeto";
+    const char SUSPEND_QUICKSTARTVETO[] = "SuspendQuickstartVeto";
 
     Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() );
     Reference< XPropertySet > xPropertySet(xDesktop, UNO_QUERY_THROW);
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 63d02f51d41a..14e1f2076e47 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -66,7 +66,7 @@ PersistentMap::~PersistentMap()
 // replace "%" with "%%"
 static OString encodeString( const OString& rStr)
 {
-    const sal_Char* pChar = rStr.getStr();
+    const char* pChar = rStr.getStr();
     const sal_Int32 nLen = rStr.getLength();
     sal_Int32 i = nLen;
     // short circuit for the simple non-encoded case
@@ -101,7 +101,7 @@ static OString encodeString( const OString& rStr)
 
 // replace "%0".."%F" with 0x00..0x0F
 // replace "%%" with "%"
-static OString decodeString( const sal_Char* pEncChars, int nLen)
+static OString decodeString( const char* pEncChars, int nLen)
 {
     const char* pChar = pEncChars;
     sal_Int32 i = nLen;
@@ -117,7 +117,7 @@ static OString decodeString( const sal_Char* pEncChars, int nLen)
     pChar = pEncChars;
     for( i = nLen; --i >= 0;)
     {
-        sal_Char c = *(pChar++);
+        char c = *(pChar++);
         // handle escaped character
         if( c == '%')
         {
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index ba642fdbff10..bfaeb801141f 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -28,7 +28,7 @@ namespace sdecl = comphelper::service_decl;
 extern "C" {
 
 SAL_DLLPUBLIC_EXPORT void * deployment_component_getFactory(
-    sal_Char const * pImplName, void *, void *)
+    char const * pImplName, void *, void *)
 {
     return sdecl::component_getFactoryHelper(
         pImplName,
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 641ba623a534..a333705a561d 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -324,7 +324,7 @@ sdecl::ServiceDecl const updateDecl(
 extern "C" {
 
 SAL_DLLPUBLIC_EXPORT void * deploymentgui_component_getFactory(
-    sal_Char const * pImplName, void *, void *)
+    char const * pImplName, void *, void *)
 {
     return sdecl::component_getFactoryHelper(
         pImplName,
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index be7150588485..78ad04945c5a 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -260,7 +260,7 @@ void PackageManagerImpl::initActivationLayer(
                             ucbhelper::Content remFileContent(
                                 url + "removed", Reference<XCommandEnvironment>(), m_xComponentContext);
                             std::vector<sal_Int8> data = dp_misc::readFile(remFileContent);
-                            OString osData(reinterpret_cast<const sal_Char*>(data.data()),
+                            OString osData(reinterpret_cast<const char*>(data.data()),
                                                   data.size());
                             OUString sData = OStringToOUString(
                                 osData, RTL_TEXTENCODING_UTF8);
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index 35be6bb90918..ef9b4b390d37 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -205,7 +205,7 @@ bool readLine( OUString * res, OUString const & startingWith,
 {
     // read whole file:
     std::vector<sal_Int8> bytes( readFile( ucb_content ) );
-    OUString file( reinterpret_cast<sal_Char const *>(bytes.data()),
+    OUString file( reinterpret_cast<char const *>(bytes.data()),
                    bytes.size(), textenc );
     sal_Int32 pos = 0;
     for (;;)
@@ -261,7 +261,7 @@ bool readProperties( std::vector< std::pair< OUString, OUString> > & out_result,
 {
     // read whole file:
     std::vector<sal_Int8> bytes( readFile( ucb_content ) );
-    OUString file( reinterpret_cast<sal_Char const *>(bytes.data()),
+    OUString file( reinterpret_cast<char const *>(bytes.data()),
                    bytes.size(), RTL_TEXTENCODING_UTF8);
     sal_Int32 pos = 0;
 
diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx
index 0cda82e6b3c3..4bd475e89ccd 100644
--- a/desktop/source/deployment/misc/lockfile.cxx
+++ b/desktop/source/deployment/misc/lockfile.cxx
@@ -61,7 +61,7 @@ static OString impl_getHostname()
         aHost = OString("UNKNOWN");
 #else
     /* Don't do dns lookup on Linux either */
-    sal_Char pHostName[1024];
+    char pHostName[1024];
 
     if ( gethostname( pHostName, sizeof( pHostName ) - 1 ) == 0 )
     {
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index fb00877fb276..ad34987632d0 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -596,7 +596,7 @@ OUString replaceOrigin(
     std::vector<sal_Int8> filtered( bytes.size() * 2 );
     bool use_filtered = false;
     OString origin;
-    sal_Char const * pBytes = reinterpret_cast<sal_Char const *>(
+    char const * pBytes = reinterpret_cast<char const *>(
         bytes.data());
     std::size_t nBytes = bytes.size();
     size_t write_pos = 0;
@@ -621,7 +621,7 @@ OUString replaceOrigin(
         // consume %:
         ++pBytes;
         --nBytes;
-        sal_Char const * pAdd = "%";
+        char const * pAdd = "%";
         sal_Int32 nAdd = 1;
         if (nBytes > 1 && pBytes[ 0 ] == '%')
         {
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 4ae501fdd948..9ea8c47ea3db 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -549,7 +549,7 @@ OUString BackendImpl::PackageImpl::getTextFromURL(
         ::ucbhelper::Content descContent(
             licenseUrl, xCmdEnv, getMyBackend()->getComponentContext());
         std::vector<sal_Int8> seq = dp_misc::readFile(descContent);
-        return OUString( reinterpret_cast<sal_Char const *>(
+        return OUString( reinterpret_cast<char const *>(
             seq.data()), seq.size(), RTL_TEXTENCODING_UTF8);
     }
     catch (const css::uno::Exception&)
@@ -1470,7 +1470,7 @@ void BackendImpl::PackageImpl::scanBundle(
             OUStringBuffer buf;
             if ( !bytes.empty() )
             {
-                buf.append( OUString( reinterpret_cast<sal_Char const *>(
+                buf.append( OUString( reinterpret_cast<char const *>(
                                           bytes.data() ),
                                       bytes.size(), RTL_TEXTENCODING_UTF8 ) );
             }
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ad44965df7dd..99fc74208529 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3758,13 +3758,13 @@ static bool getFromTransferrable(
         if (bConvert)
             aRet = OUStringToOString(aString, RTL_TEXTENCODING_UTF8);
         else
-            aRet = OString(reinterpret_cast<const sal_Char *>(aString.getStr()), aString.getLength() * sizeof(sal_Unicode));
+            aRet = OString(reinterpret_cast<const char *>(aString.getStr()), aString.getLength() * sizeof(sal_Unicode));
     }
     else
     {
         uno::Sequence<sal_Int8> aSequence;
         aAny >>= aSequence;
-        aRet = OString(reinterpret_cast<sal_Char*>(aSequence.getArray()), aSequence.getLength());
+        aRet = OString(reinterpret_cast<char*>(aSequence.getArray()), aSequence.getLength());
     }
 
     return true;
diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx
index c80e70b11f56..7efaca9abd78 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -144,7 +144,7 @@ LOKTransferable::LOKTransferable(const OUString& sMimeType,
     uno::Any aContent;
     if (m_aFlavors[0].DataType == cppu::UnoType<OUString>::get())
     {
-        auto pText = reinterpret_cast<const sal_Char*>(aSequence.getConstArray());
+        auto pText = reinterpret_cast<const char*>(aSequence.getConstArray());
         aContent <<= OUString(pText, aSequence.getLength(), RTL_TEXTENCODING_UTF8);
     }
     else
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index be21788c40d1..93757d366b42 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -736,7 +736,7 @@ next:
     }
 }
 
-uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPath, bool bUpdate)
+uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const char* pPath, bool bUpdate)
 {
     uno::Reference< XNameAccess > xNameAccess;
     try {
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 399066bdafe6..51de2125db0b 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -174,7 +174,7 @@ private:
     // helpers
     strings_vr getAllFiles(const OUString& baseURL) const;
     static strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns);
-    static css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, bool rw=false);
+    static css::uno::Reference< css::container::XNameAccess > getConfigAccess(const char* path, bool rw=false);
 
     std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
     void compareOldAndNewConfig(const OUString& sParentNodeName,
diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx
index a56f0dae9458..6f0e50d9a732 100644
--- a/desktop/source/migration/services/cexports.cxx
+++ b/desktop/source/migration/services/cexports.cxx
@@ -51,7 +51,7 @@ extern "C"
 
 
 SAL_DLLPUBLIC_EXPORT void * migrationoo2_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+    const char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
         pImplName, pServiceManager, pRegistryKey, oo2_entries );
diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx
index a53884760d0b..d2a82c1a8e90 100644
--- a/desktop/source/migration/services/cexportsoo3.cxx
+++ b/desktop/source/migration/services/cexportsoo3.cxx
@@ -36,7 +36,7 @@ extern "C"
 
 
 SAL_DLLPUBLIC_EXPORT void * migrationoo3_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+    const char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
         pImplName, pServiceManager, pRegistryKey, oo3_entries );
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 02318df826ad..21edc727b40f 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -111,10 +111,10 @@ static bool IsUserWordbook( const OUString& rFile )
     std::unique_ptr<SvStream> pStream = ::utl::UcbStreamHelper::CreateStream( rFile, StreamMode::STD_READ );
     if ( pStream && !pStream->GetError() )
     {
-        static const sal_Char* const pVerOOo7    = "OOoUserDict1";
+        static const char* const pVerOOo7    = "OOoUserDict1";
         sal_uInt64 const nSniffPos = pStream->Tell();
         static std::size_t nVerOOo7Len = sal::static_int_cast< std::size_t >(strlen( pVerOOo7 ));
-        sal_Char pMagicHeader[MAX_HEADER_LENGTH];
+        char pMagicHeader[MAX_HEADER_LENGTH];
         pMagicHeader[ nVerOOo7Len ] = '\0';
         if (pStream->ReadBytes(static_cast<void *>(pMagicHeader), nVerOOo7Len) == nVerOOo7Len)
         {