untranslated strings are just strings

removes starmaths InsertCommand in favour of InsertCommandText

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

5 files changed, 31 insertions, 33 deletions

diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index a3c93d89b3e1..e635ad9a9c0b 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -38,9 +38,6 @@
 #define RID_MISC_START                  RID_RPT_START
 
 // strings
-#define RID_STR_CLASS_FORMATTEDFIELD        ( RID_STRING_START +   1 )
-#define RID_STR_CLASS_FIXEDTEXT             ( RID_STRING_START +   2 )
-#define RID_STR_CLASS_IMAGECONTROL          ( RID_STRING_START +   3 )
 #define RID_STR_PROPTITLE_FIXEDTEXT         ( RID_STRING_START +   4 )
 #define RID_STR_PROPTITLE_FORMATTED         ( RID_STRING_START +   5 )
 #define RID_STR_PROPTITLE_SHAPE             ( RID_STRING_START +   6 )
@@ -118,7 +115,7 @@
 
 #define RID_STR_PROPTITLE_GROUP             (RID_STRING_START + 84)
 #define RID_STR_PROPTITLE_FIXEDLINE         (RID_STRING_START + 85)
-#define RID_STR_CLASS_FIXEDLINE             (RID_STRING_START + 86)
+// free
 #define RID_STR_BACKTRANSPARENT             (RID_STRING_START + 87)
 #define RID_STR_CONTROLBACKGROUNDTRANSPARENT (RID_STRING_START + 88)
 #define RID_STR_OVERLAP_OTHER_CONTROL       (RID_STRING_START + 89)
diff --git a/reportdesign/inc/strings.hxx b/reportdesign/inc/strings.hxx
new file mode 100644
index 000000000000..d5fd6ad8385b
--- /dev/null
+++ b/reportdesign/inc/strings.hxx
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_REPORTDESIGN_INC_STRINGS_HRC
+#define INCLUDED_REPORTDESIGN_INC_STRINGS_HRC
+
+// Dialog Controls
+
+#define RID_STR_CLASS_FIXEDTEXT         "Label"
+#define RID_STR_CLASS_FIXEDLINE         "Line"
+#define RID_STR_CLASS_IMAGECONTROL      "Graphic"
+#define RID_STR_CLASS_FORMATTEDFIELD    "FormattedField"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 92ee82a45587..45b5dc064d30 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -32,6 +32,7 @@
 #include "ModuleHelper.hxx"
 
 #include <RptResId.hrc>
+#include "strings.hxx"
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlndsit.hxx>
@@ -764,32 +765,27 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 
 OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
 {
-    sal_uInt16 nResId = 0;
     OUString aDefaultName = "HERE WE HAVE TO INSERT OUR NAME!";
     if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) )
     {
-        nResId = RID_STR_CLASS_FIXEDTEXT;
+        aDefaultName = RID_STR_CLASS_FIXEDTEXT;
     }
     else if ( _pObj->supportsService( SERVICE_FIXEDLINE ) )
     {
-        nResId = RID_STR_CLASS_FIXEDLINE;
+        aDefaultName = RID_STR_CLASS_FIXEDLINE;
     }
     else if ( _pObj->supportsService( SERVICE_IMAGECONTROL ) )
     {
-        nResId = RID_STR_CLASS_IMAGECONTROL;
+        aDefaultName = RID_STR_CLASS_IMAGECONTROL;
     }
     else if ( _pObj->supportsService( SERVICE_FORMATTEDFIELD ) )
     {
-        nResId = RID_STR_CLASS_FORMATTEDFIELD;
+        aDefaultName = RID_STR_CLASS_FORMATTEDFIELD;
     }
 
-    if (nResId)
-        aDefaultName = ModuleRes(nResId);
-
     return aDefaultName;
 }
 
-
 void OUnoObject::_propertyChange( const  beans::PropertyChangeEvent& evt )
 {
     OObjectBase::_propertyChange(evt);
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 8d436f30e291..5e7316b7dcd3 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -54,6 +54,7 @@
 #include "ViewsWindow.hxx"
 #include "UITools.hxx"
 #include <unotools/confignode.hxx>
+#include "strings.hxx"
 
 namespace rptui
 {
@@ -381,7 +382,8 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
             else
             {
                 OSL_FAIL("Unknown service name!");
-                nResId = RID_STR_CLASS_FORMATTEDFIELD;
+                aName += RID_STR_CLASS_FORMATTEDFIELD;
+                return aName;
             }
 
             if (nResId)
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index af7f1b0e3876..55472688ab79 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -21,25 +21,6 @@
 #include <svx/svxids.hrc>
 #include "helpids.hrc"
 
-// Dialog Controls ---------------------------------------------------------------
-
-String RID_STR_CLASS_FIXEDTEXT
-{
-    Text = "Label" ;
-};
-String RID_STR_CLASS_FIXEDLINE
-{
-    Text = "Line" ;
-};
-String RID_STR_CLASS_IMAGECONTROL
-{
-    Text = "Graphic" ;
-};
-String RID_STR_CLASS_FORMATTEDFIELD
-{
-    Text = "FormattedField" ;
-};
-
 // Property Browser Headline ----------------------------------------------------------------
 
 String RID_STR_BRWTITLE_PROPERTIES