diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/i18nhelp.cxx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index ca4ddbbfcca8..acbb9311d03b 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -48,11 +48,8 @@ vcl::I18nHelper::~I18nHelper() void vcl::I18nHelper::ImplDestroyWrappers() { - delete mpLocaleDataWrapper; - mpLocaleDataWrapper = nullptr; - - delete mpTransliterationWrapper; - mpTransliterationWrapper= nullptr; + mpLocaleDataWrapper.reset(); + mpTransliterationWrapper.reset(); } utl::TransliterationWrapper& vcl::I18nHelper::ImplGetTransliterationWrapper() const @@ -63,7 +60,7 @@ utl::TransliterationWrapper& vcl::I18nHelper::ImplGetTransliterationWrapper() co if ( mbTransliterateIgnoreCase ) nModules |= TransliterationFlags::IGNORE_CASE; - const_cast<vcl::I18nHelper*>(this)->mpTransliterationWrapper = new utl::TransliterationWrapper( m_xContext, nModules ); + const_cast<vcl::I18nHelper*>(this)->mpTransliterationWrapper.reset(new utl::TransliterationWrapper( m_xContext, nModules )); const_cast<vcl::I18nHelper*>(this)->mpTransliterationWrapper->loadModuleIfNeeded( maLanguageTag.getLanguageType() ); } return *mpTransliterationWrapper; @@ -73,7 +70,7 @@ LocaleDataWrapper& vcl::I18nHelper::ImplGetLocaleDataWrapper() const { if ( !mpLocaleDataWrapper ) { - const_cast<vcl::I18nHelper*>(this)->mpLocaleDataWrapper = new LocaleDataWrapper( m_xContext, maLanguageTag ); + const_cast<vcl::I18nHelper*>(this)->mpLocaleDataWrapper.reset(new LocaleDataWrapper( m_xContext, maLanguageTag )); } return *mpLocaleDataWrapper; } @@ -118,8 +115,7 @@ sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& // Change mbTransliterateIgnoreCase and destroy the wrapper, next call to // ImplGetTransliterationWrapper() will create a wrapper with the correct bIgnoreCase const_cast<vcl::I18nHelper*>(this)->mbTransliterateIgnoreCase = false; - delete const_cast<vcl::I18nHelper*>(this)->mpTransliterationWrapper; - const_cast<vcl::I18nHelper*>(this)->mpTransliterationWrapper = nullptr; + const_cast<vcl::I18nHelper*>(this)->mpTransliterationWrapper.reset(); } OUString aStr1( filterFormattingChars(rStr1) ); @@ -136,8 +132,7 @@ bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rStr2 // Change mbTransliterateIgnoreCase and destroy the wrapper, next call to // ImplGetTransliterationWrapper() will create a wrapper with the correct bIgnoreCase const_cast<vcl::I18nHelper*>(this)->mbTransliterateIgnoreCase = true; - delete const_cast<vcl::I18nHelper*>(this)->mpTransliterationWrapper; - const_cast<vcl::I18nHelper*>(this)->mpTransliterationWrapper = nullptr; + const_cast<vcl::I18nHelper*>(this)->mpTransliterationWrapper.reset(); } OUString aStr1( filterFormattingChars(rStr1) ); |