diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-02-26 20:17:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-26 19:50:19 +0000 |
| commit | bee4402c7ed97f3373f93eb7939940557bd59912 (patch) | |
| tree | a136d87fffdbae92b0259017aefa760e0b5e0377 /starmath | |
| parent | 639d72e13e57cfffc857af1b9b7034c97f1f355d (diff) | |
no need to hold SvtSysLocale by std::unique_ptr
allocate it inline, it is only one pointer in size
Change-Id: I736f3322784897054993fbddd423f36357f817c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147741
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/smmod.hxx | 3 | ||||
| -rw-r--r-- | starmath/source/smmod.cxx | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index f75643d0ffe8..9ab99c2420d7 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -23,6 +23,7 @@ #include <sfx2/app.hxx> #include <vcl/vclptr.hxx> #include <unotools/options.hxx> +#include <optional> namespace svtools { class ColorConfig; } @@ -65,7 +66,7 @@ class SmModule final : public SfxModule, public utl::ConfigurationListener std::unique_ptr<svtools::ColorConfig> mpColorConfig; std::unique_ptr<SmMathConfig> mpConfig; std::unique_ptr<SmLocalizedSymbolData> mpLocSymbolData; - std::unique_ptr<SvtSysLocale> mpSysLocale; + std::optional<SvtSysLocale> moSysLocale; VclPtr<VirtualDevice> mpVirtualDev; public: diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 783965844b38..934e6090eaf1 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -173,9 +173,9 @@ SmSymbolManager & SmModule::GetSymbolManager() const SvtSysLocale& SmModule::GetSysLocale() { - if( !mpSysLocale ) - mpSysLocale.reset(new SvtSysLocale); - return *mpSysLocale; + if( !moSysLocale ) + moSysLocale.emplace(); + return *moSysLocale; } VirtualDevice &SmModule::GetDefaultVirtualDev() |