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>

13 files changed, 29 insertions, 27 deletions

diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 6545f0b80b92..7dd87b46059e 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -254,10 +254,6 @@ String STR_EXPORT_HTML_NAME
 {
     Text [ en-US ] = "Web Page";
 };
-String STR_HTMLEXP_DEFAULT_EXTENSION
-{
-    Text = ".html";
-};
 String STR_UNDO_COPYOBJECTS
 {
     Text [ en-US ] = "Duplicate" ;
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index b81d4708b5c2..b7641aa2ea34 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -243,8 +243,7 @@ TemplateScanner::State TemplateScanner::ScanEntry()
                         // The following id comes from the bugdoc in #i2764#.
                     ||  (sContentType == "Impress 2.0"))
                 {
-                    OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString(
-                        STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, sTitle );
+                    OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString(sTitle);
                     mpLastAddedEntry = new TemplateEntry(sLocalisedTitle, sTargetURL);
                     mpTemplateDirectory->InsertEntry(mpLastAddedEntry);
                 }
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 533ec58df7ad..77c39845a4e4 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -39,6 +39,7 @@
 #include "sdresid.hxx"
 
 #include "glob.hrc"
+#include "strings.hxx"
 #include "bulmaper.hxx"
 #include "DrawDocShell.hxx"
 #include <svl/aeitem.hxx>
@@ -96,7 +97,7 @@ OutlineBulletDlg::OutlineBulletDlg(
         if(bOutliner)
         {
             SfxStyleSheetBasePool* pSSPool = pView->GetDocSh()->GetStyleSheetPool();
-            OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1");
+            OUString aStyleName(STR_LAYOUT_OUTLINE " 1");
             SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
             if( pFirstStyleSheet )
                 pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 604ddd093209..7b6842539fbe 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -33,7 +33,7 @@
 #include "drawdoc.hxx"
 #include "stlsheet.hxx"
 #include "glob.hrc"
-
+#include "strings.hxx"
 
 StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
                                            SfxStyleSheet* pTheStyleSheet,
@@ -59,23 +59,23 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
     if (nPos != -1)
         aName = aName.copy(nPos + strlen(SD_LT_SEPARATOR));
 
-    if (aName == SD_RESSTR(STR_LAYOUT_TITLE))
+    if (aName == STR_LAYOUT_TITLE)
     {
         aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE);
     }
-    else if (aName == SD_RESSTR(STR_LAYOUT_SUBTITLE))
+    else if (aName == STR_LAYOUT_SUBTITLE)
     {
         aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE);
     }
-    else if (aName == SD_RESSTR(STR_LAYOUT_BACKGROUND))
+    else if (aName == STR_LAYOUT_BACKGROUND)
     {
         aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND);
     }
-    else if (aName == SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS))
+    else if (aName == STR_LAYOUT_BACKGROUNDOBJECTS)
     {
         aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
     }
-    else if (aName == SD_RESSTR(STR_LAYOUT_NOTES))
+    else if (aName == STR_LAYOUT_NOTES)
     {
         aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES);
     }
@@ -86,7 +86,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
         if (nPos != -1)
         {
             OUString aNumStr(aName.copy(aOutlineStr.getLength()));
-            aName = SD_RESSTR(STR_LAYOUT_OUTLINE) + aNumStr;
+            aName = STR_LAYOUT_OUTLINE + aNumStr;
         }
     }
 
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index e5ec8b91c1be..4366d5a5aa57 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -29,6 +29,7 @@
 
 #include "app.hrc"
 #include "glob.hrc"
+#include "strings.hxx"
 #include "fudraw.hxx"
 #include "View.hxx"
 #include "Window.hxx"
@@ -316,7 +317,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
         ***********************************************/
         OUString aName( pPage->GetLayoutName() );
         sal_Int32 n = aName.indexOf(SD_LT_SEPARATOR) + strlen(SD_LT_SEPARATOR);
-        aName = aName.copy(0, n) + SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS);
+        aName = aName.copy(0, n) + STR_LAYOUT_BACKGROUNDOBJECTS;
         SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(pPage->GetModel()->
                                                 GetStyleSheetPool()->
                                                 Find(aName, SD_STYLE_FAMILY_MASTERPAGE));
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 81c5f6799b6b..c15d2948573b 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -26,6 +26,7 @@
 #include <editeng/numitem.hxx>
 #include "sdresid.hxx"
 #include "glob.hrc"
+#include "strings.hxx"
 
 #include <editeng/editdata.hxx>
 #include <svx/svxids.hrc>
@@ -334,7 +335,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u
             if(bOutliner)
             {
                 SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
-                OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1");
+                OUString aStyleName(STR_LAYOUT_OUTLINE " 1");
                 SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
                 if( pFirstStyleSheet )
                     pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 683c7e58cab1..7a87b97976e8 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -29,6 +29,7 @@
 #include "strings.hrc"
 #include "glob.hrc"
 #include "prltempl.hrc"
+#include "strings.hxx"
 
 #include "sdresid.hxx"
 #include "drawdoc.hxx"
@@ -121,12 +122,12 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
         if( bPage )
         {
             ePO = PO_TITLE;
-            aStyleName += SD_RESSTR(STR_LAYOUT_TITLE);
+            aStyleName += STR_LAYOUT_TITLE;
         }
         else
         {
             ePO = (PresentationObjects) ( PO_OUTLINE_1 + nDepth - 1 );
-            aStyleName += SD_RESSTR(STR_LAYOUT_OUTLINE) + " "
+            aStyleName += STR_LAYOUT_OUTLINE " "
                 + OUString::number(nDepth);
         }
 
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 2582ab3625e2..b7efeb248c64 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -328,8 +328,6 @@
 #define STR_AL_TITLE_VERT_OUTLINE         (RID_APP_START+674)
 #define STR_AL_TITLE_VERT_OUTLINE_CLIPART (RID_APP_START+675)
 
-#define STR_HTMLEXP_DEFAULT_EXTENSION       (RID_APP_START+680)
-
 #define STR_SET_BACKGROUND_PICTURE          (RID_APP_START+681)
 
 #define STR_DESC_RENAMESLIDE                (RID_APP_START+682)
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 0bd7d4532a6c..aefeb457483a 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -87,6 +87,7 @@
 #include <sdpage.hxx>
 
 #include <strings.hrc>
+#include <strings.hxx>
 #include <unolayer.hxx>
 #include <unoprnms.hxx>
 #include <unopage.hxx>
@@ -3135,7 +3136,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
 
         OUString aLayoutName( aPrefix );
         aLayoutName += SD_LT_SEPARATOR;
-        aLayoutName += SD_RESSTR(STR_LAYOUT_OUTLINE);
+        aLayoutName += STR_LAYOUT_OUTLINE;
 
         // create styles
         static_cast<SdStyleSheetPool*>(pDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix );
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 11ec2247db07..18c50b8c608d 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -69,6 +69,7 @@
 #include "DrawViewShell.hxx"
 #include "unoobj.hxx"
 #include "res_bmp.hrc"
+#include "strings.hxx"
 #include "bitmaps.hlst"
 #include "unokywds.hxx"
 #include "unopback.hxx"
@@ -2907,7 +2908,7 @@ void SdMasterPage::setBackground( const Any& rValue )
             {
                 OUString aLayoutName( static_cast< SdPage* >( SvxFmDrawPage::mpPage )->GetLayoutName() );
                 aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)+4);
-                aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
+                aLayoutName += STR_LAYOUT_BACKGROUND;
                 SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE );
 
                 if( pStyleSheet )
@@ -2951,7 +2952,7 @@ void SdMasterPage::getBackground( Any& rValue )
             {
                 OUString aLayoutName( static_cast< SdPage* >(SvxFmDrawPage::mpPage)->GetLayoutName() );
                 aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)+4);
-                aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
+                aLayoutName += STR_LAYOUT_BACKGROUND;
                 SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE );
 
                 if( pStyleSheet )
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index 1fd58ecdc028..380ffc4aad03 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -29,6 +29,7 @@
 #include "sdxfer.hxx"
 #include "sdresid.hxx"
 #include "glob.hrc"
+#include "strings.hxx"
 
 #include <svx/svdpagv.hxx>
 #include <osl/mutex.hxx>
@@ -141,7 +142,7 @@ void ViewClipboard::AssignMasterPage (
 
     // We have to remove the layout suffix from the layout name which is
     // appended again by SetMasterPage() to the given name.  Don't ask.
-    OUString sLayoutSuffix = SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE);
+    OUString sLayoutSuffix = SD_LT_SEPARATOR STR_LAYOUT_OUTLINE;
     sal_Int32 nLength = sLayoutSuffix.getLength();
     OUString sLayoutName = pMasterPage->GetLayoutName();
     if (sLayoutName.endsWith(sLayoutSuffix))
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index ac3176c2887f..afbb9c07e917 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -24,6 +24,7 @@
 #include <svx/svdview.hxx>
 
 #include "strings.hrc"
+#include "strings.hxx"
 #include "glob.hxx"
 #include "glob.hrc"
 #include "app.hrc"
@@ -179,13 +180,13 @@ RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction(
 
 void RenameLayoutTemplateUndoAction::Undo()
 {
-    OUString aLayoutName(maNewName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE));
+    OUString aLayoutName(maNewName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE);
     mpDoc->RenameLayoutTemplate( aLayoutName, maOldName );
 }
 
 void RenameLayoutTemplateUndoAction::Redo()
 {
-    OUString aLayoutName(maOldName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE));
+    OUString aLayoutName(maOldName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE);
     mpDoc->RenameLayoutTemplate( aLayoutName, maNewName );
 }
 
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 2c7f16a1338d..25917474f54c 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -89,6 +89,7 @@
 #include <editeng/editeng.hxx>
 #include <svl/poolitem.hxx>
 #include <glob.hrc>
+#include "strings.hxx"
 #include "AccessibleDocumentViewBase.hxx"
 
 using namespace ::com::sun::star;
@@ -908,7 +909,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16&
             if(bOutliner)
             {
                 SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
-                OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1");
+                OUString aStyleName(STR_LAYOUT_OUTLINE " 1");
                 SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
                 if( pFirstStyleSheet )
                     pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));