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>

7 files changed, 14 insertions, 19 deletions

diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 188eb1409974..6c4a4814ae61 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -106,13 +106,13 @@ namespace
 {
     OUString lcl_makeColorName(const Color& rColor)
     {
-        OUString aStr = SVX_RESSTR(RID_SVXFLOAT3D_FIX_R) +
+        OUString aStr = SvxResId(RID_SVXFLOAT3D_FIX_R) +
                         OUString::number(rColor.GetRed()) +
                         " " +
-                        SVX_RESSTR(RID_SVXFLOAT3D_FIX_G) +
+                        SvxResId(RID_SVXFLOAT3D_FIX_G) +
                         OUString::number(rColor.GetGreen()) +
                         " " +
-                        SVX_RESSTR(RID_SVXFLOAT3D_FIX_B) +
+                        SvxResId(RID_SVXFLOAT3D_FIX_B) +
                         OUString::number(rColor.GetBlue());
         return aStr;
     }
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 489dbf02bbb9..6c98f4f77015 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -385,7 +385,7 @@ void ChartController::impl_PasteShapes( SdrModel* pModel )
         if ( pDestPage )
         {
             Reference< drawing::XShape > xSelShape;
-            m_pDrawViewWrapper->BegUndo( SVX_RESSTR( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
+            m_pDrawViewWrapper->BegUndo( SvxResId( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
             sal_uInt16 nCount = pModel->GetPageCount();
             for ( sal_uInt16 i = 0; i < nCount; ++i )
             {
@@ -470,7 +470,7 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons
                 SdrObject* pObj = DrawViewWrapper::getSdrObject( xTextShape );
                 if ( pObj )
                 {
-                    m_pDrawViewWrapper->BegUndo( SVX_RESSTR( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
+                    m_pDrawViewWrapper->BegUndo( SvxResId( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
                     m_pDrawViewWrapper->AddUndo( new SdrUndoInsertObj( *pObj ) );
                     m_pDrawViewWrapper->EndUndo();
 
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 22f3bb95ad29..d1e6488c052c 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -93,7 +93,7 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL )
     XLineEndListRef pLineEndList = rModel.GetLineEndList();
     if ( pLineEndList.is() )
     {
-        OUString aName( SVX_RESSTR( nResId ) );
+        OUString aName( SvxResId( nResId ) );
         long nCount = pLineEndList->Count();
         for ( long nIndex = 0; nIndex < nCount; ++nIndex )
         {
@@ -215,7 +215,7 @@ void DrawCommandDispatch::setLineEnds( SfxItemSet& rAttr )
                 }
             }
 
-            rAttr.Put( XLineEndItem( SVX_RESSTR( RID_SVXSTR_ARROW ), aArrow ) );
+            rAttr.Put( XLineEndItem( SvxResId( RID_SVXSTR_ARROW ), aArrow ) );
             rAttr.Put( XLineEndWidthItem( nWidth ) );
         }
     }
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index ed78d54188eb..25ff8605d9f7 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -69,9 +69,9 @@ void UndoCommandDispatch::fireStatusEvent(
         const bool bFireAll = rURL.isEmpty();
         uno::Any aUndoState, aRedoState;
         if( m_xUndoManager->isUndoPossible())
-            aUndoState <<= ( SVT_RESSTR( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle());
+            aUndoState <<= ( SvtResId( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle());
         if( m_xUndoManager->isRedoPossible())
-            aRedoState <<= ( SVT_RESSTR( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle());
+            aRedoState <<= ( SvtResId( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle());
 
         if( bFireAll || rURL == ".uno:Undo" )
             fireStatusEventForURL( ".uno:Undo", aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener );
diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx
index 802eea9c7277..0eefc83d5362 100644
--- a/chart2/source/inc/ResId.hxx
+++ b/chart2/source/inc/ResId.hxx
@@ -19,18 +19,13 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_RESID_HXX
 #define INCLUDED_CHART2_SOURCE_INC_RESID_HXX
 
-#include <tools/resid.hxx>
 #include <rtl/ustring.hxx>
 #include "charttoolsdllapi.hxx"
 
 namespace chart
 {
 
-class OOO_DLLPUBLIC_CHARTTOOLS SchResId : public ResId
-{
-public:
-    SchResId( sal_Int16 nId );
-};
+OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(sal_uInt16 nId);
 
 } //  namespace chart
 
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 84e53f2c514e..59d5cb1b6dee 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -21,6 +21,7 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 
+#include <osl/diagnose.h>
 #include <rtl/math.hxx>
 #ifdef DEBUG_CHART2_TOOLS
 #define DEBUG_INTERNAL_DATA 1
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index 61e6755f3e90..6bff5b7efc0e 100644
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -19,15 +19,14 @@
 
 #include "ResId.hxx"
 #include "ResourceManager.hxx"
+#include <tools/resid.hxx>
 
 namespace chart
 {
-
-    SchResId::SchResId( sal_Int16 nId )
-        : ResId( nId, ResourceManager::getResourceManager() )
+    OUString SchResId(sal_uInt16 nId)
     {
+        return ResId(nId, ResourceManager::getResourceManager());
     }
-
 } //  namespace chart
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */