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 --- scp2/source/ooo/file_extra_ooo.scp | 70 +++++++++++++++++++++++++++++++++++ scp2/source/ooo/module_hidden_ooo.scp | 10 +++++ 2 files changed, 80 insertions(+) (limited to 'scp2') diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 0933ff7eb4f7..62085b9f85b5 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -161,6 +161,76 @@ File gid_File_Extra_Gallroot Name = "extras_gallroot.filelist"; End +File gid_File_Extra_Gallarrows + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_gallarrows.filelist"; +End + +File gid_File_Extra_Gallcomputers + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_gallcomputers.filelist"; +End + +File gid_File_Extra_Galldiagrams + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_galldiagrams.filelist"; +End + +File gid_File_Extra_Galleducation + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_galleducation.filelist"; +End + +File gid_File_Extra_Gallenvironment + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_gallenvironment.filelist"; +End + +File gid_File_Extra_Gallfinance + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_gallfinance.filelist"; +End + +File gid_File_Extra_Gallpeople + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_gallpeople.filelist"; +End + +File gid_File_Extra_Gallsymbols + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_gallsymbols.filelist"; +End + +File gid_File_Extra_Galltransport + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_galltransport.filelist"; +End + +File gid_File_Extra_Galltxtshapes + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_galltxtshapes.filelist"; +End + File gid_File_Extra_Gallsound Dir = FILELIST_DIR; USER_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 858d06782d93..e26aa929851c 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -328,6 +328,16 @@ Module gid_Module_Root_Files_6 gid_File_Extra_Autocorr, gid_File_Extra_Autocorr_Lang, gid_File_Extra_Gallroot, + gid_File_Extra_Gallarrows, + gid_File_Extra_Gallcomputers, + gid_File_Extra_Galldiagrams, + gid_File_Extra_Galleducation, + gid_File_Extra_Gallenvironment, + gid_File_Extra_Gallfinance, + gid_File_Extra_Gallpeople, + gid_File_Extra_Gallsymbols, + gid_File_Extra_Galltransport, + gid_File_Extra_Galltxtshapes, gid_File_Extra_Gallbullets, gid_File_Extra_Gallhtmlexpo, gid_File_Extra_Gallsystem, -- cgit