diff options
| author | Eike Rathke <erack@redhat.com> | 2013-03-28 00:39:06 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-03-28 01:39:08 +0100 |
| commit | 3106c4d37f70114c41ceca1213f12eb1bc0f92d4 (patch) | |
| tree | 6990b266680959c2158cbd94b062024672cf36c1 /framework/source/inc/accelerators | |
| parent | 68fac46e71e954d559eeb8591383f304f3038ad6 (diff) | |
eliminated useless back and forth conversion
Why convert back and forth between LanguageTag (formerly
comphelper::Locale) if all you need and use is a BCP47 string.
Change-Id: I1ec12186284211bcd7d115ee092c195b926e7cd0
Diffstat (limited to 'framework/source/inc/accelerators')
| -rw-r--r-- | framework/source/inc/accelerators/acceleratorconfiguration.hxx | 13 | ||||
| -rw-r--r-- | framework/source/inc/accelerators/presethandler.hxx | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 38889fa93ffa..a918a4627700 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -48,7 +48,6 @@ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/weak.hxx> -#include <i18npool/languagetag.hxx> #include <salhelper/singletonref.hxx> //__________________________________________ @@ -210,10 +209,10 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase @descr We does not cache this value, because we are not listen for changes on the configuration layer ... - @return LanguageTag - The current office locale. + @return OUString + The current office locale as BCP47 string. */ - LanguageTag impl_ts_getLocale() const; + OUString impl_ts_getLocale() const; //______________________________________ // helper @@ -428,10 +427,10 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase @descr We does not cache this value, because we are not listen for changes on the configuration layer ... - @return LanguageTag - The current office locale. + @return OUString + The current office locale as BCP47 string. */ - LanguageTag impl_ts_getLocale() const; + OUString impl_ts_getLocale() const; //______________________________________ // helper diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index c1069f320aa8..d5325f9cf093 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -455,7 +455,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas As a negative result the special iterator lLocalizedValues.end() will be returned. */ ::std::vector< ::rtl::OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< ::rtl::OUString >& lLocalizedValues, - LanguageTag& rLanguageTag , + OUString& rLanguageTag , sal_Bool bAllowFallbacks ); //--------------------------------------- @@ -489,7 +489,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(::rtl::OUString& sPath , sal_Int32 eMode , sal_Bool bShare , - LanguageTag& rLanguageTag , + OUString& rLanguageTag , sal_Bool bAllowFallback); //--------------------------------------- |