diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-05-12 22:24:39 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2018-05-13 13:27:25 +0200 |
| commit | 8010f473c77b9f384a7067f487bc24469f8c0cd3 (patch) | |
| tree | fe65d29ea38ca2e6bb1fb1d9f35e302ca82fb4c2 | |
| parent | 439f17c5cf43b38092b1b834bb006420220262e1 (diff) | |
Drop newly unused ScGlobal::GetRscString
Change-Id: I744b069542007d7ed965ef229a263c09a27181ce
Reviewed-on: https://gerrit.libreoffice.org/54187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | sc/inc/global.hxx | 1 | ||||
| -rw-r--r-- | sc/source/core/data/global.cxx | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index fdb1e5e37467..912164234597 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -566,7 +566,6 @@ public: SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection(); SC_DLLPUBLIC static ScUserList* GetUserList(); static void SetUserList( const ScUserList* pNewList ); - SC_DLLPUBLIC static const OUString& GetRscString(const char* pResId); /// Open the specified URL. static void OpenURL(const OUString& rURL, const OUString& rTarget); SC_DLLPUBLIC static OUString GetAbsDocName( const OUString& rFileName, diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 432b4ae2d468..9e4ce14e3ddf 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -86,7 +86,6 @@ ScAutoFormat* ScGlobal::pAutoFormat = nullptr; LegacyFuncCollection* ScGlobal::pLegacyFuncCollection = nullptr; ScUnoAddInCollection* ScGlobal::pAddInCollection = nullptr; ScUserList* ScGlobal::pUserList = nullptr; -std::map<const char*, OUString>* ScGlobal::pRscString = nullptr; LanguageType ScGlobal::eLnge = LANGUAGE_SYSTEM; css::lang::Locale* ScGlobal::pLocale = nullptr; SvtSysLocale* ScGlobal::pSysLocale = nullptr; @@ -310,13 +309,6 @@ void ScGlobal::SetUserList( const ScUserList* pNewList ) } } -const OUString& ScGlobal::GetRscString(const char* pResId) -{ - if (pRscString->find(pResId) == pRscString->end()) - (*pRscString)[pResId] = ScResId(pResId); - return (*pRscString)[pResId]; -} - OUString ScGlobal::GetErrorString(FormulaError nErr) { const char* pErrNumber; @@ -462,8 +454,6 @@ void ScGlobal::Init() pCharClass = pSysLocale->GetCharClassPtr(); pLocaleData = pSysLocale->GetLocaleDataPtr(); - pRscString = new std::map<const char*, OUString>; - pEmptyBrushItem = new SvxBrushItem( COL_TRANSPARENT, ATTR_BACKGROUND ); pButtonBrushItem = new SvxBrushItem( Color(), ATTR_BACKGROUND ); pEmbeddedBrushItem = new SvxBrushItem( COL_LIGHTCYAN, ATTR_BACKGROUND ); @@ -551,7 +541,6 @@ void ScGlobal::Clear() DELETEZ(pLegacyFuncCollection); DELETEZ(pAddInCollection); DELETEZ(pUserList); - DELETEZ(pRscString); DELETEZ(pStarCalcFunctionList); // Destroy before ResMgr! DELETEZ(pStarCalcFunctionMgr); ScParameterClassification::Exit(); |