summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-11-29 15:15:00 +0000
committerMichael Meeks <michael.meeks@suse.com>2013-04-22 09:21:20 +0000
commit36557ab053c5bb28bf5203cabcb4d6cb2ae893b0 (patch)
tree5a3e0753966f4caa3366625668b0736edf9bc230
parentb9cc769926fa2558b8e76181b0cc850347410a09 (diff)
fdo#63749: #118845# corrected missing ressource for gallery theme htmlexpo
(cherry picked from commit fee688fd96329f628f83623ea91c32e10eeb134b) Conflicts: svx/inc/svx/gallery.hxx Change-Id: I263bc8bcd4232d8e9b4a971fd611b451840618a3 Reviewed-on: https://gerrit.libreoffice.org/3507 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
-rw-r--r--extras/source/gallery/gallery_system/sg25.sdgbin55650 -> 0 bytes
-rw-r--r--extras/source/gallery/gallery_system/sg25.sdvbin2048 -> 0 bytes
-rw-r--r--extras/source/gallery/gallery_system/sg25.thmbin2016 -> 0 bytes
-rw-r--r--svx/inc/galtheme.hrc2
-rw-r--r--svx/inc/svx/gallery.hxx1
-rw-r--r--svx/source/gallery2/galtheme.src8
6 files changed, 10 insertions, 1 deletions
diff --git a/extras/source/gallery/gallery_system/sg25.sdg b/extras/source/gallery/gallery_system/sg25.sdg
deleted file mode 100644
index af78e56603e0..000000000000
--- a/extras/source/gallery/gallery_system/sg25.sdg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg25.sdv b/extras/source/gallery/gallery_system/sg25.sdv
deleted file mode 100644
index 444959152744..000000000000
--- a/extras/source/gallery/gallery_system/sg25.sdv
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg25.thm b/extras/source/gallery/gallery_system/sg25.thm
deleted file mode 100644
index e7b0a497cfd0..000000000000
--- a/extras/source/gallery/gallery_system/sg25.thm
+++ /dev/null
Binary files differ
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 7eda727a85f6..52b9fdd4646c 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -39,7 +39,7 @@
#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)
-// free
+#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)
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index f7b7b56cc6e8..a2b010b9f4f0 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -41,6 +41,7 @@
#define GALLERY_THEME_3D 1
#define GALLERY_THEME_BULLETS 3
#define GALLERY_THEME_HOMEPAGE 10
+#define GALLERY_THEME_HTMLBUTTONS 15
#define GALLERY_THEME_POWERPOINT 16
#define GALLERY_THEME_SOUNDS 18
#define GALLERY_THEME_USERSOUNDS 21
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 34650c5c61dc..4b63b8251d15 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -119,6 +119,14 @@ String RID_GALLERYSTR_THEME_SURFACES
// -----------------------------------------------------------------------------
+String RID_GALLERYSTR_THEME_HTMLBUTTONS
+{
+ // !!! Don't translate, please !!!
+ Text = "private://gallery/hidden/HtmlExportButtons";
+};
+
+// -----------------------------------------------------------------------------
+
String RID_GALLERYSTR_THEME_POWERPOINT
{
// !!! Don't translate, please !!!