sal_Char->char in extensions

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

24 files changed, 44 insertions, 44 deletions

diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index b106212d6d5d..8b5e734142c5 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -274,7 +274,7 @@ namespace abp
             // already a valid table selected
             return;
 
-        const sal_Char* pGuess = nullptr;
+        const char* pGuess = nullptr;
         switch ( getSettings().eType )
         {
             case AST_MORK               :
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 3f121bc4d5bd..d2aa6e699168 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -132,7 +132,7 @@ namespace abp
     /// creates and inserts a data source, and sets its URL property to the string given
     static ODataSource lcl_implCreateAndSetURL(
         const Reference< XComponentContext >& _rxORB, const OUString& _rName,
-        const sal_Char* _pInitialAsciiURL )
+        const char* _pInitialAsciiURL )
     {
         ODataSource aReturn( _rxORB );
         try
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index c011d4a55825..b91101b29b0e 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -125,7 +125,7 @@ namespace abp
                 //    For this, the driver uses programmatic names, too, but they differ from the programmatic names the
                 //    template documents have.
                 // So what we need first is a mapping from programmatic names (1) to programmatic names (2)
-                const sal_Char* pMappingProgrammatics[] =
+                const char* pMappingProgrammatics[] =
                 {
                     "FirstName",            "FirstName",
                     "LastName",             "LastName",
@@ -169,7 +169,7 @@ namespace abp
                 // number of pairs
                 sal_Int32 const nIntersectedProgrammatics = SAL_N_ELEMENTS( pMappingProgrammatics ) / 2;
 
-                const sal_Char** pProgrammatic = pMappingProgrammatics;
+                const char** pProgrammatic = pMappingProgrammatics;
                 OUString sAddressProgrammatic;
                 OUString sDriverProgrammatic;
                 OUString sDriverUI;
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 6edbddd3c744..95dc8bc962ba 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -192,7 +192,7 @@ Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static() throw
 extern "C"
 {
     SAL_DLLPUBLIC_EXPORT void * bib_component_getFactory(
-        const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+        const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
     {
         void * pRet = nullptr;
         if (BibliographyLoader::getImplementationName_Static().equalsAscii( pImplName ) )
diff --git a/extensions/source/config/WinUserInfo/componentdef.cxx b/extensions/source/config/WinUserInfo/componentdef.cxx
index 7d8ff550445d..e2d38e98866f 100644
--- a/extensions/source/config/WinUserInfo/componentdef.cxx
+++ b/extensions/source/config/WinUserInfo/componentdef.cxx
@@ -25,7 +25,7 @@ static const cppu::ImplementationEntry kImplementations_entries[]
         { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } };
 
 extern "C" SAL_DLLPUBLIC_EXPORT void*
-WinUserInfoBe_component_getFactory(const sal_Char* aImplementationName, void* aServiceManager,
+WinUserInfoBe_component_getFactory(const char* aImplementationName, void* aServiceManager,
                                    void* aRegistryKey)
 {
     return cppu::component_getFactoryHelper(aImplementationName, aServiceManager, aRegistryKey,
diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx
index e8abd45fe248..02320f7cbb30 100644
--- a/extensions/source/config/ldap/componentdef.cxx
+++ b/extensions/source/config/ldap/componentdef.cxx
@@ -44,7 +44,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 } ;
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * ldapbe2_component_getFactory(const sal_Char *aImplementationName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * ldapbe2_component_getFactory(const char *aImplementationName,
                                       void *aServiceManager,
                                       void *aRegistryKey) {
     return cppu::component_getFactoryHelper(aImplementationName,
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index e6a44aa1b0c1..5f9c6820b6cc 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -61,7 +61,7 @@ void LdapConnection::disconnect()
 }
 
 
-static void checkLdapReturnCode(const sal_Char *aOperation,
+static void checkLdapReturnCode(const char *aOperation,
                                 LdapErrCode aRetCode)
 {
     if (aRetCode == LDAP_SUCCESS) { return ; }
@@ -75,7 +75,7 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
     message += OUString::createFromAscii(ldap_err2string(aRetCode)) + " (" ;
 
 #ifndef LDAP_OPT_SIZELIMIT // for use with OpenLDAP
-    sal_Char* stub = nullptr;
+    char* stub = nullptr;
     ldap_get_lderrno(aConnection, NULL, &stub) ;
     if (stub != nullptr)
     {
@@ -251,7 +251,7 @@ void LdapConnection::initConnection()
                                       LDAP_SCOPE_SUBTREE,
                                       const_cast<PWSTR>(o3tl::toW(filter.getStr())), attributes, 0, &result.msg) ;
 #else
-    sal_Char * attributes [2] = { const_cast<sal_Char *>(LDAP_NO_ATTRS), nullptr };
+    char * attributes [2] = { const_cast<char *>(LDAP_NO_ATTRS), nullptr };
     LdapErrCode retCode = ldap_search_s(mConnection,
                                       OUStringToOString( mLdapDefinition.mBaseDN, RTL_TEXTENCODING_UTF8 ).getStr(),
                                       LDAP_SCOPE_SUBTREE,
@@ -269,7 +269,7 @@ void LdapConnection::initConnection()
         userDn = OUString( o3tl::toU( charsDn ) );
         ldap_memfreeW(charsDn) ;
 #else
-        sal_Char *charsDn = ldap_get_dn(mConnection, entry) ;
+        char *charsDn = ldap_get_dn(mConnection, entry) ;
 
         userDn = OStringToOUString( charsDn, RTL_TEXTENCODING_UTF8 );
         ldap_memfree(charsDn) ;
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index 42779c6d1754..fd2f472ae769 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -42,7 +42,7 @@ static void dbp_initializeModule()
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* dbp_component_getFactory(
-                    const sal_Char* pImplementationName,
+                    const char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
 {
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index f43a3c080858..b882b9d40834 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -154,8 +154,8 @@ namespace logging
                 const Reference<XComponentContext>& _rContext,
                 const Reference< XLogger >& _rxLogger,
                 const Reference< XNameAccess >& _rxLoggerSettings,
-                const sal_Char* _pServiceNameAsciiNodeName,
-                const sal_Char* _pServiceSettingsAsciiNodeName,
+                const char* _pServiceNameAsciiNodeName,
+                const char* _pServiceSettingsAsciiNodeName,
                 SettingTranslation _pSettingTranslation = nullptr
             )
         {
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index cdecefae695c..66928137b494 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -50,7 +50,7 @@ Reference<XInterface> OleServer_CreateInstance( const Reference<XMultiServiceFac
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * oleautobridge_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+    const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = nullptr;
 
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 9d19aef5fc56..841961788543 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -102,8 +102,8 @@ namespace pcr
         // service names for all our handlers
         static struct
         {
-            const sal_Char* serviceName;
-            bool            isFormOnly;
+            const char* serviceName;
+            bool        isFormOnly;
         } const aFactories[] = {
 
             // a generic handler for form component properties (must precede the ButtonNavigationHandler)
@@ -156,9 +156,9 @@ namespace pcr
 
         static struct
         {
-            const sal_Char* programmaticName;
+            const char* programmaticName;
             const char* uiNameResId;
-            const sal_Char* helpId;
+            const char* helpId;
         } const aCategories[] = {
             { "General",    RID_STR_PROPPAGE_DEFAULT,   HID_FM_PROPDLG_TAB_GENERAL },
             { "Data",       RID_STR_PROPPAGE_DATA,      HID_FM_PROPDLG_TAB_DATA },
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 646e4feec6f0..c25dffa415a3 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -133,8 +133,8 @@ namespace pcr
     namespace PropertyAttribute = css::beans::PropertyAttribute;
     namespace FormComponentType = css::form::FormComponentType;
 
-    EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName,
-            const sal_Char* _pListenerMethodAsciiName, const char* pDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId )
+    EventDescription::EventDescription( EventId _nId, const char* _pListenerNamespaceAscii, const char* _pListenerClassAsciiName,
+            const char* _pListenerMethodAsciiName, const char* pDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId )
         :sDisplayName(PcrRes( pDisplayNameResId ))
         ,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) )
         ,sHelpId( _sHelpId )
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 7c461c6e0bc4..059c68433435 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -56,9 +56,9 @@ namespace pcr
 
         EventDescription(
             EventId _nId,
-            const sal_Char* _pListenerNamespaceAscii,
-            const sal_Char* _pListenerClassAsciiName,
-            const sal_Char* _pListenerMethodAsciiName,
+            const char* _pListenerNamespaceAscii,
+            const char* _pListenerClassAsciiName,
+            const char* _pListenerMethodAsciiName,
             const char* pDisplayNameResId,
             const OString& _sHelpId,
             const OString& _sUniqueBrowseId );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 6af595e4283c..38236bccc319 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2098,7 +2098,7 @@ namespace pcr
                 // it's a control model, and can tell about it's supported services
                 m_nClassId = FormComponentType::CONTROL;
 
-                const sal_Char* aControlModelServiceNames[] =
+                const char* aControlModelServiceNames[] =
                 {
                     "UnoControlButtonModel",
                     "UnoControlCheckBoxModel",
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index 8156ffeb603a..18a79e16d837 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -59,7 +59,7 @@ static void pcr_initializeModule()
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* pcr_component_getFactory(
-                    const sal_Char* pImplementationName,
+                    const char* pImplementationName,
                     void* pServiceManager,
                     SAL_UNUSED_PARAMETER void* /*pRegistryKey*/)
 {
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index 72a57957107c..68e72ab9637e 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -39,7 +39,7 @@ namespace pcr
     {
         static const sal_Int32 s_nFirstVirtualButtonType = 1 + sal_Int32(FormButtonType_URL);
 
-        static const sal_Char* pNavigationURLs[] =
+        static const char* pNavigationURLs[] =
         {
             ".uno:FormController/moveToFirst",
             ".uno:FormController/moveToPrev",
@@ -55,7 +55,7 @@ namespace pcr
 
         sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL )
         {
-            const sal_Char** pLookup = pNavigationURLs;
+            const char** pLookup = pNavigationURLs;
             while ( *pLookup )
             {
                 if ( _rNavURL.equalsAscii( *pLookup ) )
@@ -65,9 +65,9 @@ namespace pcr
             return -1;
         }
 
-        const sal_Char* lcl_getNavigationURL( sal_Int32 _nButtonTypeIndex )
+        const char* lcl_getNavigationURL( sal_Int32 _nButtonTypeIndex )
         {
-            const sal_Char** pLookup = pNavigationURLs;
+            const char** pLookup = pNavigationURLs;
             while ( _nButtonTypeIndex-- && *pLookup++ )
                 ;
             OSL_ENSURE( *pLookup, "lcl_getNavigationURL: invalid index!" );
@@ -151,7 +151,7 @@ namespace pcr
             bool bIsVirtualButtonType = nButtonType >= s_nFirstVirtualButtonType;
             if ( bIsVirtualButtonType )
             {
-                const sal_Char* pURL = lcl_getNavigationURL( nButtonType - s_nFirstVirtualButtonType );
+                const char* pURL = lcl_getNavigationURL( nButtonType - s_nFirstVirtualButtonType );
                 sTargetURL = OUString::createFromAscii( pURL );
 
                 nButtonType = sal_Int32(FormButtonType_URL);
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index 91443b4444e5..37fe176b35a1 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -27,7 +27,7 @@
 using namespace com::sun::star::registry;
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* scn_component_getFactory( const char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     Reference< css::lang::XSingleServiceFactory > xFactory;
     void*                                         pRet = nullptr;
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index cc196ce7d180..9f49ad6129b3 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -148,14 +148,14 @@ OUString getImageFromFileName(const OUString& aFile)
             {
                 if( 0 == aInfo.Code )
                 {
-                    sal_Char   szBuffer[4096];
+                    char       szBuffer[4096];
                     sal_uInt64 nBytesRead = 0;
                     const sal_uInt64 nBytesToRead = sizeof(szBuffer) - 1;
 
                     OUString aImageName;
                     while( osl_File_E_None == osl_readFile(hOut, szBuffer, nBytesToRead, &nBytesRead) )
                     {
-                        sal_Char *pc = szBuffer + nBytesRead;
+                        char *pc = szBuffer + nBytesRead;
                         do
                         {
                             *pc = '\0'; --pc;
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index b6c31564e0ad..b7a8393806b7 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -59,7 +59,7 @@ namespace uno = com::sun::star::uno ;
 
 #define PROPERTY_VERSION        "Version"
 
-static const sal_Char * const aUpdateEntryProperties[] = {
+static const char * const aUpdateEntryProperties[] = {
     UPDATE_VERSION,
     UPDATE_BUILDID,
     UPDATE_DESCRIPTION,
@@ -79,7 +79,7 @@ NamedValueByNameAccess::~NamedValueByNameAccess()
 {
 }
 
-css::uno::Any NamedValueByNameAccess::getValue(const sal_Char * pName)
+css::uno::Any NamedValueByNameAccess::getValue(const char * pName)
 {
     const sal_Int32 nLen = m_rValues.getLength();
     for( sal_Int32 n=0; n < nLen; ++n )
@@ -103,7 +103,7 @@ UpdateCheckROModel::isDownloadPaused() const
 }
 
 OUString
-UpdateCheckROModel::getStringValue(const sal_Char * pStr) const
+UpdateCheckROModel::getStringValue(const char * pStr) const
 {
     uno::Any aAny( m_aNameAccess.getValue(pStr) );
     OUString aRet;
diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx
index c76c876ec568..2ee5f3ebaead 100644
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -43,7 +43,7 @@ public:
 
     ~NamedValueByNameAccess();
 
-    css::uno::Any getValue(const sal_Char * pName);
+    css::uno::Any getValue(const char * pName);
 };
 
 
@@ -65,7 +65,7 @@ public:
 
 private:
 
-    OUString getStringValue(const sal_Char *) const;
+    OUString getStringValue(const char *) const;
 
     NamedValueByNameAccess& m_aNameAccess;
 };
@@ -184,7 +184,7 @@ private:
 
 /// @throws css::uno::RuntimeException
 template <typename T>
-T getValue( const css::uno::Sequence< css::beans::NamedValue >& rNamedValues, const sal_Char * pszName )
+T getValue( const css::uno::Sequence< css::beans::NamedValue >& rNamedValues, const char * pszName )
 {
     for( sal_Int32 n=0; n < rNamedValues.getLength(); n++ )
     {
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 683ac5ce7db5..7a91c1c7bf03 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -339,7 +339,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 } ;
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * updchk_component_getFactory(const char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
     return cppu::component_getFactoryHelper(
         pszImplementationName,
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 6642d977b1eb..be7dcef13d85 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -794,7 +794,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 } ;
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * updatefeed_component_getFactory(const char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
     return cppu::component_getFactoryHelper(
         pszImplementationName,
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index d96132fe3f53..8c7c311a84c4 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -916,7 +916,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 } ;
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * updchkui_component_getFactory(const char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
     return cppu::component_getFactoryHelper(
         pszImplementationName,
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index 5ef2e052e563..a45f5c02c26c 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -360,7 +360,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(   void * /*pServiceManager*/,
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+    const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     static void * pRet= NULL;
     if( ! pRet)