Kaydet (Commit) ac35a51e authored tarafından Noel Grandin's avatar Noel Grandin

no need to allocate aEmptyOUString separately

Change-Id: I938f5c022ef07e9ac4cc6eaf60cc7a88deabbda7
Reviewed-on: https://gerrit.libreoffice.org/69747
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 91875498
...@@ -509,7 +509,7 @@ class ScGlobal ...@@ -509,7 +509,7 @@ class ScGlobal
static ScUserList* pUserList; static ScUserList* pUserList;
static std::map<const char*, OUString>* pRscString; static std::map<const char*, OUString>* pRscString;
static OUString* pStrScDoc; static OUString* pStrScDoc;
static OUString* pEmptyOUString; static SC_DLLPUBLIC const OUString aEmptyOUString;
static OUString* pStrClipDocName; static OUString* pStrClipDocName;
static SvxBrushItem* pEmptyBrushItem; static SvxBrushItem* pEmptyBrushItem;
static SvxBrushItem* pButtonBrushItem; static SvxBrushItem* pButtonBrushItem;
...@@ -592,7 +592,7 @@ public: ...@@ -592,7 +592,7 @@ public:
static void InitTextHeight(const SfxItemPool* pPool); static void InitTextHeight(const SfxItemPool* pPool);
static SvxBrushItem* GetEmptyBrushItem() { return pEmptyBrushItem; } static SvxBrushItem* GetEmptyBrushItem() { return pEmptyBrushItem; }
static SvxBrushItem* GetButtonBrushItem(); static SvxBrushItem* GetButtonBrushItem();
SC_DLLPUBLIC static const OUString& GetEmptyOUString(); static const OUString& GetEmptyOUString() { return aEmptyOUString; }
static bool HasStarCalcFunctionList(); static bool HasStarCalcFunctionList();
static ScFunctionList* GetStarCalcFunctionList(); static ScFunctionList* GetStarCalcFunctionList();
......
...@@ -83,7 +83,7 @@ std::atomic<CollatorWrapper*> ScGlobal::pCaseCollator(nullptr); ...@@ -83,7 +83,7 @@ std::atomic<CollatorWrapper*> ScGlobal::pCaseCollator(nullptr);
std::atomic<::utl::TransliterationWrapper*> ScGlobal::pTransliteration(nullptr); std::atomic<::utl::TransliterationWrapper*> ScGlobal::pTransliteration(nullptr);
std::atomic<::utl::TransliterationWrapper*> ScGlobal::pCaseTransliteration(nullptr); std::atomic<::utl::TransliterationWrapper*> ScGlobal::pCaseTransliteration(nullptr);
css::uno::Reference< css::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix; css::uno::Reference< css::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix;
OUString* ScGlobal::pEmptyOUString = nullptr; const OUString ScGlobal::aEmptyOUString;
OUString* ScGlobal::pStrClipDocName = nullptr; OUString* ScGlobal::pStrClipDocName = nullptr;
SvxBrushItem* ScGlobal::pEmptyBrushItem = nullptr; SvxBrushItem* ScGlobal::pEmptyBrushItem = nullptr;
...@@ -431,15 +431,8 @@ SvxBrushItem* ScGlobal::GetButtonBrushItem() ...@@ -431,15 +431,8 @@ SvxBrushItem* ScGlobal::GetButtonBrushItem()
return pButtonBrushItem; return pButtonBrushItem;
} }
const OUString& ScGlobal::GetEmptyOUString()
{
return *pEmptyOUString;
}
void ScGlobal::Init() void ScGlobal::Init()
{ {
pEmptyOUString = new OUString;
// The default language for number formats (ScGlobal::eLnge) must // The default language for number formats (ScGlobal::eLnge) must
// always be LANGUAGE_SYSTEM // always be LANGUAGE_SYSTEM
// FIXME: So remove this variable? // FIXME: So remove this variable?
...@@ -567,7 +560,6 @@ void ScGlobal::Clear() ...@@ -567,7 +560,6 @@ void ScGlobal::Clear()
delete pUnitConverter.load(); pUnitConverter = nullptr; delete pUnitConverter.load(); pUnitConverter = nullptr;
DELETEZ(pFieldEditEngine); DELETEZ(pFieldEditEngine);
DELETEZ(pEmptyOUString);
xDrawClipDocShellRef.clear(); xDrawClipDocShellRef.clear();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment