diff options
| author | Armin Le Grand <alg@apache.org> | 2012-12-07 17:15:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-10 17:04:38 +0100 |
| commit | bbc58f2043eb0787f498f62ac54500bd31d8c89c (patch) | |
| tree | 832b790c92eb07c3b38ed746f31831a6b1b891f6 /svx/inc/galtheme.hrc | |
| parent | 94298db96fa14f6c7c8eb67b2faab3ac01bd5ccd (diff) | |
Resolves: #i121445# Added transparency support to the gallery
(cherry picked from commit cf417aec41decab94b5f1e82f6409e97a6c02fb5)
Conflicts:
extras/source/gallery/gallery_system/sg2.sdg
extras/source/gallery/gallery_system/sg2.thm
svx/inc/galtheme.hrc
svx/inc/svx/fontworkgallery.hxx
svx/inc/svx/gallery.hxx
svx/inc/svx/galtheme.hxx
svx/source/gallery2/galctrl.cxx
svx/source/gallery2/galexpl.cxx
svx/source/gallery2/galobj.cxx
svx/source/tbxctrls/fontworkgallery.cxx
vcl/inc/vcl/outdev.hxx
vcl/source/gdi/outdev6.cxx
Change-Id: I519a2cf4e16bb42ecfd9c4b48094e65adcc35599
(cherry picked from commit ddec662e8dc234b7196c1b3c28db5da743557ec6)
Diffstat (limited to 'svx/inc/galtheme.hrc')
| -rw-r--r-- | svx/inc/galtheme.hrc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc index 2ecb5268c460..48aa05450ec5 100644 --- a/svx/inc/galtheme.hrc +++ b/svx/inc/galtheme.hrc @@ -22,8 +22,14 @@ #define RID_GALLERYSTR_THEME_START (6000) // ATTENTION: This list has to be in sync with -// * svx/inc/svx/gallery.hxx +// * include/svx/gallery.hxx // * share/gallery (theme files are identified by id) +// +// These defines are used to map gallery names to translated string ressources. Since +// galleries may be copied from older offices to newer, do *never* change this +// IDs except adding new ones (and adapting RID_GALLERYSTR_THEME_LAST). The ID +// *is* written into the binary file *.thm (which is a galler theme combined of +// three files, *.thm, *.sdv and *.sdg) #define RID_GALLERYSTR_THEME_3D (RID_GALLERYSTR_THEME_START + 1) #define RID_GALLERYSTR_THEME_ANIMATIONS (RID_GALLERYSTR_THEME_START + 2) |