From c1a4554c67fc975ead3f79b3511a76617e4615b3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 19 Dec 2019 09:46:58 +0200 Subject: sal_Char->char in idlc..linguistic Change-Id: Ib30fe34123ad7e5d892e8db9c742e08c4ca8fcd2 Reviewed-on: https://gerrit.libreoffice.org/85477 Tested-by: Jenkins Reviewed-by: Noel Grandin --- idlc/inc/astdeclaration.hxx | 2 +- idlc/inc/astexpression.hxx | 2 +- idlc/inc/astsequence.hxx | 2 +- idlc/inc/errorhandler.hxx | 4 ++-- idlc/source/astdump.cxx | 2 +- idlc/source/astexpression.cxx | 2 +- idlc/source/errorhandler.cxx | 10 +++++----- idlc/source/idlccompile.cxx | 2 +- idlc/source/parser.y | 2 +- idlc/source/scanner.l | 14 +++++++------- io/source/TextOutputStream/TextOutputStream.cxx | 2 +- io/source/services.cxx | 2 +- io/test/stm/testfactreg.cxx | 2 +- io/test/testcomponent.cxx | 2 +- javaunohelper/source/javaunohelper.cxx | 4 ++-- jvmfwk/inc/libxmlutil.hxx | 2 +- jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 10 +++++----- jvmfwk/source/elements.cxx | 2 +- jvmfwk/source/framework.cxx | 2 +- l10ntools/source/helper.cxx | 2 +- lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 2 +- lingucomponent/source/languageguessing/guesslang.cxx | 2 +- lingucomponent/source/lingutil/lingutil.cxx | 2 +- lingucomponent/source/lingutil/lingutil.hxx | 2 +- lingucomponent/source/numbertext/numbertext.cxx | 2 +- .../source/spellcheck/macosxspell/macspellimp.mm | 2 +- lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2 +- lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2 +- linguistic/source/convdiclist.cxx | 2 +- linguistic/source/dicimp.cxx | 14 +++++++------- linguistic/source/dlistimp.cxx | 2 +- linguistic/source/gciterator.cxx | 2 +- linguistic/source/lngopt.cxx | 2 +- linguistic/source/lngreg.cxx | 2 +- linguistic/source/lngreg.hxx | 10 +++++----- linguistic/source/lngsvcmgr.cxx | 10 +++++----- linguistic/workben/sreg.cxx | 4 ++-- linguistic/workben/sspellimp.cxx | 2 +- 38 files changed, 69 insertions(+), 69 deletions(-) diff --git a/idlc/inc/astdeclaration.hxx b/idlc/inc/astdeclaration.hxx index aca098d16bbd..ce8f9740a745 100644 --- a/idlc/inc/astdeclaration.hxx +++ b/idlc/inc/astdeclaration.hxx @@ -70,7 +70,7 @@ public: { return m_scopedName; } const OString& getFullName() const { return m_fullName; } - virtual const sal_Char* getRelativName() const + virtual const char* getRelativName() const { return m_fullName.getStr()+1; } AstScope* getScope() { return m_pScope; } diff --git a/idlc/inc/astexpression.hxx b/idlc/inc/astexpression.hxx index ae96dff602ea..b146e9c85a07 100644 --- a/idlc/inc/astexpression.hxx +++ b/idlc/inc/astexpression.hxx @@ -85,7 +85,7 @@ struct AstExprValue ExprType et; }; -const sal_Char* exprTypeToString(ExprType t); +const char* exprTypeToString(ExprType t); class AstExpression final { diff --git a/idlc/inc/astsequence.hxx b/idlc/inc/astsequence.hxx index 0a8efc77b4f8..6c2143267532 100644 --- a/idlc/inc/astsequence.hxx +++ b/idlc/inc/astsequence.hxx @@ -35,7 +35,7 @@ public: virtual bool isUnsigned() const override { return m_pMemberType != nullptr && m_pMemberType->isUnsigned(); } - virtual const sal_Char* getRelativName() const override; + virtual const char* getRelativName() const override; private: AstType const * m_pMemberType; mutable o3tl::optional m_xRelativName; diff --git a/idlc/inc/errorhandler.hxx b/idlc/inc/errorhandler.hxx index 6a26497f042b..9b49f5df441a 100644 --- a/idlc/inc/errorhandler.hxx +++ b/idlc/inc/errorhandler.hxx @@ -83,10 +83,10 @@ public: static void error3(ErrorCode e, AstDeclaration const * d1, AstDeclaration const * d2, AstDeclaration const * d3); // Warning - static void warning0(WarningCode e, const sal_Char* warningmsg); + static void warning0(WarningCode e, const char* warningmsg); // Report a syntax error in IDL input - static void syntaxError(ParseState state, sal_Int32 lineNumber, const sal_Char* errmsg); + static void syntaxError(ParseState state, sal_Int32 lineNumber, const char* errmsg); // Report an unsuccessful coercion attempt static void coercionError(AstExpression *pExpr, ExprType et); diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx index 6038c4af7997..081671615912 100644 --- a/idlc/source/astdump.cxx +++ b/idlc/source/astdump.cxx @@ -404,7 +404,7 @@ void AstAttribute::dumpExceptions( } } -const sal_Char* AstSequence::getRelativName() const +const char* AstSequence::getRelativName() const { if ( !m_xRelativName ) { diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index f9b0f08f0534..cd5a21656ff6 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -1277,7 +1277,7 @@ OString AstExpression::toString() } // Convert the type of an AST_Expression to a char * -const sal_Char* exprTypeToString(ExprType t) +const char* exprTypeToString(ExprType t) { switch (t) { diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx index b31340ef5ee8..6d2d92ea35e5 100644 --- a/idlc/source/errorhandler.cxx +++ b/idlc/source/errorhandler.cxx @@ -20,7 +20,7 @@ #include #include -static const sal_Char* errorCodeToMessage(ErrorCode eCode) +static const char* errorCodeToMessage(ErrorCode eCode) { switch (eCode) { @@ -121,7 +121,7 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode) return "unknown error"; } -static const sal_Char* warningCodeToMessage(WarningCode wCode) +static const char* warningCodeToMessage(WarningCode wCode) { switch (wCode) { @@ -131,7 +131,7 @@ static const sal_Char* warningCodeToMessage(WarningCode wCode) return "unknown warning"; } -static const sal_Char* parseStateToMessage(ParseState state) +static const char* parseStateToMessage(ParseState state) { switch (state) { @@ -452,7 +452,7 @@ void ErrorHandler::error3(ErrorCode e, AstDeclaration const * d1, AstDeclaration idlc()->incErrorCount(); } -void ErrorHandler::warning0(WarningCode w, const sal_Char* warningmsg) +void ErrorHandler::warning0(WarningCode w, const char* warningmsg) { if ( idlc()->getOptions()->isValid("-w") || idlc()->getOptions()->isValid("-we") ) { warningHeader(w); @@ -465,7 +465,7 @@ void ErrorHandler::warning0(WarningCode w, const sal_Char* warningmsg) idlc()->incWarningCount(); } -void ErrorHandler::syntaxError(ParseState ps, sal_Int32 lineNumber, const sal_Char* errmsg) +void ErrorHandler::syntaxError(ParseState ps, sal_Int32 lineNumber, const char* errmsg) { errorHeader(ErrorCode::SyntaxError, lineNumber); fprintf(stderr, "%s: %s\n", parseStateToMessage(ps), errmsg); diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 8d3897890e0f..1cb84cc9fe8b 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -49,7 +49,7 @@ extern int yyparse(); extern FILE* yyin; extern int yydebug; -static sal_Char tmpFilePattern[512]; +static char tmpFilePattern[512]; bool isFileUrl(const OString& fileName) { diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 9c055d920a33..40e82ef85216 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -213,7 +213,7 @@ static bool includes(AstDeclaration const * type1, AstDeclaration const * type2) FeInheritanceHeader* ihval; /* inheritance header value */ OString* sval; /* OString value */ std::vector< OString > * svals; - sal_Char* strval; /* sal_Char* value */ + char* strval; /* char* value */ bool bval; /* sal_Boolean* value */ sal_Int64 ival; /* sal_Int64 value */ sal_uInt64 uval; /* sal_uInt64 value */ diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l index 37b2bbff0829..660e01588960 100644 --- a/idlc/source/scanner.l +++ b/idlc/source/scanner.l @@ -146,7 +146,7 @@ static int asciiToInteger(char const * s, sal_Int64 * sval, sal_uInt64 * uval) } } -static double asciiToFloat(const sal_Char *s) +static double asciiToFloat(const char *s) { double d = 0.0; double e, k; @@ -201,21 +201,21 @@ static double asciiToFloat(const sal_Char *s) return d; } -static void idlParsePragma(sal_Char* pPragma) +static void idlParsePragma(char* pPragma) { OString pragma(pPragma); sal_Int32 index = pragma.indexOf("include"); - sal_Char* begin = pPragma + index + 8; - sal_Char* offset = begin; + char* begin = pPragma + index + 8; + char* offset = begin; while (*offset != ',') offset++; //OString include = pragma.copy(index + 8, offset - begin); //unused// idlc()->insertInclude(pragma.copy(index + 8, (sal_Int32)(offset - begin))); } -static void parseLineAndFile(sal_Char* pBuf) +static void parseLineAndFile(char* pBuf) { - sal_Char *r = pBuf; - sal_Char *h; + char *r = pBuf; + char *h; bool bIsInMain = false; /* Skip initial '#' */ diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 5f39c8afbb5e..22b4de2f10fb 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -120,7 +120,7 @@ Sequence OTextOutputStream::implConvert( const OUString& rSource ) sal_Int32 nSeqSize = nSourceSize * 3; Sequence seqText( nSeqSize ); - sal_Char *pTarget = reinterpret_cast(seqText.getArray()); + char *pTarget = reinterpret_cast(seqText.getArray()); while( true ) { nTargetCount += rtl_convertUnicodeToText( diff --git a/io/source/services.cxx b/io/source/services.cxx index 557712dbf493..c0da0ee8b3ad 100644 --- a/io/source/services.cxx +++ b/io/source/services.cxx @@ -93,7 +93,7 @@ static const struct ImplementationEntry g_entries[] = }; extern "C" SAL_DLLPUBLIC_EXPORT void * io_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx index 1a409e929a4a..2250429e5676 100644 --- a/io/test/stm/testfactreg.cxx +++ b/io/test/stm/testfactreg.cxx @@ -110,7 +110,7 @@ sal_Bool SAL_CALL component_writeInfo( } 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/io/test/testcomponent.cxx b/io/test/testcomponent.cxx index 27be71daf0bc..2b317c90341c 100644 --- a/io/test/testcomponent.cxx +++ b/io/test/testcomponent.cxx @@ -67,7 +67,7 @@ int main (int argc, char **argv) exit(1); } - sal_Char szBuf[1024]; + char szBuf[1024]; OString sTestName; try diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index 823d069d769e..abf57e17f0a4 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -74,7 +74,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( { Environment java_env, loader_env; - const sal_Char * pEnvTypeName = nullptr; + const char * pEnvTypeName = nullptr; (*reinterpret_cast(pSym))( &pEnvTypeName, reinterpret_cast(&loader_env) ); if (! loader_env.is()) @@ -163,7 +163,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( { Environment java_env, loader_env; - const sal_Char * pEnvTypeName = nullptr; + const char * pEnvTypeName = nullptr; (*reinterpret_cast(pSym))( &pEnvTypeName, reinterpret_cast(&loader_env) ); diff --git a/jvmfwk/inc/libxmlutil.hxx b/jvmfwk/inc/libxmlutil.hxx index 8e6f9afaadbd..31332f3cea57 100644 --- a/jvmfwk/inc/libxmlutil.hxx +++ b/jvmfwk/inc/libxmlutil.hxx @@ -89,7 +89,7 @@ public: CXmlCharPtr & operator = (xmlChar* pObj); operator xmlChar* () const { return _object;} operator OUString (); - operator OString () { return reinterpret_cast(_object);} + operator OString () { return reinterpret_cast(_object);} }; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 937500fe2467..579be1ea71e8 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -201,7 +201,7 @@ public: private: enum { BUFFER_SIZE = 1024 }; - sal_Char m_aBuffer[BUFFER_SIZE]; + char m_aBuffer[BUFFER_SIZE]; FileHandleGuard m_aGuard; int m_nSize; int m_nIndex; @@ -271,7 +271,7 @@ namespace { class AsynchReader: public salhelper::Thread { size_t m_nDataSize; - std::unique_ptr m_arData; + std::unique_ptr m_arData; FileHandleGuard m_aGuard; @@ -306,7 +306,7 @@ OString AsynchReader::getData() void AsynchReader::execute() { const sal_uInt64 BUFFER_SIZE = 4096; - sal_Char aBuffer[BUFFER_SIZE]; + char aBuffer[BUFFER_SIZE]; while (true) { sal_uInt64 nRead; @@ -330,12 +330,12 @@ void AsynchReader::execute() else if (nRead <= BUFFER_SIZE) { //Save the data we have in m_arData into a temporary array - std::unique_ptr arTmp( new sal_Char[m_nDataSize]); + std::unique_ptr arTmp( new char[m_nDataSize]); if (m_nDataSize != 0) { memcpy(arTmp.get(), m_arData.get(), m_nDataSize); } //Enlarge m_arData to hold the newly read data - m_arData.reset(new sal_Char[static_cast(m_nDataSize + nRead)]); + m_arData.reset(new char[static_cast(m_nDataSize + nRead)]); //Copy back the data that was already in m_arData memcpy(m_arData.get(), arTmp.get(), m_nDataSize); //Add the newly read data to m_arData diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 69688df85295..807a65a3a154 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -72,7 +72,7 @@ static OString getElement(OString const & docPath, JFW_E_ERROR, "[Java framework] Error in function getElement (elements.cxx)"); } - sValue = reinterpret_cast(pathObj->nodesetval->nodeTab[0]->content); + sValue = reinterpret_cast(pathObj->nodesetval->nodeTab[0]->content); return sValue; } diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 32120308f932..60d7dd796c20 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -246,7 +246,7 @@ javaFrameworkError jfw_startVM( //add the options set by options dialog for (auto const & vmParam : vmParams) { - arOpt[index].optionString = const_cast(vmParam.getStr()); + arOpt[index].optionString = const_cast(vmParam.getStr()); arOpt[index].extraInfo = nullptr; index ++; } diff --git a/l10ntools/source/helper.cxx b/l10ntools/source/helper.cxx index 84b454bde587..b842755c27f6 100644 --- a/l10ntools/source/helper.cxx +++ b/l10ntools/source/helper.cxx @@ -137,7 +137,7 @@ bool isWellFormedXML( OString const & text ) OString xmlStrToOString( const xmlChar* pString ) { xmlChar* pTemp = xmlStrdup( pString ); - OString sResult = reinterpret_cast( pTemp ); + OString sResult = reinterpret_cast( pTemp ); xmlFree( pTemp ); return sResult; } diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index a16420844228..e6692a1d0b50 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -818,7 +818,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * hyphen_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; if ( Hyphenator::getImplementationName_Static().equalsAscii( pImplName ) ) diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 254abc882e8e..3e285b6909cc 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -348,7 +348,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * guesslang_component_getFactory( - sal_Char const * implName, void * xMgr, + char const * implName, void * xMgr, void * xRegistry ) { return ::cppu::component_getFactoryHelper( diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index 76c79aba698a..13f0cf1d31a6 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -272,7 +272,7 @@ void MergeNewStyleDicsAndOldStyleDics( } } -rtl_TextEncoding getTextEncodingFromCharset(const sal_Char* pCharset) +rtl_TextEncoding getTextEncodingFromCharset(const char* pCharset) { // default result: used to indicate that we failed to get the proper encoding rtl_TextEncoding eRet = RTL_TEXTENCODING_DONTKNOW; diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx index c84d465af9cb..984b5e2e8902 100644 --- a/lingucomponent/source/lingutil/lingutil.hxx +++ b/lingucomponent/source/lingutil/lingutil.hxx @@ -50,7 +50,7 @@ void MergeNewStyleDicsAndOldStyleDics( std::vector< SvtLinguConfigDictionaryEntr //rtl_getTextEncodingFromUnixCharset with the addition of //ISCII-DEVANAGARI. On failure will return final fallback of //RTL_TEXTENCODING_ISO_8859_1 -rtl_TextEncoding getTextEncodingFromCharset(const sal_Char* pCharset); +rtl_TextEncoding getTextEncodingFromCharset(const char* pCharset); #endif diff --git a/lingucomponent/source/numbertext/numbertext.cxx b/lingucomponent/source/numbertext/numbertext.cxx index 8c388e6adb92..44149fa39d68 100644 --- a/lingucomponent/source/numbertext/numbertext.cxx +++ b/lingucomponent/source/numbertext/numbertext.cxx @@ -187,7 +187,7 @@ static const struct ::cppu::ImplementationEntry s_component_entries[] extern "C" { -SAL_DLLPUBLIC_EXPORT void* numbertext_component_getFactory(sal_Char const* implName, void* xMgr, +SAL_DLLPUBLIC_EXPORT void* numbertext_component_getFactory(char const* implName, void* xMgr, void* xRegistry) { return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries); diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index ef3d5decb013..1d6f84fcce78 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -651,7 +651,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * MacOSXSpell_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; if ( MacSpellChecker::getImplementationName_Static().equalsAscii( pImplName ) ) diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index e6901af11577..60dcc350f07a 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -651,7 +651,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * spell_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; if ( SpellChecker::getImplementationName_Static().equalsAscii( pImplName ) ) diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index cb15183964e7..7cab6c0770eb 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -581,7 +581,7 @@ Sequence< OUString > Thesaurus::getSupportedServiceNames_Static() extern "C" { SAL_DLLPUBLIC_EXPORT void * lnth_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; if ( Thesaurus::getImplementationName_Static().equalsAscii( pImplName ) ) diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 79ea6f639fab..600a42be6137 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -548,7 +548,7 @@ static uno::Reference< uno::XInterface > ConvDicList_CreateInstance( } void * ConvDicList_getFactory( - const sal_Char * pImplName, + const char * pImplName, XMultiServiceFactory * pServiceManager ) { void * pRet = nullptr; diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 328871f0bd7a..e2fc1d53832c 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -76,10 +76,10 @@ using namespace linguistic; // text stripping and dictionary saving. #define EXTENSION_FOR_TITLE_TEXT "." -static const sal_Char* const pVerStr2 = "WBSWG2"; -static const sal_Char* const pVerStr5 = "WBSWG5"; -static const sal_Char* const pVerStr6 = "WBSWG6"; -static const sal_Char* const pVerOOo7 = "OOoUserDict1"; +static const char* const pVerStr2 = "WBSWG2"; +static const char* const pVerStr5 = "WBSWG5"; +static const char* const pVerStr6 = "WBSWG6"; +static const char* const pVerOOo7 = "OOoUserDict1"; static const sal_Int16 DIC_VERSION_DONTKNOW = -1; static const sal_Int16 DIC_VERSION_2 = 2; @@ -94,7 +94,7 @@ static uno::Reference< XLinguServiceManager2 > GetLngSvcMgr_Impl() return xRes; } -static bool getTag(const OString &rLine, const sal_Char *pTagName, +static bool getTag(const OString &rLine, const char *pTagName, OString &rTagValue) { sal_Int32 nPos = rLine.indexOf(pTagName); @@ -111,7 +111,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr const &rpStream, LanguageType &nLng, bool { // Sniff the header sal_Int16 nDicVersion = DIC_VERSION_DONTKNOW; - sal_Char pMagicHeader[MAX_HEADER_LENGTH]; + char pMagicHeader[MAX_HEADER_LENGTH]; nLng = LANGUAGE_NONE; bNeg = false; @@ -314,7 +314,7 @@ ErrCode DictionaryNeo::loadEntries(const OUString &rMainURL) DIC_VERSION_2 == nDicVersion) { sal_uInt16 nLen = 0; - sal_Char aWordBuf[ BUFSIZE ]; + char aWordBuf[ BUFSIZE ]; // Read the first word if (!pStream->eof()) diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index abe2aa291efd..27ad955ca886 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -688,7 +688,7 @@ uno::Sequence< OUString > DicList::getSupportedServiceNames_Static() throw() return { "com.sun.star.linguistic2.DictionaryList" }; } -void * DicList_getFactory( const sal_Char * pImplName, +void * DicList_getFactory( const char * pImplName, XMultiServiceFactory * pServiceManager ) { void * pRet = nullptr; diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 95624a9ccd38..8d97abefcc6f 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1186,7 +1186,7 @@ static uno::Reference< uno::XInterface > GrammarCheckingIterator_createInstance( void * GrammarCheckingIterator_getFactory( - const sal_Char *pImplName, + const char *pImplName, lang::XMultiServiceFactory *pServiceManager ) { void * pRet = nullptr; diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 0bd9883f999e..dfe620504d6d 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -438,7 +438,7 @@ Locale LinguProps::getPropertyLocale(const OUString& aPropertyName) return b; } -void * LinguProps_getFactory( const sal_Char * pImplName, +void * LinguProps_getFactory( const char * pImplName, XMultiServiceFactory *pServiceManager ) { void * pRet = nullptr; diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx index 37cbea265d6a..f5de3599e6d1 100644 --- a/linguistic/source/lngreg.cxx +++ b/linguistic/source/lngreg.cxx @@ -29,7 +29,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * lng_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = LngSvcMgr_getFactory( diff --git a/linguistic/source/lngreg.hxx b/linguistic/source/lngreg.hxx index 129b0e95c498..6cbbb0df3135 100644 --- a/linguistic/source/lngreg.hxx +++ b/linguistic/source/lngreg.hxx @@ -30,31 +30,31 @@ namespace com { namespace sun { namespace star { namespace lang { extern void * LngSvcMgr_getFactory ( - const sal_Char * pImplName, + const char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); extern void * DicList_getFactory ( - const sal_Char * pImplName, + const char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); void * LinguProps_getFactory ( - const sal_Char * pImplName, + const char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); extern void * ConvDicList_getFactory ( - const sal_Char * pImplName, + const char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); extern void * GrammarCheckingIterator_getFactory ( - const sal_Char * pImplName, + const char * pImplName, css::lang::XMultiServiceFactory * pServiceManager ); diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index f8d373a6c554..afa5f0795804 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -620,9 +620,9 @@ void LngSvcMgr::UpdateAll() SvtLinguConfig aCfg; const int nNumServices = 4; - const sal_Char * const apServices[nNumServices] = { SN_SPELLCHECKER, SN_GRAMMARCHECKER, SN_HYPHENATOR, SN_THESAURUS }; - const sal_Char * const apCurLists[nNumServices] = { "ServiceManager/SpellCheckerList", "ServiceManager/GrammarCheckerList", "ServiceManager/HyphenatorList", "ServiceManager/ThesaurusList" }; - const sal_Char * const apLastFoundLists[nNumServices] = { "ServiceManager/LastFoundSpellCheckers", "ServiceManager/LastFoundGrammarCheckers", "ServiceManager/LastFoundHyphenators", "ServiceManager/LastFoundThesauri" }; + const char * const apServices[nNumServices] = { SN_SPELLCHECKER, SN_GRAMMARCHECKER, SN_HYPHENATOR, SN_THESAURUS }; + const char * const apCurLists[nNumServices] = { "ServiceManager/SpellCheckerList", "ServiceManager/GrammarCheckerList", "ServiceManager/HyphenatorList", "ServiceManager/ThesaurusList" }; + const char * const apLastFoundLists[nNumServices] = { "ServiceManager/LastFoundSpellCheckers", "ServiceManager/LastFoundGrammarCheckers", "ServiceManager/LastFoundHyphenators", "ServiceManager/LastFoundThesauri" }; // usage of indices as above: 0 = spell checker, 1 = grammar checker, 2 = hyphenator, 3 = thesaurus std::vector< list_entry_map_t > aLastFoundSvcs(nNumServices); @@ -684,7 +684,7 @@ void LngSvcMgr::UpdateAll() { for (int i = 0; i < 2; ++i) { - const sal_Char *pSubNodeName = (i == 0) ? apCurLists[k] : apLastFoundLists[k]; + const char *pSubNodeName = (i == 0) ? apCurLists[k] : apLastFoundLists[k]; OUString aSubNodeName( OUString::createFromAscii(pSubNodeName) ); list_entry_map_t &rCurMap = (i == 0) ? aCurSvcs[k] : aLastFoundSvcs[k]; @@ -1845,7 +1845,7 @@ static uno::Reference< uno::XInterface > LngSvcMgr_CreateInstance( } void * LngSvcMgr_getFactory( - const sal_Char * pImplName, + const char * pImplName, lang::XMultiServiceFactory * pServiceManager ) { diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx index 3d63813ce881..64af55925d8e 100644 --- a/linguistic/workben/sreg.cxx +++ b/linguistic/workben/sreg.cxx @@ -31,7 +31,7 @@ extern sal_Bool SAL_CALL SpellChecker_writeInfo( void * /*pServiceManager*/, XRegistryKey * pRegistryKey ); extern void * SAL_CALL SpellChecker_getFactory( - const sal_Char * pImplName, + const char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ ); @@ -47,7 +47,7 @@ sal_Bool SAL_CALL component_writeInfo( } 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 = SpellChecker_getFactory( pImplName, diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 6cfc89cef298..04c5d03d6263 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -453,7 +453,7 @@ sal_Bool SAL_CALL SpellChecker_writeInfo( } -void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, +void * SAL_CALL SpellChecker_getFactory( const char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { void * pRet = 0; -- cgit