diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 23:54:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-17 14:03:25 +0100 |
| commit | 0e9c60d5964e27d0ff5b48edcb23b340e9a0233b (patch) | |
| tree | ea47e8ec080c2b84dbdae92f17099b2fff51c565 /comphelper | |
| parent | 1d0f8a1bfb295ee8871267c6af8d5a2836e97ae9 (diff) | |
reduce static_initialization_and_destruction chain
Change-Id: Ib2642e19d9148acca27227b0d91de4e8855178aa
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/locale.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx index 6ed05bcc113d..aef1a3dc36fe 100644 --- a/comphelper/source/misc/locale.cxx +++ b/comphelper/source/misc/locale.cxx @@ -45,28 +45,19 @@ const sal_Unicode Locale::SEPERATOR_CV_LINUX = (sal_Unicode)'.'; //----------------------------------------------- const Locale Locale::X_DEFAULT() { - static Locale aLocale( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"))); - return aLocale; + return Locale(::rtl::OUString("x"), ::rtl::OUString("default")); } //----------------------------------------------- const Locale Locale::EN_US() { - static Locale aLocale( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"))); - return aLocale; + return Locale(::rtl::OUString("en"), ::rtl::OUString("US")); } //----------------------------------------------- const Locale Locale::X_NOTRANSLATE() { - static Locale aLocale( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notranslate"))); - return aLocale; + return Locale(::rtl::OUString("x"), ::rtl::OUString("notranslate")); } //----------------------------------------------- |