jl152 merge with DEV300_m80

7 files changed, 75 insertions, 56 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ca44a4e6c465..d3a679008844 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -119,19 +119,22 @@ Module gid_Module_Langpack_Brand_Template
             gid_Brand_Dir_Share_Readme);
     Files = (gid_Brand_File_Res_Iso,
              gid_Brand_File_Res_Ooo,
-             gid_Brand_File_Entitlement,
              gid_Brand_File_Help_C05_Sdatabase_Zip,
              gid_Brand_File_Help_C05_Scalc_Zip,
              gid_Brand_File_Help_C05_Sdraw_Zip,
              gid_Brand_File_Help_C05_Swriter_Zip,
              gid_Brand_File_License_License,
+             gid_Brand_File_License_License_Small,
              gid_Brand_File_License_License_Html,
+             gid_Brand_File_License_License_Html_Small,
              gid_Brand_File_Readme_Readme,
              gid_Brand_File_Readme_Readme_Html,
              gid_Brand_File_Share_Registry_Cjk_Xcd,
              gid_Brand_File_Share_Registry_Korea_Xcd,
              gid_Brand_File_Txt_License,
+             gid_Brand_File_Txt_License_Small,
              gid_Brand_File_Txt_License_Html,
+             gid_Brand_File_Txt_License_Html_Small,
              gid_Brand_File_Txt_Readme,
              gid_Brand_File_Txt_Readme_Html);
 End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index cc44163568d8..7d4e6c2a1954 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(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)
+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)
 
 
 #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);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -363,7 +363,7 @@ File gid_File_Lib_Vbaswobj
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
   #else
@@ -375,7 +375,7 @@ File gid_File_Lib_Vbamsforms
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
   #else
@@ -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);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     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,PATCH,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -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);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     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);
+    Styles = (PACKED,PATCH);
     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);
+    Styles = (PACKED,PATCH);
     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);
+    Styles = (PACKED,PATCH);
     Dir = gid_Dir_Program;
 End
 #endif
@@ -1172,7 +1172,7 @@ End
 File gid_File_Lib_AppleRemote
     Name = LIBNAME(AppleRemote);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     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);
+    Styles = (PACKED,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 
 #if defined UNX && ! defined QUARTZ
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE_PATCH( 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);
+    Styles = (PACKED,PATCH);
     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);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1512,7 +1512,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     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 5cd5a29b0065..ae5b2d9dd0e4 100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1732,15 +1732,6 @@ File gid_File_App_InfoPlist
 End
 #endif
 
-#if defined MACOSX && !defined QUARTZ
-File gid_File_App_Bundle
-    ARCHIVE_TXT_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents;
-    Name = "osxbundle.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
-#endif
-
 #ifdef MACOSX
 File gid_File_Icns_Bundle
     ARCHIVE_TXT_FILE_BODY;
@@ -1777,15 +1768,6 @@ File gid_File_Spotlight_Bundle
 End
 #endif
 
-#if defined MACOSX && !defined QUARTZ
-File gid_File_Bin_Fondu
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "fondu";
-    Styles = (PACKED);
-End
-#endif
-
 File gid_File_Config_Javasettingsunopkginstall
     USER_FILE_BODY;
     Dir = gid_Dir_Config;
@@ -1911,7 +1893,7 @@ End
 File gid_File_Extension_Dictionary_Da
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Da;
 	Name = "dict-da.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -1919,8 +1901,8 @@ End
 #ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_De_AT
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_De_At;
-    Name = "dict-de-AT.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Name = "dict-de-AT.oxt";
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -1929,7 +1911,7 @@ End
 File gid_File_Extension_Dictionary_De_CH
     Dir = gid_Brand_Dir_Share_Extensions_Dict_De_Ch;
     Name = "dict-de-CH.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+    Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
@@ -1938,7 +1920,7 @@ End
 File gid_File_Extension_Dictionary_De_DE
     Dir = gid_Brand_Dir_Share_Extensions_Dict_De_De;
     Name = "dict-de-DE.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+    Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
@@ -1947,7 +1929,7 @@ End
 File gid_File_Extension_Dictionary_En
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_En;
 	Name = "dict-en.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -1965,7 +1947,7 @@ End
 File gid_File_Extension_Dictionary_Et
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Et;
 	Name = "dict-et.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -1974,7 +1956,7 @@ End
 File gid_File_Extension_Dictionary_Fr
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Fr;
 	Name = "dict-fr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -2001,7 +1983,7 @@ End
 File gid_File_Extension_Dictionary_Hu
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hu;
 	Name = "dict-hu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -2010,7 +1992,16 @@ End
 File gid_File_Extension_Dictionary_It
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_It;
 	Name = "dict-it.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ku_Tr
+	Dir = gid_Brand_Dir_Share_Extension_Install;
+	Name = "dict-ku-TR.oxt";
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -2046,7 +2037,7 @@ End
 File gid_File_Extension_Dictionary_No
     Dir = gid_Brand_Dir_Share_Extensions_Dict_No;
     Name = "dict-no.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+    Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
@@ -2055,7 +2046,7 @@ End
 File gid_File_Extension_Dictionary_Pl
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl;
 	Name = "dict-pl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -2064,7 +2055,7 @@ End
 File gid_File_Extension_Dictionary_Pt
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt;
 	Name = "dict-pt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -2073,7 +2064,7 @@ End
 File gid_File_Extension_Dictionary_Ro
     Dir = gid_Brand_Dir_Share_Extensions_Dict_Ro;
     Name = "dict-ro.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+    Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
     UnixRights = 444;
 End
 #endif
@@ -2091,7 +2082,7 @@ End
 File gid_File_Extension_Dictionary_Sk
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sk;
 	Name = "dict-sk.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
@@ -2118,7 +2109,7 @@ End
 File gid_File_Extension_Dictionary_Sv
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sv;
 	Name = "dict-sv.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index bd0182f95c49..a91114de03d7 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -968,6 +968,17 @@ Module gid_Module_Root_Extension_Dictionary_It
 	Styles = (HIDDEN_ROOT);
 End
 
+Module gid_Module_Root_Extension_Dictionary_Ku_Tr
+	Name = "gid_Module_Root_Extension_Dictionary_Ku_Tr";
+	Description = "gid_Module_Root_Extension_Dictionary_Ku_Tr";
+	Files = (gid_File_Extension_Dictionary_Ku_Tr);
+	InstallOrder = "2000";
+	Spellcheckerlanguage = "ku-TR";
+	PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Root;
+	Styles = (HIDDEN_ROOT);
+End
+
 Module gid_Module_Root_Extension_Dictionary_Lt
 	Name = "gid_Module_Root_Extension_Dictionary_Lt";
 	Description = "gid_Module_Root_Extension_Dictionary_Lt";
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index e5314c7c386e..d6f294f1da08 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -358,7 +358,11 @@ End
 
 #ifdef MACOSX
 ScpAction scp_Copy_Dmg_Background_Image
+  #if defined(BUILD_SPECIAL)
     Copy = "osxdndinstall.png";
+  #else
+    Copy = "osxdndinstall_nologo.png";
+  #endif
     Name = "background.png";
     UnixRights = 444;
     Styles = ();
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index ca7a7222b074..2bf8db09254c 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -634,6 +634,15 @@ File gid_File_Dl_Jpipe
 End
 #endif
 
+#if defined SOLAR_JAVA && defined WNT
+File gid_File_Dl_Jpipx
+    TXT_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("jpipx");
+    Styles = (PACKED);
+End
+#endif
+
 #if defined SOLAR_JAVA
 File gid_File_Dl_Juh
     TXT_FILE_BODY;
@@ -1153,6 +1162,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_AffineUnoUno,
             gid_File_Dl_LogUnoUno,
             gid_File_Dl_Jpipe,
+            gid_File_Dl_Jpipx,
             gid_File_Dl_Juh,
             gid_File_Dl_Juhx,
             gid_File_Dl_Acceptor,
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index 848b1c707ff7..e044a3dee90d 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);
+    Styles = (PACKED,PATCH);
     Dir = gid_Dir_Share_Xslt_Export_Xhtml;
     Name = "/xslt/export/xhtml/body.xsl";
 End