sal_Char->char in dbaccess

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

13 files changed, 24 insertions, 24 deletions

diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 0d1c2f7fd982..edcee4c901b3 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -62,7 +62,7 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
 
 #define SPACEBETWEENENTRIES     4
 
-TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, const char* _pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled )
+TaskEntry::TaskEntry( const char* _pAsciiUNOCommand, const char* _pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled )
     :sUNOCommand( OUString::createFromAscii( _pAsciiUNOCommand ) )
     ,pHelpID( _pHelpID )
     ,sTitle( DBA_RES(pTitleResourceID) )
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 1f7866e7b9ef..345db14bb577 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -96,7 +96,7 @@ namespace dbaui
             // If an entry is disabled in the latter, it should also be disabled in the former.
             // If an entry is *hidden* in the former, it should also be hidden in the latter.
 
-        TaskEntry( const sal_Char* _pAsciiUNOCommand, const char* pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled = false );
+        TaskEntry( const char* _pAsciiUNOCommand, const char* pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled = false );
     };
     typedef std::vector< TaskEntry >  TaskEntryList;
 
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index c235320ddc1f..9413f98f4ee2 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -311,7 +311,7 @@ namespace dbaui
             return bSuccess;
         }
 
-        void lcl_notifySubComponentEvent( const SubComponentManager_Data& _rData, const sal_Char* _pAsciiEventName,
+        void lcl_notifySubComponentEvent( const SubComponentManager_Data& _rData, const char* _pAsciiEventName,
                 const SubComponentDescriptor& _rComponent )
         {
             try
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 81dfef0f840c..cce3d6b35e82 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -779,7 +779,7 @@ void OGenericUnoController::frameAction(const FrameActionEvent& aEvent)
         m_aCurrentFrame.frameAction( aEvent.Action );
 }
 
-void OGenericUnoController::implDescribeSupportedFeature( const sal_Char* _pAsciiCommandURL,
+void OGenericUnoController::implDescribeSupportedFeature( const char* _pAsciiCommandURL,
         sal_uInt16 _nFeatureId, sal_Int16 _nCommandGroup )
 {
 #ifdef DBG_UTIL
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index baf3d3cd2719..e5c095e185e9 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1241,7 +1241,7 @@ void SbaTableQueryBrowser::connectExternalDispatches()
     {
         if ( m_aExternalFeatures.empty() )
         {
-            const sal_Char* pURLs[] = {
+            const char* pURLs[] = {
                 ".uno:DataSourceBrowser/DocumentDataSource",
                 ".uno:DataSourceBrowser/FormLetter",
                 ".uno:DataSourceBrowser/InsertColumns",
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 48c7a9162c39..3ca51921375f 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -57,7 +57,7 @@ namespace dbaui
         using ::com::sun::star::ui::XImageManager;
         using ::com::sun::star::graphic::XGraphic;
 
-        Reference< XGraphic> GetCommandIcon( const sal_Char* _pCommandURL, const OUString& _rModuleName )
+        Reference< XGraphic> GetCommandIcon( const char* _pCommandURL, const OUString& _rModuleName )
         {
             if ( !_pCommandURL || !*_pCommandURL )
                 return nullptr;
@@ -99,13 +99,13 @@ namespace dbaui
 
     // OpenButton
 
-    OpenDocumentButton::OpenDocumentButton(std::unique_ptr<weld::Button> xControl, const sal_Char* _pAsciiModuleName)
+    OpenDocumentButton::OpenDocumentButton(std::unique_ptr<weld::Button> xControl, const char* _pAsciiModuleName)
         : m_xControl(std::move(xControl))
     {
         impl_init( _pAsciiModuleName );
     }
 
-    void OpenDocumentButton::impl_init( const sal_Char* _pAsciiModuleName )
+    void OpenDocumentButton::impl_init( const char* _pAsciiModuleName )
     {
         OSL_ENSURE( _pAsciiModuleName, "OpenDocumentButton::impl_init: invalid module name!" );
         m_sModule = OUString::createFromAscii( _pAsciiModuleName );
@@ -121,7 +121,7 @@ namespace dbaui
 
     // OpenDocumentListBox
 
-    OpenDocumentListBox::OpenDocumentListBox(std::unique_ptr<weld::ComboBox> xControl, const sal_Char* _pAsciiModuleName )
+    OpenDocumentListBox::OpenDocumentListBox(std::unique_ptr<weld::ComboBox> xControl, const char* _pAsciiModuleName )
         : m_xControl(std::move(xControl))
     {
         // we need to limit the max auto width feature of the filter box
@@ -131,7 +131,7 @@ namespace dbaui
         impl_init( _pAsciiModuleName );
     }
 
-    void OpenDocumentListBox::impl_init( const sal_Char* _pAsciiModuleName )
+    void OpenDocumentListBox::impl_init( const char* _pAsciiModuleName )
     {
         OSL_ENSURE( _pAsciiModuleName, "OpenDocumentListBox::impl_init: invalid module name!" );
 
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 9d8035e582ee..6a96a2a574c7 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -240,7 +240,7 @@ namespace dbaui
     }
 
 #ifdef DBG_UTIL
-    const sal_Char* DirectSQLDialog::impl_CheckInvariants() const
+    const char* DirectSQLDialog::impl_CheckInvariants() const
     {
         if (m_aStatementHistory.size() != m_aNormalizedHistory.size())
             return "statement history is inconsistent!";
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index f4e831439591..551202f5ca69 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -70,7 +70,7 @@ typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMA
 
 // OOdbcLibWrapper
 
-bool OOdbcEnumeration::load(const sal_Char* _pLibPath)
+bool OOdbcEnumeration::load(const char* _pLibPath)
 {
     m_sLibPath = OUString::createFromAscii(_pLibPath);
 #if defined(HAVE_ODBC_SUPPORT) && !defined(DISABLE_DYNLOADING)
@@ -93,7 +93,7 @@ void OOdbcEnumeration::unload()
 #endif
 }
 
-oslGenericFunction OOdbcEnumeration::loadSymbol(const sal_Char* _pFunctionName)
+oslGenericFunction OOdbcEnumeration::loadSymbol(const char* _pFunctionName)
 {
     return osl_getFunctionSymbol(m_pOdbcLib, OUString::createFromAscii(_pFunctionName).pData);
 }
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index aa409d69d1e3..22ba099109f2 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -72,10 +72,10 @@ public:
     void        getDatasourceNames(std::set<OUString>& _rNames);
 
 private:
-    oslGenericFunction  loadSymbol(const sal_Char* _pFunctionName);
+    oslGenericFunction  loadSymbol(const char* _pFunctionName);
 
     /// load the lib
-    bool        load(const sal_Char* _pLibPath);
+    bool        load(const char* _pLibPath);
     /// unload the lib
     void        unload();
     /// ensure that an ODBC environment is allocated
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 89986975145f..d515a2f20183 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -122,14 +122,14 @@ namespace dbaui
         void display(const css::uno::Reference< css::sdbc::XResultSet >& xRS);
 
 #ifdef DBG_UTIL
-        const sal_Char* impl_CheckInvariants() const;
+        const char* impl_CheckInvariants() const;
 #endif
     };
 
 #ifdef DBG_UTIL
 #define CHECK_INVARIANTS(methodname)    \
     {   \
-        const sal_Char* pError = impl_CheckInvariants();    \
+        const char* pError = impl_CheckInvariants();    \
         if (pError) \
             SAL_WARN("dbaccess.ui", methodname ": " << pError);   \
     }
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 2e6bd573de22..214a07e08549 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -40,14 +40,14 @@ namespace dbaui
 
         std::unique_ptr<weld::Button> m_xControl;
     public:
-        OpenDocumentButton(std::unique_ptr<weld::Button> xControl, const sal_Char* _pAsciiModuleName);
+        OpenDocumentButton(std::unique_ptr<weld::Button> xControl, const char* _pAsciiModuleName);
 
         void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); }
         bool get_sensitive() const { return m_xControl->get_sensitive(); }
         void connect_clicked(const Link<weld::Button&, void>& rLink) { m_xControl->connect_clicked(rLink); }
 
     private:
-        void    impl_init( const sal_Char* _pAsciiModuleName );
+        void    impl_init( const char* _pAsciiModuleName );
     };
 
     // OpenDocumentListBox
@@ -61,7 +61,7 @@ namespace dbaui
         std::unique_ptr<weld::ComboBox> m_xControl;
 
     public:
-        OpenDocumentListBox(std::unique_ptr<weld::ComboBox> xControl, const sal_Char* _pAsciiModuleName);
+        OpenDocumentListBox(std::unique_ptr<weld::ComboBox> xControl, const char* _pAsciiModuleName);
 
         OUString  GetSelectedDocumentURL() const;
 
@@ -75,7 +75,7 @@ namespace dbaui
     private:
         StringPair  impl_getDocumentAtIndex( sal_uInt16 _nListIndex ) const;
 
-        void    impl_init( const sal_Char* _pAsciiModuleName );
+        void    impl_init( const char* _pAsciiModuleName );
     };
 
 } // namespace dbaui
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index 045f5b10bcdc..a894c0329080 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -52,8 +52,8 @@ namespace dbaui
     struct FeatureMapping
     {
         /// one of the items from dsitems.hxx
-        ItemID          nItemID;
-        const sal_Char* pAsciiFeatureName;
+        ItemID      nItemID;
+        const char* pAsciiFeatureName;
     };
 
     }
diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx
index c6cdcb2a24f0..4d8a020e3631 100644
--- a/dbaccess/source/ui/misc/uiservices.cxx
+++ b/dbaccess/source/ui/misc/uiservices.cxx
@@ -65,7 +65,7 @@ static void createRegistryInfo_DBU()
 }
 
 extern "C"  SAL_DLLPUBLIC_EXPORT void* dbu_component_getFactory(
-                    const sal_Char* pImplementationName,
+                    const char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
 {