summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2021-10-25 15:39:46 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2021-10-26 00:08:20 +0200
commit3a76bba6bc2d638ce9e13179bcf03854b05b97e1 (patch)
tree5978e34a69764c57cb0448aec047f631397e2542 /include
parentc8dd76d1cb66cf5f4d02bf5d3265904ded9e471f (diff)
Fix toolbar button's currency list's number format for default locale
Always resulted in the currency's LCID being omitted in the number format for the default locale, which doesn't immediately harm but loses the context (what currency a $ sign is actually), and also lead to the "real" default currency format never matching the one being generated for the list so no entry was selected if that format was applied. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124152 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 97e63ff5375d9d80d6fe5d4bd68883e35bd56d91) Backported, deleted the deleted copy-ctor ... Change-Id: I7963e4d3701092d6e227705fc0e8282448f075b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124025 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'include')
-rw-r--r--include/svl/zforlist.hxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index c3d82d7b109a..31559e80b209 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -312,7 +312,6 @@ class UNLESS_MERGELIBS(SVL_DLLPUBLIC) NfCurrencyEntry
sal_uInt16 nDigits; /// count of decimal digits
sal_Unicode cZeroChar; /// which character is used for zeros as last decimal digits
- NfCurrencyEntry( const NfCurrencyEntry& ) = delete;
NfCurrencyEntry& operator=( const NfCurrencyEntry& ) = delete;
private:
@@ -328,6 +327,7 @@ public:
NfCurrencyEntry( const css::i18n::Currency & rCurr,
const LocaleDataWrapper& rLocaleData,
LanguageType eLang );
+ NfCurrencyEntry( const NfCurrencyEntry& ) = default;
/// Symbols and language identical
bool operator==( const NfCurrencyEntry& r ) const;
@@ -339,6 +339,9 @@ public:
sal_uInt16 GetNegativeFormat() const { return nNegativeFormat; }
sal_uInt16 GetDigits() const { return nDigits; }
+ /** Only to resolve system locale for currency list. */
+ void SetLanguage( LanguageType nLang ) { eLanguage = nLang; }
+
/** [$DM-407] (bBank==false) or [$DEM] (bBank==true)
is returned. If bBank==false and
bWithoutExtension==true only [$DM] */