diff options
17 files changed, 86 insertions, 86 deletions
diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx index 1815e406ea93..017bd476139b 100644 --- a/lotuswordpro/source/filter/explode.cxx +++ b/lotuswordpro/source/filter/explode.cxx @@ -334,7 +334,7 @@ sal_Int32 Decompression::explode() * @descr bits to string * @return */ -void Decompression::ToString(sal_uInt32 nBits, sal_Char *pChar, sal_uInt32 nLen) +void Decompression::ToString(sal_uInt32 nBits, char *pChar, sal_uInt32 nLen) { sal_uInt32 nBit; for (sal_uInt32 i=nLen; i > 0; i--) @@ -364,7 +364,7 @@ sal_uInt32 Decompression::Decode(HuffmanTreeNode * pRoot) nReadAlready = (nReadAlready << 1) | (nRead & 0x01); - sal_Char sCode[16]; + char sCode[16]; ToString(nReadAlready, sCode, i); nRet = pRoot->QueryValue(sCode); if (nRet != 0xffffffff) @@ -456,13 +456,13 @@ HuffmanTreeNode::~HuffmanTreeNode() { } -HuffmanTreeNode * HuffmanTreeNode::InsertNode(sal_uInt32 nValue, const sal_Char * pInCode) +HuffmanTreeNode * HuffmanTreeNode::InsertNode(sal_uInt32 nValue, const char * pInCode) { HuffmanTreeNode *pNew = new HuffmanTreeNode(nValue); std::string aCode(pInCode); // query its parents - const sal_Char cLast = aCode.back(); + const char cLast = aCode.back(); aCode.pop_back(); HuffmanTreeNode * pParent = QueryNode(aCode.c_str()); if (!pParent) @@ -477,14 +477,14 @@ HuffmanTreeNode * HuffmanTreeNode::InsertNode(sal_uInt32 nValue, const sal_Char return pNew; } -HuffmanTreeNode * HuffmanTreeNode::QueryNode(const sal_Char * pCode) +HuffmanTreeNode * HuffmanTreeNode::QueryNode(const char * pCode) { sal_uInt32 nLen = strlen(pCode); HuffmanTreeNode * pNode = this; // this is the root for(sal_uInt32 i=0; i<nLen && pNode; i++) { - sal_Char cChar= pCode[i]; + char cChar= pCode[i]; if (cChar == '0') { pNode = pNode->left.get(); @@ -497,7 +497,7 @@ HuffmanTreeNode * HuffmanTreeNode::QueryNode(const sal_Char * pCode) return pNode; } -sal_uInt32 HuffmanTreeNode::QueryValue(const sal_Char * pCode) +sal_uInt32 HuffmanTreeNode::QueryValue(const char * pCode) { HuffmanTreeNode * pNode =QueryNode(pCode); if (pNode) diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx index a313c55dd2bd..95f45f2ef821 100644 --- a/lotuswordpro/source/filter/explode.hxx +++ b/lotuswordpro/source/filter/explode.hxx @@ -69,9 +69,9 @@ class HuffmanTreeNode public: explicit HuffmanTreeNode(sal_uInt32 value = 0xffffffff) ; ~HuffmanTreeNode() ; - HuffmanTreeNode * InsertNode(sal_uInt32 nValue, const sal_Char * pInCode); - HuffmanTreeNode * QueryNode(const sal_Char *pCode); - sal_uInt32 QueryValue(const sal_Char *pCode); + HuffmanTreeNode * InsertNode(sal_uInt32 nValue, const char * pInCode); + HuffmanTreeNode * QueryNode(const char *pCode); + sal_uInt32 QueryValue(const char *pCode); }; /** @@ -116,7 +116,7 @@ public: void ConstructTree1(); void ConstructTree2(); void fillArray(); - static void ToString(sal_uInt32 nBits, sal_Char *pChar, sal_uInt32 nLen); + static void ToString(sal_uInt32 nBits, char *pChar, sal_uInt32 nLen); }; #endif diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx index 8ce2e9676d63..6c84aaab51eb 100644 --- a/lotuswordpro/source/filter/lwptools.cxx +++ b/lotuswordpro/source/filter/lwptools.cxx @@ -89,7 +89,7 @@ void LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, if( !IsUnicodePacked(pObjStrm, strlen) ) { sal_uInt16 len = 0; - sal_Char buf[1024]; + char buf[1024]; while(strlen) { @@ -104,7 +104,7 @@ void LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, } else { - sal_Char buf[1024]; + char buf[1024]; sal_Unicode unibuf[1024]; sal_uInt8 readbyte; sal_uInt16 readword; diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.cxx b/lotuswordpro/source/filter/xfilter/xfbase64.cxx index 3a1c82778f48..1b7224a248ce 100644 --- a/lotuswordpro/source/filter/xfilter/xfbase64.cxx +++ b/lotuswordpro/source/filter/xfilter/xfbase64.cxx @@ -61,7 +61,7 @@ #include <memory> #include "xfbase64.hxx" -const sal_Char aBase64EncodeTable[] = +const char aBase64EncodeTable[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', @@ -72,7 +72,7 @@ const sal_Char aBase64EncodeTable[] = * @descr Encode 3 byte to 4 byte. * Please refer to RFC to get the base64 algorithm. */ -static void Encode_(const sal_uInt8 *src, sal_Char* dest) +static void Encode_(const sal_uInt8 *src, char* dest) { sal_Int32 nBinaer = (src[ 0] << 16) + (src[1] << 8) + @@ -96,7 +96,7 @@ static void Encode_(const sal_uInt8 *src, sal_Char* dest) */ OUString XFBase64::Encode(sal_uInt8 const *buf, sal_Int32 len) { - std::unique_ptr<sal_Char[]> buffer; + std::unique_ptr<char[]> buffer; sal_Int32 nNeeded; sal_Int32 cycles = len/3; sal_Int32 remain = len%3; @@ -105,7 +105,7 @@ OUString XFBase64::Encode(sal_uInt8 const *buf, sal_Int32 len) nNeeded = cycles*4; else nNeeded = (cycles+1)*4; - buffer.reset(new sal_Char[nNeeded+1]); + buffer.reset(new char[nNeeded+1]); memset(buffer.get(), 0, nNeeded+1); diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx index 9a9befd877dc..6ccb241496fd 100644 --- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx @@ -97,7 +97,7 @@ void XFTextContent::ToXml(IXFStream *pStrm) pStrm->Characters(sSubString.copy(0,nIndex)); for (j=nIndex+1;j<nSize-i;j++) { - if (sSubString[j] != sal_Char(' ')) + if (sSubString[j] != ' ') break; } IXFAttrList *pAttrList = pStrm->GetAttrList(); diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx index 6a57f3291f9b..4d34b55219f6 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star::registry; * @param pRegistryKey the registry key for this component, need for persistent data * @return a component factory */ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * /*pServiceManager*/, void * pRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const char * pImplName, void * /*pServiceManager*/, void * pRegistryKey) { void * pRet = 0; diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx index 5fa2e5af1331..b032b670e137 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx @@ -196,7 +196,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - sal_Char const * implName, lang::XMultiServiceFactory * xMgr, + char const * implName, lang::XMultiServiceFactory * xMgr, registry::XRegistryKey * xRegistry ) { return ::cppu::component_getFactoryHelper( diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx index 2915b2055102..b04963d052ff 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx @@ -88,7 +88,7 @@ struct ProviderRequest ProviderRequest( void* pServiceManager, - sal_Char const* pImplementationName + char const* pImplementationName ) : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager)) , sImplementationName(OUString::createFromAscii(pImplementationName)) @@ -119,7 +119,7 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( - const sal_Char* pImplementationName, + const char* pImplementationName, void* pServiceManager, void* pRegistryKey) { diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx index e8a80fa672a3..cbbe29bd1749 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx @@ -38,64 +38,64 @@ namespace connectivity { namespace skeleton { - const sal_Char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; } - const sal_Char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; } - const sal_Char* getPROPERTY_MAXROWS() { return "MaxRows"; } - const sal_Char* getPROPERTY_CURSORNAME() { return "CursorName"; } - const sal_Char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; } - const sal_Char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; } - const sal_Char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; } - const sal_Char* getPROPERTY_FETCHSIZE() { return "FetchSize"; } - const sal_Char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; } - const sal_Char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; } - - const sal_Char* getPROPERTY_NAME() { return "Name"; } - const sal_Char* getPROPERTY_TYPE() { return "Type"; } - const sal_Char* getPROPERTY_TYPENAME() { return "TypeName"; } - const sal_Char* getPROPERTY_PRECISION() { return "Precision"; } - const sal_Char* getPROPERTY_SCALE() { return "Scale"; } - const sal_Char* getPROPERTY_ISNULLABLE() { return "IsNullable"; } - const sal_Char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; } - const sal_Char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; } - const sal_Char* getPROPERTY_DESCRIPTION() { return "Description"; } - const sal_Char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; } - - const sal_Char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; } - const sal_Char* getPROPERTY_UPDATERULE() { return "UpdateRule"; } - const sal_Char* getPROPERTY_DELETERULE() { return "DeleteRule"; } - const sal_Char* getPROPERTY_CATALOG() { return "Catalog"; } - const sal_Char* getPROPERTY_ISUNIQUE() { return "IsUnique"; } - const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; } - const sal_Char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; } - const sal_Char* getPROPERTY_ISASCENDING() { return "IsAscending"; } - const sal_Char* getPROPERTY_SCHEMANAME() { return "SchemaName"; } - const sal_Char* getPROPERTY_CATALOGNAME() { return "CatalogName"; } - const sal_Char* getPROPERTY_COMMAND() { return "Command"; } - const sal_Char* getPROPERTY_CHECKOPTION() { return "CheckOption"; } - const sal_Char* getPROPERTY_PASSWORD() { return "Password"; } - const sal_Char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; } - - const sal_Char* getSTAT_INVALID_INDEX() { return "Invalid descriptor index"; } - - const sal_Char* getPROPERTY_FUNCTION() { return "Function"; } - const sal_Char* getPROPERTY_TABLENAME() { return "TableName"; } - const sal_Char* getPROPERTY_REALNAME() { return "RealName"; } - const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; } - const sal_Char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; } - const sal_Char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; } - - const sal_Char* getPROPERTY_FORMATKEY() { return "FormatKey"; } - const sal_Char* getPROPERTY_LOCALE() { return "Locale"; } - - const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; } - const sal_Char* getPROPERTY_PRIVILEGES() { return "Privileges"; } + const char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; } + const char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; } + const char* getPROPERTY_MAXROWS() { return "MaxRows"; } + const char* getPROPERTY_CURSORNAME() { return "CursorName"; } + const char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; } + const char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; } + const char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; } + const char* getPROPERTY_FETCHSIZE() { return "FetchSize"; } + const char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; } + const char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; } + + const char* getPROPERTY_NAME() { return "Name"; } + const char* getPROPERTY_TYPE() { return "Type"; } + const char* getPROPERTY_TYPENAME() { return "TypeName"; } + const char* getPROPERTY_PRECISION() { return "Precision"; } + const char* getPROPERTY_SCALE() { return "Scale"; } + const char* getPROPERTY_ISNULLABLE() { return "IsNullable"; } + const char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; } + const char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; } + const char* getPROPERTY_DESCRIPTION() { return "Description"; } + const char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; } + + const char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; } + const char* getPROPERTY_UPDATERULE() { return "UpdateRule"; } + const char* getPROPERTY_DELETERULE() { return "DeleteRule"; } + const char* getPROPERTY_CATALOG() { return "Catalog"; } + const char* getPROPERTY_ISUNIQUE() { return "IsUnique"; } + const char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; } + const char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; } + const char* getPROPERTY_ISASCENDING() { return "IsAscending"; } + const char* getPROPERTY_SCHEMANAME() { return "SchemaName"; } + const char* getPROPERTY_CATALOGNAME() { return "CatalogName"; } + const char* getPROPERTY_COMMAND() { return "Command"; } + const char* getPROPERTY_CHECKOPTION() { return "CheckOption"; } + const char* getPROPERTY_PASSWORD() { return "Password"; } + const char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; } + + const char* getSTAT_INVALID_INDEX() { return "Invalid descriptor index"; } + + const char* getPROPERTY_FUNCTION() { return "Function"; } + const char* getPROPERTY_TABLENAME() { return "TableName"; } + const char* getPROPERTY_REALNAME() { return "RealName"; } + const char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; } + const char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; } + const char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; } + + const char* getPROPERTY_FORMATKEY() { return "FormatKey"; } + const char* getPROPERTY_LOCALE() { return "Locale"; } + + const char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; } + const char* getPROPERTY_PRIVILEGES() { return "Privileges"; } //= error messages - const sal_Char* getERRORMSG_SEQUENCE() { return "Function sequence error"; } - const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; } - const sal_Char* getSQLSTATE_GENERAL() { return "HY0000"; } - const sal_Char* getSTR_DELIMITER() { return "/"; } + const char* getERRORMSG_SEQUENCE() { return "Function sequence error"; } + const char* getSQLSTATE_SEQUENCE() { return "HY010"; } + const char* getSQLSTATE_GENERAL() { return "HY0000"; } + const char* getSTR_DELIMITER() { return "/"; } OPropertyMap::~OPropertyMap() { diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx index fa3a5ffd2f30..bc8e20d7acff 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx @@ -65,11 +65,11 @@ namespace skeleton }; - typedef const sal_Char* (*PVFN)(); + typedef const char* (*PVFN)(); struct UStringDescription { - const sal_Char* pZeroTerminatedName; + const char* pZeroTerminatedName; sal_Int32 nLength; UStringDescription(PVFN _fCharFkt); diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx index 9d234e9aa1df..37b7a936031c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star::registry; 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 ) { void * pRet = 0; diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx index 8d9e75e0b848..8ced96d3b7a0 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx @@ -136,7 +136,7 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments ) long bytestRead = xInStream->readBytes(aHeadData, nHeadSize); - OString aHead = OString((const sal_Char *)aHeadData.getConstArray(), bytestRead).toAsciiLowerCase(); + OString aHead = OString((const char *)aHeadData.getConstArray(), bytestRead).toAsciiLowerCase(); // check for document element of flatxml format if (aHead.indexOf(aDocToken) >= 0) diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx index e07d5cb26d24..58dda0443489 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx @@ -318,7 +318,7 @@ using namespace XFlatXml; 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 ) { void * pRet = 0; diff --git a/odk/examples/cpp/complextoolbarcontrols/exports.cxx b/odk/examples/cpp/complextoolbarcontrols/exports.cxx index 35a4f3910128..c88013b6424c 100644 --- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx @@ -26,7 +26,7 @@ extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName , +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const char* pImplName , void* pServiceManager, void* pRegistryKey ) { diff --git a/odk/examples/cpp/counter/counter.cxx b/odk/examples/cpp/counter/counter.cxx index 86f8d87b6271..7e16b6a10838 100644 --- a/odk/examples/cpp/counter/counter.cxx +++ b/odk/examples/cpp/counter/counter.cxx @@ -151,7 +151,7 @@ Reference< XInterface > SAL_CALL MyCounterImpl_create( * @param pRegistryKey the registry key for this component, need for persistent data * @return a component factory */ -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey) +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const char * pImplName, void * pServiceManager, void * pRegistryKey) { void * pRet = 0; diff --git a/odk/examples/cpp/custompanel/ctp_services.cxx b/odk/examples/cpp/custompanel/ctp_services.cxx index d259028b1986..5c795f695b5f 100644 --- a/odk/examples/cpp/custompanel/ctp_services.cxx +++ b/odk/examples/cpp/custompanel/ctp_services.cxx @@ -47,7 +47,7 @@ namespace sd { namespace colortoolpanel extern "C" { - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::sd::colortoolpanel::s_aServiceEntries ); } diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx index e754a2fa42e3..7c70f5dfe813 100644 --- a/odk/examples/cpp/remoteclient/remoteclient.cxx +++ b/odk/examples/cpp/remoteclient/remoteclient.cxx @@ -228,7 +228,7 @@ using namespace remotebridges_officeclient; 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 ) { void * pRet = 0; |