diff options
| -rw-r--r-- | scp2/source/gnome/file_gnome.scp | 6 | ||||
| -rw-r--r-- | scp2/source/gnome/module_gnome.scp | 15 | ||||
| -rw-r--r-- | scp2/source/impress/module_ogltrans.scp | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 79 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 34 | ||||
| -rwxr-xr-x | scp2/source/ooo/module_lang_template.scp | 3 | ||||
| -rw-r--r-- | scp2/source/writer/module_writer.scp | 1 |
8 files changed, 40 insertions, 112 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 diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index 18425e88033a..9811616f0c3a 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -34,7 +34,7 @@ Module gid_Module_Optional_OGLTrans PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_OGLTRANS); ParentID = gid_Module_Optional; - Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu ); + Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd ); Minimal = NO; Default = NO; End @@ -58,9 +58,9 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml Name = "transitions-ogl.xml"; End -File gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu +File gid_File_Share_Registry_Ogltrans_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Impress; - Name = "registry/spool/org/openoffice/Office/Impress-ogltrans.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "ogltrans.xcd"; End diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 7fd55f47a06f..76bc8d6cf9c0 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -50,13 +50,6 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, gid_Brand_Dir_Share_Registry, - gid_Brand_Dir_Share_Registry_Modules, - gid_Brand_Dir_Share_Registry_Modules_Org, - gid_Brand_Dir_Share_Registry_Modules_Oo, - gid_Brand_Dir_Share_Registry_Modules_Oo_Inet, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer, gid_Brand_Dir_Share_Xdg); Files = (gid_Brand_File_BasisLink, gid_Brand_File_Bin_Crashreport, @@ -94,9 +87,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Lib_Npsoplugin, gid_Brand_File_Lib_Subscrib_C05, gid_Brand_File_Share_Registry_Brand_Xcd, - gid_Brand_File_Registry_Spool_Oo_Inet_defaultsearchengine_Xcu_C01, - gid_Brand_File_Registry_Spool_Oo_Office_Writer_directcursor_Xcu_C01, - gid_Brand_File_Registry_Spool_Oo_Office_Writer_defaultfontarial_Xcu_C01, + gid_Brand_File_Share_Registry_C01_Xcd, gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Xdg_Base, gid_Brand_File_Share_Xdg_Calc, @@ -140,9 +131,8 @@ Module gid_Module_Langpack_Brand_Template gid_Brand_File_License_License_Html, gid_Brand_File_Readme_Readme, gid_Brand_File_Readme_Readme_Html, - gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu, + gid_Brand_File_Share_Registry_Cjk_Xcd, + gid_Brand_File_Share_Registry_Korea_Xcd, gid_Brand_File_Txt_License, gid_Brand_File_Txt_License_Html, gid_Brand_File_Txt_Readme, @@ -245,41 +235,6 @@ Directory gid_Brand_Dir_Share_Registry DosName = "registry"; End -Directory gid_Brand_Dir_Share_Registry_Modules - ParentID = gid_Brand_Dir_Share_Registry; - HostName = "modules"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Org - ParentID = gid_Brand_Dir_Share_Registry_Modules; - HostName = "org"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo - ParentID = gid_Brand_Dir_Share_Registry_Modules_Org; - HostName = "openoffice"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Inet - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo; - HostName = "Inet"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo; - HostName = "Office"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Common"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Writer"; -End - #if defined UNX && ! defined MACOSX Directory gid_Brand_Dir_Share_Xdg ParentID = gid_Brand_Dir_Share; @@ -523,31 +478,21 @@ File gid_Brand_File_Share_Registry_Brand_Xcd Name = "brand.xcd"; End -File gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu +File gid_Brand_File_Share_Registry_Cjk_Xcd TXT_FILE_BODY; Styles = (PACKED,MAKE_LANG_SPECIFIC); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common; - Name (ja) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; - Name (ko) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; - Name (zh-CN) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; - Name (zh-TW) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; + Dir = gid_Brand_Dir_Share_Registry; + Name (ja) = "cjk.xcd"; + Name (ko) = "cjk.xcd"; + Name (zh-CN) = "cjk.xcd"; + Name (zh-TW) = "cjk.xcd"; End -File gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu +File gid_Brand_File_Share_Registry_Korea_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common; - Name (ko) = "/registry/spool/org/openoffice/Office/Common-korea.xcu"; -End - -File gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu - TXT_FILE_BODY; - Styles = (PACKED,MAKE_LANG_SPECIFIC); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer; - Name (ja) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; - Name (ko) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; - Name (zh-CN) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; - Name (zh-TW) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; + Dir = gid_Brand_Dir_Share_Registry; + Name (ko) = "korea.xcd"; End #if defined UNX && ! defined MACOSX diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 6318b779169c..ac75f20a37f0 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1005,12 +1005,6 @@ End STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql) STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc) -File gid_File_Registry_Drivers_Zip - Dir = gid_Dir_Share_Registry_Res; - TXT_FILE_BODY; - EXTRA_ALL_LANG(fcfg_drivers,xcd); -End - // STD_LIB_FILE( gid_File_Lib_Ofa , ofa) STD_UNO_LIB_FILE( gid_File_Lib_Offacc, offacc) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 017a7550f37a..222401098af9 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1234,25 +1234,25 @@ File gid_File_Registry_Spool_Langpack_Lang FILE_ALL_LANG_LETTER(Langpack-,xcd); End -File gid_File_Registry_Spool_Oo_Common_Ctl_Xcu +File gid_File_Share_Registry_Ctl_Xcd TXT_FILE_BODY; Styles = (PACKED,MAKE_LANG_SPECIFIC); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name (th) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (hi-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (pa-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (ta-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (ar) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (he) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (lo) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (dz) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (km) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (or) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (ne) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (fa) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (my) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; + Dir = gid_Dir_Share_Registry; + Name (th) = "ctl.xcd"; + Name (hi-IN) = "ctl.xcd"; + Name (pa-IN) = "ctl.xcd"; + Name (ta-IN) = "ctl.xcd"; + Name (gu-IN) = "ctl.xcd"; + Name (ar) = "ctl.xcd"; + Name (he) = "ctl.xcd"; + Name (lo) = "ctl.xcd"; + Name (dz) = "ctl.xcd"; + Name (km) = "ctl.xcd"; + Name (gu-IN) = "ctl.xcd"; + Name (or) = "ctl.xcd"; + Name (ne) = "ctl.xcd"; + Name (fa) = "ctl.xcd"; + Name (my) = "ctl.xcd"; End File gid_File_Scripts_Beanshell diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index d28fa5bb54dd..686a4ef719c8 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -47,10 +47,9 @@ Module gid_Module_Langpack_Basis_Template gid_File_Extra_Wordbook, gid_File_Extra_Wordbook_Lang, gid_File_Registry_Filter_Zip, - gid_File_Registry_Drivers_Zip, gid_File_Registry_Lang, gid_File_Registry_Spool_Langpack_Lang, - gid_File_Registry_Spool_Oo_Common_Ctl_Xcu, + gid_File_Share_Registry_Ctl_Xcd, gid_File_InfoPlist_Lang); Dirs = (gid_Dir_Samples_Language); End diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index ccf14081f452..3568686ac94a 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -61,7 +61,6 @@ Module gid_Module_Prg_Wrt_Bin gid_File_Jar_Mail, gid_File_Jar_Activation, gid_File_Share_Registry_Writer_Xcd, - gid_File_Registry_Spool_Oo_Common_Dicooo_Xcu, gid_File_Tmp_Userinstall_Wrt_Inf); End |