make string translation loading more uniform

change various ResId classes that use conversion operator to OUString to
functions that return a OUString

drop various defines

drop unnecessary toString calls

Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92
Reviewed-on: https://gerrit.libreoffice.org/37817
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 12 insertions, 12 deletions

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 2fbabe9efa36..e2336902a3bd 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1566,7 +1566,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 {
                     mpTempAccEdit = new ScAccessibleEditObject(this, rViewData.GetEditView(meSplitPos),
                         mpViewShell->GetWindowByPos(meSplitPos), GetCurrentCellName(),
-                        OUString(ScResId(STR_ACC_EDITLINE_DESCR)), ScAccessibleEditObject::CellInEditMode);
+                        ScResId(STR_ACC_EDITLINE_DESCR), ScAccessibleEditObject::CellInEditMode);
                     uno::Reference<XAccessible> xAcc = mpTempAccEdit;
 
                     AddChild(xAcc, true);
@@ -2120,7 +2120,7 @@ OUString SAL_CALL
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
-    OUString sName = OUString(ScResId(STR_ACC_DOC_NAME));
+    OUString sName = ScResId(STR_ACC_DOC_NAME);
     sal_Int32 nNumber(sal_Int32(meSplitPos) + 1);
     sName += OUString::number(nNumber);
     return sName;
@@ -2238,7 +2238,7 @@ void ScAccessibleDocument::RemoveChild(const uno::Reference<XAccessible>& xAcc,
 
 OUString ScAccessibleDocument::GetCurrentCellName() const
 {
-    OUString sName(SC_RESSTR(STR_ACC_CELL_NAME));
+    OUString sName(ScResId(STR_ACC_CELL_NAME));
     if (mpViewShell)
     {
         // Document not needed, because only the cell address, but not the tablename is needed
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 21e84ddaaca7..4a76e4abb9f5 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1521,7 +1521,7 @@ OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription()
 
 OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName()
 {
-    OUString sName = OUString(ScResId(STR_ACC_PREVIEWDOC_NAME));
+    OUString sName = ScResId(STR_ACC_PREVIEWDOC_NAME);
     return sName;
 }
 
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 7bc640910bdf..80f33b6e9516 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -299,13 +299,13 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceName
 OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription()
 {
     OUString sDesc(mbHeader ? OUString(STR_ACC_HEADER_DESCR) : OUString(STR_ACC_FOOTER_DESCR));
-    return sDesc.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN));
+    return sDesc.replaceFirst("%1", ScResId(SCSTR_UNKNOWN));
 }
 
 OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName()
 {
-    OUString sName(SC_RESSTR(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME));
-    return sName.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN));
+    OUString sName(ScResId(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME));
+    return sName.replaceFirst("%1", ScResId(SCSTR_UNKNOWN));
 }
 
 tools::Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 5f05a33da2cb..da2c3bcc02c3 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -229,13 +229,13 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName()
     switch (meAdjust)
     {
     case SvxAdjust::Left :
-        sName = OUString(ScResId(STR_ACC_LEFTAREA_NAME));
+        sName = ScResId(STR_ACC_LEFTAREA_NAME);
         break;
     case SvxAdjust::Right:
-        sName = OUString(ScResId(STR_ACC_RIGHTAREA_NAME));
+        sName = ScResId(STR_ACC_RIGHTAREA_NAME);
         break;
     case SvxAdjust::Center:
-        sName = OUString(ScResId(STR_ACC_CENTERAREA_NAME));
+        sName = ScResId(STR_ACC_CENTERAREA_NAME);
         break;
     default:
         OSL_FAIL("wrong adjustment found");
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index e4b47a759da7..7354b92bf90e 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -586,7 +586,7 @@ OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription()
 
 OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName()
 {
-    OUString sName(SC_RESSTR(STR_ACC_TABLE_NAME));
+    OUString sName(ScResId(STR_ACC_TABLE_NAME));
 
     if (mpViewShell)
     {
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index e83a421e542c..b598dba0953a 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -349,7 +349,7 @@ OUString SAL_CALL
 
 OUString SAL_CALL ScAccessibleTableBase::createAccessibleName()
 {
-    OUString sName(SC_RESSTR(STR_ACC_TABLE_NAME));
+    OUString sName(ScResId(STR_ACC_TABLE_NAME));
     OUString sCoreName;
     if (mpDoc && mpDoc->GetName( maRange.aStart.Tab(), sCoreName ))
         sName = sName.replaceFirst("%1", sCoreName);