CWS-TOOLING: integrate CWS native309

6 files changed, 52 insertions, 71 deletions

diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index aaba3cd6c2ab..7b392f173378 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -49,11 +49,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
+STD_LIB_FILE( gid_File_Lib_Scui, scui)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 5ce656d436eb..404a1588f344 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -100,10 +100,10 @@ File gid_File_Lib_Ldapbe2
 End
 #endif
 
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartmodel, chartmodel)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Charttools, charttools)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartview, chartview)
+STD_UNO_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
+STD_UNO_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
+STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools)
+STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
 
 
 #if defined WNT && defined _MSC
@@ -228,7 +228,7 @@ End
 File gid_File_Lib_QStart_Gtk
     Name = LIBNAME(qstart_gtk);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -505,7 +505,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
 
 File gid_File_Lib_Filterconfig1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = SPECIAL_NAME(filterconfig1);
@@ -653,7 +653,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -677,7 +677,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
 
 File gid_File_Lib_I18npool
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1126,13 +1126,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
 File gid_File_Lib_Desktop_Detector
     Name = LIBNAME(desktop_detector);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1142,7 +1142,7 @@ End
 File gid_File_Lib_Vclplug_Gtk
     Name = LIBNAME(vclplug_gtk);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1151,7 +1151,7 @@ End
 File gid_File_Lib_Vclplug_Kde
     Name = LIBNAME(vclplug_kde);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1161,7 +1161,7 @@ End
 File gid_File_Lib_Vclplug_Kde4
     Name = LIBNAME(vclplug_kde4);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = gid_Dir_Program;
 End
 #endif
@@ -1172,7 +1172,7 @@ End
 File gid_File_Lib_AppleRemote
     Name = LIBNAME(AppleRemote);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1181,13 +1181,13 @@ End
 File gid_File_Lib_Basebmp
     Name = LIBNAME(basebmp);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 
 #if defined UNX && ! defined QUARTZ
-STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif
 
@@ -1195,7 +1195,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 
 File gid_File_Lib_Recentfile
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
 End
@@ -1238,7 +1238,7 @@ End
 File gid_File_Lib_Res
     Name = LIBNAME(res);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1325,7 +1325,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1381,7 +1381,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
+STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
 
 STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
 STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
@@ -1390,10 +1390,10 @@ STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
-STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Swui, swui)
 
-STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
+STD_LIB_FILE( gid_File_Lib_Msword, msword )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
@@ -1514,7 +1514,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1539,7 +1539,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 11173e1f37fc..81ee4eac2960 100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1899,7 +1899,7 @@ End
 File gid_File_Extension_Dictionary_Da
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-da.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1908,7 +1908,7 @@ End
 File gid_File_Extension_Dictionary_De_AT
 	Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-de-AT.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1917,7 +1917,7 @@ End
 File gid_File_Extension_Dictionary_De_CH
     Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-de-CH.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK);
     UnixRights = 444;
 End
 #endif
@@ -1926,7 +1926,7 @@ End
 File gid_File_Extension_Dictionary_De_DE
     Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-de-DE.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK);
     UnixRights = 444;
 End
 #endif
@@ -1935,7 +1935,7 @@ End
 File gid_File_Extension_Dictionary_En
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-en.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1953,7 +1953,7 @@ End
 File gid_File_Extension_Dictionary_Et
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-et.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1962,7 +1962,7 @@ End
 File gid_File_Extension_Dictionary_Fr
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-fr.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1989,7 +1989,7 @@ End
 File gid_File_Extension_Dictionary_Hu
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-hu.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -1998,7 +1998,7 @@ End
 File gid_File_Extension_Dictionary_It
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-it.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2007,7 +2007,7 @@ End
 File gid_File_Extension_Dictionary_Ku_Tr
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-ku-TR.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2043,7 +2043,7 @@ End
 File gid_File_Extension_Dictionary_No
     Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-no.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK);
     UnixRights = 444;
 End
 #endif
@@ -2052,7 +2052,7 @@ End
 File gid_File_Extension_Dictionary_Pl
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-pl.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2061,7 +2061,7 @@ End
 File gid_File_Extension_Dictionary_Pt
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-pt.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2070,7 +2070,7 @@ End
 File gid_File_Extension_Dictionary_Ro
     Dir = gid_Brand_Dir_Share_Extension_Install;
     Name = "dict-ro.oxt";
-    Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+    Styles = (PACKED, FORCELANGUAGEPACK);
     UnixRights = 444;
 End
 #endif
@@ -2088,7 +2088,7 @@ End
 File gid_File_Extension_Dictionary_Sk
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sk.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2097,7 +2097,7 @@ End
 File gid_File_Extension_Dictionary_Sl
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sl.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
@@ -2115,7 +2115,7 @@ End
 File gid_File_Extension_Dictionary_Sv
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sv.oxt";
-	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+	Styles = (PACKED, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index f02b5be04368..12ccef46c805 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -45,6 +45,6 @@ Module gid_Module_Optional_Systemintegration
   #else
     PackageName = "";
   #endif
-	InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250";
+	InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250, redhat-menus:1260";
 End
 
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 70c490d954f8..0b71511c7f0e 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -29,32 +29,9 @@
 
 #if defined(WITH_VC_REDIST)
 
-// WindowsCustomAction gid_Customaction_InstallRuntime
-//	Name = "InstallRuntime";
-//	Typ = "98";
-//	Source = "SystemFolder";
-//	Target = "[SourceDir]redist\vcredist_x86.exe /qb";
-//	Inbinarytable = 0;
-//    Styles = (NO_FILE);
-//	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
-//	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost");
-// End
-
-// WindowsCustomAction gid_Customaction_InstallRuntime_X64
-//	Name = "InstallRuntimeX64";
-//	Typ = "98";
-//	Source = "SystemFolder";
-//	Target = "[SourceDir]redist\vcredist_x64.exe /qb";
-//	Inbinarytable = 0;
-//    Styles = (NO_FILE);
-//	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
-//	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost");
-// End
-
-
 ScpAction scp_Copy_vcredist_x86
   #if defined(BUILD_SPECIAL)
-    Copy = "vcredist_x86_9.0.21022.218.exe";
+    Copy = "vcredist_x86_9.0.30729.4148.exe";
   #else
     Copy = "vcredist_x86.exe";
   #endif
@@ -63,7 +40,11 @@ ScpAction scp_Copy_vcredist_x86
 End
 
 ScpAction scp_Copy_vcredist_x64
+  #if defined(BUILD_SPECIAL)
+    Copy = "vcredist_x64_9.0.30729.4148.exe";
+  #else
     Copy = "vcredist_x64.exe";
+  #endif
     Name = "vcredist_x64.exe";
     Subdir = "redist";
 End
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index e044a3dee90d..848b1c707ff7 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -57,7 +57,7 @@ End
 
 File gid_File_Xsl_Export_Xhtml_Body
     TXT_FILE_BODY;
-    Styles = (PACKED,PATCH);
+    Styles = (PACKED);
     Dir = gid_Dir_Share_Xslt_Export_Xhtml;
     Name = "/xslt/export/xhtml/body.xsl";
 End