diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2011-12-06 09:36:57 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-12-06 09:39:16 +0100 |
| commit | 73a395cdc7d3ad802182a470c799720307ed408e (patch) | |
| tree | 9ea8af5b8a9a168182d7504e5753acec54fe212e /svx | |
| parent | e57053c435c4ccd8375904b22e6e0a40f149b346 (diff) | |
Make merges of impress210 build.
Diffstat (limited to 'svx')
| -rwxr-xr-x | svx/inc/galtheme.hrc | 2 | ||||
| -rw-r--r-- | svx/inc/svx/gallery.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc index 3567e0cdebed..90b05abffe2b 100755 --- a/svx/inc/galtheme.hrc +++ b/svx/inc/galtheme.hrc @@ -43,7 +43,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_RULERS (RID_GALLERYSTR_THEME_START + 17) #define RID_GALLERYSTR_THEME_SOUNDS (RID_GALLERYSTR_THEME_START + 18) diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx index 05b78ad54bf4..c8ca0218d770 100644 --- a/svx/inc/svx/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -64,7 +64,7 @@ #define GALLERY_THEME_MAPS 12 #define GALLERY_THEME_PEOPLE 13 #define GALLERY_THEME_SURFACES 14 -// free +#define GALLERY_THEME_HTMLBUTTONS 15 #define GALLERY_THEME_POWERPOINT 16 #define GALLERY_THEME_RULERS 17 #define GALLERY_THEME_SOUNDS 18 |