summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:14:49 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-16 13:14:49 +0000
commit4d939118edf891e85c25ada02ac857a122c975dc (patch)
treeb613a76db46a85c8c743805f2d3a83fcaf671c87 /scp2
parent198b7ec747c4809d190501612b418d2e0d070ad0 (diff)
INTEGRATION: CWS sb88 (1.95.2); FILE MERGED
2008/06/11 10:49:13 sb 1.95.2.3: RESYNC: (1.95-1.99); FILE MERGED 2008/05/16 08:04:40 sb 1.95.2.2: #i88325#, #i88974# localised xcu files moved back from brand to basis layer, brand specific parts extracted into modules and kept in brand layer 2008/05/15 10:06:46 sb 1.95.2.1: #i88329# move just-for-moz msvcp71.dll/msvcr71.dll from URE to Basis layer
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp10
1 files changed, 8 insertions, 2 deletions
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 2c27b98db7e0..32ebfbe0d31d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: module_hidden_ooo.scp,v $
- * $Revision: 1.99 $
+ * $Revision: 1.100 $
*
* This file is part of OpenOffice.org.
*
@@ -658,6 +658,7 @@ Module gid_Module_Root_Files_6
gid_File_Oo_Office_Ui_Genericcategories_Xcs,
gid_File_Oo_Office_Ui_Genericcategories_Xcu,
gid_File_Oo_Office_Common_Xcs,
+ gid_File_Oo_Office_Common_Xcu,
gid_File_Oo_Office_Extendedcolorscheme_Xcs,
gid_File_Oo_Office_Extendedcolorscheme_Xcu,
gid_File_Oo_Office_OptionsDialog_Xcs,
@@ -713,6 +714,7 @@ Module gid_Module_Root_Files_6
gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu,
gid_File_Oo_Office_Substitution_Xcs,
gid_File_Oo_Office_Ui_Xcs,
+ gid_File_Oo_Office_Ui_Xcu,
gid_File_Oo_Office_Views_Xcs,
gid_File_Oo_Office_Writer_Xcs,
gid_File_Oo_Office_Writer_Xcu,
@@ -726,6 +728,7 @@ Module gid_Module_Root_Files_6
gid_File_Oo_Office_TypeDetection_Xcs,
gid_File_Oo_Office_Embedding_Xcs,
gid_File_Oo_Setup_Xcs,
+ gid_File_Oo_Setup_Xcu,
gid_File_Oo_Setup_Start_Xcu,
gid_File_Oo_Firststartwizard_Xcs,
gid_File_Oo_Firststartwizard_Xcu,
@@ -836,7 +839,10 @@ Module gid_Module_Root_Files_7
Sortkey = "1900";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Mozilla_Runtime,gid_File_Help_Help_Zip);
+ Files = (gid_File_Help_Help_Zip,
+ gid_File_Moz_Msvcp71,
+ gid_File_Moz_Msvcr71,
+ gid_File_Mozilla_Runtime);
End
#ifdef UNX