From 02b24d77476f93887691dde564351d6f8b770b8f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 19 Dec 2019 09:31:15 +0200 Subject: sal_Char->char in forms..framework Change-Id: I756c1f54d50403aa9b4f03dbbc2a387556f07084 Reviewed-on: https://gerrit.libreoffice.org/85475 Tested-by: Jenkins Reviewed-by: Noel Grandin --- fpicker/source/aqua/FPentry.mm | 2 +- fpicker/source/office/OfficeControlAccess.cxx | 4 ++-- fpicker/source/office/fps_office.cxx | 2 +- fpicker/source/office/iodlg.cxx | 2 +- fpicker/source/win32/FPentry.cxx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'fpicker') diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm index 4fe6b9839aac..5cec5eab213b 100644 --- a/fpicker/source/aqua/FPentry.mm +++ b/fpicker/source/aqua/FPentry.mm @@ -50,7 +50,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* fps_aqua_component_getFactory( - const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) + const char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = nullptr; diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index ae8569b72c8c..296e9368779a 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -53,7 +53,7 @@ namespace svt struct ControlDescription { - const sal_Char* pControlName; + const char* pControlName; sal_Int16 nControlId; PropFlags nPropertyFlags; }; @@ -114,7 +114,7 @@ namespace svt struct ControlProperty { - const sal_Char* pPropertyName; + const char* pPropertyName; PropFlags nPropertyId; }; diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx index ed8313c67dbd..a08c1b1830d5 100644 --- a/fpicker/source/office/fps_office.cxx +++ b/fpicker/source/office/fps_office.cxx @@ -51,7 +51,7 @@ static const cppu::ImplementationEntry g_entries[] = extern "C" { SAL_DLLPUBLIC_EXPORT void * fps_office_component_getFactory( - const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey) + const char * pImplementationName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper ( pImplementationName, pServiceManager, pRegistryKey, g_entries); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 8357cc8f330e..7a28b76562b2 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -262,7 +262,7 @@ namespace /** retrieves the value of an environment variable @return if and only if the retrieved string value is not empty */ - bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, OUString& _rValue ) + bool getEnvironmentValue( const char* _pAsciiEnvName, OUString& _rValue ) { _rValue.clear(); OUString sEnvName = OUString::createFromAscii( _pAsciiEnvName ); diff --git a/fpicker/source/win32/FPentry.cxx b/fpicker/source/win32/FPentry.cxx index 2e24682d5544..a4e48f8865e5 100644 --- a/fpicker/source/win32/FPentry.cxx +++ b/fpicker/source/win32/FPentry.cxx @@ -53,7 +53,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void* fps_win32_component_getFactory( - const sal_Char* pImplName, void* pSrvManager, void* ) + const char* pImplName, void* pSrvManager, void* ) { void* pRet = nullptr; -- cgit