diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 48ddb8bf86f0..9ae29efb5f06 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -186,12 +186,10 @@ public: aUserMakeObjHdl; OLEObjCache aOLEObjCache; - - const SvtSysLocale* GetSysLocale() { return &maSysLocale; } // follows always locale settings - const LocaleDataWrapper* GetLocaleData(); // follows always SysLocale -public: SdrGlobalData(); + const SvtSysLocale& GetSysLocale() { return maSysLocale; } // follows always locale settings + const LocaleDataWrapper& GetLocaleData(); // follows always SysLocale OLEObjCache& GetOLEObjCache() { return aOLEObjCache; } }; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 8ba5df1b948c..7ca62d9daa1b 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1418,12 +1418,12 @@ private: // Collect some frequently used data. if (mpOptions->IsDate()) { - aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getDate( Date( Date::SYSTEM ) ); + aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData().getDate( Date( Date::SYSTEM ) ); aInfo.msTimeDate += " "; } if (mpOptions->IsTime()) - aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( ::tools::Time( ::tools::Time::SYSTEM ), false ); + aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData().getTime( ::tools::Time( ::tools::Time::SYSTEM ), false ); // Draw and Notes should usually use specified paper size when printing if (!mpOptions->IsPrinterPreferred(mrBase.GetDocShell()->GetDocumentType())) diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index a5a83b475c59..41639002a143 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -68,9 +68,9 @@ SdrGlobalData::SdrGlobalData() } } -const LocaleDataWrapper* SdrGlobalData::GetLocaleData() +const LocaleDataWrapper& SdrGlobalData::GetLocaleData() { - return &GetSysLocale()->GetLocaleData(); + return GetSysLocale().GetLocaleData(); } namespace {