sb118: merged in backout

author: sb <sb@openoffice.org> 2010-04-14 17:21:13 +0200
committer: sb <sb@openoffice.org> 2010-04-14 17:21:13 +0200
commit: 19087e3ef7793983f244d1d5265fefe746ef7727 (patch)
tree: 436ed752da5c25f2ab044ac86dfae3e29ce6aa8b /scp2
parent: 5aaefa22ae131a80c8beaaa5294c2bb3cd65d4ca (diff)
parent: ba6ae7eaaa7436354a0f61c4c12aea45be0a3c27 (diff)
184 files changed, 932 insertions, 3949 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 27ef93479d36..48a1ae148777 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -501,7 +501,17 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(opendocument.,doc_type,Document.1)); \
+        Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \
+        Styles = (); \
+    End
+
+#define REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = modid; \
+        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
+        Name = STRING(CONCAT2(.,key)); \
+        Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \
         Styles = (); \
     End
 
@@ -518,6 +528,32 @@ End
     REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
     REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
 
+#define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
+    CONDITIONAL_MODULE_ENTRY(name,modid) \
+    REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
+    CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
+    REGISTRY_ENTRY_DOC(name,modid,disp_name) \
+    REGISTRY_ENTRY_ICON(name,modid,icon_id) \
+    REGISTRY_ENTRY_SHELL(name,default,modid) \
+    REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
+    REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
+    REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
+
+// ---------------------------------------
+
+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; \
+        ComponentCondition = "VersionNT >= 600"; \
+        Styles = (X64); \
+        Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
+        Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+        Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+    End
+
 // ---------------------------------------
 
 #if defined WNT
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 53bf047d9e98..d9d1420bdc73 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macro.pl,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,6 +60,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG();
 write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
 write_DIR_IDENT_ALL_LANG();
 write_EXTRA_ALL_LANG();
+write_EXTRA_ALL_LANG_BUT_EN_US();
 write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
 write_EXTRA_IDENT_ALL_LANG();
 write_RESFILE_ALL_LANG();
@@ -138,14 +135,29 @@ sub write_DIR_IDENT_ALL_LANG
 
 sub write_EXTRA_ALL_LANG
 {
-    print OUTFILE "#define EXTRA_ALL_LANG(name) ";
+    print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
     foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tName ($lang) = EXTRAFILENAME(name,_$lang)";
+        print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
         print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
     }
     print OUTFILE "\n\n";
 }
 
+sub write_EXTRA_ALL_LANG_BUT_EN_US
+{
+    print OUTFILE "#define EXTRA_ALL_LANG_BUT_EN_US(name,ext) ";
+    my $first = 1;
+    foreach $lang (@completelangiso) {
+        if ($lang ne "en-US") {
+            print OUTFILE "; " unless $first;
+            $first = 0;
+            print OUTFILE
+                "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
+        }
+    }
+    print OUTFILE "\n\n";
+}
+
 sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
 {
     my $first = 1;
diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk
index c9930631755e..d36f25efabd3 100644
--- a/scp2/macros/makefile.mk
+++ b/scp2/macros/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index abf5f14740da..f3fbbec38273 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp    scp2    :    l10n i18npool setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 5f257af2e1b8..574657b5b441 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_activex.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk
index 86097032f455..fb4342e4a891 100644
--- a/scp2/source/activex/makefile.mk
+++ b/scp2/source/activex/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index 4d39208f5d14..808afa874992 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_activex.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/activex/module_activex.ulf b/scp2/source/activex/module_activex.ulf
index 60af356828d9..fb7e101da95d 100644
--- a/scp2/source/activex/module_activex.ulf
+++ b/scp2/source/activex/module_activex.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_activex.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 0f34c3ad358d..3d209912479c 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_base.scp,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -82,38 +79,9 @@ File gid_File_Help_Sdatabase_Zip
     Patchfiles = (); 
 End
 
-File gid_File_Registry_Spool_Oo_Setup_Base_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-base.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Base_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-base.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu
+File gid_File_Share_Registry_Base_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_database_types.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "base.xcd";
 End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_database_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc;
-    Name = "/registry/spool/fcfg_database_others.xcu";
-End
-
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index ca7a012009bb..c678e7424cd7 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_base.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/folderitem_base.ulf b/scp2/source/base/folderitem_base.ulf
index 495c3f747353..3bea2fd724dc 100644
--- a/scp2/source/base/folderitem_base.ulf
+++ b/scp2/source/base/folderitem_base.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_base.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk
index 53d1f0a89666..ead15b19776c 100644
--- a/scp2/source/base/makefile.mk
+++ b/scp2/source/base/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index 27617b9d8eb5..dc4d76fcf5d1 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_base.scp,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,10 +43,7 @@ Module gid_Module_Prg_Base_Bin
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Files = (
-        gid_File_Registry_Spool_Oo_Setup_Base_Xcu,gid_File_Registry_Spool_Oo_Common_Base_Xcu
-        ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu
-        ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu
-        ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu
+        gid_File_Share_Registry_Base_Xcd
         ,gid_File_Lib_Abp
         ,gid_File_Lib_Dbp
         ,gid_File_Lib_Dbu
diff --git a/scp2/source/base/module_base.ulf b/scp2/source/base/module_base.ulf
index b2b9e4718ff1..1cd8b2e77a80 100644
--- a/scp2/source/base/module_base.ulf
+++ b/scp2/source/base/module_base.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_base.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 616084e9b967..833ed3905241 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_base.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -97,6 +94,14 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,13";
 End
 
+RegistryItem gid_Regitem_odb_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.DatabaseDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DatabaseDocument.1\shell";
@@ -152,3 +157,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sbas
     Name = "Path";
     Value = "<progpath>";
 End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odb )
diff --git a/scp2/source/base/registryitem_base.ulf b/scp2/source/base/registryitem_base.ulf
index bf18083e8566..bf6942ecf261 100644
--- a/scp2/source/base/registryitem_base.ulf
+++ b/scp2/source/base/registryitem_base.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_base.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index 7de57837fd0c..be66b907a25d 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_binfilter.scp,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,127 +28,13 @@
 
 #include "macros.inc"
 
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_chart_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_chart_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_calc_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_calc_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_draw_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_draw_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_global_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_global_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_impress_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_impress_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu
+File gid_File_Share_Registry_Binfilter_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_math_bf_types.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "binfilter.xcd";
 End
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_math_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_web_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_web_bf_filters.xcu";
-End
-
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_writer_bf_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_writer_bf_filters.xcu";
-End
-
-
 File gid_Starregistry_Legacy_Binfilters_Rdb
     TXT_FILE_BODY;
     Name = "legacy_binfilters.rdb";
diff --git a/scp2/source/binfilter/makefile.mk b/scp2/source/binfilter/makefile.mk
index 09d88c4690c8..f7882a3041b1 100644
--- a/scp2/source/binfilter/makefile.mk
+++ b/scp2/source/binfilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index 41039a84281c..d7cba78f6101 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_binfilter.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,22 +34,7 @@ Module gid_Module_Optional_Binfilter
     InstallOrder = "1100";
     ParentID = gid_Module_Optional;
     Default = YES;
-    Files = (gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu,
+    Files = (gid_File_Share_Registry_Binfilter_Xcd,
     gid_Starregistry_Legacy_Binfilters_Rdb,
     gid_File_Lib_Bf_Go,
     gid_File_Lib_Bf_Sch,
diff --git a/scp2/source/binfilter/module_binfilter.ulf b/scp2/source/binfilter/module_binfilter.ulf
index 2369831767bd..9b7fc77e9236 100644
--- a/scp2/source/binfilter/module_binfilter.ulf
+++ b/scp2/source/binfilter/module_binfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_binfilter.ulf,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
index 3c828d0042e4..fa4e2297516d 100644
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ b/scp2/source/binfilter/registryitem_binfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_binfilter.scp,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -819,7 +816,7 @@ RegistryItem gid_Regitem_OpenOffice_SDW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdw\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.5";
     Value = " ";
 End
 
@@ -828,7 +825,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.5";
     Value = " ";
 End
 
@@ -837,7 +834,7 @@ RegistryItem gid_Regitem_OpenOffice_SGL_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sgl\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterGlobalDocument.5";
     Value = " ";
 End
 
@@ -846,7 +843,7 @@ RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdc\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.5";
     Value = " ";
 End
 
@@ -855,7 +852,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.5";
     Value = " ";
 End
 
@@ -864,7 +861,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdd\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -873,7 +870,7 @@ RegistryItem gid_Regitem_OpenOffice_SDP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdp\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -882,7 +879,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sda\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -891,7 +888,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -900,7 +897,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sda\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -909,7 +906,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdd\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -918,7 +915,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -927,7 +924,7 @@ RegistryItem gid_Regitem_OpenOffice_SMF_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".smf\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.MathDocument.1";
+    Name = "soffice.StarMathDocument.5";
     Value = " ";
 End
 
diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf
index 1372ee893ff4..6af0f0e02d73 100644
--- a/scp2/source/binfilter/registryitem_binfilter.ulf
+++ b/scp2/source/binfilter/registryitem_binfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_binfilter.ulf,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 3917d5f3e92f..7b392f173378 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_calc.scp,v $
- * $Revision: 1.43.204.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,12 +38,13 @@ End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis)
 
-File gid_File_Oo_Office_Dataaccess_Calc_Xcu
+File gid_File_Share_Registry_Calc_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/calc.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "calc.xcd";
 End
+
 STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
@@ -59,8 +57,6 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
 
-STD_LIB_FILE( gid_File_Lib_Tfu, tfu)
-
 STD_RES_FILE( gid_File_Res_Solver, solver)
 
 STD_RES_FILE( gid_File_Res_Analysis, analysis)
@@ -69,15 +65,6 @@ STD_RES_FILE( gid_File_Res_Date, date)
 
 STD_RES_FILE( gid_File_Res_Sc, sc )
 
-STD_RES_FILE( gid_File_Res_Tfu, tfu )
-
-File gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-calc.xcu";
-End
-
 File gid_File_Help_Scalc_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY;
@@ -94,69 +81,6 @@ File gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml
     Name = "/uiconfig/scalc/menubar/menubar.xml";
 End
 */
-File gid_File_Oo_Office_Ui_Calccommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Calccommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/CalcCommands.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-calc.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_calc_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_calc_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Calc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-calc.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Calc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-calc.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Calcwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Calcwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu";
-End
-
 File gid_File_Exe_Scalc
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index bff71957bd0e..36cd965cb53b 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_calc.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/folderitem_calc.ulf b/scp2/source/calc/folderitem_calc.ulf
index 6ac55f58416f..e4919fbee29c 100644
--- a/scp2/source/calc/folderitem_calc.ulf
+++ b/scp2/source/calc/folderitem_calc.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_calc.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk
index 2ccfd5dd22c1..e049057f7335 100644
--- a/scp2/source/calc/makefile.mk
+++ b/scp2/source/calc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 939b2cd81ac1..84ab326814ee 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_calc.scp,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,11 +42,9 @@ Module gid_Module_Prg_Calc_Bin
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Oo_Office_Dataaccess_Calc_Xcu,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+    Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
     gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
-    gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
-    gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
-    gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf);
+    gid_File_Tmp_Userinstall_Calc_Inf);
 End
 
 // Module gid_Module_Prg_Calc_Help
diff --git a/scp2/source/calc/module_calc.ulf b/scp2/source/calc/module_calc.ulf
index ab0bbdfa6d76..dbbf3227aa0b 100644
--- a/scp2/source/calc/module_calc.ulf
+++ b/scp2/source/calc/module_calc.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_calc.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 4a30287e6fce..e2504579e0a0 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_calc.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -348,7 +345,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "soffice.StarCalcDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Print_Command
@@ -411,7 +408,7 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarCalcTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Print_Command
@@ -499,6 +496,14 @@ RegistryItem gid_Regitem_Stc_Contenttype
     Value = "application/vnd.sun.xml.calc.template";
 End
 
+RegistryItem gid_Regitem_stc_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarCalcTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxc_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -532,6 +537,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxc_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarCalcDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 
 // new ods file extension 
 
@@ -582,7 +595,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_ods
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = "application/vnd.oasis.opendocument.spreadsheet";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -640,6 +653,14 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,3";
 End
 
+RegistryItem gid_Regitem_ods_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.CalcDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -695,13 +716,6 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Calc_Bin;
-//     Subkey = "opendocument.CalcDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -783,6 +797,14 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,4";
 End
 
+RegistryItem gid_Regitem_ots_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.Calctemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.CalcTemplate.1\shell";
@@ -808,7 +830,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.CalcTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
@@ -850,7 +872,7 @@ RegistryItem gid_Regitem_OpenOffice_SXC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxc\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -859,7 +881,7 @@ RegistryItem gid_Regitem_OpenOffice_STC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".stc\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcTemplate.6";
     Value = " ";
 End
 
@@ -868,7 +890,7 @@ RegistryItem gid_Regitem_OpenOffice_DIF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".dif\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -877,7 +899,7 @@ RegistryItem gid_Regitem_OpenOffice_DBF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".dbf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -886,7 +908,7 @@ RegistryItem gid_Regitem_OpenOffice_XLW_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xlw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -895,7 +917,7 @@ RegistryItem gid_Regitem_OpenOffice_RTF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".rtf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -904,7 +926,7 @@ RegistryItem gid_Regitem_OpenOffice_SLK_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".slk\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -913,7 +935,7 @@ RegistryItem gid_Regitem_OpenOffice_CSV_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".csv\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -922,7 +944,7 @@ RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".txt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -931,7 +953,7 @@ RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".htm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -940,7 +962,7 @@ RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".html\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -949,7 +971,7 @@ RegistryItem gid_Regitem_OpenOffice_WK1_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wk1\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -958,7 +980,7 @@ RegistryItem gid_Regitem_OpenOffice_WKS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wks\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -967,7 +989,7 @@ RegistryItem gid_Regitem_OpenOffice_123_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".123\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -976,16 +998,18 @@ RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
+// "FileAssociations" entries
+
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stc
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".stc";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcTemplate.6";
     Styles = ();
 End
 
@@ -994,7 +1018,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dif";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1003,7 +1027,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dbf";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1012,7 +1036,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".slk";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1021,7 +1045,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".csv";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1030,7 +1054,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".xlw";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1039,7 +1063,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wk1";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1048,7 +1072,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wks";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1057,10 +1081,11 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".123";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
+
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scalc_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\scalc.exe";
@@ -1076,11 +1101,20 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scal
     Value = "<progpath>";
 End
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_Bin, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_Bin, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlt,  gid_Module_Prg_Calc_Bin, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xltx, gid_Module_Prg_Calc_Bin, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xltm, gid_Module_Prg_Calc_Bin, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ods )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ots )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxc )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
+
+// registering the mso file types
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_Bin, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_Bin, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_Bin, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_Bin, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_Bin, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
 
diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf
index 088adcd46e20..2f6e1e8eda9a 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_calc.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index f3251634c53d..435cef4304f8 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cairocanvas.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 67e374e6d584..f095eff9f23e 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: canvascommons.scp,v $
- * $Revision: 1.11.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,19 +27,6 @@
 
 #include "macros.inc"
 
-File gid_File_Oo_Office_Canvas_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Canvas.xcs";
-End 
-File gid_File_Oo_Office_Canvas_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Canvas.xcu";
-End 
-
 STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
 STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
 
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
index f8be02db0e02..febdb8428c8b 100644
--- a/scp2/source/canvas/directxcanvas.scp
+++ b/scp2/source/canvas/directxcanvas.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directxcanvas.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 9bfc24d7a297..f89e1c685b08 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
index 04d0db1f74dd..5f69de34fee9 100644
--- a/scp2/source/canvas/vclcanvas.scp
+++ b/scp2/source/canvas/vclcanvas.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vclcanvas.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/crashrep/file_crashrep_dynamic.scp b/scp2/source/crashrep/file_crashrep.scp
index 21710ccbd2f8..f92f93f0b1d8 100644
--- a/scp2/source/crashrep/file_crashrep_dynamic.scp
+++ b/scp2/source/crashrep/file_crashrep.scp
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/scp2/source/crashrep/file_crashrep_static.scp b/scp2/source/crashrep/file_crashrep_static.scp
deleted file mode 100644
index 8bd76e80edb4..000000000000
--- a/scp2/source/crashrep/file_crashrep_static.scp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: file_crashrep_static.scp,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-// crashreporter files
-// crash_report_with_gtk.bin is statically built
-// it exists only for Unix
-
-#ifndef MACOSX
-
-File gid_File_Bin_Crashreport_With_Gtk
-    BIN_FILE_BODY;
-    Name = "crash_report_with_gtk.bin";
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-End
-
-#endif
-
-#ifndef MACOSX
-
-File gid_File_Aliases_Pangox
-    TXT_FILE_BODY;
-    Name = "pangox.aliases";
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-End
-
-#endif
diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk
index b58ced3b18ea..5e8101488270 100644
--- a/scp2/source/crashrep/makefile.mk
+++ b/scp2/source/crashrep/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +42,7 @@ TARGETTYPE=CUI
 SCP_PRODUCT_TYPE=osl
 
 PARFILES = \
-    file_crashrep_dynamic.par
+    file_crashrep.par
 
 .ENDIF # "$(ENABLE_CRASHDUMP)" != ""
 
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index b613f62ad97f..357e01f3cc00 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_draw.scp,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,11 +27,11 @@
 
 #include "macros.inc"
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu
+File gid_File_Share_Registry_Draw_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-draw.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "draw.xcd";
 End
 
 File gid_File_Help_Sdraw_Zip
@@ -65,53 +62,3 @@ File gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml
     Name = "/uiconfig/sdraw/menubar/menubar.xml";
 End
 */
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-draw.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_draw_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_draw_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Draw_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-draw.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Draw_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-draw.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Drawwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Drawwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu";
-End
-
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index 598884b60e13..4a73948ced39 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_draw.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/folderitem_draw.ulf b/scp2/source/draw/folderitem_draw.ulf
index aa800caeea70..5eea77b3e739 100644
--- a/scp2/source/draw/folderitem_draw.ulf
+++ b/scp2/source/draw/folderitem_draw.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_draw.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/makefile.mk b/scp2/source/draw/makefile.mk
index 373de268b8d9..605300dad7ca 100644
--- a/scp2/source/draw/makefile.mk
+++ b/scp2/source/draw/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index b5f8c89624a4..3226e08ea559 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_draw.scp,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,10 +43,8 @@ Module gid_Module_Prg_Draw_Bin
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml,
-    gid_File_Registry_Spool_Oo_Common_Draw_Xcu,gid_File_Registry_Spool_Oo_Setup_Draw_Xcu,
-    gid_File_Oo_Office_Ui_Drawwindowstate_Xcs,gid_File_Oo_Office_Ui_Drawwindowstate_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu, gid_File_Tmp_Userinstall_Draw_Inf);
+    gid_File_Share_Registry_Draw_Xcd,
+    gid_File_Tmp_Userinstall_Draw_Inf);
 End
 
 // Module gid_Module_Prg_Draw_Help
diff --git a/scp2/source/draw/module_draw.ulf b/scp2/source/draw/module_draw.ulf
index f61b12960423..2d8bc0c38a16 100644
--- a/scp2/source/draw/module_draw.ulf
+++ b/scp2/source/draw/module_draw.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_draw.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index b06ca6430fe4..0ecb21536613 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_draw.scp,v $
- * $Revision: 1.16.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -316,7 +313,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "soffice.StarDrawDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Print_Command
@@ -413,7 +410,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarDrawTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Print_Command
@@ -473,6 +470,14 @@ RegistryItem gid_Regitem_Std_Contenttype
     Value = "application/vnd.sun.xml.draw.template";
 End
 
+RegistryItem gid_Regitem_std_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarDrawTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxd_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -533,6 +538,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxd_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarDrawDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // new odg file extension 
 
 RegistryItem gid_Regitem_Odg_PersistentHandler
@@ -598,7 +611,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = "application/vnd.oasis.opendocument.graphics";
     Value = "opendocument.DrawDocument.1";
     Styles = ();
@@ -640,6 +653,14 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,5";
 End
 
+RegistryItem gid_Regitem_odg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.DrawDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -661,13 +682,6 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Draw_Bin;
-//     Subkey = "opendocument.DrawDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -783,6 +797,14 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,6";
 End
 
+RegistryItem gid_Regitem_otg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.DrawTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DrawTemplate.1\shell";
@@ -808,7 +830,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DrawTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
@@ -850,7 +872,7 @@ RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxd\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.6";
     Value = " ";
 End
 
@@ -859,10 +881,11 @@ RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".std\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.6";
     Value = " ";
 End
 
+
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
@@ -877,7 +900,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".std";
-    Value = "opendocument.DrawDocument.1";
+    Value = "soffice.StarDrawTemplate.6";
     Styles = ();
 End
 
@@ -895,3 +918,10 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sdra
     Name = "Path";
     Value = "<progpath>";
 End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odg )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otg )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxd )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( std )
diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf
index 852c93618811..46224625dfb8 100644
--- a/scp2/source/draw/registryitem_draw.ulf
+++ b/scp2/source/draw/registryitem_draw.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_draw.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index a7fdf1196ac3..9d10261843d2 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_gnome.scp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,6 +48,15 @@ File gid_File_Lib_Gnomevfs
 End
 #endif
 
+#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 = "gnome.xcd";
+End
+#endif
+
 #ifdef ENABLE_GCONF
 File gid_File_Lib_Gconfbe
     TXT_FILE_BODY;
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index ffbcc719144f..185915353a5a 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,6 +45,10 @@ SCP_PRODUCT_TYPE=osl
 SCPDEFS+=-DENABLE_GCONF
 .ENDIF
 
+.IF "$(ENABLE_LOCKDOWN)" == "YES"
+SCPDEFS+=-DENABLE_LOCKDOWN
+.ENDIF
+
 .IF "$(ENABLE_GNOMEVFS)" != ""
 SCPDEFS+=-DENABLE_GNOMEVFS
 .ENDIF
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 739609ce74bd..f9df5c8969a1 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_gnome.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,15 +27,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,11 +45,14 @@ 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) || defined ENABLE_GIO
+      gid_File_Share_Registry_Gnome_Xcd
+#endif
     );
 End
 
diff --git a/scp2/source/gnome/module_gnome.ulf b/scp2/source/gnome/module_gnome.ulf
index e1d3e9314412..e39d1c626cb4 100644
--- a/scp2/source/gnome/module_gnome.ulf
+++ b/scp2/source/gnome/module_gnome.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_gnome.ulf,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index ea92bdac8c86..2cd0f53f9e56 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_graphicfilter.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,32 +27,11 @@
 
 #include "macros.inc"
 
-File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_impressgraphics_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_impressgraphics_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_drawgraphics_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu
+File gid_File_Share_Registry_Graphicfilter_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_drawgraphics_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "graphicfilter.xcd";
 End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash )
diff --git a/scp2/source/graphicfilter/makefile.mk b/scp2/source/graphicfilter/makefile.mk
index 38e2d67eb8ee..522a22d36b28 100644
--- a/scp2/source/graphicfilter/makefile.mk
+++ b/scp2/source/graphicfilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index c55a253774ab..d5d99969fd64 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_graphicfilter.scp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,6 +34,5 @@ Module gid_Module_Optional_Grfflt
     ParentID = gid_Module_Optional;
     Default = YES;
     Files = (gid_File_Lib_Svg, gid_File_Lib_Flash,
-    		 gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu,
-    		 gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu);
+    		 gid_File_Share_Registry_Graphicfilter_Xcd);
 End
diff --git a/scp2/source/graphicfilter/module_graphicfilter.ulf b/scp2/source/graphicfilter/module_graphicfilter.ulf
index ae748f9d2102..f152392a941e 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.ulf
+++ b/scp2/source/graphicfilter/module_graphicfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_graphicfilter.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 5b8475e8cc9f..00dde2ca9162 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_impress.scp,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,11 +37,11 @@ File gid_File_Lib_Animcore
 	PACKED_UNO_LIB_FILE_BODY;
 End
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu
+File gid_File_Share_Registry_Impress_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-impress.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "impress.xcd";
 End
 
 File gid_File_Help_Simpress_Zip
@@ -77,55 +74,6 @@ File gid_File_Share_Config_Sofficecfg_Impress_Menubar_Xml
 End
 */
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-impress.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_impress_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_impress_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Impress_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-impress.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Impress_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-impress.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Impresswindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Impresswindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu";
-End
-
 // configuration files for custom animation effects
 
 File gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml
@@ -141,17 +89,3 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml
     Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
     Name = "transitions.xml";
 End
-
-File gid_File_Oo_Office_Ui_Effects_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Effects.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Effects_Xcu
-	TXT_FILE_BODY;
-	Styles = (PACKED);
-	Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-	Name = "/registry/data/org/openoffice/Office/UI/Effects.xcu";
-End
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index 16d78cc8b18e..db7b0c3794dd 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_impress.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/folderitem_impress.ulf b/scp2/source/impress/folderitem_impress.ulf
index 7a3c1cd4a3e1..d633e57593fb 100644
--- a/scp2/source/impress/folderitem_impress.ulf
+++ b/scp2/source/impress/folderitem_impress.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_impress.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
index a2036f5a3a8c..0a6e4c37ef1c 100644
--- a/scp2/source/impress/makefile.mk
+++ b/scp2/source/impress/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index dce65fe05170..7f8bcb7c44f7 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.scp,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,11 +43,9 @@ Module gid_Module_Prg_Impress_Bin
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
-    gid_File_Registry_Spool_Oo_Common_Impress_Xcu,gid_File_Registry_Spool_Oo_Setup_Impress_Xcu,
-    gid_File_Oo_Office_Ui_Impresswindowstate_Xcs,gid_File_Oo_Office_Ui_Impresswindowstate_Xcu,
+    gid_File_Share_Registry_Impress_Xcd,
 	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
-	gid_File_Oo_Office_Ui_Effects_Xcs, gid_File_Oo_Office_Ui_Effects_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu, gid_File_Tmp_Userinstall_Impress_Inf);
+    gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
 // Module gid_Module_Prg_Impress_Help
diff --git a/scp2/source/impress/module_impress.ulf b/scp2/source/impress/module_impress.ulf
index dbb8b86b7084..6d795644a06e 100644
--- a/scp2/source/impress/module_impress.ulf
+++ b/scp2/source/impress/module_impress.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 18425e88033a..06fbb4bfcc1a 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.scp,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,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 +55,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/impress/module_ogltrans.ulf b/scp2/source/impress/module_ogltrans.ulf
index 8faa064a5466..555e88a0fae4 100644
--- a/scp2/source/impress/module_ogltrans.ulf
+++ b/scp2/source/impress/module_ogltrans.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_impress.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index cb23b879fc37..689dcd7e1526 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_impress.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -350,7 +347,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "soffice.StarImpressDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Print_Command
@@ -427,7 +424,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarImpressTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Print_Command
@@ -487,6 +484,14 @@ RegistryItem gid_Regitem_Sti_Contenttype
     Value = "application/vnd.sun.xml.impress.template";
 End
 
+RegistryItem gid_Regitem_sti_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarImpressTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxi_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -547,6 +552,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxi_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarImpressDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // new odp file extension
 
 RegistryItem gid_Regitem_Odp_PersistentHandler
@@ -596,7 +609,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = "application/vnd.oasis.opendocument.presentation";
     Value = "opendocument.ImpressDocument.1";
     Styles = ();
@@ -655,6 +668,14 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,7";
 End
 
+RegistryItem gid_Regitem_odp_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.ImpressDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -710,13 +731,6 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Impress_Bin;
-//     Subkey = "opendocument.ImpressDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -812,6 +826,14 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,8";
 End
 
+RegistryItem gid_Regitem_otp_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.ImpressTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.ImpressTemplate.1\shell";
@@ -837,7 +859,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.ImpressTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command
@@ -879,7 +901,7 @@ RegistryItem gid_Regitem_OpenOffice_SXI_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxi\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.6";
     Value = " ";
 End
 
@@ -888,7 +910,7 @@ RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sti\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.6";
     Value = " ";
 End
 
@@ -897,7 +919,7 @@ RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxd\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.6";
     Value = " ";
 End
 
@@ -925,7 +947,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sti";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "soffice.StarImpressDocument.6";
     Styles = ();
 End
 
@@ -944,11 +966,19 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simp
     Value = "<progpath>";
 End
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_Bin, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_Bin, pps,  PPS,  MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pot,  gid_Module_Prg_Impress_Bin, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odp )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otp )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxi )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
+
+// registering the mso file types
 
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_Bin, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_Bin, pps,  PPS,  MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_Bin, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf
index 2aaa99102691..2b49957ea470 100644
--- a/scp2/source/impress/registryitem_impress.ulf
+++ b/scp2/source/impress/registryitem_impress.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_impress.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index 3cd33ece0b26..d7a902dbf00f 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_javafilter.scp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,46 +49,25 @@ End
 
 #endif
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_palm_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_palm_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_pocketword_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu
+File gid_File_Share_Registry_Palm_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_pocketword_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "palm.xcd";
 End
 
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu
+File gid_File_Share_Registry_Pocketexcel_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_pocketexcel_types.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "pocketexcel.xcd";
 End
 
-File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu
+File gid_File_Share_Registry_Pocketword_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_pocketexcel_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "pocketword.xcd";
 End
 
 #ifdef SOLAR_JAVA
diff --git a/scp2/source/javafilter/makefile.mk b/scp2/source/javafilter/makefile.mk
index 3e34a40e8c1a..49f50ab16162 100644
--- a/scp2/source/javafilter/makefile.mk
+++ b/scp2/source/javafilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp
index f256472a67de..dd69d014caf7 100644
--- a/scp2/source/javafilter/module_javafilter.scp
+++ b/scp2/source/javafilter/module_javafilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_javafilter.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -63,7 +60,7 @@ End
 Module gid_Module_Optional_Javafilter_Palm_Aportisdoc
     MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC);
     ParentID = gid_Module_Optional_Javafilter_Palm;
-    Files = ( gid_File_Jar_Aportisdoc, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu );
+    Files = ( gid_File_Jar_Aportisdoc, gid_File_Share_Registry_Palm_Xcd );
     Sortkey = "100";
     Minimal = NO;
     Default = NO;
@@ -99,7 +96,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word
     MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD);
     ParentID = gid_Module_Optional_Javafilter_Pocketpc;
     Sortkey = "100";
-    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcword_Inf );
+    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword, gid_File_Share_Registry_Pocketword_Xcd, gid_File_Tmp_Userinstall_Pocketpcword_Inf );
     Minimal = NO;
     Default = NO;
     Styles (en-US) = ();
@@ -114,7 +111,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel
     MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL);
     ParentID = gid_Module_Optional_Javafilter_Pocketpc;
     Sortkey = "200";
-    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf );
+    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel, gid_File_Share_Registry_Pocketexcel_Xcd, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf );
     Minimal = NO;
     Default = NO;
     Styles (en-US) = ();
diff --git a/scp2/source/javafilter/module_javafilter.ulf b/scp2/source/javafilter/module_javafilter.ulf
index 1e0762d0cc4a..64ae9c420367 100644
--- a/scp2/source/javafilter/module_javafilter.ulf
+++ b/scp2/source/javafilter/module_javafilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_javafilter.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp
index 14c3ac59200d..593c6177edad 100644
--- a/scp2/source/javafilter/registryitem_javafilter.scp
+++ b/scp2/source/javafilter/registryitem_javafilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_javafilter.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/javafilter/registryitem_javafilter.ulf b/scp2/source/javafilter/registryitem_javafilter.ulf
index 5c0bf9d2dfb5..fb2478dd8dda 100644
--- a/scp2/source/javafilter/registryitem_javafilter.ulf
+++ b/scp2/source/javafilter/registryitem_javafilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_javafilter.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index 4cd9de0b240c..0e0b3d1b73bb 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_kde.scp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
index 6ddb30108ce6..32d713812ee9 100644
--- a/scp2/source/kde/makefile.mk
+++ b/scp2/source/kde/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 28dacbef0583..55180c57bad8 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_kde.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/kde/module_kde.ulf b/scp2/source/kde/module_kde.ulf
index 1c9aa414b9e9..3d9be78ef898 100644
--- a/scp2/source/kde/module_kde.ulf
+++ b/scp2/source/kde/module_kde.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_kde.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index 0bb9d19ec2ab..c801808a444b 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layout.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/layout/makefile.mk b/scp2/source/layout/makefile.mk
index eb923ceb7cae..55fddf86e915 100644
--- a/scp2/source/layout/makefile.mk
+++ b/scp2/source/layout/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 5bd506f7432b..4da9f1a23bbc 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_math.scp,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,11 +43,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd)
 
 STD_RES_FILE( gid_File_Res_Sm, sm )
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu
+File gid_File_Share_Registry_Math_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-math.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "math.xcd";
 End
 
 File gid_File_Help_Smath_Zip
@@ -81,67 +78,3 @@ File gid_File_Share_Config_Sofficecfg_Math_Menubar_Xml
     Name = "/uiconfig/smath/menubar/menubar.xml";
 End
 */
-
-File gid_File_Oo_Office_Ui_Mathcommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/MathCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Mathcommands_Xcu
-   TXT_FILE_BODY;
-   Styles = (PACKED);
-   Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-   Name = "/registry/data/org/openoffice/Office/UI/MathCommands.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-math.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_math_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_math_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Math_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-math.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Math_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-math.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Mathwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/MathWindowState.xcu";
-End
-
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index cf6564e414a1..2decfb20811c 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_math.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/folderitem_math.ulf b/scp2/source/math/folderitem_math.ulf
index 3e0372b8b1aa..4458d7115aed 100644
--- a/scp2/source/math/folderitem_math.ulf
+++ b/scp2/source/math/folderitem_math.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_math.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/makefile.mk b/scp2/source/math/makefile.mk
index 6237dc67c09d..b622097ee65d 100644
--- a/scp2/source/math/makefile.mk
+++ b/scp2/source/math/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index 08ab1725ed1e..e9c084ba928d 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_math.scp,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,10 +43,8 @@ Module gid_Module_Prg_Math_Bin
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Html_W3c_Ipr,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
-    gid_File_Oo_Office_Ui_Mathcommands_Xcs,gid_File_Oo_Office_Ui_Mathcommands_Xcu,gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
-    gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
-	gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu, gid_File_Tmp_Userinstall_Math_Inf);
+    gid_File_Share_Registry_Math_Xcd,
+    gid_File_Tmp_Userinstall_Math_Inf);
 End
 
 // Module gid_Module_Prg_Math_Help
diff --git a/scp2/source/math/module_math.ulf b/scp2/source/math/module_math.ulf
index b830e39735c9..25fd59018858 100644
--- a/scp2/source/math/module_math.ulf
+++ b/scp2/source/math/module_math.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_math.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index cc50981da023..b87e5b940356 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_math.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -349,7 +346,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "soffice.StarMathDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\smath.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Print_Command
@@ -433,6 +430,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxm_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarMathDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // new odf file extension
 
 RegistryItem gid_Regitem_Odf_PersistentHandler
@@ -498,7 +503,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odf
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Math_Bin;
     Name = "application/vnd.oasis.opendocument.formula";
     Value = "opendocument.MathDocument.1";
     Styles = ();
@@ -532,6 +537,14 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,14";
 End
 
+RegistryItem gid_Regitem_odf_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.MathDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -587,13 +600,6 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Math_Bin;
-//     Subkey = "opendocument.MathDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -632,7 +638,7 @@ RegistryItem gid_Regitem_OpenOffice_SXM_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "opendocument.MathDocument.1";
+    Name = "soffice.StarMathDocument.6";
     Value = " ";
 End
 
@@ -641,18 +647,18 @@ RegistryItem gid_Regitem_OpenOffice_MML_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".mml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "opendocument.MathDocument.1";
+    Name = "soffice.StarMathDocument.6";
     Value = " ";
 End
 
-// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml
-//     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-//     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-//     ModuleID = gid_Module_Prg_Math_Bin;
-//     Name = ".mml";
-//     Value = "opendocument.MathDocument.1";
-//     Styles = ();
-// End
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = ".mml";
+    Value = "soffice.StarMathDocument.6";
+    Styles = ();
+End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smath_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
@@ -668,3 +674,8 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smat
     Name = "Path";
     Value = "<progpath>";
 End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odf )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxm )
diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf
index d94c2e3f2331..cee55d76d3c8 100644
--- a/scp2/source/math/registryitem_math.ulf
+++ b/scp2/source/math/registryitem_math.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_math.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 470b69eb9030..e33eb6fa35c7 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_onlineupdate.scp,v $
- * $Revision: 1.7.116.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,18 +29,11 @@
 
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
 
-File gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Addons;
-    Name = "/registry/spool/org/openoffice/Office/Addons/Addons-onlineupdate.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu
+File gid_File_Share_Registry_Onlineupdate_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs;
-    Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "onlineupdate.xcd";
 End
 
 #if defined LINUX || defined SOLARIS
diff --git a/scp2/source/onlineupdate/makefile.mk b/scp2/source/onlineupdate/makefile.mk
index 19d62c5549c5..4b3ce930483f 100644
--- a/scp2/source/onlineupdate/makefile.mk
+++ b/scp2/source/onlineupdate/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index cb6d6e267b98..6685450774f2 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_onlineupdate.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,6 +34,5 @@ Module gid_Module_Optional_Onlineupdate
     ParentID = gid_Module_Optional;
     Default = YES;
     Styles = (DONTSHOWINUSERINSTALL);
-    Files = (gid_File_Lib_Updchk, gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu, gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu, gid_File_Bin_UnpackUpdate);
-    Dirs = (gid_Dir_Share_Registry_Modules_Oo_Office_Addons, gid_Dir_Share_Registry_Modules_Oo_Office_Jobs);
+    Files = (gid_File_Lib_Updchk, gid_File_Share_Registry_Onlineupdate_Xcd, gid_File_Bin_UnpackUpdate);
 End
diff --git a/scp2/source/onlineupdate/module_onlineupdate.ulf b/scp2/source/onlineupdate/module_onlineupdate.ulf
index c0620c9c548b..be6d799de65b 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.ulf
+++ b/scp2/source/onlineupdate/module_onlineupdate.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_onlineupdate.ulf,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 88c1e02a7591..9be400ed2d39 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: common_brand.scp,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,20 +47,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_Data,
-            gid_Brand_Dir_Share_Registry_Data_Org,
-            gid_Brand_Dir_Share_Registry_Data_Org_Openoffice,
-            gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office,
-            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_Jobs,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer,
-            gid_Brand_Dir_Share_Registry_Modules_Oo_Setup,
             gid_Brand_Dir_Share_Xdg);
     Files = (gid_Brand_File_BasisLink,
              gid_Brand_File_Bin_Crashreport,
@@ -100,12 +83,8 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Msvcm80crt_Manifest,
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
-             gid_Brand_File_Oo_Office_Compatibility_Xcu,
-             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_Share_Registry_Brand_Xcd,
              gid_Brand_File_Script_Unopkg,
-             gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration,
              gid_Brand_File_Share_Xdg_Base,
              gid_Brand_File_Share_Xdg_Calc,
              gid_Brand_File_Share_Xdg_Draw,
@@ -148,9 +127,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,
@@ -253,71 +231,6 @@ Directory gid_Brand_Dir_Share_Registry
     DosName = "registry";
 End
 
-Directory gid_Brand_Dir_Share_Registry_Data
-    ParentID = gid_Brand_Dir_Share_Registry;
-    HostName = "data";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Data_Org
-    ParentID = gid_Brand_Dir_Share_Registry_Data;
-    HostName = "org";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice
-    ParentID = gid_Brand_Dir_Share_Registry_Data_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office
-    ParentID = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice;
-    HostName = "Office";
-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_Ui
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "UI";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Writer";
-End
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Setup
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo;
-    HostName = "Setup";
-End
-
 #if defined UNX && ! defined MACOSX
 Directory gid_Brand_Dir_Share_Xdg
     ParentID = gid_Brand_Dir_Share;
@@ -430,7 +343,7 @@ File gid_Brand_File_Desktophelper_Txt
     Styles = (PACKED);
     Dir = gid_Brand_Dir_Program;
     Name = "desktophelper.txt";
-	ComponentCondition = "CREATEDESKTOPLINK=1";
+    ComponentCondition = "CREATEDESKTOPLINK=1";
 End
 #endif
 
@@ -461,17 +374,17 @@ End
 
 #ifdef WNT
 File gid_Brand_File_Bin_Rebaseoo
-	BIN_FILE_BODY;
-	Dir = gid_Brand_Dir_Program;
-	Styles = (PACKED);
-	Name = "rebaseoo.exe";
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "rebaseoo.exe";
 End
 
 File gid_Brand_File_Bin_Rebasegui
-	BIN_FILE_BODY;
-	Dir = gid_Brand_Dir_Program;
-	Styles = (PACKED);
-	Name = "rebasegui.exe";
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "rebasegui.exe";
 End
 #endif
 
@@ -554,59 +467,28 @@ File gid_Brand_File_Images_Brand_Zip
     Styles = (PACKED);
 End
 
-File gid_Brand_File_Oo_Office_Compatibility_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Compatibility.xcu";
-End
-
-File gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu
+File gid_Brand_File_Share_Registry_Brand_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-brand.xcu";
+    Dir = gid_Brand_Dir_Share_Registry;
+    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_Ui_Brand_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui;
-    Name = "/registry/spool/org/openoffice/Office/UI-brand.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";
-End
-
-File gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-brand.xcu";
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name (ko) = "korea.xcd";
 End
 
 #if defined UNX && ! defined MACOSX
@@ -620,37 +502,37 @@ End
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Calc
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "calc.desktop";
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "calc.desktop";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Draw
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "draw.desktop";
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "draw.desktop";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Impress
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "impress.desktop";
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "impress.desktop";
     Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Math
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "math.desktop";
-	Styles = (PACKED,SCPZIP_REPLACE);
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "math.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
 End
 #endif
 
@@ -881,7 +763,6 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
   #else
     Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #endif
-    StandaloneValue = "$ORIGIN/..";
 End
 
 ProfileItem gid_Brand_Profileitem_Soffice_UreBootstrap
@@ -937,6 +818,15 @@ ProfileItem gid_Brand_Profileitem_Soffice_ProgressFrameColor_So
     Value = "${PROGRESSFRAMECOLOR}";
 End
 
+ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 6;
+    Key = "NativeProgress";
+    Value = "${NATIVEPROGRESS}";
+End
+
 #ifdef WNT
 ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
     ProfileID = gid_Brand_Profile_Soffice_Ini;
@@ -951,6 +841,20 @@ ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
 End
 #endif
 
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Soffice_Startlang
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 8;
+    Key = "STARTLANG";
+    Value = "[STARTLANG]";
+    Inifiletablekey = "STARTLANG";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+#endif
+
 ProfileItem gid_Brand_Profileitem_Version_Buildid
     ProfileID = gid_Brand_Profile_Version_Ini;
     ModuleID = gid_Module_Root_Brand;
@@ -1094,7 +998,7 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
     Section = "Version";
     Order = 18;
     Key = "ExtensionUpdateURL";
-    Value = "http://updateext.services.openoffice.org/ProductUpdateService/check.Update";
+    Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
@@ -1331,22 +1235,6 @@ ProfileItem gid_Brand_Profileitem_Setup_Install
 End
 #endif
 
-#ifdef ENABLE_SVCTAGS
-
-Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs
-    ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Jobs";
-End
-
-File gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs;
-    Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-registration.xcu";
-End
-
-#endif
-
 //TODO: This actually belongs into a module of its own:
 #if !defined SYSTEM_PYTHON
 File gid_Brand_File_Bin_Python
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index ba10f087fb2e..dea9145a000e 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: common_brand_readme.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/datacarrier_ooo.scp b/scp2/source/ooo/datacarrier_ooo.scp
index 5d6398c984be..89bfef1e5626 100644
--- a/scp2/source/ooo/datacarrier_ooo.scp
+++ b/scp2/source/ooo/datacarrier_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datacarrier_ooo.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index ce9fd987d038..cc805f9e8288 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory_ooo.scp,v $
- * $Revision: 1.55.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -177,56 +174,6 @@ Directory gid_Dir_User
     DosName = "presets";
 End
 
-Directory gid_Dir_User_Registry
-    ParentID = gid_Dir_User;
-    DosName = "registry";
-End
-
-Directory gid_Dir_User_Registry_Data
-    ParentID = gid_Dir_User_Registry;
-    DosName = "data";
-End
-
-Directory gid_Dir_User_Registry_Data_Org
-    ParentID = gid_Dir_User_Registry_Data;
-    DosName = "org";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice
-    ParentID = gid_Dir_User_Registry_Data_Org;
-    DosName = "openoffice";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice;
-    DosName = "Office";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Ui
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
-    DosName = "UI";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Dataaccess
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
-    HostName = "DataAccess";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_OOoImprovement
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
-    DosName = "OOoImprovement";
-End
-
-Directory gid_Dir_User_Registry_Data_Org_Openoffice_Ucb
-    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice;
-    DosName = "ucb";
-End
-
-Directory gid_Dir_User_Registry_Cache
-    ParentID = gid_Dir_User_Registry;
-    DosName = "cache";
-End
-
 Directory gid_Dir_User_Xslt
     ParentID = gid_Dir_User;
     DosName = "xslt";
@@ -727,256 +674,11 @@ Directory gid_Dir_Share_Registry
     DosName = "registry";
 End
 
-Directory gid_Dir_Share_Registry_Schema
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "schema";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org
-    ParentID = gid_Dir_Share_Registry_Schema;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice
-    ParentID = gid_Dir_Share_Registry_Schema_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    HostName = "UI";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    HostName = "DataAccess";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    HostName = "OOoImprovement";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection
-    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    HostName = "TypeDetection";
-End
-
-Directory gid_Dir_Share_Registry_Ldap
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "ldap";
-End
-
-Directory gid_Dir_Share_Registry_Data
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "data";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org
-    ParentID = gid_Dir_Share_Registry_Data;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice
-    ParentID = gid_Dir_Share_Registry_Data_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    HostName = "UI";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Dataaccess
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    HostName = "DataAccess";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection
-    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    HostName = "TypeDetection";
-End
-
 Directory gid_Dir_Share_Registry_Res
     ParentID = gid_Dir_Share_Registry;
     HostName = "res";
 End
 
-Directory gid_Dir_Share_Registry_Res_Lang
-    ParentID = gid_Dir_Share_Registry_Res;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org
-    ParentID = gid_Dir_Share_Registry_Res_Lang;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice
-    ParentID = gid_Dir_Share_Registry_Res_Lang_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Office
-    ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice;
-    HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Ucb
-    ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice;
-    HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Modules
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "modules";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Org
-    ParentID = gid_Dir_Share_Registry_Modules;
-    HostName = "org";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo
-    ParentID = gid_Dir_Share_Registry_Modules_Org;
-    HostName = "openoffice";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "Office";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "TypeDetection";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "UISort";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Ucb
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "ucb";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Ucb;
-    HostName = "Configuration";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Setup
-    ParentID = gid_Dir_Share_Registry_Modules_Oo;
-    HostName = "Setup";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Accelerators";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Paths
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Paths";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Common
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Common";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Writer
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Writer";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Impress
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Impress";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Linguistic";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Logging
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Logging";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Embedding
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Embedding";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Scripting
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Scripting";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Addons
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Addons";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_Jobs
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "Jobs";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "Filter";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "GraphicFilter";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "Types";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection;
-    HostName = "Misc";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-	HostName = "DataAccess";
-End
-
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess;
-	HostName = "Drivers";
-End
-
 Directory gid_Dir_Autotext
     ParentID = gid_Dir_Share;
     DosName = "autotext";
diff --git a/scp2/source/ooo/directory_ooo.ulf b/scp2/source/ooo/directory_ooo.ulf
index 9c8604922589..6102bc4cf497 100644
--- a/scp2/source/ooo/directory_ooo.ulf
+++ b/scp2/source/ooo/directory_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory_ooo.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index 6bff77e6f355..9cd00117dcbf 100755
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory_ooo_macosx.scp,v $
- * $Revision: 1.55.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index b2789c3087d7..dbea12eee10c 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_extra_ooo.scp,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,7 +38,7 @@ File gid_File_Extra_Autotextshare_Lang
     Dir = gid_Dir_Autotext_Language;
     USER_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(autotextshare);
+    EXTRA_ALL_LANG(autotextshare,zip);
 End
 
 File gid_File_Extra_Autotextuser
@@ -308,7 +305,7 @@ File gid_File_Extra_Palettes_Lang
     Dir = gid_Dir_User_Config;
     USER_FILE_BODY;
     Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(palettes);
+    EXTRA_ALL_LANG(palettes,zip);
 End
 
 File gid_File_Extra_Poll_Asp
@@ -357,14 +354,14 @@ File gid_File_Extra_Tpllayoutimpr_Lang
     Dir = gid_Dir_Template_Layout;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tpllayoutimpr);
+    EXTRA_ALL_LANG(tpllayoutimpr,zip);
 End
 
 File gid_File_Extra_Tplpresntimpr_Lang
     Dir = gid_Dir_Template_Presnt;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplpresntimpr);
+    EXTRA_ALL_LANG(tplpresntimpr,zip);
 End
 
 File gid_File_Extra_Tplwizbitmap
@@ -378,7 +375,7 @@ File gid_File_Extra_Tplwizdesktop_Lang
     Dir = gid_Dir_Template_Internal;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizdesktop);
+    EXTRA_ALL_LANG(tplwizdesktop,zip);
 End
 
 File gid_File_Extra_Tplwizletter
@@ -390,35 +387,35 @@ End
 File gid_File_Extra_Tplwizletter_Lang
     Dir = gid_Dir_Template_Wizard_Letter;
     ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(tplwizletter);
+    EXTRA_ALL_LANG(tplwizletter,zip);
 End
 
 File gid_File_Extra_Tplwizfax_Lang
     Dir = gid_Dir_Template_Wizard_Fax;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizfax);
+    EXTRA_ALL_LANG(tplwizfax,zip);
 End
 
 File gid_File_Extra_Tplwizagenda_Lang
     Dir = gid_Dir_Template_Wizard_Agenda;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizagenda);
+    EXTRA_ALL_LANG(tplwizagenda,zip);
 End
 
 File gid_File_Extra_Tplwizreport_Lang
     Dir = gid_Dir_Template_Wizard_Report;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizreport);
+    EXTRA_ALL_LANG(tplwizreport,zip);
 End
 
 File gid_File_Extra_Tplwizstyles_Lang
     Dir = gid_Dir_Template_Wizard_Styles;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizstyles);
+    EXTRA_ALL_LANG(tplwizstyles,zip);
 End
 
 File gid_File_Extra_Webcast_Asp
@@ -444,5 +441,5 @@ File gid_File_Extra_Wordbook_Lang
     Dir = gid_Dir_Wordbook_Language;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(wordbook);
+    EXTRA_ALL_LANG(wordbook,zip);
 End
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 59d829b29830..f26339fe8b1d 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_font_ooo.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 67ec89b15963..224d26de6a0d 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_jre_ooo.scp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,20 +28,11 @@
 #include "macros.inc"
 
 #if defined(BUILD_SPECIAL)
-File gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Logging;
-    Name = "/registry/spool/org/openoffice/Office/Logging/Logging-oooimprovement.xcu";
-End
-#endif
-
-#if defined(BUILD_SPECIAL)
-File gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement
+File gid_File_Share_Registry_Oooimprovement_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs;
-    Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-oooimprovement.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "oooimprovement.xcd";
 End
 #endif
 
diff --git a/scp2/source/ooo/file_jre_ooo.scp b/scp2/source/ooo/file_jre_ooo.scp
index 45985d8c9290..8800db4c6065 100644
--- a/scp2/source/ooo/file_jre_ooo.scp
+++ b/scp2/source/ooo/file_jre_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_jre_ooo.scp,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index f9c247bd6157..4a39b5da4978 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -2,12 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_library_ooo.scp,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,22 +36,10 @@ End
 #endif
 #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
 STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas)
-File gid_File_Oo_Office_Dataaccess_Adabas_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/adabas.xcu";
-End
 #endif
 
 #if defined(WNT)
 STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado)
-File gid_File_Oo_Office_Dataaccess_Ado_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/ado.xcu";
-End
 #endif
 
 STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl)
@@ -70,55 +56,35 @@ File gid_File_Lib_Basprov
   #endif
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib)
-
-File gid_File_Lib_Cached1
+#ifdef ENABLE_VBA
+File gid_File_Lib_Vbaevent
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT2(libcached1,UNXSUFFIX));
+    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
   #else
-    Name = "cached1.dll";
+    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
   #endif
 End
+#endif // ENABLE_VBA
 
-File gid_File_Lib_Configmgr2
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(configmgr2.uno,UNXSUFFIX));
-  #else
-    Name = "configmgr2.uno.dll";
-  #endif
-End
+STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib)
 
-File gid_File_Lib_Sysmgr1
+File gid_File_Lib_Cached1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT2(sysmgr1.uno,UNXSUFFIX));
+    Name = STRING(CONCAT2(libcached1,UNXSUFFIX));
   #else
-    Name = "sysmgr1.uno.dll";
+    Name = "cached1.dll";
   #endif
 End
 
-File gid_File_Lib_Behelper
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(behelper.uno,UNXSUFFIX));
-  #else
-    Name = "behelper.uno.dll";
-  #endif
-End
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Configmgr, configmgr)
 
 #ifdef WITH_LDAP
 File gid_File_Lib_Ldapbe2
@@ -219,13 +185,13 @@ File gid_File_Lib_Curl
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
+       Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
+       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
     #endif
   #else
    #ifdef _gcc3
-    Name = "libcurl-3.dll";
+    Name = "libcurl-4.dll";
    #else
     Name = "libcurl.dll";
    #endif
@@ -278,12 +244,6 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
-File gid_File_Oo_Office_Dataaccess_Dbase_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/dbase.xcu";
-End
 
 STD_LIB_FILE( gid_File_Lib_Dbfile , file)
 STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
@@ -486,12 +446,6 @@ End
 #ifdef UNX
 
 #ifdef ENABLE_KAB
-File gid_File_Oo_Office_Dataaccess_Kab_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/kab.xcu";
-End
 File gid_File_Lib_Kab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -510,12 +464,6 @@ End
 #endif
 
 #ifdef MACOSX
-File gid_File_Oo_Office_Dataaccess_Macab_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/macab.xcu";
-End
 File gid_File_Lib_Macab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -534,12 +482,6 @@ End
 #endif  // #ifdef ENABLE_KAB
 
 #ifdef ENABLE_EVOAB2
-File gid_File_Oo_Office_Dataaccess_Evoab2_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/evoab2.xcu";
-End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
@@ -569,12 +511,6 @@ File gid_File_Lib_Filterconfig1
     Name = SPECIAL_NAME(filterconfig1);
 End
 
-File gid_File_Oo_Office_Dataaccess_Flat_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/flat.xcu";
-End
 STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat)
 
 #ifdef WNT
@@ -735,14 +671,6 @@ File gid_File_Lib_Gdiplus
 End
 #endif
 
-File gid_File_Lib_Go
-    Name = LIBNAME(go);
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
-End
-
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
 
 STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
@@ -855,22 +783,10 @@ End
 #ifdef SOLAR_JAVA
 
 STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
-File gid_File_Oo_Office_Dataaccess_Jdbc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/jdbc.xcu";
-End
 
 #endif
 
 #ifdef SOLAR_JAVA
-File gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/hsqldb.xcu";
-End
 File gid_File_Lib_Hsqldb_2
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -1000,17 +916,6 @@ End
 
 #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
                                                                 // #i91209#
-File gid_File_Oo_Office_Dataaccess_Mozab_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-#ifdef WNT
-    Name = "/registry/spool/DataAccess/mozab.xcu";
-#else
-    Name = "/registry/spool/DataAccess/mozab2.xcu";
-#endif
-End
-
 STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
@@ -1144,25 +1049,7 @@ End
 #endif
 
 STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql)
-File gid_File_Oo_Office_Dataaccess_Mysql_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/mysql.xcu";
-End
 STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc)
-File gid_File_Oo_Office_Dataaccess_Odbc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-    Name = "/registry/spool/DataAccess/odbc.xcu";
-End
-
-File gid_File_Registry_Drivers_Zip
-    Dir = gid_Dir_Share_Registry_Res_Lang;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(fcfg_drivers);
-End
 
 // STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
 
@@ -1499,6 +1386,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
 STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
 STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
 STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
+STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5a280328e66a..94f9bb6e4450 100644..100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_ooo.scp,v $
- * $Revision: 1.257.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1147,969 +1144,36 @@ End
 
 #endif
 
-File gid_File_Oo_Inet_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/Inet.xcs";
-End
-
-File gid_File_Oo_Inet_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/Inet.xcu";
-End
-
-File gid_File_Oo_Office_Addons_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Addons.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidecommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidecommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Windowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Bibliographycommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Bibliographycommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs";
-End
-
-/*
-File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BibliographyWindowState.xcu";
-End
-*/
-File gid_File_Oo_Office_Calc_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Calc.xcs";
-End
-
-File gid_File_Oo_Office_Calc_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Calc.xcu";
-End
-
-File gid_File_Oo_Office_CalcAddIns_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/CalcAddIns.xcs";
-End
-
-File gid_File_Oo_Office_Chart_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Chart.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Chartcommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Chartcommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/ChartCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Chartwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Chartwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Commands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Commands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Commands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Commands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Category_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Category.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Genericcategories_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Genericcategories_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/GenericCategories.xcu";
-End
-
-File gid_File_Oo_Office_Common_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Common.xcs";
-End
-
-File gid_File_Oo_Office_Histories_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Histories.xcs";
-End
-
-File gid_File_Oo_Office_Ui_WindowContentFactories_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs";
-End
-
-File gid_File_Oo_Office_Extendedcolorscheme_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs";
-End
-
-File gid_File_Oo_Office_Paths_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Paths.xcs";
-End
-
-File gid_File_Oo_Office_Logging_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Logging.xcs";
-End
-
-File gid_File_Oo_Office_OOoImprovement_Settings_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement;
-    Name = "/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs";
-End
-
-File gid_File_Oo_Office_OptionsDialog_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/OptionsDialog.xcs";
-End
-
-File gid_File_Oo_Office_Recovery_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Recovery.xcs";
-End
-
-File gid_File_Oo_Office_Histories_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Histories.xcu";
-End
-
-File gid_File_Oo_Office_Common_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED,SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Common.xcu";
-End
-
-File gid_File_Oo_Office_Accelerators_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Accelerators.xcs";
-End
-
-File gid_File_Oo_Office_Accelerators_Xcu
+File gid_File_Share_Registry_Main_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Accelerators.xcu";
-End
-
-File gid_File_Oo_Office_Paths_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Paths.xcu";
-End
-
-File gid_File_Oo_Office_Logging_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Logging.xcu";
-End
-
-File gid_File_Oo_Office_Views_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Views.xcu";
-End
-
-File gid_File_Oo_Office_Compatibility_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Compatibility.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Controller_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Controller.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Controller_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/Controller.xcu";
-End
-
-File gid_File_Oo_Office_Dataaccess_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/DataAccess.xcs";
-End
-
-File gid_File_Oo_Office_Dataaccess_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/DataAccess.xcu";
-End
-
-File gid_File_Oo_Office_Dataaccess_Drivers_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess;
-    Name = "/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbucommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbucommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbuCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Basewindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Basewindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu";
-End
-
-
-File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu";
-End
-
-
-File gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Draw_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Draw.xcs";
-End
-
-File gid_File_Oo_Office_Events_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Events.xcs";
-End
-
-File gid_File_Oo_Office_ExtensionManager_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/ExtensionManager.xcs";
-End
-
-File gid_File_Oo_Office_ExtensionManager_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/ExtensionManager.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Factories_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/Factories.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Factories_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/Factories.xcu";
-End
-
-File gid_File_Oo_Office_Embedding_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-	Name = "/registry/data/org/openoffice/Office/Embedding.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-chart.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Genericcommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Genericcommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/GenericCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_GlobalSettings_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs";
-End
-
-File gid_File_Oo_Office_Impress_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Impress.xcs";
-End
-
-File gid_File_Oo_Office_Impress_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Impress.xcu";
-End
-
-File gid_File_Oo_Office_Java_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Java.xcs";
-End
-
-File gid_File_Oo_Office_Jobs_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Jobs.xcs";
+    Dir = gid_Dir_Share_Registry;
+    Name = "main.xcd";
 End
 
-File gid_File_Oo_Office_Jobs_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Jobs.xcu";
-End
-
-File gid_File_Oo_Office_Labels_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Labels.xcs";
-End
-
-File gid_File_Oo_Office_Labels_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Labels.xcu";
-End
-
-File gid_File_Oo_Office_Linguistic_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Linguistic.xcs";
-End
-
-File gid_File_Oo_Office_Math_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Math.xcs";
-End
-
-File gid_File_Oo_Office_Math_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Math.xcu";
-End
-
-File gid_File_Oo_Office_TabBrowse_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/TabBrowse.xcs";
-End
-
-File gid_File_Oo_Office_Protocolhandler_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/ProtocolHandler.xcs";
-End
-
-File gid_File_Oo_Office_Protocolhandler_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/ProtocolHandler.xcu";
-End
-
-File gid_File_Oo_Office_Scripting_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Scripting.xcs";
-End
-
-File gid_File_Oo_Office_Scripting_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Scripting.xcu";
-End
-
-File gid_File_Oo_Office_Security_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Security.xcs";
-End
-
-File gid_File_Oo_Office_Security_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Security.xcu";
-End
-
-File gid_File_Oo_Office_Sfx_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/SFX.xcs";
-End
-
-File gid_File_Oo_Office_Sfx_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/SFX.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulecommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulecommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Substitution_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Substitution.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/UI.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/UI.xcu";
-End
-
-File gid_File_Oo_Office_Views_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Views.xcs";
-End
-
-File gid_File_Oo_Office_Writer_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Writer.xcs";
-End
-
-File gid_File_Oo_Office_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/Writer.xcu";
-End
-
-File gid_File_Oo_Office_WebWizard_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/WebWizard.xcs";
-End
-
-File gid_File_Oo_Office_WebWizard_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/WebWizard.xcu";
-End
-
-File gid_File_Oo_Office_FormWizard_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/FormWizard.xcs";
-End
-
-File gid_File_Oo_Office_FormWizard_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/FormWizard.xcu";
-End
-
-
-File gid_File_Oo_Office_TableWizard_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/TableWizard.xcs";
-End
-
-File gid_File_Oo_Office_TableWizard_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
-    Name = "/registry/data/org/openoffice/Office/TableWizard.xcu";
-End
-
-
-File gid_File_Oo_Office_Writerweb_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/WriterWeb.xcs";
-End
-
-File gid_File_Oo_Office_TypeDetection_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/TypeDetection.xcs";
-End
-
-File gid_File_Oo_Office_Embedding_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
-    Name = "/registry/schema/org/openoffice/Office/Embedding.xcs";
-End
-
-File gid_File_Oo_Setup_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/Setup.xcs";
-End
-
-File gid_File_Oo_Setup_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/Setup.xcu";
-End
-
-File gid_File_Oo_Setup_Start_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-start.xcu";
-End
-
-File gid_File_Oo_Firststartwizard_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/FirstStartWizard.xcs";
-End
-
-File gid_File_Oo_Firststartwizard_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/FirstStartWizard.xcu";
-End
-
-File gid_File_Oo_System_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/System.xcs";
-End
-
-File gid_File_Oo_Typedetection_Filter_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/Filter.xcs";
-End
-
-File gid_File_Oo_Typedetection_Graphicfilter_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs";
-End
-
-File gid_File_Oo_Typedetection_Misc_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/Misc.xcs";
-End
-
-File gid_File_Oo_Typedetection_Types_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/Types.xcs";
-End
-
-File gid_File_Oo_Typedetection_UISort_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection;
-    Name = "/registry/schema/org/openoffice/TypeDetection/UISort.xcs";
-End
-
-File gid_File_Oo_TypeDetection_UISort_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection;
-    Name = "/registry/data/org/openoffice/TypeDetection/UISort.xcu";
-End
-
-File gid_File_Oo_Ucb_Configuration_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
-    Name = "/registry/schema/org/openoffice/ucb/Configuration.xcs";
-End
-
-File gid_File_Oo_Ucb_InteractionHandler_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
-    Name = "/registry/schema/org/openoffice/ucb/InteractionHandler.xcs";
-End
-
-File gid_File_Oo_Ucb_Configuration_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb;
-    Name = "/registry/data/org/openoffice/ucb/Configuration.xcu";
-End
-
-File gid_File_Oo_Ucb_Hierarchy_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
-    Name = "/registry/schema/org/openoffice/ucb/Hierarchy.xcs";
-End
-
-File gid_File_Oo_Ucb_Store_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb;
-    Name = "/registry/schema/org/openoffice/ucb/Store.xcs";
-End
-
-File gid_File_Oo_Userprofile_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/UserProfile.xcs";
-End
-
-File gid_File_Oo_Userprofile_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/UserProfile.xcu";
-End
-
-File gid_File_Oo_Vcl_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/VCL.xcs";
-End
-
-File gid_File_Oo_Vcl_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/VCL.xcu";
-End
+#ifdef WNT
 
-File gid_File_Oo_Ldap_Xcs
+File gid_File_Share_Registry_Forcedefault_Xcd
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice;
-    Name = "/registry/schema/org/openoffice/LDAP.xcs";
+    Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE);
+    Dir = gid_Dir_Share_Registry;
+    Name = "forcedefault.xcd";
 End
 
+#endif
 
-File gid_File_Oo_Ldap_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice;
-    Name = "/registry/data/org/openoffice/LDAP.xcu.sample";
-End
-
-File gid_File_Oo_Ldap_Attr_Map
+File gid_File_Oo_Ldap_Xcd_Sample
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Ldap;
-    Name = "/registry/schema/oo-ldap-attr.map";
+    Dir = gid_Dir_Share_Registry;
+    Name = "oo-ldap.xcd.sample";
 End
 
-File gid_File_Oo_AD_Ldap_Attr_Map
+File gid_File_Oo_Ad_Ldap_Xcd_Sample
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Ldap;
-    Name = "/registry/schema/oo-ad-ldap-attr.map";
+    Dir = gid_Dir_Share_Registry;
+    Name = "oo-ad-ldap.xcd.sample";
 End
 
 File gid_File_Rdb_Offapi
@@ -2138,141 +1202,43 @@ End
 #endif
 
 File gid_File_Registry_Lang
-    Dir = gid_Dir_Share_Registry_Res_Lang;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(registry);
-End
-
-File gid_File_Registry_Filter_Zip
-    Dir = gid_Dir_Share_Registry_Res_Lang;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(fcfg_langpack);
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_base_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_base_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc;
-    Name = "/registry/spool/fcfg_base_others.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu
+    Dir = gid_Dir_Share_Registry_Res;
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_chart_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_chart_filters.xcu";
+    EXTRA_ALL_LANG_BUT_EN_US(registry,xcd);
 End
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc;
-    Name = "/registry/spool/fcfg_chart_others.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_internalgraphics_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu
+File gid_File_Registry_Filter_Zip
+    Dir = gid_Dir_Share_Registry_Res;
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter;
-    Name = "/registry/spool/fcfg_internalgraphics_filters.xcu";
+    EXTRA_ALL_LANG(fcfg_langpack,xcd);
 End
 
 File gid_File_Registry_Spool_Langpack_Lang
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    FILE_ALL_LANG_LETTER(/registry/spool/Langpack-,xcu);
+    Dir = gid_Dir_Share_Registry;
+    FILE_ALL_LANG_LETTER(Langpack-,xcd);
 End
 
-File gid_File_Registry_Spool_Oo_Accelerators_System_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators;
-#ifdef QUARTZ 
-    Name = "/registry/spool/org/openoffice/Office/Accelerators-macosx.xcu";
-#else
-    Name = "/registry/spool/org/openoffice/Office/Accelerators-unxwnt.xcu";
-#endif
-End
-
-File gid_File_Oo_Office_Paths_System_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Paths;
-#ifdef MACOSX
-    Name = "/registry/spool/org/openoffice/Office/Paths-macosx.xcu";
-#else
-    Name = "/registry/spool/org/openoffice/Office/Paths-unxwnt.xcu";
-#endif
-End
-
-File gid_File_Registry_Spool_Oo_Common_System_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-#ifdef WNT
-    Name = "/registry/spool/org/openoffice/Office/Common-wnt.xcu";
-#elif defined QUARTZ
-    Name = "/registry/spool/org/openoffice/Office/Common-macosx.xcu";
-#else
-    Name = "/registry/spool/org/openoffice/Office/Common-unx.xcu";
-#endif
-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";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Writer;
-    Name = "/registry/spool/org/openoffice/Office/Writer-javamail.xcu";
-    Styles = (PACKED);
+    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
@@ -2722,28 +1688,6 @@ File gid_Starregistry_Services_Rdb
     JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/";
 End
 
-#if defined(UNX) && !defined(QUARTZ)
-
-File gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-UseOOoFileDialogs.xcu";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
-    Name = "/registry/spool/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu";
-    Styles = (PACKED,SCPZIP_REPLACE,SET_OFFICE_LANGUAGE);
-End
-
-#endif
-
 #ifdef LINUX
 File gid_File_Dat_Root3
     TXT_FILE_BODY;
@@ -2820,7 +1764,7 @@ File gid_File_InfoPlist_Lang
     Dir = gid_Dir_Bundle_Contents_Resources_Lang;
     ARCHIVE_TXT_FILE_BODY;
     Styles = (ARCHIVE);
-    EXTRA_ALL_LANG(InfoPlist);
+    EXTRA_ALL_LANG(InfoPlist,zip);
 End
 #endif
 
@@ -2927,25 +1871,11 @@ File gid_File_ImagesClassic8_Zip
     Styles = (PACKED);
 End
 
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu
+File gid_File_Share_Registry_Lingucomponent_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
-    Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-spellchecker.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
-    Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-hyphenator.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic;
-    Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "lingucomponent.xcd";
 End
 
 // Dictionary extensions
@@ -3179,7 +2109,7 @@ End
 File gid_File_Extension_Dictionary_Sr
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sr.oxt";
-	Styles = (PACKED);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 010a3ec5efd6..5e4a2b0ff089 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_resource_ooo.scp,v $
- * $Revision: 1.66.96.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -104,6 +101,7 @@ STD_RES_FILE( gid_File_Res_Svt, svt )
 STD_RES_FILE_ONLY( gid_File_Res_Svp, svp )
 
 STD_RES_FILE( gid_File_Res_Svx, svx )
+STD_RES_FILE( gid_File_Res_Editeng, editeng )
 STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
 
 STD_RES_FILE( gid_File_Res_Cui, cui )
diff --git a/scp2/source/ooo/folder_ooo.scp b/scp2/source/ooo/folder_ooo.scp
index a8335061fcf0..88e40629661e 100644
--- a/scp2/source/ooo/folder_ooo.scp
+++ b/scp2/source/ooo/folder_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folder_ooo.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index ef6cd70d1eb5..b6ef81eff36d 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_ooo.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf
index dfa22d09132c..93d938531abe 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_ooo.ulf,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,4 +32,4 @@ en-US = "From Template"
 en-US = "Open Document"
 
 [STR_FI_TOOLTIP_SOFFICE]
-en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems."
+en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle."
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
index 22bdbce84de3..8b045bb440c2 100644
--- a/scp2/source/ooo/installation_ooo.scp
+++ b/scp2/source/ooo/installation_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: installation_ooo.scp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index aa8c3178c9fd..0777febdc869 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.77.16.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,10 +41,6 @@ TARGETTYPE=CUI
 SCPDEFS+=-D_MSC
 .ENDIF
 
-.IF "$(ENABLE_CRASHDUMP)"!=""
-SCPDEFS+=-DENABLE_CRASHDUMP
-.ENDIF
-
 .IF "$(BUILD_SPECIAL)"!=""
 SCPDEFS+=-DBUILD_SPECIAL
 .ENDIF
diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp
index ca4cf0d0f68c..f88cce4d2314 100755
--- a/scp2/source/ooo/mergemodules_ooo.scp
+++ b/scp2/source/ooo/mergemodules_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mergemodules_ooo.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_headless.scp b/scp2/source/ooo/module_headless.scp
index 024d3d3a079a..bb77b0e2fbcb 100644
--- a/scp2/source/ooo/module_headless.scp
+++ b/scp2/source/ooo/module_headless.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_headless.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_headless.ulf b/scp2/source/ooo/module_headless.ulf
index 33839fcc58c4..e64185dfb1a8 100644
--- a/scp2/source/ooo/module_headless.ulf
+++ b/scp2/source/ooo/module_headless.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_headless.ulf,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index f1c647a5bb91..bd0182f95c49 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_hidden_ooo.scp,v $
- * $Revision: 1.123 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -173,12 +170,11 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Dba,
 	gid_File_Lib_Dbacfg,
 	gid_File_Lib_Dbase2,
-	gid_File_Oo_Office_Dataaccess_Dbase_Xcu,
 	gid_File_Lib_Dbaxml,
 	gid_File_Lib_Dbt,
 	gid_File_Lib_Dbfile,
 	gid_File_Lib_Drawinglayer,
-	gid_File_Oo_Office_Dataaccess_Flat_Xcu,
+        gid_File_Lib_Editeng,
 	gid_File_Lib_Flat,
 	gid_File_Lib_For,
 	gid_File_Lib_Forui,
@@ -272,16 +268,13 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_Index_Data,
     gid_File_Lib_Textconv_Dict,
 	gid_File_Lib_Basprov,
-	gid_File_Lib_Behelper,
-	gid_File_Lib_Configmgr2,
+	gid_File_Lib_Configmgr,
 	gid_File_Lib_Crypto,
 	gid_File_Lib_Dlgprov,
 	gid_File_Lib_Stringresource,
 	gid_File_Lib_Ldapbe2,
 	gid_File_Lib_Comphelper2,
-	gid_File_Lib_Sysmgr1,
 	gid_File_Lib_Adabas,
-	gid_File_Oo_Office_Dataaccess_Adabas_Xcu,
 	gid_File_Lib_Cached1,
 	gid_File_Lib_Curl,
 	gid_File_Lib_Db,
@@ -289,11 +282,8 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Embobj,
 	gid_File_Lib_Emboleobj,
 	gid_File_Lib_Evoab_2,
-	gid_File_Oo_Office_Dataaccess_Evoab_Xcu,
 	gid_File_Lib_Kab_1,
-	gid_File_Oo_Office_Dataaccess_Kab_Xcu,
     gid_File_Lib_Kab_Drv_1,
-    gid_File_Oo_Office_Dataaccess_Macab_Xcu,
 	gid_File_Lib_Macab_1,
     gid_File_Lib_Macab_Drv_1,
 	gid_File_Lib_Evtatt,
@@ -315,19 +305,14 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Localedata_Es,
 	gid_File_Lib_Localedata_Euro,
 	gid_File_Lib_Localedata_Others,
-	gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu,
 	gid_File_Lib_Hsqldb_2,
 	gid_File_Lib_Jdbc,
-	gid_File_Oo_Office_Dataaccess_Jdbc_Xcu,
 	gid_File_Lib_Mcnttype,
-	gid_File_Oo_Office_Dataaccess_Mozab_Xcu,
 	gid_File_Lib_Mozab_2,
 	gid_File_Lib_Mozabdrv,
 	gid_File_Lib_Mozbootstrap,
 	gid_File_Lib_Mysql,
-	gid_File_Oo_Office_Dataaccess_Mysql_Xcu,
 	gid_File_Lib_Odbc,
-	gid_File_Oo_Office_Dataaccess_Odbc_Xcu,
 	gid_File_Lib_Officebean,
 	gid_File_Lib_Openssl,
 	gid_File_Lib_Package2,
@@ -388,7 +373,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Stdc_5,
 	gid_File_Lib_Accessbridge,
 	gid_File_Lib_Ado,
-	gid_File_Oo_Office_Dataaccess_Ado_Xcu,
 	gid_File_Lib_Dl,
 	gid_File_Lib_Dnd,
 	gid_File_Lib_Dtrans,
@@ -636,150 +620,10 @@ Module gid_Module_Root_Files_6
 	gid_File_Mod_Style,
 	gid_File_Mod_Table,
 	gid_File_Mod_Text,
-	gid_File_Oo_Ldap_Attr_Map,
-	gid_File_Oo_AD_Ldap_Attr_Map,
-	gid_File_Oo_Inet_Xcs,
-	gid_File_Oo_Inet_Xcu,
-	gid_File_Oo_Office_Addons_Xcs,
-	gid_File_Oo_Office_OOoImprovement_Settings_Xcs,
-	gid_File_Oo_Office_Ui_Basicidecommands_Xcs,
-	gid_File_Oo_Office_Ui_Basicidecommands_Xcu,
-	gid_File_Oo_Office_Ui_Windowstate_Xcs,
-	gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu,
-	gid_File_Oo_Office_Ui_Bibliographycommands_Xcs,
-	gid_File_Oo_Office_Ui_Bibliographycommands_Xcu,
-	gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs,
-	gid_File_Oo_Office_Calc_Xcs,
-	gid_File_Oo_Office_Calc_Xcu,
-	gid_File_Oo_Office_CalcAddIns_Xcs,
-	gid_File_Oo_Office_Chart_Xcs,
-	gid_File_Oo_Office_Ui_Chartcommands_Xcs,
-	gid_File_Oo_Office_Ui_Chartcommands_Xcu,
-	gid_File_Oo_Office_Ui_Chartwindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Chartwindowstate_Xcu,
-	gid_File_Oo_Office_Commands_Xcs,
-	gid_File_Oo_Office_Ui_Commands_Xcs,
-	gid_File_Oo_Office_Ui_Category_Xcs,
-	gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs,
-	gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu,
-	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_OptionsDialog_Xcs,
-	gid_File_Oo_Office_Recovery_Xcs,
-	gid_File_Oo_Office_Compatibility_Xcs,
-	gid_File_Oo_Office_Ui_Controller_Xcs,
-	gid_File_Oo_Office_Ui_Controller_Xcu,
-	gid_File_Oo_Office_Dataaccess_Xcs,
-	gid_File_Oo_Office_Dataaccess_Xcu,
-	gid_File_Oo_Office_Dataaccess_Drivers_Xcs,
-	gid_File_Oo_Office_Ui_Dbucommands_Xcs,
-	gid_File_Oo_Office_Ui_Dbucommands_Xcu,
-	gid_File_Oo_Office_Ui_Basewindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Basewindowstate_Xcu,
-	gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu,
-	gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu,
-	gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu,
-	gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs,
-	gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu,
-	gid_File_Oo_Office_Draw_Xcs,
-	gid_File_Oo_Office_Events_Xcs,
-	gid_File_Oo_Office_ExtensionManager_Xcs,
-	gid_File_Oo_Office_ExtensionManager_Xcu,
-	gid_File_Oo_Office_Ui_Factories_Xcs,
-	gid_File_Oo_Office_Ui_Factories_Xcu,
-	gid_File_Oo_Office_Embedding_Xcu,
-	gid_File_Oo_Office_Ui_Genericcommands_Xcs,
-	gid_File_Oo_Office_Ui_Genericcommands_Xcu,
-	gid_File_Oo_Office_Ui_GlobalSettings_Xcs,
-	gid_File_Oo_Office_Impress_Xcs,
-	gid_File_Oo_Office_Impress_Xcu,
-	gid_File_Oo_Office_Java_Xcs,
-	gid_File_Oo_Office_Jobs_Xcs,
-	gid_File_Oo_Office_Jobs_Xcu,
-	gid_File_Oo_Office_Labels_Xcs,
-	gid_File_Oo_Office_Labels_Xcu,
-	gid_File_Oo_Office_Linguistic_Xcs,
-	gid_File_Oo_Office_Math_Xcs,
-	gid_File_Oo_Office_Math_Xcu,
-	gid_File_Oo_Office_Protocolhandler_Xcs,
-	gid_File_Oo_Office_Protocolhandler_Xcu,
-	gid_File_Oo_Office_Scripting_Xcs,
-	gid_File_Oo_Office_Scripting_Xcu,
-	gid_File_Oo_Office_Security_Xcs,
-	gid_File_Oo_Office_Security_Xcu,
-	gid_File_Oo_Office_Sfx_Xcs,
-	gid_File_Oo_Office_Sfx_Xcu,
-	gid_File_Oo_Office_Ui_Startmodulecommands_Xcs,
-	gid_File_Oo_Office_Ui_Startmodulecommands_Xcu,
-	gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs,
-	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,
-	gid_File_Oo_Office_WebWizard_Xcs,
-	gid_File_Oo_Office_WebWizard_Xcu,
-	gid_File_Oo_Office_FormWizard_Xcs,
-	gid_File_Oo_Office_FormWizard_Xcu,
-	gid_File_Oo_Office_TableWizard_Xcs,
-	gid_File_Oo_Office_TableWizard_Xcu,
-	gid_File_Oo_Office_Writerweb_Xcs,
-	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,
-	gid_File_Oo_System_Xcs,
-	gid_File_Oo_Typedetection_Filter_Xcs,
-	gid_File_Oo_Typedetection_Graphicfilter_Xcs,
-	gid_File_Oo_Typedetection_Misc_Xcs,
-	gid_File_Oo_Typedetection_Types_Xcs,
-	gid_File_Oo_Ucb_Configuration_Xcs,
-	gid_File_Oo_Ucb_Configuration_Xcu,
-	gid_File_Oo_Ucb_InteractionHandler_Xcs,
-	gid_File_Oo_Ucb_Hierarchy_Xcs,
-	gid_File_Oo_Ucb_Store_Xcs,
-	gid_File_Oo_Userprofile_Xcs,
-	gid_File_Oo_Userprofile_Xcu,
-	gid_File_Oo_Vcl_Xcs,
-	gid_File_Oo_Vcl_Xcu,
-	gid_File_Oo_Ldap_Xcs,
-	gid_File_Oo_Ldap_Xcu,
-	gid_File_Oo_Typedetection_UISort_Xcs,
-	gid_File_Oo_Office_Ui_Mathwindowstate_Xcs,
-	gid_File_Oo_Office_Views_Xcu,
-	gid_File_Oo_TypeDetection_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu,
-	gid_File_Registry_Spool_Oo_Common_System_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu,
-	gid_File_Registry_Spool_Oo_Dataaccess_Adabasdriver_Xcu,
-	gid_File_Registry_Spool_Oo_Writer_javamail_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu,
+    gid_File_Oo_Ldap_Xcd_Sample,
+    gid_File_Oo_Ad_Ldap_Xcd_Sample,
+    gid_File_Share_Registry_Main_Xcd,
+    gid_File_Share_Registry_Forcedefault_Xcd,
 	gid_File_Pymailmerge,
     gid_File_Xsl_Common_Measure_Conversion,
 	gid_File_Xsl_Common_Math_Functions,
@@ -930,11 +774,9 @@ Module gid_Module_Oo_Linguistic
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Lib_Spell,
         gid_File_Lib_Hunspell,
-        gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu,
         gid_File_Lib_Hyph,
-        gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu,
         gid_File_Lib_Lnth,
-        gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu);
+        gid_File_Share_Registry_Lingucomponent_Xcd);
 End
 
 #ifdef LINUX
diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp
index b0485f7a0f73..1380202f34e7 100644
--- a/scp2/source/ooo/module_improvement.scp
+++ b/scp2/source/ooo/module_improvement.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_java.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,6 +37,6 @@ Module gid_Module_Oooimprovement
     ParentID = gid_Module_Root;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement, gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement, gid_File_Lib_Oooimprovement);
+    Files = (gid_File_Share_Registry_Oooimprovement_Xcd, gid_File_Lib_Oooimprovement);
 End
 #endif
diff --git a/scp2/source/ooo/module_java.scp b/scp2/source/ooo/module_java.scp
index 32cf80586969..e93721ce3c5b 100644
--- a/scp2/source/ooo/module_java.scp
+++ b/scp2/source/ooo/module_java.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_java.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_java.ulf b/scp2/source/ooo/module_java.ulf
index c58cc885c1ee..c3ccedc59f14 100644
--- a/scp2/source/ooo/module_java.ulf
+++ b/scp2/source/ooo/module_java.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_java.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 9f6329fabc77..7ecd4747cdea 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_lang_template.scp,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,10 +44,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
@@ -69,6 +65,7 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Dba,
              gid_File_Res_Dbw,
              gid_File_Res_Dkt,
+             gid_File_Res_Editeng,
              gid_File_Res_Epb,
              gid_File_Res_Epg,
              gid_File_Res_Epp,
diff --git a/scp2/source/ooo/module_langpack.scp b/scp2/source/ooo/module_langpack.scp
index d50be8837337..bda152b286da 100644
--- a/scp2/source/ooo/module_langpack.scp
+++ b/scp2/source/ooo/module_langpack.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack.scp,v $
- * $Revision: 1.11.222.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 5fbcbdda7107..3127cdd8b904 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack.ulf,v $
- * $Revision: 1.10.178.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 3a643705124e..d77c05768fbb 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_ooo.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 37e97b3932c7..4660a2a442df 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_ooo.ulf,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index 552ed2c2e24a..f02b5be04368 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_systemint.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@ Module gid_Module_Optional_Systemintegration
     Styles = (SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
   #endif
   #if (defined(LINUX)) || (defined(SOLARIS))
-    PackageName = "%UNIXPRODUCTNAME-desktop-integration.tar.gz";
+    PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
   #else
     PackageName = "";
   #endif
diff --git a/scp2/source/ooo/module_systemint.ulf b/scp2/source/ooo/module_systemint.ulf
index 1f2a525fb4cb..b178c80fa2c4 100644
--- a/scp2/source/ooo/module_systemint.ulf
+++ b/scp2/source/ooo/module_systemint.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_systemint.ulf,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index cc5780b56f57..7021f02efc4a 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ooo_brand.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index 34c3a5ce8957..a2491045caf9 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: profile_ooo.scp,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,17 +27,6 @@
 
 #include "macros.inc"
 
-Profile gid_Profile_Configmgr_Ini
-    ModuleID = gid_Module_Root;
-  #ifdef UNX
-    Name = "configmgrrc";
-  #else
-    Name = "configmgr.ini";
-  #endif
-    Dir = gid_Dir_Program;
-    Styles = (NETWORK);
-End
-
 Profile gid_Profile_Uno_Ini
     ModuleID = gid_Module_Root;
   #ifdef UNX
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 69c771c83782..ebd0b87fbabd 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: profileitem_ooo.scp,v $
- * $Revision: 1.67.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,262 +27,6 @@
 
 #include "macros.inc"
 
-// for the configmgr
-
-ProfileItem gid_Profileitem_Configmgr_Cfg_Servertype
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "CFG_ServerType";
-    Value = "uno";
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Bootstrap_Ini
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "BootstrapFile";
-    Value = "$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap);
-End
-
-ProfileItem gid_Profileitem_Configmgr_Version_Ini
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "VersionFile";
-    Value = "$BRAND_BASE_DIR/program/" PROFILENAME(version);
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Uno_Ini
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 3;
-    Key = "UnoFile";
-  #ifdef UNX
-    Value = "$ORIGIN/unorc";
-  #else
-    Value = "$ORIGIN/uno.ini";
-  #endif
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Baseinstallation
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "BaseInstallation";
-    Value = "${OOO_BASE_DIR}";
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Userinstallation
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "UserInstallation";
-    Value = "${$BootstrapFile:UserInstallation}";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Schemaversion
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "CFG_SchemaVersion";
-    Value = "${$VersionFile:buildid}";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemadataurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 7;
-    Key = "CFG_SchemaDataUrl";
-    Value = "$BaseInstallation/share/registry/schema ?$CFG_BrandLayerUrl/schema ?$CFG_UnoSharedPackages/schema ?$CFG_UnoUserPackages/schema";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultdataurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 8;
-    Key = "CFG_DefaultLayerUrls";
-    Value = "$BaseInstallation/share/registry $CFG_UnoSharedPackages $CFG_UnoUserPackages";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Cachedisposal
-    ProfileID =gid_Profile_Configmgr_Ini  ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 9;
-    Key  = "CFG_CacheDisposeDelay";
-    Value  = "900";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Cacheinterval
-    ProfileID = gid_Profile_Configmgr_Ini ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 10;
-    Key  = "CFG_CacheDisposeInterval";
-    Value  = "60";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Cachewrite
-    ProfileID = gid_Profile_Configmgr_Ini ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 11;
-    Key  = "CFG_CacheWriteInterval";
-    Value  = "2";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Userdataurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 12;
-    Key  = "CFG_UserLayerUrl";
-    Value  = "$UserInstallation/user/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Cacheurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 13;
-    Key  = "CFG_CacheUrl";
-    Value  = "$UserInstallation/user/registry/cache";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultlayerurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 14;
-    Key  = "CFG_DefaultLayerUrl";
-    Value  = "$BaseInstallation/share/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Modulelayerurl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 15;
-    Key  = "CFG_ModuleLayerUrl";
-    Value  = "$CFG_DefaultLayerUrl/modules";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Unosharedpackages
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 16;
-    Key  = "CFG_UnoSharedPackages";
-    Value = "${$UnoFile:UNO_SHARED_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Unouserpackages
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 17;
-    Key  = "CFG_UnoUserPackages";
-    Value = "${$UnoFile:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerUrl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 18;
-    Key  = "CFG_BrandLayerUrl";
-    Value  = "${BRAND_BASE_DIR}/share/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerModulesUrl
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 19;
-    Key  = "CFG_BrandLayerModulesUrl";
-    Value  = "$CFG_BrandLayerUrl/modules";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Unocfg_Backendservice
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 20;
-    Key  = "CFG_BackendService";
-    Value  = "com.sun.star.comp.configuration.backend.MultiStratumBackend";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemasupplier
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 21;
-    Key  = "CFG_SchemaSupplier";
-    Value  = "com.sun.star.comp.configuration.backend.LocalSchemaSupplier";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Datasvc
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 22;
-    Key  = "CFG_LocalDataSvc";
-    Value  = "com.sun.star.comp.configuration.backend.LocalStratum";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Moduledatasvc
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 23;
-    Key  = "CFG_LocalModuleDataSvc";
-    Value  = "com.sun.star.comp.configuration.backend.LocalMultiStratum";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Localcfg_Resdatasvc
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 24;
-    Key  = "CFG_LocalResDataSvc";
-    Value  = "com.sun.star.comp.configuration.backend.LocalResourceStratum";
-End
-
-
-ProfileItem gid_Profileitem_Configmgr_Strata
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 25;
-    Key  = "CFG_Strata";
-    Value  = "${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalModuleDataSvc}:$CFG_ModuleLayerUrl;${CFG_LocalResDataSvc}:$CFG_DefaultLayerUrl;?${CFG_LocalDataSvc}:$CFG_BrandLayerUrl;?${CFG_LocalModuleDataSvc}:$CFG_BrandLayerModulesUrl;${CFG_LocalDataSvc}:$CFG_UnoSharedPackages;?com.sun.star.comp.configuration.backend.SystemIntegration:;${CFG_LocalDataSvc}:$CFG_UnoUserPackages;${CFG_LocalDataSvc}:$CFG_UserLayerUrl;";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Ldapmappingurl
-    ProfileID = gid_Profile_Configmgr_Ini ;
-    ModuleID = gid_Module_Root;
-    Section   = "Bootstrap";
-    Order = 26;
-    Key  = "CFG_LdapMappingUrl";
-    Value  = "$BaseInstallation/share/registry/ldap";
-End
-
-//end configmgr
-
 ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath
     ProfileID = gid_Profile_Setup_Ini;
     ModuleID = gid_Module_Root;
@@ -407,13 +148,22 @@ ProfileItem gid_Profileitem_Soffice_ProgressPosition
     Value = "-1,-1";
 End
 
+ProfileItem gid_Profileitem_Soffice_NativeProgress
+    ProfileID = gid_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 6;
+    Key = "NativeProgress";
+    Value = "true";
+End
+
 #ifdef WNT
 
 ProfileItem gid_Profileitem_Soffice_Hideeula
     ProfileID = gid_Profile_Soffice_Ini;
     ModuleID = gid_Module_Root;
     Section = "Bootstrap";
-    Order = 7;
+    Order = 8;
     Key = "HideEula";
     Value = "[HIDEEULA]";
     Inifiletablekey = "HideEula";
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 6544de17f993..5d8673ef9855 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_ooo.scp,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -143,13 +140,6 @@ RegistryItem gid_Regitem_Soffice_Starconfigfile_6
     REG_VALUE_LNG(SO60_CONFIGFILE)
 End
 
-RegistryItem gid_Regitem_Soffice_Starconfigfile_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "soffice.StarConfigFile.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,17";
-End
-
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Soffice_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\soffice.exe";
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
index cbcf513d1358..cbb57ef56d98 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_ooo.ulf,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index f88737451a5f..e5314c7c386e 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scpaction_ooo.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 3824fe3a0841..fb43b041c585 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shortcut_ooo.scp,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/starregistry_ooo.scp b/scp2/source/ooo/starregistry_ooo.scp
index dfd1d3c0170b..41bacdcecf48 100644
--- a/scp2/source/ooo/starregistry_ooo.scp
+++ b/scp2/source/ooo/starregistry_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: starregistry_ooo.scp,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 41f2b73adbe8..ca7a7222b074 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ure.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index 0f5be1aae19b..397d8fd8f2da 100755
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ure_into_ooo.scp,v $
- * $Revision: 1.5.176.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index d4fd951c9771..caa78335e509 100755
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ure_standalone.scp,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index b7e6e81dc331..70c490d954f8 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -2,12 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vc_redist.scp,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index ceb0b156cd7b..b69082b05cd5 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: windowscustomaction_ooo.scp,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index d8412b7e2cab..1303bf59460f 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_python.scp,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -121,11 +118,11 @@ End
 
 // Scripting Framework Python configuration settings
 
-File gid_File_Registry_Spool_Oo_Scripting_Python_Xcu
+File gid_File_Share_Registry_Pyuno_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Scripting;
-    Name = "/registry/spool/org/openoffice/Office/Scripting-python.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "pyuno.xcd";
 End
 
 #ifndef SYSTEM_PYTHON
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
index f78bdbd7d349..b34c0af1491d 100644
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index a3e7611dc56f..3abeec2e3142 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python.scp,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@ Module gid_Module_Optional_Pyuno
     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
     ParentID = gid_Module_Optional;
     Sortkey = "750";
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu);
+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
     Minimal = NO;
     Default = YES;
     Styles = ( );
diff --git a/scp2/source/python/module_python.ulf b/scp2/source/python/module_python.ulf
index 411debf2d469..2303dcd8a383 100644
--- a/scp2/source/python/module_python.ulf
+++ b/scp2/source/python/module_python.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python.ulf,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 2d7f68d3a315..00a5c30a122c 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python_mailmerge.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/module_python_mailmerge.ulf b/scp2/source/python/module_python_mailmerge.ulf
index 12de9f65ed8f..b69dda152aeb 100755
--- a/scp2/source/python/module_python_mailmerge.ulf
+++ b/scp2/source/python/module_python_mailmerge.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_python_mailmerge.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index 75bb6710f0f9..be8edc601eb6 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: profileitem_python.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/file_quickstart.scp b/scp2/source/quickstart/file_quickstart.scp
index 50548eac85f9..447dcee0431a 100644
--- a/scp2/source/quickstart/file_quickstart.scp
+++ b/scp2/source/quickstart/file_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_quickstart.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/folderitem_quickstart.scp b/scp2/source/quickstart/folderitem_quickstart.scp
index 0243c6fba216..b533637cc788 100644
--- a/scp2/source/quickstart/folderitem_quickstart.scp
+++ b/scp2/source/quickstart/folderitem_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_quickstart.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/makefile.mk b/scp2/source/quickstart/makefile.mk
index 96adeafcce16..283d220733e3 100644
--- a/scp2/source/quickstart/makefile.mk
+++ b/scp2/source/quickstart/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/module_quickstart.scp b/scp2/source/quickstart/module_quickstart.scp
index 7e1bad4f825f..078de4b5f041 100644
--- a/scp2/source/quickstart/module_quickstart.scp
+++ b/scp2/source/quickstart/module_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_quickstart.scp,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/module_quickstart.ulf b/scp2/source/quickstart/module_quickstart.ulf
index 93d39ef0bf6b..f8a8809f69a3 100644
--- a/scp2/source/quickstart/module_quickstart.ulf
+++ b/scp2/source/quickstart/module_quickstart.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_quickstart.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp
index 3a10ff71e929..4c8b4c5ad2a5 100644
--- a/scp2/source/quickstart/registryitem_quickstart.scp
+++ b/scp2/source/quickstart/registryitem_quickstart.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_quickstart.scp,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/makefile.mk b/scp2/source/sdkoo/makefile.mk
index 5a4fdf72f021..6b4200b4671c 100644
--- a/scp2/source/sdkoo/makefile.mk
+++ b/scp2/source/sdkoo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index 4777fb0b5598..b24bd7aafd50 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_sdkoo.scp,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/module_sdkoo.ulf b/scp2/source/sdkoo/module_sdkoo.ulf
index 52c377ce6af3..1bb139979403 100644
--- a/scp2/source/sdkoo/module_sdkoo.ulf
+++ b/scp2/source/sdkoo/module_sdkoo.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_sdkoo.ulf,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index b8dd4e5faed4..9794fa06719e 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdkoo.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 59f5dab89f9e..47be771c5e50 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack.sct b/scp2/source/templates/module_langpack.sct
index 1d349100eb4b..2876776f5f32 100755
--- a/scp2/source/templates/module_langpack.sct
+++ b/scp2/source/templates/module_langpack.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack.sct,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_base.sct b/scp2/source/templates/module_langpack_base.sct
index 7dacd0710437..4c569f322b52 100755
--- a/scp2/source/templates/module_langpack_base.sct
+++ b/scp2/source/templates/module_langpack_base.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_base.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
index e4f558df0d1a..76f389049580 100644
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ b/scp2/source/templates/module_langpack_binfilter.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_binfilter.sct,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_calc.sct b/scp2/source/templates/module_langpack_calc.sct
index de6d8385fc02..865d03ebe3ff 100755
--- a/scp2/source/templates/module_langpack_calc.sct
+++ b/scp2/source/templates/module_langpack_calc.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_calc.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_draw.sct b/scp2/source/templates/module_langpack_draw.sct
index 1a6349fd4c27..b87ff103a517 100755
--- a/scp2/source/templates/module_langpack_draw.sct
+++ b/scp2/source/templates/module_langpack_draw.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_draw.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_impress.sct b/scp2/source/templates/module_langpack_impress.sct
index 919cf74e2355..fe90cfdc8892 100755
--- a/scp2/source/templates/module_langpack_impress.sct
+++ b/scp2/source/templates/module_langpack_impress.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_impress.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_math.sct b/scp2/source/templates/module_langpack_math.sct
index 6b5189a86ca1..5b7722a146c0 100755
--- a/scp2/source/templates/module_langpack_math.sct
+++ b/scp2/source/templates/module_langpack_math.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_math.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_onlineupdate.sct b/scp2/source/templates/module_langpack_onlineupdate.sct
index 6aed95ff6a2d..24fb09c3566a 100755
--- a/scp2/source/templates/module_langpack_onlineupdate.sct
+++ b/scp2/source/templates/module_langpack_onlineupdate.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_onlineupdate.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct
index 977608d78ea3..0eb5a5373f55 100755
--- a/scp2/source/templates/module_langpack_root.sct
+++ b/scp2/source/templates/module_langpack_root.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_root.sct,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/module_langpack_writer.sct b/scp2/source/templates/module_langpack_writer.sct
index 15e5aab9bcd9..d4c59baa68af 100755
--- a/scp2/source/templates/module_langpack_writer.sct
+++ b/scp2/source/templates/module_langpack_writer.sct
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_langpack_writer.sct,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/templates/modules.pl b/scp2/source/templates/modules.pl
index 2b77662a95b8..68133b14a772 100755
--- a/scp2/source/templates/modules.pl
+++ b/scp2/source/templates/modules.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: modules.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp
index 4e44a1f80fcd..86faf16faefc 100644
--- a/scp2/source/testtool/file_testtool.scp
+++ b/scp2/source/testtool/file_testtool.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_testtool.scp,v $
- * $Revision: 1.7.156.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/makefile.mk b/scp2/source/testtool/makefile.mk
index 036cd1420c12..edcad2e17abe 100644
--- a/scp2/source/testtool/makefile.mk
+++ b/scp2/source/testtool/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/module_testtool.scp b/scp2/source/testtool/module_testtool.scp
index 356772a62310..1a6bc0d01484 100644
--- a/scp2/source/testtool/module_testtool.scp
+++ b/scp2/source/testtool/module_testtool.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_testtool.scp,v $
- * $Revision: 1.9.156.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/testtool/module_testtool.ulf b/scp2/source/testtool/module_testtool.ulf
index 20a93f19d6c0..8d219eaab541 100644
--- a/scp2/source/testtool/module_testtool.ulf
+++ b/scp2/source/testtool/module_testtool.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_testtool.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index dd8b8912ae8c..50f0aa064d71 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_winexplorerext.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,13 +39,6 @@ File gid_File_Lib_OOoFilt
     Name = "ooofilt.dll";
 End
 
-File gid_File_Lib_OOoFiltProxy
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofiltproxy.dll";
-End
-
 #ifdef BUILD_X64
 
 File gid_File_Lib_OOoFilt64
@@ -59,14 +49,6 @@ File gid_File_Lib_OOoFilt64
     ComponentCondition = "VersionNT64";
 End
 
-File gid_File_Lib_OOoFiltProxy64
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofiltproxy_x64.dll";
-    ComponentCondition = "VersionNT64";
-End
-
 #endif
 
 File gid_File_Lib_Shlxthdl
@@ -87,34 +69,29 @@ End
 
 #endif
 
-#if defined M1310
-File gid_File_Lib_Shlxthdl_Msvcr71
+File gid_File_Lib_PropertyHdl
     TXT_FILE_BODY;
+    Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
+    Name = "propertyhdl.dll";
+End
+
+#ifdef BUILD_X64
+	File gid_File_Lib_PropertyHdl64
+    TXT_FILE_BODY;
     Styles = (PACKED);
+    Dir = gid_Dir_Shlxthdl;
+    Name = "propertyhdl_x64.dll";
+    ComponentCondition = "VersionNT64";
 End
+
 #endif
 
-#if !defined USE_SYSTEM_STL
-File gid_File_Lib_Shlxthdl_Stlport
+#if defined M1310
+File gid_File_Lib_Shlxthdl_Msvcr71
     TXT_FILE_BODY;
     Dir = gid_Dir_Shlxthdl;
-#if defined _gcc3 /* && defined WNT */
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
-#else
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
-#endif
-#elif (defined(M1310) || defined(M1400) || defined(M1500)) /* && defined WNT */
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
-#else
-    Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
-#endif
-#else
-#error "stlport dynamic library: unsupported platform"
-#endif
+    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
     Styles = (PACKED);
 End
 #endif
@@ -132,3 +109,4 @@ File gid_File_Lib_Reg64
     Dir = SCP2_OOO_BIN_DIR;
     Name = "reg64msi.dll";
 End
+
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 6fc8ef03b382..21eaad714eac 100644
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index c1f0ac7f9010..6993ba25c1d1 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_winexplorerext.scp,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 
 Module gid_Module_Optional_Winexplorerext
     MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
-    Sortkey = "1200";
+    Sortkey = "1205";
     Default = YES;
     Minimal = YES;
     ParentID = gid_Module_Optional;
@@ -40,12 +37,21 @@ Module gid_Module_Optional_Winexplorerext
     Files = (gid_File_Lib_Shlxthdl,
 			 gid_File_Lib_Shlxthdl64,
 			 gid_File_Lib_OOoFilt,
-			 gid_File_Lib_OOoFiltProxy,
 			 gid_File_Lib_OOoFilt64,
-			 gid_File_Lib_OOoFiltProxy64,
              gid_File_Lib_Shlxthdl_Msvcr71,
-             gid_File_Lib_Shlxthdl_Stlport,
              gid_File_Lib_Shlxtmsi,
              gid_File_Lib_Reg64,
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
 End
+
+Module gid_Module_Optional_Winexplorerext_PropertyHdl
+	ParentID = gid_Module_Optional_Winexplorerext;
+	Name = "gid_Module_Optional_Winexplorerext_PropertyHdl";
+	Description = "gid_Module_Optional_Winexplorerext_PropertyHdl";
+	Sortkey = "1210";
+	Default = YES;
+	Styles = (HIDDEN_ROOT);
+    Dirs = (gid_Dir_Shlxthdl);
+	Files = (gid_File_Lib_PropertyHdl,
+			 gid_File_Lib_PropertyHdl64);
+End
diff --git a/scp2/source/winexplorerext/module_winexplorerext.ulf b/scp2/source/winexplorerext/module_winexplorerext.ulf
index bfc8aaa90d14..506c80d71766 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.ulf
+++ b/scp2/source/winexplorerext/module_winexplorerext.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_winexplorerext.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 87084695ada0..7c932bac1f28 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_winexplorerext.scp,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,8 +35,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
-    Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
-    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -61,8 +58,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
-    Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
-    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -93,8 +90,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
-    Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
-    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
     
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -127,8 +124,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
     Styles = (X64); // Values: X64 / X64_ONLY
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy_x64.dll";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -170,8 +167,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
-    Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\"";
-    Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\"";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -184,4 +181,50 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
     Val64 = "Apartment";
 End
 
-// End registry entries for the PropertySheet handler
-\ No newline at end of file
+// End registry entries for the PropertySheet handler
+
+// Begin registry entries for the Property handler
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+    Val64 = "%PRODUCTNAME Property Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+    Val64 = "Apartment";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    ComponentCondition = "VersionNT >= 600";
+    Styles = (X64);
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+    Val64 = "%PRODUCTNAME Property Handler";
+End
+
+// End registry entries for the Property handler
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 91ff3a33ca0a..3d7c22b9e7a9 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_writer.scp,v $
- * $Revision: 1.39 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,13 +63,6 @@ File gid_File_Exe_Sweb
 End
 #endif
 
-File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding;
-    Name = "/registry/spool/org/openoffice/Office/Embedding-writer.xcu";
-End
-
 File gid_File_Help_Swriter_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY;
@@ -102,164 +92,10 @@ File gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml
     Name = "/uiconfig/sglobal/menubar/menubar.xml";
 End
 */
-File gid_File_Oo_Office_Ui_Writercommands_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writercommands_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterCommands.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_writer_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_writer_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_web_types.xcu";
-End
 
-File gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu
+File gid_File_Share_Registry_Writer_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_web_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "writer.xcd";
 End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_global_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_global_filters.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort;
-    Name = "/registry/spool/org/openoffice/TypeDetection/UISort-writer.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Common_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common;
-    Name = "/registry/spool/org/openoffice/Office/Common-writer.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_Setup_Writer_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_Setup;
-    Name = "/registry/spool/org/openoffice/Setup-writer.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Xformswindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui;
-    Name = "/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs";
-End
-
-File gid_File_Oo_Office_Ui_Writerwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Xformswindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu";
-End
-
-File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui;
-    Name = "/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu";
-End
-
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index 3b7f28b67970..7541e1d2d344 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_writer.scp,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/folderitem_writer.ulf b/scp2/source/writer/folderitem_writer.ulf
index d585bfd18dc6..a088978663d6 100644
--- a/scp2/source/writer/folderitem_writer.ulf
+++ b/scp2/source/writer/folderitem_writer.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: folderitem_writer.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/makefile.mk b/scp2/source/writer/makefile.mk
index 09d48fc67134..136079bec377 100644
--- a/scp2/source/writer/makefile.mk
+++ b/scp2/source/writer/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 6384bc28f3e3..16928c8b25b9 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_writer.scp,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,21 +57,7 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Jar_Email, 
     gid_File_Jar_Mail, 
     gid_File_Jar_Activation,
-    gid_File_Oo_Office_Ui_Writercommands_Xcs,
-    gid_File_Oo_Office_Ui_Writercommands_Xcu,
-    gid_File_Registry_Spool_Oo_Common_Writer_Xcu,
-    gid_File_Registry_Spool_Oo_Setup_Writer_Xcu,
-    gid_File_Registry_Spool_Oo_Common_Dicooo_Xcu,
-    gid_File_Oo_Office_Ui_Writerwindowstate_Xcs,
-    gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs,
-    gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs,
-    gid_File_Oo_Office_Ui_Writerwindowstate_Xcu,
-    gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu,
-    gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu,
-	gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu,
+    gid_File_Share_Registry_Writer_Xcd,
     gid_File_Tmp_Userinstall_Wrt_Inf);
 End
 
diff --git a/scp2/source/writer/module_writer.ulf b/scp2/source/writer/module_writer.ulf
index 32b9bf2804fb..1e02043e19ee 100644
--- a/scp2/source/writer/module_writer.ulf
+++ b/scp2/source/writer/module_writer.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_writer.ulf,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 819ba6128663..a1233bb1792f 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_writer.scp,v $
- * $Revision: 1.15.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -349,7 +346,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "soffice.StarWriterDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Print_Command
@@ -419,7 +416,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterGlobalDocument.6\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Print_Command
@@ -489,7 +486,7 @@ RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Print_Command
@@ -542,6 +539,14 @@ RegistryItem gid_Regitem_Stw_Contenttype
     Value = "application/vnd.sun.xml.writer.template";
 End
 
+RegistryItem gid_Regitem_stw_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarWriterTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxg_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -586,6 +591,14 @@ RegistryItem gid_Regitem_Sxg_Mime_Database
     Value = ".sxg";
 End
 
+RegistryItem gid_Regitem_sxg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarWriterGlobalDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Sxw_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -646,6 +659,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
+RegistryItem gid_Regitem_sxw_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "soffice.StarWriterDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 
 // new odt file extension 
 
@@ -696,13 +717,12 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odt
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = "application/vnd.oasis.opendocument.text";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
 
-
 RegistryItem gid_Regitem_Odt_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -761,6 +781,14 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
     Subkey = "opendocument.WriterDocument.1\Insertable";
 End
 
+RegistryItem gid_Regitem_odt_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -810,13 +838,6 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Wrt_Bin;
-//     Subkey = "opendocument.WriterDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -921,6 +942,14 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,2";
 End
 
+RegistryItem gid_Regitem_ott_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -946,7 +975,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command
@@ -1037,6 +1066,14 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
     Value = "<progpath>\program\soffice.exe,10";
 End
 
+RegistryItem gid_Regitem_odm_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterGlobalDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterGlobalDocument.1\shell";
@@ -1062,7 +1099,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterGlobalDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command
@@ -1178,7 +1215,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterWebTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command
@@ -1195,6 +1232,14 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
+RegistryItem gid_Regitem_oth_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
+    Subkey = "opendocument.WriterWebTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+
 // "OpenWith" Windows Registry keys for extensions supported by Writer
 
 // .ODT
@@ -1215,12 +1260,30 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
     Value = " ";
 End
 
+// .OTH
+RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".oth\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "opendocument.WriterDocument.1";
+    Value = " ";
+End
+
+// .ODM
+RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odm\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "opendocument.WriterDocument.1";
+    Value = " ";
+End
+
 // .SXW
 RegistryItem gid_Regitem_OpenOffice_SXW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1229,7 +1292,7 @@ RegistryItem gid_Regitem_OpenOffice_STW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".stw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterTemplate.6";
     Value = " ";
 End
 
@@ -1238,7 +1301,7 @@ RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".txt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1247,7 +1310,7 @@ RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".htm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterWebDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1256,7 +1319,7 @@ RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".html\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterWebDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1265,7 +1328,7 @@ RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1274,7 +1337,7 @@ RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wpd\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1283,25 +1346,7 @@ RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".hwp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .OTH
-RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".oth\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .ODM
-RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odm\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1310,10 +1355,11 @@ RegistryItem gid_Regitem_OpenOffice_SXG_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterGlobalDocument.6";
     Value = " ";
 End
 
+
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ott
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
@@ -1328,7 +1374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".stw";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1337,7 +1383,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".txt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1346,7 +1392,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".htm";
-    Value = "opendocument.WriterWebDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1355,7 +1401,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".html";
-    Value = "opendocument.WriterWebDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1364,7 +1410,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".xml";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1373,7 +1419,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".wpd";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1382,33 +1428,33 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".hwp";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".oth";
-    Value = "opendocument.WriterDocument.1";
+    Name = ".sxg";
+    Name = "soffice.StarWriterGlobalDocument.6";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".odm";
+    Name = ".oth";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".sxg";
+    Name = ".odm";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
@@ -1428,13 +1474,25 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Swri
     Value = "<progpath>";
 End
 
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odt )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ott )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( oth )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odm )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxw )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stw )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg )
+
+// registering the mso file types
 // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,                 key,  cond, disp_name,        icon_id, app, default, dox_type)
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_Bin, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_Bin, docx, DOCX, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_Bin, docm, DOCM, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Dot,  gid_Module_Prg_Wrt_Bin, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 2, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Dotx, gid_Module_Prg_Wrt_Bin, dotx, DOTX, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Dotm, gid_Module_Prg_Wrt_Bin, dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_Bin, rtf,  RTF,  MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_Bin, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_Bin, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_Bin, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_Bin, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_Bin, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_Bin, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_Bin, rtf,  RTF,  MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer )
 
diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf
index 87c27fbce898..ce8108ae572d 100644
--- a/scp2/source/writer/registryitem_writer.ulf
+++ b/scp2/source/writer/registryitem_writer.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registryitem_writer.ulf,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index c85dde29958c..848b1c707ff7 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_xsltfilter.scp,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,18 +27,11 @@
 
 #include "macros.inc"
 
-File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
-    Name = "/registry/spool/fcfg_xslt_types.xcu";
-End
-
-File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu
+File gid_File_Share_Registry_Xsltfilter_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
-    Name = "/registry/spool/fcfg_xslt_filters.xcu";
+    Dir = gid_Dir_Share_Registry;
+    Name = "xsltfilter.xcd";
 End
 
 File gid_File_Stw_Docbooktemplate
diff --git a/scp2/source/xsltfilter/makefile.mk b/scp2/source/xsltfilter/makefile.mk
index 29e2ffb4c2f5..a9c6c9f77888 100644
--- a/scp2/source/xsltfilter/makefile.mk
+++ b/scp2/source/xsltfilter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp
index 7432e169d909..7854ce70474f 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_xsltfilter.scp,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,8 +43,7 @@ Module gid_Module_Optional_Xsltfiltersamples
     gid_File_Xsl_Export_Xhtml_Master_Usability_Links,
     gid_File_Xsl_Export_Xhtml_Ooo2xhtml,
     gid_File_Xsl_Export_Xhtml_Table,
-    gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu,
-    gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu );
+    gid_File_Share_Registry_Xsltfilter_Xcd );
     Minimal = NO;
     Default = NO;
     Styles = ( );
diff --git a/scp2/source/xsltfilter/module_xsltfilter.ulf b/scp2/source/xsltfilter/module_xsltfilter.ulf
index 5620f926d210..9561c2dc6ec6 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.ulf
+++ b/scp2/source/xsltfilter/module_xsltfilter.ulf
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: module_xsltfilter.ulf,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index bafca83860cb..1fed891823b6 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.58 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -176,7 +172,7 @@ SCP1FILES += \
 
 .IF "$(ENABLE_CRASHDUMP)" != ""
 SCP1FILES += \
-             file_crashrep_dynamic.par
+             file_crashrep.par
 .ENDIF
 
 SCP1FILES += \
@@ -329,7 +325,7 @@ SCP2FILES += \
 
 .IF "$(ENABLE_CRASHDUMP)" != ""
 SCP2FILES += \
-             file_crashrep_dynamic.par
+             file_crashrep.par
 .ENDIF
 
 SCP2FILES += \
author	sb <sb@openoffice.org>	2010-04-14 17:21:13 +0200
committer	sb <sb@openoffice.org>	2010-04-14 17:21:13 +0200
commit	19087e3ef7793983f244d1d5265fefe746ef7727 (patch)
tree	436ed752da5c25f2ab044ac86dfae3e29ce6aa8b /scp2
parent	5aaefa22ae131a80c8beaaa5294c2bb3cd65d4ca (diff)
parent	ba6ae7eaaa7436354a0f61c4c12aea45be0a3c27 (diff)