From fb6f2e1109abdd09e80dbcd6660a9530fc06ff0f Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Wed, 5 Dec 2012 16:17:41 +0000 Subject: Resolves: #i121407# Gallery reorganizations... and additions of new themes (cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c) Conflicts: extras/prj/build.lst extras/source/gallery/bullets/makefile.mk extras/source/gallery/gallery_system/sg2.sdg extras/source/gallery/gallery_system/sg2.sdv extras/source/gallery/gallery_system/sg2.thm extras/util/target.pmk scp2/source/ooo/directory_ooo.scp scp2/source/ooo/file_extra_ooo.scp svx/inc/galtheme.hrc svx/source/gallery2/gallery1.cxx svx/source/gallery2/galobj.cxx svx/source/gallery2/galtheme.src vcl/inc/vcl/alpha.hxx vcl/inc/vcl/bitmap.hxx vcl/inc/vcl/bitmapex.hxx vcl/source/gdi/alpha.cxx vcl/source/gdi/bitmap.cxx vcl/source/gdi/bitmap3.cxx vcl/source/gdi/bitmapex.cxx (cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f) Conflicts: vcl/source/gdi/bitmap3.cxx Change-Id: If4b2397b889f914487f2135679250c175181e1df --- svx/inc/galtheme.hrc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'svx/inc') diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc index 52b9fdd4646c..2ecb5268c460 100644 --- a/svx/inc/galtheme.hrc +++ b/svx/inc/galtheme.hrc @@ -170,10 +170,17 @@ #define RID_GALLERYSTR_THEME_RELIGION (RID_GALLERYSTR_THEME_START + 139) #define RID_GALLERYSTR_THEME_BUILDINGS (RID_GALLERYSTR_THEME_START + 140) #define RID_GALLERYSTR_THEME_HOMEPAGE2 (RID_GALLERYSTR_THEME_START + 141) -#define RID_GALLERYSTR_THEME_ELEMENTSBULLETS2 (RID_GALLERYSTR_THEME_START + 142) +#define RID_GALLERYSTR_THEME_ELEMENTSBULLETS2 (RID_GALLERYSTR_THEME_START + 142) + +#define RID_GALLERYSTR_THEME_COMPUTERS (RID_GALLERYSTR_THEME_START + 143) +#define RID_GALLERYSTR_THEME_DIAGRAMS (RID_GALLERYSTR_THEME_START + 144) +#define RID_GALLERYSTR_THEME_ENVIRONMENT (RID_GALLERYSTR_THEME_START + 145) +#define RID_GALLERYSTR_THEME_FINANCE (RID_GALLERYSTR_THEME_START + 146) +#define RID_GALLERYSTR_THEME_TRANSPORT (RID_GALLERYSTR_THEME_START + 147) +#define RID_GALLERYSTR_THEME_TXTSHAPES (RID_GALLERYSTR_THEME_START + 148) #define RID_GALLERYSTR_THEME_FIRST RID_GALLERYSTR_THEME_3D -#define RID_GALLERYSTR_THEME_LAST RID_GALLERYSTR_THEME_ELEMENTSBULLETS2 +#define RID_GALLERYSTR_THEME_LAST RID_GALLERYSTR_THEME_TXTSHAPES #endif -- cgit