CWS-TOOLING: integrate CWS dv11

2009-05-13 16:50:24 +0200 dv  r271863 : #i101829# Use UPGRADINGPRODUCTCODE to detect major upgrade
2009-04-17 15:55:48 +0200 dv  r270953 : CWS-TOOLING: rebase CWS dv11 to trunk@270723 (milestone: DEV300:m46)
2009-04-17 09:14:21 +0200 dv  r270916 : #i100915# Use better product name
2009-04-16 14:41:49 +0200 dv  r270884 : #i101132# Use a waiting thread to defere update check
2009-04-07 15:46:52 +0200 dv  r270599 : #i100915# Use one include file for all version.rc files
2009-04-07 13:49:56 +0200 dv  r270596 : #i100915# Use one include file for all version.rc files
2009-04-03 09:04:08 +0200 dv  r270447 : #100776# Added Microsoft XML file types to 'Default Applications', cleaned up Application name display in 'Default Applications'
2009-04-01 10:13:28 +0200 dv  r270306 : #i100713# Remove instmsia.exe from installation set
2009-03-30 16:35:35 +0200 dv  r270240 : CWS-TOOLING: rebase CWS dv11 to trunk@270033 (milestone: DEV300:m45)
2009-03-27 10:24:40 +0100 dv  r270138 : #i100410# Show survey after deinstalling OpenOffice.org (Windows only)
2009-03-18 15:05:31 +0100 dv  r269679 : #i98780# Use 'Desktop' folder only, if it exists
2009-03-17 11:19:47 +0100 dv  r269581 : #i100082# Ignore updates with failed dependencies for automatic update check
2009-03-13 14:37:27 +0100 dv  r269479 : #i100082# Use 'value' instead of 'name' to create error message
2009-03-13 10:14:48 +0100 dv  r269460 : #i100082# Support better error message when extension manager update finds an incompatible update

22 files changed, 273 insertions, 225 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index cee36eda1..cdbc6f8ce 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -477,6 +477,16 @@ End
         Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
     End
 
+#define REGISTRY_ENTRY_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(opendocument.,doc_type,Document.1)); \
+        Styles = (); \
+    End
+
 #define CONDITIONAL_REGISTER_DOC_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) \
@@ -488,6 +498,7 @@ End
     REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
     REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
     REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
+    REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
 
 // ---------------------------------------
 
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index e069d7392..fa6c1cfcd 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -34,7 +34,12 @@ File gid_File_Exe_Sbase
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sbase);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Base";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 #if defined WNT
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 035c3ffd1..616084e9b 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -132,9 +132,9 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odb
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Base_Bin;
     Name = ".odb";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "opendocument.DatabaseDocument.1";
     Styles = ();
 End
 
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index e49770f4e..904960fdb 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -155,5 +155,10 @@ File gid_File_Exe_Scalc
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(scalc);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Calc";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 0e7671281..133dc6952 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -526,7 +526,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxc
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".sxc";
     Value = "soffice.StarCalcDocument.6";
     Styles = ();
@@ -573,7 +573,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_ods
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".ods";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -983,7 +983,7 @@ End
 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_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".stc";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -992,7 +992,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dif
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dif";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -1001,53 +1001,35 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dbf
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dbf";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xls
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".xls";
-    Value = "opendocument.CalcDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".xlw";
-    Value = "opendocument.CalcDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlt
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Slk
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".xlt";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".slk";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Slk
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Csv
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".slk";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".csv";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Csv
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlw
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".csv";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".xlw";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
@@ -1055,7 +1037,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wk1
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wk1";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -1064,7 +1046,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wks
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wks";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
@@ -1073,7 +1055,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_123
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".123";
     Value = "opendocument.CalcDocument.1";
     Styles = ();
diff --git a/scp2/source/crashrep/file_crashrep_dynamic.scp b/scp2/source/crashrep/file_crashrep_dynamic.scp
index 0a6c40e19..21710ccbd 100644
--- a/scp2/source/crashrep/file_crashrep_dynamic.scp
+++ b/scp2/source/crashrep/file_crashrep_dynamic.scp
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: file_crashrep_dynamic.scp,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,6 +38,7 @@ File gid_Brand_File_Bin_Crashreport
   #endif
     Dir = gid_Brand_Dir_Program;
   #ifdef WNT
+    FileDescription = "%PRODUCTNAME Crashreporter";
     Styles = (PACKED, PATCH_SO_NAME);
   #else
     Styles = (PACKED);
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 641f29b4b..b613f62ad 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -48,7 +48,12 @@ File gid_File_Exe_Sdraw
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sdraw);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Draw";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 // new user interface configuration files
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index cf4dc241d..f1f1a086c 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -527,7 +527,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxd
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".sxd";
     Value = "soffice.StarDrawDocument.6";
     Styles = ();
@@ -589,7 +589,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".odg";
     Value = "opendocument.DrawDocument.1";
     Styles = ();
@@ -866,18 +866,18 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".otg";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "opendocument.DrawDocument.1";
     Styles = ();
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Std
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".std";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "opendocument.DrawDocument.1";
     Styles = ();
 End
 
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index f5b0ca626..5b8475e8c 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -59,7 +59,12 @@ File gid_File_Exe_Simpress
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(simpress);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Impress";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 // new user interface configuration files
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 69a7fa22e..5ba0cecb9 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -541,7 +541,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxi
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sxi";
     Value = "soffice.StarImpressDocument.6";
     Styles = ();
@@ -587,7 +587,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".odp";
     Value = "opendocument.ImpressDocument.1";
     Styles = ();
@@ -914,7 +914,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".otp";
     Value = "opendocument.ImpressDocument.1";
     Styles = ();
@@ -923,39 +923,12 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sti
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sti";
     Value = "opendocument.ImpressDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ppt
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".ppt";
-    Value = "opendocument.ImpressDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Pps
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".pps";
-    Value = "opendocument.ImpressDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Pot
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".pot";
-    Value = "opendocument.ImpressDocument.1";
-    Styles = ();
-End
-
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simpress_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\simpress.exe";
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 7ae718f10..8f7b00ed5 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -70,7 +70,12 @@ File gid_File_Exe_Smath
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(smath);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Math";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 // new user interface configuration files
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 789daa837..5a55f1bf4 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -427,7 +427,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxm
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Math_Bin;
     Name = ".sxm";
     Value = "soffice.StarMathDocument.6";
     Styles = ();
@@ -489,7 +489,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odf
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Math_Bin;
     Name = ".odf";
     Value = "opendocument.MathDocument.1";
     Styles = ();
@@ -648,7 +648,7 @@ 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_Root;
+//     ModuleID = gid_Module_Prg_Math_Bin;
 //     Name = ".mml";
 //     Value = "opendocument.MathDocument.1";
 //     Styles = ();
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index e4157a3f6..ddf537ed8 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -483,3 +483,11 @@ WindowsCustomAction gid_Customaction_ShowReleaseNotes2
 	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
 End
 
+WindowsCustomAction gid_Customaction_ShowSurvey
+	Name = "ShowSurveyAfterUninstall";
+	Typ = "65";
+	Source = "relnotes.dll";
+	Target = "ShowSurveyAfter";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
+End
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index fcd9cac77..96960dc62 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -48,7 +48,12 @@ File gid_File_Exe_Swriter
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(swriter);
+  #ifdef WNT
+    FileDescription = "%PRODUCTNAME Writer";
+    Styles = (PACKED, PATCH_SO_NAME);
+  #else
     Styles = (PACKED);
+  #endif
 End
 
 #ifdef WNT
@@ -56,7 +61,8 @@ File gid_File_Exe_Sweb
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sweb);
-    Styles = (PACKED);
+    FileDescription = "%PRODUCTNAME Writer(Web)";
+    Styles = (PACKED, PATCH_SO_NAME);
 End
 #endif
 
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 0d8d18d4d..545225ca8 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -640,7 +640,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxw
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".sxw";
     Value = "soffice.StarWriterDocument.6";
     Styles = ();
@@ -687,7 +687,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odt
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odt";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1317,7 +1317,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ott
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".ott";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1326,43 +1326,16 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stw
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".stw";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Doc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".doc";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dot
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".dot";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Rtf
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".rtf";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Txt
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".txt";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1371,7 +1344,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Htm
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".htm";
     Value = "opendocument.WriterWebDocument.1";
     Styles = ();
@@ -1380,7 +1353,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Html
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".html";
     Value = "opendocument.WriterWebDocument.1";
     Styles = ();
@@ -1389,7 +1362,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xml
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".xml";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1398,7 +1371,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wpd
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".wpd";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1407,7 +1380,7 @@ End
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Hwp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".hwp";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1416,7 +1389,7 @@ End
 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_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".oth";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1425,7 +1398,7 @@ End
 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_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odm";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
@@ -1434,7 +1407,7 @@ End
 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_Root;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".sxg";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index e0050276d..2f876010e 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -8,8 +8,6 @@
 #
 # $RCSfile: make_installer.pl,v $
 #
-# $Revision: 1.121 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2221,14 +2219,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         }
 
         # Analyzing the ScpActions and copying the files into the installation set
-        # At least the loader, instmsia.exe and instmsiw.exe
+        # At least the loader.exe
 
         installer::logger::print_message( "... copying files into installation set ...\n" );
 
         # installer::windows::msiglobal::copy_scpactions_into_installset($defaultlanguage, $installdir, $scpactionsinproductlanguageresolvedarrayref);
         installer::worker::put_scpactions_into_installset($installdir);
 
-        # ... copying the setup.exe, instmsia.exe and instmsiw.exe
+        # ... copying the setup.exe
 
         installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir, $includepatharrayref, $allvariableshashref);
 
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index 4e2f4be24..c789085ab 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -78,7 +78,7 @@ sub convert_to_unicode
 
 sub replace_productname_in_file
 {
-    my ($sourcepath, $destpath, $variableshashref) = @_;
+    my ($sourcepath, $destpath, $variableshashref, $filedescription) = @_;
 
     my $onefile = installer::files::read_binary_file($sourcepath);
 
@@ -87,6 +87,7 @@ sub replace_productname_in_file
     for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
 
     my $productname = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
+    if ( $filedescription ne "" ) { $productname = $filedescription; }
     my $unicode_productname = convert_to_unicode($productname);
 
     change_length_of_string(\$unicode_productname, $replacestring);
@@ -124,6 +125,7 @@ sub resolving_patchsoname_flag
             # Language specific subdirectory
 
             my $onelanguage = $onefile->{'specificlanguage'};
+            my $filedescription = "";
             
             if ($onelanguage eq "")
             {
@@ -139,6 +141,8 @@ sub resolving_patchsoname_flag
             my $sourcepath = $onefile->{'sourcepath'};
             my $destinationpath = $replacedir . $onefilename;  
             my $movepath = $destinationpath . ".orig";
+            
+            if ( exists($onefile-> {'FileDescription'}) ) { $filedescription = $onefile-> {'FileDescription'}; }
 
             # if (!(-f $destinationpath))	# do nothing if the file already exists
             # {
@@ -148,7 +152,7 @@ sub resolving_patchsoname_flag
             if ( $copysuccess )
             {
                 # Now the file can be patch (binary!)
-                my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref);
+                my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $filedescription);
                     
                 if ($found == 0)
                 {
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index b0b313fe8..ec6f679a9 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -8,8 +8,6 @@
 #
 # $RCSfile: msiglobal.pm,v $
 #
-# $Revision: 1.51 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1162,34 +1160,6 @@ sub put_databasename_into_setupini
 }
 
 ##########################################################################
-# Writing the path to the instmsiw.exe into setup.ini
-##########################################################################
-
-sub put_instmsiwpath_into_setupini
-{
-    my ($setupinifile) = @_;
-    
-    my $instmsiwexepath = "instmsiw.exe";	
-    my $line = "instmsiw=" . $instmsiwexepath . "\n";
-    
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the path to the instmsia.exe into setup.ini
-##########################################################################
-
-sub put_instmsiapath_into_setupini
-{
-    my ($setupinifile) = @_;
-    
-    my $instmsiaexepath = "instmsia.exe";	
-    my $line = "instmsia=" . $instmsiaexepath . "\n";
-    
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
 # Writing the required msi version into setup.ini
 ##########################################################################
 
@@ -1335,8 +1305,6 @@ sub create_setup_ini
     push(@setupinifile, $line);
 
     put_databasename_into_setupini($setupinifile, $allvariableshashref);
-    put_instmsiwpath_into_setupini($setupinifile);
-    put_instmsiapath_into_setupini($setupinifile);
     put_msiversion_into_setupini($setupinifile);
     put_productname_into_setupini($setupinifile, $allvariableshashref);
     put_productcode_into_setupini($setupinifile);
@@ -1406,7 +1374,7 @@ sub copy_scpactions_into_installset
 
 #################################################################
 # Copying the files for the Windows installer into the 
-# installation set (setup.exe, instmsia.exe, instmsiw.exe).
+# installation set (setup.exe).
 #################################################################
 
 sub copy_windows_installer_files_into_installset
@@ -1416,8 +1384,6 @@ sub copy_windows_installer_files_into_installset
     installer::logger::include_header_into_logfile("Copying Windows installer files into installation set");
     
     @copyfile = ();
-    push(@copyfile, "instmsia.exe");
-    push(@copyfile, "instmsiw.exe");
     push(@copyfile, "loader2.exe");
     
     if ( $allvariables->{'NOLOADERREQUIRED'} ) { @copyfile = (); }
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index 0bb1c47c0..26dec0109 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -8,8 +8,6 @@
 #
 # $RCSfile: binary.pm,v $
 #
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -299,7 +297,6 @@ sub analyze_installset_content
         if ( $sourcefiles[$j] =~ /\.cab\s*$/ ) { $allcabfileshash{$sourcefiles[$j]} = 1; }
         else
         {
-            if ( $sourcefiles[$j] =~ /instmsi\w+.exe\s*$/ ) { next; } # no signing of instmsia.exe and instmsiw.exe
             if ( $sourcefiles[$j] =~ /jre[-\w]+.exe\s*$/ ) { next; } # no signing of java executable
             if ( $sourcefiles[$j] =~ /\.txt\s*$/ ) { next; }
             if ( $sourcefiles[$j] =~ /\.html\s*$/ ) { next; }
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index c552a4963..07853e848 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shlinfo.rc,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,30 +25,11 @@
  *
  ************************************************************************/
 
-#define VERSION			3
-#define SUBVERSION		1
-#define VERVARIANT		0
-
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT		0
-//#define VER_BETA		6
-#define VER_FINAL		0
-
-#define VER_DAY			1
-#define VER_MONTH		4
-#define VER_YEAR		2009
-
-// -----------------------------------------------------------------------
-
 #if !defined(ENGLISH)
 #define LG_D 					// generate always german version
 #endif
 
-#define VER_FIRSTYEAR	VER_YEAR
+#define VER_FIRSTYEAR	2008
 
 
 #if defined(OS2)
@@ -61,30 +39,7 @@
 #else
 
 #include <windows.h>
-#include "verinfo.hrc"
-
-#ifdef WIN32
-#define FOR_WIN_X " (32 Bit)"
-#else
-#define FOR_WIN_X ""
-#endif
-
-// -----------------------------------------------------------------------
-// 				language/character set specification table
-// -----------------------------------------------------------------------
-
-RCD_LANGUAGE rcdata
-{
-#ifdef LG_D
-	"040704B0", 	// Germany -> Unicode
-	"040704E4", 	// Germany -> Windows, Multilingual
-#else
-	"040904B0", 	// Germany -> Unicode
-	"040904E4", 	// USA -> Windows, Multilingual
-#endif
-	"04090000", 	// USA -> 7-Bit-ASCII
-	0				// end of table
-}
+#include "version.hrc"
 
 // -----------------------------------------------------------------------
 // 				version information
@@ -92,11 +47,11 @@ RCD_LANGUAGE rcdata
 
 VS_VERSION_INFO versioninfo
 #ifndef SUBVERSION
-	fileversion    VERSION, 0, 0, VERVARIANT
-	productversion VERSION, 0, 0, VERVARIANT
+	fileversion    VERSION, 0, VERVARIANT, VER_COUNT
+	productversion VERSION, 0, VERVARIANT, VER_COUNT
 #else
-	fileversion    VERSION, VERVARIANT, VER_COUNT
-	productversion VERSION, VERVARIANT, VER_COUNT
+	fileversion    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+	productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
 #endif
 	fileflagsmask 0x3F
 	fileflags
@@ -120,7 +75,7 @@ VS_VERSION_INFO versioninfo
 			block "040704E4"
 			{
 				// German StringTable
-				value "CompanyName",		"Sun Microsystems, Inc.\0"
+				value "CompanyName",		"OpenOffice.org\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
@@ -133,7 +88,7 @@ VS_VERSION_INFO versioninfo
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName", 		"Sun Microsystems, Inc.\0"
+				value "CompanyName",		"OpenOffice.org\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
@@ -155,11 +110,4 @@ VS_VERSION_INFO versioninfo
 		}
 	}
 
-// version binary entry
-VS_VERSION_INFO rcdata
-{
-	0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
-	VERSION, VERVARIANT, VER_COUNT
-};
-
 #endif // OS2
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
new file mode 100644
index 000000000..50173ea15
--- /dev/null
+++ b/solenv/inc/version.hrc
@@ -0,0 +1,80 @@
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2009 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * 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.

+ *

+ *************************************************************************/

+

+#define VERSION			3

+#define SUBVERSION		2

+//#define VERVARIANT	0 // never define this one, will be provided by build environment (BUILD_ID)

+// .0 + VER_CONCEPT

+// .100 + VER_ALPHA

+// .200 + VER_BETA

+// .300 + VER_GAMMA

+// .500 + VER_FINAL

+//#define VER_CONCEPT		0

+//#define VER_BETA		6

+#define VER_FINAL		0

+

+#define VER_DAY			1

+#define VER_MONTH		9

+#define VER_YEAR		2009

+

+#ifndef VER_FIRSTYEAR

+#define VER_FIRSTYEAR	VER_YEAR

+#endif

+

+#include "verinfo.hrc"

+

+#ifdef WIN32

+#define FOR_WIN_X " (32 Bit)"

+#else

+#define FOR_WIN_X ""

+#endif

+

+// -----------------------------------------------------------------------

+// 				language/character set specification table

+// -----------------------------------------------------------------------

+

+RCD_LANGUAGE rcdata

+{

+#ifdef LG_D

+    "040704B0", 	// Germany -> Unicode

+    "040704E4", 	// Germany -> Windows, Multilingual

+#else

+    "040904B0", 	// Germany -> Unicode

+    "040904E4", 	// USA -> Windows, Multilingual

+#endif

+    "04090000", 	// USA -> 7-Bit-ASCII

+    0				// end of table

+}

+

+

+// version binary entry

+VS_VERSION_INFO rcdata

+{

+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,

+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

+};

+

diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
new file mode 100644
index 000000000..0f468701f
--- /dev/null
+++ b/solenv/inc/version_so.hrc
@@ -0,0 +1,79 @@
+/*************************************************************************

+ *

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2009 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * 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.

+ *

+ *************************************************************************/

+

+#define VERSION			9

+#define SUBVERSION		2

+//#define VERVARIANT	0 // never define this one, will be provided by build environment (BUILD_ID)

+// .0 + VER_CONCEPT

+// .100 + VER_ALPHA

+// .200 + VER_BETA

+// .300 + VER_GAMMA

+// .500 + VER_FINAL

+//#define VER_CONCEPT		0

+//#define VER_BETA		6

+#define VER_FINAL		0

+

+#define VER_DAY			1

+#define VER_MONTH		9

+#define VER_YEAR		2009

+

+#ifndef VER_FIRSTYEAR

+#define VER_FIRSTYEAR	VER_YEAR

+#endif

+

+#include "verinfo.hrc"

+

+#ifdef WIN32

+#define FOR_WIN_X " (32 Bit)"

+#else

+#define FOR_WIN_X ""

+#endif

+

+// -----------------------------------------------------------------------

+// 				language/character set specification table

+// -----------------------------------------------------------------------

+

+RCD_LANGUAGE rcdata

+{

+#ifdef LG_D

+    "040704B0", 	// Germany -> Unicode

+    "040704E4", 	// Germany -> Windows, Multilingual

+#else

+    "040904B0", 	// Germany -> Unicode

+    "040904E4", 	// USA -> Windows, Multilingual

+#endif

+    "04090000", 	// USA -> 7-Bit-ASCII

+    0				// end of table

+}

+

+// version binary entry

+VS_VERSION_INFO rcdata

+{

+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,

+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

+};

+