From 821bdf5f7980de0c67ac17f275d3d2e0710ec6a5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 19 Dec 2019 09:42:08 +0200 Subject: sal_Char->char in formula..i18npool Change-Id: I765979f41842befcf25909944100d1caa97f81a8 Reviewed-on: https://gerrit.libreoffice.org/85476 Tested-by: Jenkins Reviewed-by: Noel Grandin --- i18npool/inc/breakiterator_unicode.hxx | 4 ++-- i18npool/inc/calendar_gregorian.hxx | 2 +- i18npool/inc/indexentrysupplier_common.hxx | 2 +- i18npool/inc/inputsequencechecker.hxx | 10 +++++----- i18npool/inc/localedata.hxx | 2 +- i18npool/inc/textToPronounce_zh.hxx | 2 +- i18npool/inc/textconversion.hxx | 4 ++-- i18npool/inc/transliteration_commonclass.hxx | 4 ++-- i18npool/inc/xdictionary.hxx | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'i18npool/inc') diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index b0e0850f09bc..ebb193ea2d68 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -71,7 +71,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: - const sal_Char *cBreakIterator, *lineRule; + const char *cBreakIterator, *lineRule; /** Used as map value. */ struct BI_ValueData @@ -98,7 +98,7 @@ protected: /// @throws css::uno::RuntimeException void loadICUBreakIterator(const css::lang::Locale& rLocale, - sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText); + sal_Int16 rBreakType, sal_Int16 rWordType, const char* name, const OUString& rText); public: typedef std::unordered_map< OString, std::shared_ptr< BI_ValueData > > BIMap; diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index c0541d7443b0..d579ee735f00 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -103,7 +103,7 @@ protected: const Era *eraArray; std::unique_ptr body; rtl::Reference mxNatNum; - const sal_Char* cCalendar; + const char* cCalendar; css::lang::Locale aLocale; sal_uInt32 fieldSet; sal_Int16 fieldValue[FIELD_INDEX_COUNT]; diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx index a6cfcb3b7964..72685fda9aa2 100644 --- a/i18npool/inc/indexentrysupplier_common.hxx +++ b/i18npool/inc/indexentrysupplier_common.hxx @@ -78,7 +78,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: - const sal_Char * implementationName; + const char * implementationName; bool usePhonetic; rtl::Reference collator; diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx index bbd76025d30c..52963b3be171 100644 --- a/i18npool/inc/inputsequencechecker.hxx +++ b/i18npool/inc/inputsequencechecker.hxx @@ -55,12 +55,12 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: - const sal_Char *serviceName; + const char *serviceName; struct lookupTableItem { - lookupTableItem(const sal_Char* rLanguage, const css::uno::Reference < css::i18n::XExtendedInputSequenceChecker >& rxISC) : + lookupTableItem(const char* rLanguage, const css::uno::Reference < css::i18n::XExtendedInputSequenceChecker >& rxISC) : aLanguage(rLanguage), xISC(rxISC) {} - const sal_Char* aLanguage; + const char* aLanguage; css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > xISC; }; std::vector> lookupTable; @@ -69,8 +69,8 @@ private: css::uno::Reference < css::uno::XComponentContext > m_xContext; /// @throws css::uno::RuntimeException - css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& getInputSequenceChecker(sal_Char const * rLanguage); - static sal_Char* getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar); + css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& getInputSequenceChecker(char const * rLanguage); + static char* getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar); }; } diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index b707ed3596b1..d8612a362bf0 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -131,7 +131,7 @@ private: OUString ref_name; /// @throws css::uno::RuntimeException - oslGenericFunction getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction ); + oslGenericFunction getFunctionSymbol( const css::lang::Locale& rLocale, const char* pFunction ); sal_Unicode ** getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount); sal_Unicode ** getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm); /// @throws css::uno::RuntimeException diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx index 931817b9075a..df948148c315 100644 --- a/i18npool/inc/textToPronounce_zh.hxx +++ b/i18npool/inc/textToPronounce_zh.hxx @@ -35,7 +35,7 @@ protected: public: #ifndef DISABLE_DYNLOADING - TextToPronounce_zh(const sal_Char* func_name); + TextToPronounce_zh(const char* func_name); #else TextToPronounce_zh(sal_uInt16 ** (*function)()); #endif diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index b3096ecf86f2..76ec8abf06e7 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.hxx @@ -66,11 +66,11 @@ public: css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: - const sal_Char* implementationName; + const char* implementationName; protected: #ifndef DISABLE_DYNLOADING oslModule hModule; - oslGenericFunction getFunctionBySymbol(const sal_Char* func); + oslGenericFunction getFunctionBySymbol(const char* func); #endif }; diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index 5cb7dd24b91e..97f716c082a5 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.hxx @@ -95,8 +95,8 @@ protected: foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) = 0; css::lang::Locale aLocale; - const sal_Char* transliterationName; - const sal_Char* implementationName; + const char* transliterationName; + const char* implementationName; }; } diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx index 38d5ac72e195..dbb07f75652b 100644 --- a/i18npool/inc/xdictionary.hxx +++ b/i18npool/inc/xdictionary.hxx @@ -60,13 +60,13 @@ class xdictionary { private: xdictionarydata data; - void initDictionaryData(const sal_Char *lang); + void initDictionaryData(const char *lang); css::i18n::Boundary boundary; bool japaneseWordBreak; public: - xdictionary(const sal_Char *lang); + xdictionary(const char *lang); ~xdictionary(); css::i18n::Boundary nextWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType); css::i18n::Boundary previousWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType); -- cgit