summaryrefslogtreecommitdiff
path: root/scp2/source/ooo
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-12-09 12:56:49 +0000
committerMichael Meeks <michael.meeks@novell.com>2010-12-09 12:57:19 +0000
commitd1839b973b330e2e0e8d8a6aca2a21f2c982e63c (patch)
tree881ae14a0bc74cc5f556b90f6eec00ad68fb1928 /scp2/source/ooo
parent357d10916a37c5c2ede24a02c8e53066889e6782 (diff)
rename to with_themes, and test scp2 a little
Diffstat (limited to 'scp2/source/ooo')
-rw-r--r--scp2/source/ooo/file_ooo.scp2
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp16
2 files changed, 16 insertions, 2 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 64d91e5a3bb3..8c425b837c6c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1836,12 +1836,14 @@ File gid_File_Jar_Productregistration
End
#endif
+#ifdef THEME_DEFAULT
File gid_File_Images_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
Name = "images.zip";
Styles = (PACKED);
End
+#endif
#ifdef THEME_CRYSTAL
File gid_File_ImagesCrystal_Zip
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 84f96a51c5f4..d5214eb1f354 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -766,11 +766,23 @@ Module gid_Module_Root_Files_Images
Sortkey = "2050";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Images_Zip,
+ Files = (
+#ifdef THEME_DEFAULT
+ gid_File_Images_Zip,
+#endif
+#ifdef THEME_CRYSTAL
gid_File_ImagesCrystal_Zip,
+#endif
+#ifdef THEME_OXYGEN
gid_File_ImagesOxygen_Zip,
+#endif
+#ifdef THEME_HICONTRAST
gid_File_ImagesHicontrast_Zip,
- gid_File_ImagesTango_Zip);
+#endif
+#ifdef THEME_TANGO
+ gid_File_ImagesTango_Zip
+#endif
+ );
End
#ifndef WITHOUT_FONTS