summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-30 17:01:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-02 13:18:57 +0200
commit34f7e618ddd3399d9e7f3998e25545256255d02d (patch)
treefd946f8f2ab8386db89f531d49fae1718a21e943 /svx
parentc881756fcfdc1fa63ff534bf4538d551b2139515 (diff)
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>
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/galtheme.hrc8
-rw-r--r--svx/inc/strings.hxx21
-rw-r--r--svx/source/gallery2/gallery1.cxx7
-rw-r--r--svx/source/gallery2/galtheme.src36
4 files changed, 25 insertions, 47 deletions
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 68ec1402582f..0b08a9ccb0f0 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -45,12 +45,9 @@
#define RID_GALLERYSTR_THEME_MAPS (RID_GALLERYSTR_THEME_START + 12)
#define RID_GALLERYSTR_THEME_PEOPLE (RID_GALLERYSTR_THEME_START + 13)
#define RID_GALLERYSTR_THEME_SURFACES (RID_GALLERYSTR_THEME_START + 14)
-#define RID_GALLERYSTR_THEME_HTMLBUTTONS (RID_GALLERYSTR_THEME_START + 15)
-#define RID_GALLERYSTR_THEME_POWERPOINT (RID_GALLERYSTR_THEME_START + 16)
#define RID_GALLERYSTR_THEME_SOUNDS (RID_GALLERYSTR_THEME_START + 18)
#define RID_GALLERYSTR_THEME_SYMBOLS (RID_GALLERYSTR_THEME_START + 19)
#define RID_GALLERYSTR_THEME_MYTHEME (RID_GALLERYSTR_THEME_START + 20)
-#define RID_GALLERYSTR_THEME_USERSOUNDS (RID_GALLERYSTR_THEME_START + 21)
#define RID_GALLERYSTR_THEME_ARROWS (RID_GALLERYSTR_THEME_START + 22)
#define RID_GALLERYSTR_THEME_BALLOONS (RID_GALLERYSTR_THEME_START + 23)
@@ -68,11 +65,6 @@
#define RID_GALLERYSTR_THEME_TROUBLE (RID_GALLERYSTR_THEME_START + 34)
#define RID_GALLERYSTR_THEME_SCREENBEANS (RID_GALLERYSTR_THEME_START + 35)
-#define RID_GALLERYSTR_THEME_DUMMY5 (RID_GALLERYSTR_THEME_START + 36)
-
-#define RID_GALLERYSTR_THEME_FONTWORK (RID_GALLERYSTR_THEME_START + 37)
-#define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL (RID_GALLERYSTR_THEME_START + 38)
-
#define RID_GALLERYSTR_THEME_COMPUTERS (RID_GALLERYSTR_THEME_START + 39)
#define RID_GALLERYSTR_THEME_DIAGRAMS (RID_GALLERYSTR_THEME_START + 40)
#define RID_GALLERYSTR_THEME_ENVIRONMENT (RID_GALLERYSTR_THEME_START + 41)
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
new file mode 100644
index 000000000000..e049c98b8b4f
--- /dev/null
+++ b/svx/inc/strings.hxx
@@ -0,0 +1,21 @@
+/* -*- 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_SVX_INC_STRINGS_HXX
+#define INCLUDED_SVX_INC_STRINGS_HXX
+
+#define RID_GALLERYSTR_THEME_HTMLBUTTONS "private://gallery/hidden/HtmlExportButtons"
+#define RID_GALLERYSTR_THEME_POWERPOINT "private://gallery/hidden/imgppt"
+#define RID_GALLERYSTR_THEME_USERSOUNDS "private://gallery/hidden/usersounds"
+#define RID_GALLERYSTR_THEME_FONTWORK "private://gallery/hidden/fontwork"
+#define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL "private://gallery/hidden/fontworkvertical"
+#define RID_GALLERYSTR_THEME_DUMMY5 "Dummy 5"
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 24c88101efea..ae03b34f6c1e 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -39,6 +39,7 @@
#include <sfx2/docfile.hxx>
#include "svx/gallery.hxx"
#include "gallery.hrc"
+#include "strings.hxx"
#include "svx/galmisc.hxx"
#include "svx/galtheme.hxx"
#include "svx/gallery1.hxx"
@@ -459,13 +460,13 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_HOMEPAGE);
break;
case GALLERY_THEME_POWERPOINT:
- aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_POWERPOINT);
+ aFallback = RID_GALLERYSTR_THEME_POWERPOINT;
break;
case GALLERY_THEME_FONTWORK:
- aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK);
+ aFallback = RID_GALLERYSTR_THEME_FONTWORK;
break;
case GALLERY_THEME_FONTWORK_VERTICAL:
- aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_FONTWORK_VERTICAL);
+ aFallback = RID_GALLERYSTR_THEME_FONTWORK_VERTICAL;
break;
case GALLERY_THEME_SOUNDS:
aFallback = GAL_RESSTR(RID_GALLERYSTR_THEME_SOUNDS);
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 7cc69daa5f6d..8a75bf77f88b 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -89,18 +89,6 @@ String RID_GALLERYSTR_THEME_SURFACES
Text [ en-US ] = "Surfaces";
};
-String RID_GALLERYSTR_THEME_HTMLBUTTONS
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/HtmlExportButtons";
-};
-
-String RID_GALLERYSTR_THEME_POWERPOINT
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/imgppt";
-};
-
String RID_GALLERYSTR_THEME_COMPUTERS
{
Text [ en-US ] = "Computers";
@@ -146,12 +134,6 @@ String RID_GALLERYSTR_THEME_MYTHEME
Text [ en-US ] = "My Theme";
};
-String RID_GALLERYSTR_THEME_USERSOUNDS
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/usersounds";
-};
-
String RID_GALLERYSTR_THEME_ARROWS
{
Text [ en-US ] = "Arrows";
@@ -222,22 +204,4 @@ String RID_GALLERYSTR_THEME_SCREENBEANS
Text [ en-US ] = "Screen Beans";
};
-String RID_GALLERYSTR_THEME_FONTWORK
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/fontwork";
-};
-
-String RID_GALLERYSTR_THEME_FONTWORK_VERTICAL
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/fontworkvertical";
-};
-
-String RID_GALLERYSTR_THEME_DUMMY5
-{
- // !!! Don't translate, please !!!
- Text = "Dummy 5";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */