From 7fd3c5e8e5897617f1e89fda26f8cdbd4092071d Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 16 Sep 2021 15:55:30 +0200
Subject: remove GetCharClassPtr from SvtSysLocale

we already have GetCharClass and we never return a nullptr

Change-Id: I3cb79bc60be614c0474ecfdaad17991f2ecb6368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122208
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 unotools/source/misc/syslocale.cxx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'unotools')

diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 0201d9f8be72..2882eb7fc436 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -53,7 +53,7 @@ public:
                                 SvtSysLocale_Impl();
     virtual                     ~SvtSysLocale_Impl() override;
 
-    CharClass*                  GetCharClass();
+    CharClass&                  GetCharClass();
     virtual void                ConfigurationChanged( utl::ConfigurationBroadcaster*, ConfigurationHints ) override;
 
 private:
@@ -75,11 +75,11 @@ SvtSysLocale_Impl::~SvtSysLocale_Impl()
     aSysLocaleOptions.RemoveListener( this );
 }
 
-CharClass* SvtSysLocale_Impl::GetCharClass()
+CharClass& SvtSysLocale_Impl::GetCharClass()
 {
     if ( !pCharClass )
         pCharClass.reset(new CharClass( aSysLocaleOptions.GetRealLanguageTag() ));
-    return pCharClass.get();
+    return *pCharClass;
 }
 
 void SvtSysLocale_Impl::ConfigurationChanged( utl::ConfigurationBroadcaster*, ConfigurationHints nHint )
@@ -93,7 +93,7 @@ void SvtSysLocale_Impl::ConfigurationChanged( utl::ConfigurationBroadcaster*, Co
     const LanguageTag& rLanguageTag = aSysLocaleOptions.GetRealLanguageTag();
     if ( nHint & ConfigurationHints::Locale )
     {
-        GetCharClass()->setLanguageTag( rLanguageTag );
+        GetCharClass().setLanguageTag( rLanguageTag );
     }
     pLocaleData.reset(new LocaleDataWrapper(rLanguageTag, getDateAcceptancePatternsConfig()));
 }
@@ -147,11 +147,6 @@ const LocaleDataWrapper& SvtSysLocale::GetLocaleData() const
 }
 
 const CharClass& SvtSysLocale::GetCharClass() const
-{
-    return *(pImpl->GetCharClass());
-}
-
-const CharClass* SvtSysLocale::GetCharClassPtr() const
 {
     return pImpl->GetCharClass();
 }
-- 
cgit