diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-16 10:36:48 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-16 12:05:00 +0200 |
commit | c7551e8a46e2f9f8142aa7921a0494221ae096e8 (patch) | |
tree | 1ac1a31fa7993a1e490f1e0d89146cc3cd9524f5 /i18npool/inc | |
parent | 92e8706b6de54b0e2e7d5915f5f9ff299727930d (diff) |
speedup CharacterClassificationImpl::toUpper
remove empty sequence creation in CharacterClassificationImpl::toUpper,
rather pass a pointer, so it can be nullptr.
Which results in a fair degree of cascading change.
Change-Id: Ie56d49dc71480195c1807764b0d5124f0019f30b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122183
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool/inc')
-rw-r--r-- | i18npool/inc/textToPronounce_zh.hxx | 2 | ||||
-rw-r--r-- | i18npool/inc/transliteration_Ignore.hxx | 10 | ||||
-rw-r--r-- | i18npool/inc/transliteration_Numeric.hxx | 6 | ||||
-rw-r--r-- | i18npool/inc/transliteration_OneToOne.hxx | 12 | ||||
-rw-r--r-- | i18npool/inc/transliteration_body.hxx | 8 | ||||
-rw-r--r-- | i18npool/inc/transliteration_commonclass.hxx | 8 |
6 files changed, 23 insertions, 23 deletions
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx index ff01d6624ca3..2ac854abddbd 100644 --- a/i18npool/inc/textToPronounce_zh.hxx +++ b/i18npool/inc/textToPronounce_zh.hxx @@ -42,7 +42,7 @@ public: virtual ~TextToPronounce_zh() override; OUString - foldingImpl(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 > & offset, bool useOffset) override; + foldingImpl(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset) override; sal_Int16 SAL_CALL getType() override; diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index 854dbfeb5cac..eaf9d602179a 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -33,7 +33,7 @@ class transliteration_Ignore : public transliteration_commonclass { public: virtual OUString - foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) override; // This method is shared. sal_Bool SAL_CALL @@ -49,7 +49,7 @@ public: sal_Int16 SAL_CALL getType( ) override; OUString - transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) override; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) override; @@ -98,7 +98,7 @@ public: ignoreDiacritics_CTL(); OUString - foldingImpl(const OUString& rInStr, sal_Int32 nStartPos, sal_Int32 nCount, css::uno::Sequence<sal_Int32>& rOffset, bool useOffset) override; + foldingImpl(const OUString& rInStr, sal_Int32 nStartPos, sal_Int32 nCount, css::uno::Sequence<sal_Int32>* pOffset) override; sal_Unicode SAL_CALL transliterateChar2Char(sal_Unicode nInChar) override; @@ -117,7 +117,7 @@ public:\ implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\ };\ OUString foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \ - css::uno::Sequence< sal_Int32 >& offset, bool useOffset) override; \ + css::uno::Sequence< sal_Int32 >* pOffset) override; \ }; TRANSLITERATION_IGNORE(KiKuFollowedBySa_ja_JP) @@ -138,7 +138,7 @@ public:\ implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\ };\ OUString foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \ - css::uno::Sequence< sal_Int32 >& offset, bool useOffset) override; \ + css::uno::Sequence< sal_Int32 >* pOffset) override; \ using transliteration_Ignore::transliterateRange;\ css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, \ const OUString& str2 ) override; \ diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx index 8ebf2a394a4a..1e50e4a5d69c 100644 --- a/i18npool/inc/transliteration_Numeric.hxx +++ b/i18npool/inc/transliteration_Numeric.hxx @@ -26,7 +26,7 @@ namespace i18npool { class transliteration_Numeric : public transliteration_commonclass { public: virtual OUString - transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) override; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) override; @@ -35,7 +35,7 @@ public: virtual sal_Int16 SAL_CALL getType( ) override; virtual OUString - foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) override; virtual sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override; @@ -51,7 +51,7 @@ private: /// @throws css::uno::RuntimeException OUString transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - css::uno::Sequence< sal_Int32 >& offset, bool useOffset ); + css::uno::Sequence< sal_Int32 >* pOffset ); }; } diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx index 9c2f79f8072d..957abcf84de2 100644 --- a/i18npool/inc/transliteration_OneToOne.hxx +++ b/i18npool/inc/transliteration_OneToOne.hxx @@ -31,7 +31,7 @@ class transliteration_OneToOne : public transliteration_commonclass { public: OUString - transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) override; sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) override; @@ -40,7 +40,7 @@ public: sal_Int16 SAL_CALL getType() override; OUString - foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) override; sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, @@ -60,7 +60,7 @@ class name final : public transliteration_OneToOne \ public: \ name (); \ OUString \ - transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) \ + transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) \ override; \ sal_Unicode SAL_CALL \ transliterateChar2Char( sal_Unicode inChar) \ @@ -76,21 +76,21 @@ class halfwidthToFullwidth final : public transliteration_OneToOne public: halfwidthToFullwidth(); OUString - transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) override; }; class HALFWIDTHKATAKANA_FULLWIDTHKATAKANA final : public transliteration_OneToOne { public: HALFWIDTHKATAKANA_FULLWIDTHKATAKANA(); OUString - transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) override; }; class HALFWIDTH_FULLWIDTH_LIKE_JIS final : public transliteration_OneToOne { public: HALFWIDTH_FULLWIDTH_LIKE_JIS(); OUString - transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) override; }; #undef TRANSLITERATION_ONETOONE diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx index aea4cd79531e..d602cbfd6ffb 100644 --- a/i18npool/inc/transliteration_body.hxx +++ b/i18npool/inc/transliteration_body.hxx @@ -33,7 +33,7 @@ public: sal_Int16 SAL_CALL getType() override; OUString transliterateImpl(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - css::uno::Sequence< sal_Int32 >& offset, bool useOffset) override; + css::uno::Sequence< sal_Int32 >* pOffset) override; OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) override; @@ -42,7 +42,7 @@ public: transliterateChar2Char( sal_Unicode inChar) override; OUString foldingImpl(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - css::uno::Sequence< sal_Int32 >& offset, bool useOffset) override; + css::uno::Sequence< sal_Int32 >* pOffset) override; sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, @@ -86,7 +86,7 @@ public: Transliteration_titlecase(); virtual OUString transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + css::uno::Sequence< sal_Int32 >* pOffset ) override; }; class Transliteration_sentencecase final : public Transliteration_body @@ -95,7 +95,7 @@ public: Transliteration_sentencecase(); virtual OUString transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) override; + css::uno::Sequence< sal_Int32 >* pOffset ) override; }; } diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index 97f716c082a5..3cead59a913c 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.hxx @@ -57,11 +57,11 @@ public: virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override final - { return transliterateImpl( inStr, startPos, nCount, offset, true ); } + { return transliterateImpl( inStr, startPos, nCount, &offset ); } virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) override final - { return foldingImpl( inStr, startPos, nCount, offset, true ); } + { return foldingImpl( inStr, startPos, nCount, &offset ); } // Methods in XExtendedTransliteration virtual OUString SAL_CALL @@ -89,10 +89,10 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: virtual OUString - transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) = 0; + transliterateImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) = 0; virtual OUString - foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset, bool useOffset ) = 0; + foldingImpl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >* pOffset ) = 0; css::lang::Locale aLocale; const char* transliterationName; |