diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-17 15:15:54 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-17 21:25:38 +0200 |
commit | 661f8785e6727dca1ef23c51ae9ecf4d3da299d3 (patch) | |
tree | b8d0bd87bc1892ab479dfcf762ea4a19b2a10c09 /include/svl | |
parent | b4edda1842c301a06c5528860542153590027b42 (diff) |
no need to allocate CharClass separately in SvNumberFormatter
Change-Id: I79b815567c59702c2d3fe7944bb2f16bacf0e472
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122252
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svl')
-rw-r--r-- | include/svl/numformat.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx index 3256adf881b5..a851032ef47c 100644 --- a/include/svl/numformat.hxx +++ b/include/svl/numformat.hxx @@ -24,6 +24,8 @@ #include <i18nlangtag/lang.h> #include <tools/link.hxx> #include <svl/zforlist.hxx> +#include <unotools/charclass.hxx> +#include <optional> class SvNumberFormatterRegistry_Impl; class NfCurrencyTable; @@ -561,7 +563,7 @@ private: std::unique_ptr<SvNumberFormatTable> pFormatTable; // For the UI dialog std::unique_ptr<SvNumberFormatterIndexTable> pMergeTable; // List of indices for merging two formatters - std::unique_ptr<CharClass> pCharClass; // CharacterClassification + std::optional<CharClass> oCharClass; // CharacterClassification OnDemandLocaleDataWrapper xLocaleData; // LocaleData switched between SYSTEM, ENGLISH and other OnDemandTransliterationWrapper xTransliteration; // Transliteration loaded on demand OnDemandCalendarWrapper xCalendar; // Calendar loaded on demand |