[Libreoffice-commits] core.git: dbaccess/inc dbaccess/source include/dbaccess
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Dec 18 16:43:14 UTC 2019
dbaccess/inc/core_resource.hxx | 6 +++---
dbaccess/source/core/dataaccess/ModelImpl.cxx | 2 +-
dbaccess/source/core/dataaccess/databasedocument.cxx | 6 +++---
dbaccess/source/core/dataaccess/databasedocument.hxx | 6 +++---
dbaccess/source/core/dataaccess/documenteventnotifier.hxx | 4 ++--
dbaccess/source/core/dataaccess/documentevents.cxx | 12 ++++++------
dbaccess/source/core/inc/ModelImpl.hxx | 6 +++---
dbaccess/source/core/misc/dsntypes.cxx | 2 +-
dbaccess/source/core/misc/services.cxx | 2 +-
dbaccess/source/core/resource/core_resource.cxx | 6 +++---
dbaccess/source/filter/xml/xmlfilter.cxx | 4 ++--
dbaccess/source/filter/xml/xmlservices.cxx | 2 +-
dbaccess/source/inc/dsntypes.hxx | 2 +-
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 2 +-
dbaccess/source/ui/app/AppDetailView.cxx | 2 +-
dbaccess/source/ui/app/AppDetailView.hxx | 2 +-
dbaccess/source/ui/app/subcomponentmanager.cxx | 2 +-
dbaccess/source/ui/browser/genericcontroller.cxx | 2 +-
dbaccess/source/ui/browser/unodatbr.cxx | 2 +-
dbaccess/source/ui/control/opendoccontrols.cxx | 10 +++++-----
dbaccess/source/ui/dlg/directsql.cxx | 2 +-
dbaccess/source/ui/dlg/odbcconfig.cxx | 4 ++--
dbaccess/source/ui/dlg/odbcconfig.hxx | 4 ++--
dbaccess/source/ui/inc/directsql.hxx | 4 ++--
dbaccess/source/ui/inc/opendoccontrols.hxx | 8 ++++----
dbaccess/source/ui/misc/dsmeta.cxx | 4 ++--
dbaccess/source/ui/misc/uiservices.cxx | 2 +-
include/dbaccess/genericcontroller.hxx | 2 +-
28 files changed, 56 insertions(+), 56 deletions(-)
New commits:
commit a783c1bb61ab888275241ff589a84d216ecbb3dc
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 18 14:25:59 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Dec 18 17:40:48 2019 +0100
sal_Char->char in dbaccess
Change-Id: I6cce128843d88bc453d171b2584ecf0dfffd1044
Reviewed-on: https://gerrit.libreoffice.org/85398
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/inc/core_resource.hxx b/dbaccess/inc/core_resource.hxx
index 91ddb2df347c..8cddf133f029 100644
--- a/dbaccess/inc/core_resource.hxx
+++ b/dbaccess/inc/core_resource.hxx
@@ -53,7 +53,7 @@ namespace dbaccess
*/
static OUString loadString(
const char* pResId,
- const sal_Char* _pPlaceholderAscii,
+ const char* _pPlaceholderAscii,
const OUString& _rReplace
);
@@ -72,9 +72,9 @@ namespace dbaccess
*/
static OUString loadString(
const char* pResId,
- const sal_Char* _pPlaceholderAscii1,
+ const char* _pPlaceholderAscii1,
const OUString& _rReplace1,
- const sal_Char* _pPlaceholderAscii2,
+ const char* _pPlaceholderAscii2,
const OUString& _rReplace2
);
};
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 076a0177e549..0b9679232141 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -469,7 +469,7 @@ namespace
{
OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType )
{
- const sal_Char* pAsciiName( nullptr );
+ const char* pAsciiName( nullptr );
switch ( _eType )
{
case ODatabaseModelImpl::E_FORM: pAsciiName = "forms"; break;
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 2a3bc8e2a369..3827cb28d27e 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1563,8 +1563,8 @@ Reference< XNameAccess > SAL_CALL ODatabaseDocument::getReportDocuments( )
return impl_getDocumentContainer_throw( ODatabaseModelImpl::E_REPORT );
}
-void ODatabaseDocument::WriteThroughComponent( const Reference< XComponent >& xComponent, const sal_Char* pStreamName,
- const sal_Char* pServiceName, const Sequence< Any >& _rArguments, const Sequence< PropertyValue >& rMediaDesc,
+void ODatabaseDocument::WriteThroughComponent( const Reference< XComponent >& xComponent, const char* pStreamName,
+ const char* pServiceName, const Sequence< Any >& _rArguments, const Sequence< PropertyValue >& rMediaDesc,
const Reference<XStorage>& _xStorageToSaveTo ) const
{
OSL_ENSURE( pStreamName, "Need stream name!" );
@@ -1594,7 +1594,7 @@ void ODatabaseDocument::WriteThroughComponent( const Reference< XComponent >& xC
}
void ODatabaseDocument::WriteThroughComponent( const Reference< XOutputStream >& xOutputStream,
- const Reference< XComponent >& xComponent, const sal_Char* pServiceName, const Sequence< Any >& _rArguments,
+ const Reference< XComponent >& xComponent, const char* pServiceName, const Sequence< Any >& _rArguments,
const Sequence< PropertyValue >& rMediaDesc ) const
{
OSL_ENSURE( xOutputStream.is(), "I really need an output stream!" );
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 8a951d61d868..0d4c0196d18b 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -235,8 +235,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
/// write a single XML stream into the package
void WriteThroughComponent(
const css::uno::Reference< css::lang::XComponent > & xComponent, /// the component we export
- const sal_Char* pStreamName, /// the stream name
- const sal_Char* pServiceName, /// service name of the component
+ const char* pStreamName, /// the stream name
+ const char* pServiceName, /// service name of the component
const css::uno::Sequence< css::uno::Any> & rArguments, /// the argument (XInitialization)
const css::uno::Sequence< css::beans::PropertyValue> & rMediaDesc,/// output descriptor
const css::uno::Reference< css::embed::XStorage >& _xStorageToSaveTo
@@ -247,7 +247,7 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
void WriteThroughComponent(
const css::uno::Reference< css::io::XOutputStream >& xOutputStream,
const css::uno::Reference< css::lang::XComponent >& xComponent,
- const sal_Char* pServiceName,
+ const char* pServiceName,
const css::uno::Sequence< css::uno::Any >& rArguments,
const css::uno::Sequence< css::beans::PropertyValue> & rMediaDesc
) const;
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
index 4ad32df302ee..cc655268f8c1 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
@@ -96,7 +96,7 @@ namespace dbaccess
->onDocumentInitialized has been called
*/
void notifyDocumentEvent(
- const sal_Char* _pAsciiEventName,
+ const char* _pAsciiEventName,
const css::uno::Reference< css::frame::XController2 >& _rxViewController = nullptr,
const css::uno::Any& _rSupplement = css::uno::Any()
)
@@ -112,7 +112,7 @@ namespace dbaccess
the mutex is locked
*/
void notifyDocumentEventAsync(
- const sal_Char* _pAsciiEventName,
+ const char* _pAsciiEventName,
const css::uno::Reference< css::frame::XController2 >& _rxViewController = nullptr,
const css::uno::Any& _rSupplement = css::uno::Any()
)
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index a6705d850161..aa89a64c2b43 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -58,12 +58,12 @@ namespace dbaccess
namespace {
- // helper
- struct DocumentEventData
- {
- const sal_Char* pAsciiEventName;
- bool bNeedsSyncNotify;
- };
+ // helper
+ struct DocumentEventData
+ {
+ const char* pAsciiEventName;
+ bool bNeedsSyncNotify;
+ };
const DocumentEventData* lcl_getDocumentEventData()
{
diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx
index 446b79592933..ff02f17b6a49 100644
--- a/dbaccess/source/core/inc/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -83,7 +83,7 @@ struct AsciiPropertyValue
// this crashes on unxlngi6.pro, since there's a bug which somehow results in
// getDefaultDataSourceSettings returning corrupted Any instances then.
css::uno::Any DefaultValue;
- const sal_Char* AsciiName;
+ const char* AsciiName;
const css::uno::Type& ValueType;
AsciiPropertyValue()
@@ -93,7 +93,7 @@ struct AsciiPropertyValue
{
}
- AsciiPropertyValue( const sal_Char* _pAsciiName, const css::uno::Any& _rDefaultValue )
+ AsciiPropertyValue( const char* _pAsciiName, const css::uno::Any& _rDefaultValue )
:DefaultValue( _rDefaultValue )
,AsciiName( _pAsciiName )
,ValueType( _rDefaultValue.getValueType() )
@@ -101,7 +101,7 @@ struct AsciiPropertyValue
OSL_ENSURE( ValueType.getTypeClass() != css::uno::TypeClass_VOID,
"AsciiPropertyValue::AsciiPropertyValue: NULL values not allowed here, use the other CTOR for this!" );
}
- AsciiPropertyValue( const sal_Char* _pAsciiName, const css::uno::Type& _rValeType )
+ AsciiPropertyValue( const char* _pAsciiName, const css::uno::Type& _rValeType )
:DefaultValue()
,AsciiName( _pAsciiName )
,ValueType( _rValeType )
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 86aedb385245..b772c85b5b9c 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -126,7 +126,7 @@ OUString ODsnTypeCollection::getPrefix(const OUString& _sURL) const
return sRet;
}
-bool ODsnTypeCollection::hasDriver( const sal_Char* _pAsciiPattern ) const
+bool ODsnTypeCollection::hasDriver( const char* _pAsciiPattern ) const
{
OUString sPrefix( getPrefix( OUString::createFromAscii( _pAsciiPattern ) ) );
return !sPrefix.isEmpty();
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index e1b3b5bef241..a2673049de5c 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -49,7 +49,7 @@ namespace dba{
}
extern "C" SAL_DLLPUBLIC_EXPORT void* dba_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* pRegistryKey)
{
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index eaadea9ded4a..0cfd227a13a6 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -39,14 +39,14 @@ namespace dbaccess
return Translate::get(pResId, Translate::Create("dba"));
}
- OUString ResourceManager::loadString(const char* pResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace)
+ OUString ResourceManager::loadString(const char* pResId, const char* _pPlaceholderAscii, const OUString& _rReplace)
{
OUString sString(loadString(pResId));
return sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii), _rReplace );
}
- OUString ResourceManager::loadString(const char* pResId, const sal_Char* _pPlaceholderAscii1, const OUString& _rReplace1,
- const sal_Char* _pPlaceholderAscii2, const OUString& _rReplace2)
+ OUString ResourceManager::loadString(const char* pResId, const char* _pPlaceholderAscii1, const OUString& _rReplace1,
+ const char* _pPlaceholderAscii2, const OUString& _rReplace2)
{
OUString sString(loadString(pResId));
sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii1), _rReplace1 );
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 2d5733dfee07..332933615ff3 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -144,8 +144,8 @@ static ErrCode ReadThroughComponent(
static ErrCode ReadThroughComponent(
const uno::Reference< embed::XStorage >& xStorage,
const uno::Reference<XComponent>& xModelComponent,
- const sal_Char* pStreamName,
- const sal_Char* pCompatibilityStreamName,
+ const char* pStreamName,
+ const char* pCompatibilityStreamName,
const uno::Reference<XComponentContext> & rxContext,
const uno::Reference< XDocumentHandler >& _xFilter)
{
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 5db99d191ab8..c4b7987a203f 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -47,7 +47,7 @@ static void createRegistryInfo_dbaxml()
}
extern "C" SAL_DLLPUBLIC_EXPORT void* dbaxml_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index f15c64410290..334b297b0bf5 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -126,7 +126,7 @@ public:
OUString getPrefix(const OUString& _sURL) const;
/// determines whether there is a driver for the given URL prefix/pattern
- bool hasDriver( const sal_Char* _pAsciiPattern ) const;
+ bool hasDriver( const char* _pAsciiPattern ) const;
/// on a given string, return the Java Driver Class
OUString getJavaDriverClass(const OUString& _sURL) const;
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 9c31a5c56909..a554611a8475 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -24,7 +24,7 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
extern "C" SAL_DLLPUBLIC_EXPORT void* sdbt_component_getFactory(
- const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void*)
+ const char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void*)
{
Reference< XInterface > xRet;
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*/)
{
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index a63144ef76ab..60c75236475f 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -299,7 +299,7 @@ namespace dbaui
by the user, see also <type scope="css::frame">CommandGroup</type>.
*/
void implDescribeSupportedFeature(
- const sal_Char* _pAsciiCommandURL,
+ const char* _pAsciiCommandURL,
sal_uInt16 _nFeatureId,
sal_Int16 _nCommandGroup = css::frame::CommandGroup::INTERNAL
);
More information about the Libreoffice-commits
mailing list