7 files changed, 10 insertions, 7 deletions
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 4c6b9b51a19b..418de1e29fa1 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -814,7 +814,7 @@ void ScDocument::UpdateExternalRefLinks(vcl::Window* pWin)
     sc::WaitPointerSwitch aWaitSwitch(pWin);
 
     pExternalRefMgr->enableDocTimer(false);
-    ScProgress aProgress(GetDocumentShell(), ScResId(SCSTR_UPDATE_EXTDOCS).toString(), aRefLinks.size(), true);
+    ScProgress aProgress(GetDocumentShell(), ScResId(SCSTR_UPDATE_EXTDOCS), aRefLinks.size(), true);
     for (size_t i = 0, n = aRefLinks.size(); i < n; ++i)
     {
         aProgress.SetState(i+1);
@@ -835,7 +835,7 @@ void ScDocument::UpdateExternalRefLinks(vcl::Window* pWin)
         aFile = aUrl.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous);
 
         OUStringBuffer aBuf;
-        aBuf.append(OUString(ScResId(SCSTR_EXTDOC_NOT_LOADED)));
+        aBuf.append(ScResId(SCSTR_EXTDOC_NOT_LOADED));
         aBuf.append("\n\n");
         aBuf.append(aFile);
         ScopedVclPtrInstance< MessageDialog > aBox(pWin, aBuf.makeStringAndClear());
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 1a67cb577fc4..3ecc2ee04e75 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 
 #include <svl/zforlist.hxx>
+#include <osl/diagnose.h>
 #include <rtl/math.hxx>
 #include <algorithm>
 
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index b8c02b9d4963..d9fe4a1aaadd 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -977,13 +977,13 @@ void ScDPOutput::Output()
         FieldCell(nHdrCol, nHdrRow, nTab, pPageFields[nField], false);
         SCCOL nFldCol = nHdrCol + 1;
 
-        OUString aPageValue = ScResId(SCSTR_ALL).toString();
+        OUString aPageValue = ScResId(SCSTR_ALL);
         const uno::Sequence<sheet::MemberResult>& rRes = pPageFields[nField].maResult;
         sal_Int32 n = rRes.getLength();
         if (n == 1)
             aPageValue = rRes[0].Caption;
         else if (n > 1)
-            aPageValue = ScResId(SCSTR_MULTIPLE).toString();
+            aPageValue = ScResId(SCSTR_MULTIPLE);
 
         ScSetStringParam aParam;
         aParam.setTextInput();
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index a5c825a462dc..012308cc99bc 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -810,7 +810,7 @@ ScFunctionList::ScFunctionList()
     // OpCodes, which is utopian...
     for (sal_uInt16 i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; ++i)
     {
-        ScResId aRes(RID_SC_FUNC_DESCRIPTIONS_START + i);
+        ResId aRes(RID_SC_FUNC_DESCRIPTIONS_START + i, *SC_MOD()->GetResMgr());
         aRes.SetRT(RSC_STRINGARRAY);
         // Opcode Resource available?
         if (SC_MOD()->GetResMgr()->IsAvailable(aRes))
@@ -1179,7 +1179,7 @@ OUString ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
         return OUString();
     }
 
-    ResStringArray aStringArray(ScResId(RID_FUNCTION_CATEGORIES));
+    ResStringArray aStringArray(ResId(RID_FUNCTION_CATEGORIES, *SC_MOD()->GetResMgr()));
     return aStringArray.GetString(_nCategoryNumber);
 }
 
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 045581c3d4ba..6b7cd8b84452 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -773,7 +773,7 @@ bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
             if( RID_SVXSTR_TBLAFMT_BEGIN <= nId &&
                 nId < RID_SVXSTR_TBLAFMT_END )
             {
-                aName = SVX_RESSTR( nId );
+                aName = SvxResId( nId );
             }
             else
                 nStrResId = USHRT_MAX;
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 4337194a425a..b2cdf34646b4 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <osl/diagnose.h>
 
 #include "cfgids.hxx"
 #include "inputopt.hxx"
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index ea0dbf962be8..0d8ee77dd82d 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <memory>
+#include <osl/diagnose.h>
 #include "rangeutl.hxx"
 #include "document.hxx"
 #include "global.hxx"