diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 09:46:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 09:56:51 +0100 |
commit | c1a4554c67fc975ead3f79b3511a76617e4615b3 (patch) | |
tree | de4da1c1ee26954ee76d2ffe8061ba86f44e5547 /linguistic | |
parent | 02b24d77476f93887691dde564351d6f8b770b8f (diff) |
sal_Char->char in idlc..linguistic
Change-Id: Ib30fe34123ad7e5d892e8db9c742e08c4ca8fcd2
Reviewed-on: https://gerrit.libreoffice.org/85477
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'linguistic')
-rw-r--r-- | linguistic/source/convdiclist.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/dicimp.cxx | 14 | ||||
-rw-r--r-- | linguistic/source/dlistimp.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/gciterator.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/lngopt.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/lngreg.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/lngreg.hxx | 10 | ||||
-rw-r--r-- | linguistic/source/lngsvcmgr.cxx | 10 | ||||
-rw-r--r-- | linguistic/workben/sreg.cxx | 4 | ||||
-rw-r--r-- | linguistic/workben/sspellimp.cxx | 2 |
10 files changed, 25 insertions, 25 deletions
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; |