[PATCH] fdo#63749: #118845# corrected missing ressource for gallery ...

Thomas Arnhold (via Code Review) gerrit at gerrit.libreoffice.org
Sat Apr 20 06:15:46 PDT 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3507

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/3507/1

fdo#63749: #118845# corrected missing ressource for gallery theme htmlexpo

(cherry picked from commit fee688fd96329f628f83623ea91c32e10eeb134b)

Conflicts:
	svx/inc/svx/gallery.hxx

Change-Id: I263bc8bcd4232d8e9b4a971fd611b451840618a3
---
D extras/source/gallery/gallery_system/sg25.sdg
D extras/source/gallery/gallery_system/sg25.sdv
D extras/source/gallery/gallery_system/sg25.thm
M svx/inc/galtheme.hrc
M svx/inc/svx/gallery.hxx
M svx/source/gallery2/galtheme.src
6 files changed, 10 insertions(+), 1 deletion(-)



diff --git a/extras/source/gallery/gallery_system/sg25.sdg b/extras/source/gallery/gallery_system/sg25.sdg
deleted file mode 100644
index af78e56..0000000
--- 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 4449591..0000000
--- 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 e7b0a49..0000000
--- 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 7eda727..52b9fdd 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 f7b7b56..a2b010b 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 34650c5..4b63b82 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -119,6 +119,14 @@
 
 // -----------------------------------------------------------------------------
 
+String RID_GALLERYSTR_THEME_HTMLBUTTONS
+{
+    // !!! Don't translate, please !!!
+    Text = "private://gallery/hidden/HtmlExportButtons";
+};
+
+// -----------------------------------------------------------------------------
+
 String RID_GALLERYSTR_THEME_POWERPOINT
 {
     // !!! Don't translate, please !!!

-- 
To view, visit https://gerrit.libreoffice.org/3507
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I263bc8bcd4232d8e9b4a971fd611b451840618a3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold <thomas at arnhold.org>



More information about the LibreOffice mailing list