diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-02-26 20:37:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-27 05:43:11 +0000 |
| commit | 09680fadbcd85da3405cefeed66712bc0ba2be9c (patch) | |
| tree | 56e32ecc03bf9f4e3a484af5150bc58abeae3fb6 /unotools | |
| parent | 44a3085f9aaf0dfc62b1a8f34d3b8889d69c4e62 (diff) | |
no need to hold CollatorWrapper by std::unique_ptr
allocate it inline, it is only one pointer in size
Change-Id: Idb6217e6c9c37da92427aa6c497223a84015c553
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147742
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/i18n/intlwrapper.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index a4c21ea940aa..19157dab4a67 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -42,17 +42,16 @@ void IntlWrapper::ImplNewLocaleData() const void IntlWrapper::ImplNewCollator( bool bCaseSensitive ) const { - CollatorWrapper* p = new CollatorWrapper( m_xContext ); if ( bCaseSensitive ) { - p->loadDefaultCollator( maLanguageTag.getLocale(), 0 ); - const_cast<IntlWrapper*>(this)->pCaseCollator.reset(p); + const_cast<IntlWrapper*>(this)->moCaseCollator.emplace(m_xContext); + const_cast<IntlWrapper*>(this)->moCaseCollator->loadDefaultCollator( maLanguageTag.getLocale(), 0 ); } else { - p->loadDefaultCollator( maLanguageTag.getLocale(), + const_cast<IntlWrapper*>(this)->moCollator.emplace(m_xContext); + const_cast<IntlWrapper*>(this)->moCollator->loadDefaultCollator( maLanguageTag.getLocale(), css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ); - const_cast<IntlWrapper*>(this)->pCollator.reset(p); } } |