diff options
author | Mathias Bauer <mba@openoffice.org> | 2009-11-23 17:39:22 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2009-11-23 17:39:22 +0100 |
commit | 8cedfc0931768085d01f577f65d120384e8328bf (patch) | |
tree | caa9dc27e40100f8ad361c3f49b3dba294da0ac4 /scp2/source/ooo | |
parent | 6fda16aece3f038783497dc1f7e74944de266588 (diff) | |
parent | 867b9406d220830960f79de3021d34445c8a8fcd (diff) |
merge commit for m65
Diffstat (limited to 'scp2/source/ooo')
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 3 | ||||
-rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 8a3b0b4443f1..88c1e02a7591 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -101,12 +101,9 @@ Module gid_Module_Root_Brand gid_Brand_File_Lib_Npsoplugin, gid_Brand_File_Lib_Subscrib_C05, gid_Brand_File_Oo_Office_Compatibility_Xcu, - gid_Brand_File_Registry_Spool_Oo_Inet_defaultsearchengine_Xcu_C01, gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu, gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu, gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu, - 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_Script_Unopkg, gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration, gid_Brand_File_Share_Xdg_Base, diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 62b569e8f730..ce9fd987d038 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -892,11 +892,6 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Setup HostName = "Setup"; End -Directory gid_Dir_Share_Registry_Modules_Oo_Inet - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "Inet"; -End - Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; HostName = "Accelerators"; |