diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-08 15:58:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-11 12:13:46 +0100 |
| commit | 3af500580b1c82eabd60335c9ebc458a3f68850c (patch) | |
| tree | e0ad105be694cfb46221d16e9ce987879794fa04 /i18npool/source/breakiterator | |
| parent | 0f9a596aa853b4f2beeff25c131246a7b31492a4 (diff) | |
loplugin:salcall fix functions
since cdecl is the default calling convention on Windows for
such functions, the annotation is redundant.
Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d
Reviewed-on: https://gerrit.libreoffice.org/46164
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool/source/breakiterator')
4 files changed, 7 insertions, 7 deletions
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 1ac3fd64af53..0f5cb29dfa84 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -122,7 +122,7 @@ Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 n return result; } -static inline bool SAL_CALL isCJK( const Locale& rLocale ) { +static inline bool isCJK( const Locale& rLocale ) { return rLocale.Language == "zh" || rLocale.Language == "ja" || rLocale.Language == "ko"; } @@ -252,7 +252,7 @@ sal_Int16 SAL_CALL BreakIteratorImpl::getScriptType( const OUString& Text, sal_I /** Increments/decrements position first, then obtains character. @return current position, may be -1 or text length if string was consumed. */ -static sal_Int32 SAL_CALL iterateCodePoints(const OUString& Text, sal_Int32 &nStartPos, sal_Int32 inc, sal_uInt32& ch) { +static sal_Int32 iterateCodePoints(const OUString& Text, sal_Int32 &nStartPos, sal_Int32 inc, sal_uInt32& ch) { sal_Int32 nLen = Text.getLength(); if (nStartPos + inc < 0 || nStartPos + inc >= nLen) { ch = 0; @@ -634,7 +634,7 @@ BreakIteratorImpl::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_BreakIterator_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx index 6e304cabd728..36ced38daba8 100644 --- a/i18npool/source/breakiterator/breakiterator_th.cxx +++ b/i18npool/source/breakiterator/breakiterator_th.cxx @@ -79,7 +79,7 @@ static const sal_Int16 thaiCompRel[MAX_CT][MAX_CT] = { const sal_uInt32 is_ST_COM = (1<<CT_CTRL)|(1<<CT_NON)|(1<<CT_CONS)|(1<<CT_TONE); -static sal_uInt16 SAL_CALL getCombState(const sal_Unicode *text, sal_Int32 pos) +static sal_uInt16 getCombState(const sal_Unicode *text, sal_Int32 pos) { sal_uInt16 ch1 = getCharType(text[pos]); sal_uInt16 ch2 = getCharType(text[pos+1]); @@ -95,7 +95,7 @@ static sal_uInt16 SAL_CALL getCombState(const sal_Unicode *text, sal_Int32 pos) } -static sal_Int32 SAL_CALL getACell(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len) +static sal_Int32 getACell(const sal_Unicode *text, sal_Int32 pos, sal_Int32 len) { sal_uInt32 curr = 1; for (; pos + 1 < len && getCombState(text, pos) == ST_COM; curr++, pos++) {} diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 3ed048b02253..a81a80e153ba 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -609,7 +609,7 @@ BreakIterator_Unicode::getSupportedServiceNames() } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * com_sun_star_i18n_BreakIterator_Unicode_get_implementation( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx index 5653021fc13a..6ee5256328df 100644 --- a/i18npool/source/breakiterator/xdictionary.cxx +++ b/i18npool/source/breakiterator/xdictionary.cxx @@ -37,7 +37,7 @@ namespace i18npool { #elif !defined DISABLE_DYNLOADING -extern "C" { static void SAL_CALL thisModule() {} } +extern "C" { static void thisModule() {} } #else |