diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-10 08:43:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-11 06:22:28 +0000 |
| commit | 0f8ec3036f44b02aa03795ede3052a790134a90d (patch) | |
| tree | a7cbba9eb70fcee3f793c07f8d8db6c092d0e594 /i18npool | |
| parent | a6f876d45bd4e41a7143594a6cb11b6893a0f620 (diff) | |
[API CHANGE] add operator==/!= to UNO structs
this is useful now that we are storing UNO structs in std::vector
Change-Id: Ic558bcd669bd2b3cdf9eb8393269eb906ac52369
Reviewed-on: https://gerrit.libreoffice.org/22257
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/inc/localedata.hxx | 6 | ||||
| -rw-r--r-- | i18npool/source/breakiterator/breakiteratorImpl.cxx | 4 | ||||
| -rw-r--r-- | i18npool/source/textconversion/textconversionImpl.cxx | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index d61b92c94aa1..0a28ee0301f6 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -58,10 +58,6 @@ struct LocaleDataLookupTableItem; namespace com { namespace sun { namespace star { namespace i18n { -inline bool operator ==(const css::lang::Locale& l1, const css::lang::Locale& l2) { - return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant; -}; - class LocaleDataImpl : public cppu::WeakImplHelper < css::i18n::XLocaleData4, @@ -122,8 +118,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; private: - friend bool operator ==(const css::lang::Locale& l1, const css::lang::Locale& l2); - ::std::unique_ptr< LocaleDataLookupTableItem > cachedItem; css::i18n::Calendar2 ref_cal; OUString ref_name; diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 6d6e1c67144f..ac7a861296d4 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -523,10 +523,6 @@ sal_Int16 BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar) return nRet; } -static inline bool operator == (const Locale& l1, const Locale& l2) { - return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant; -} - bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) throw( RuntimeException ) { // to share service between same Language but different Country code, like zh_CN and zh_TW diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx index 96d77604f413..2386d44ccb63 100644 --- a/i18npool/source/textconversion/textconversionImpl.cxx +++ b/i18npool/source/textconversion/textconversionImpl.cxx @@ -76,10 +76,6 @@ TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTex return xTC->interactiveConversion(rLocale, nTextConversionType, nTextConversionOptions); } -static inline bool operator != (const Locale& l1, const Locale& l2) { - return l1.Language != l2.Language || l1.Country != l2.Country || l1.Variant != l2.Variant; -} - void SAL_CALL TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw( NoSupportException ) { |