diff options
| author | sb <sb@openoffice.org> | 2009-10-21 10:08:09 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-10-21 10:08:09 +0200 |
| commit | 92f4d0c14f859614d50e50892547b68a3399dd06 (patch) | |
| tree | f5d6d79bd537710846f3eac6f227626fa750bbdf /scp2/source/gnome | |
| parent | 3a8d6c1a743e954b368f5a0744fe7a633361259a (diff) | |
#i101955# transformed remaining xcu files in the installation sets into xcd files
Diffstat (limited to 'scp2/source/gnome')
| -rw-r--r-- | scp2/source/gnome/file_gnome.scp | 6 | ||||
| -rw-r--r-- | scp2/source/gnome/module_gnome.scp | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 02fefbb352f2..1b0fad489748 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -51,12 +51,12 @@ File gid_File_Lib_Gnomevfs End #endif -#if defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN -File gid_File_Share_Registry_Gconflockdown_Xcd +#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO +File gid_File_Share_Registry_Gnome_Xcd TXT_FILE_BODY; Styles = (PACKED); Dir = gid_Dir_Share_Registry; - Name = "gconflockdown.xcd"; + Name = "gnome.xcd"; End #endif diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 83c282dce5bb..5a12b6ddd248 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -30,15 +30,6 @@ #include "macros.inc" -#ifdef ENABLE_GIO -File gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu - TXT_FILE_BODY; - Dir = gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration; - Name = "/registry/spool/org/openoffice/ucb/Configuration-gio.xcu"; - Styles = (PACKED,SCPZIP_REPLACE); -End -#endif - Module gid_Module_Optional_Gnome ParentID = gid_Module_Optional; Default = YES; @@ -57,13 +48,13 @@ Module gid_Module_Optional_Gnome gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application, #endif #ifdef ENABLE_GIO - gid_File_Lib_GIO, gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu + gid_File_Lib_GIO, #endif #ifdef ENABLE_GCONF gid_File_Lib_Gconfbe #endif -#if defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN - gid_File_Share_Registry_Gconflockdown_Xcd +#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO + gid_File_Share_Registry_Gnome_Xcd #endif ); End |