diff options
author | Eike Rathke <erack@redhat.com> | 2013-09-20 23:22:39 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2013-09-21 15:24:42 +0200 |
commit | 42dc3847ed7c3c3bcf43ffdb14eafeae17f79b7a (patch) | |
tree | 5420f594bb64ddf3ec20aa0014b50cef26e61140 | |
parent | 3e70b51d214d69dcd92946ee1bfa6102626ddc51 (diff) |
let reset() return a reference
Change-Id: I3700566e7ec2250909211a6d81c6f2a7854b463c
-rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 12 | ||||
-rw-r--r-- | include/i18nlangtag/languagetag.hxx | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 99611f17a8d1..054c7c3c154d 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -844,7 +844,7 @@ void LanguageTag::resetVars() } -void LanguageTag::reset( const OUString & rBcp47LanguageTag, bool bCanonicalize ) +LanguageTag & LanguageTag::reset( const OUString & rBcp47LanguageTag, bool bCanonicalize ) { resetVars(); maBcp47 = rBcp47LanguageTag; @@ -858,31 +858,35 @@ void LanguageTag::reset( const OUString & rBcp47LanguageTag, bool bCanonicalize // unconditional sync. syncFromImpl(); } + return *this; } -void LanguageTag::reset( const com::sun::star::lang::Locale & rLocale ) +LanguageTag & LanguageTag::reset( const com::sun::star::lang::Locale & rLocale ) { resetVars(); maLocale = rLocale; mbSystemLocale = rLocale.Language.isEmpty(); mbInitializedLocale = !mbSystemLocale; + return *this; } -void LanguageTag::reset( LanguageType nLanguage ) +LanguageTag & LanguageTag::reset( LanguageType nLanguage ) { resetVars(); mnLangID = nLanguage; mbSystemLocale = nLanguage == LANGUAGE_SYSTEM; mbInitializedLangID = !mbSystemLocale; + return *this; } -void LanguageTag::reset( const rtl_Locale & rLocale ) +LanguageTag & LanguageTag::reset( const rtl_Locale & rLocale ) { reset( lang::Locale( rLocale.Language, rLocale.Country, rLocale.Variant)); convertFromRtlLocale(); + return *this; } diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx index f8f9ae87bcbd..b8a63479951f 100644 --- a/include/i18nlangtag/languagetag.hxx +++ b/include/i18nlangtag/languagetag.hxx @@ -250,16 +250,16 @@ public: /** Reset with existing BCP 47 language tag string. See ctor. */ - void reset( const OUString & rBcp47LanguageTag, bool bCanonicalize = false ); + LanguageTag & reset( const OUString & rBcp47LanguageTag, bool bCanonicalize = false ); /** Reset with Locale. */ - void reset( const com::sun::star::lang::Locale & rLocale ); + LanguageTag & reset( const com::sun::star::lang::Locale & rLocale ); /** Reset with LanguageType MS-LangID. */ - void reset( LanguageType nLanguage ); + LanguageTag & reset( LanguageType nLanguage ); /** Reset with rtl_Locale. */ - void reset( const rtl_Locale & rLocale ); + LanguageTag & reset( const rtl_Locale & rLocale ); /** Fall back to a known locale. |