summaryrefslogtreecommitdiff
path: root/include/cppuhelper
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2020-09-11 22:05:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-09-12 13:36:42 +0200
commit04203a26757d26814a18c3251d1a97f6ded64a62 (patch)
tree80962f43d3b46e8670ad49068a1a6e8459c22f39 /include/cppuhelper
parent05d5062dca095f2e53de26db41edeb0b1279138b (diff)
Replace remaining uses of sal_Char
+ remove sal_Char check on compilerplugins Change-Id: I0f7da14e620f0c3d031d038aa8345ba4080fb3e9 Change-Id: Ia6dba4f27b47bc9e0c89159182ad80a5aee17166 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102499 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/cppuhelper')
-rw-r--r--include/cppuhelper/factory.hxx10
-rw-r--r--include/cppuhelper/implementationentry.hxx2
2 files changed, 6 insertions, 6 deletions
diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx
index edcbc9d6e375..18579048ed2f 100644
--- a/include/cppuhelper/factory.hxx
+++ b/include/cppuhelper/factory.hxx
@@ -54,7 +54,7 @@ typedef struct _uno_Environment uno_Environment;
i.e. has special context
*/
typedef void (SAL_CALL * component_getImplementationEnvironmentFunc)(
- const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv );
+ const char ** ppEnvTypeName, uno_Environment ** ppEnv );
/** Function pointer declaration.
Function determines the environment of the component implementation, i.e. the compiler.
@@ -67,9 +67,9 @@ typedef void (SAL_CALL * component_getImplementationEnvironmentFunc)(
@param pImplName
*/
typedef void (SAL_CALL * component_getImplementationEnvironmentExtFunc)(
- sal_Char const ** ppEnvTypeName,
+ char const ** ppEnvTypeName,
uno_Environment ** ppEnv,
- sal_Char const * pImplName,
+ char const * pImplName,
uno_Environment * pTargetEnv
);
@@ -79,7 +79,7 @@ typedef void (SAL_CALL * component_getImplementationEnvironmentExtFunc)(
@return an XML formatted string containing a short component description
@deprecated
*/
-typedef const sal_Char * (SAL_CALL * component_getDescriptionFunc)(void);
+typedef const char * (SAL_CALL * component_getDescriptionFunc)(void);
/** Function pointer declaration.
@@ -114,7 +114,7 @@ typedef sal_Bool (SAL_CALL * component_writeInfoFunc)(
environment returned by component_getImplementationEnvironment)
*/
typedef void * (SAL_CALL * component_getFactoryFunc)(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
+ const char * pImplName, void * pServiceManager, void * pRegistryKey );
namespace cppu
diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx
index 23f40a7f7453..fe290cf87364 100644
--- a/include/cppuhelper/implementationentry.hxx
+++ b/include/cppuhelper/implementationentry.hxx
@@ -100,7 +100,7 @@ CPPUHELPER_DLLPUBLIC sal_Bool component_writeInfoHelper(
to a factory.
*/
CPPUHELPER_DLLPUBLIC void *component_getFactoryHelper(
- const sal_Char * pImplName,
+ const char * pImplName,
void * pServiceManager,
void * pRegistryKey,
const struct ImplementationEntry entries[] );