Merge branch 'master' into feature/killsdf

Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk

9 files changed, 77 insertions, 32 deletions

diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 725329553327..90e99875d32e 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -287,7 +287,7 @@ End
 
 /* ** Script provider for BeanShell ** */
 
-#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
 
 #if !defined SYSTEM_BSH
 STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
@@ -306,7 +306,7 @@ End
 
 /* ** Script provider for JavaScript ** */
 
-#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
 
 STD_JAR_FILE( gid_File_Jar_Js, js )
 
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 01d773c017e4..91853ea629e1 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -326,7 +326,7 @@ End
 
 /* ** Script provider for BeanShell ** */
 
-#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
 
 Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
     PackageInfo = "packinfo_extensions.txt";
@@ -345,7 +345,7 @@ End
 
 /* ** Script provider for JavaScript ** */
 
-#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+#if defined SOLAR_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
 
 Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
     PackageInfo = "packinfo_extensions.txt";
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 0a7c84769104..5c90285ecbe7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -467,7 +467,7 @@ End
 // Files
 
 File gid_Brand_File_Html_Thirdpartylicensereadme
-    Name = "THIRDPARTYLICENSEREADME.html";
+    Name = "LICENSE.html";
 #ifdef MACOSX
     Dir = gid_Dir_Bundle_Contents;
 #else
@@ -932,6 +932,24 @@ ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
     Value = "${NATIVEPROGRESS}";
 End
 
+ProfileItem gid_Brand_Profileitem_Soffice_ProgressTextColor_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 7;
+    Key = "ProgressTextColor";
+    Value = "${PROGRESSTEXTCOLOR}";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_ProgressTextBaseline_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 8;
+    Key = "ProgressTextBaseline";
+    Value = "${PROGRESSTEXTBASELINE}";
+End
+
 ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
     ProfileID = gid_Brand_Profile_Soffice_Ini;
     ModuleID = gid_Module_Root_Brand;
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3cc740ba3daa..66f3a77e59f6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -824,17 +824,6 @@ End
 
 #endif
 
-#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
-
-File gid_File_Lib_Rebasemsi
-    LIB_FILE_BODY;
-    Name = "rebase.dll";
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
-End
-
-#endif /* WNT && HAVE_WINDOWS_SDK */
-
 STD_LIB_FILE( gid_File_Lib_Lng, lng)
 
 File gid_File_Lib_Localedata_En
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a42f6834abd3..ea102c302fdb 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -723,7 +723,7 @@ File gid_File_Scripts_Java
     Name = "ScriptsJava.zip";
 End
 
-#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+#ifndef WITHOUT_SCRIPTING_BEANSHELL
 File gid_File_Scripts_Beanshell
     Dir = gid_Dir_Share_Scripts;
     ARCHIVE_TXT_FILE_BODY;
@@ -731,7 +731,7 @@ File gid_File_Scripts_Beanshell
 End
 #endif
 
-#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+#ifndef WITHOUT_SCRIPTING_JAVASCRIPT
 File gid_File_Scripts_Javascript
     Dir = gid_Dir_Share_Scripts;
     ARCHIVE_TXT_FILE_BODY;
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index a54d1a078c0e..462273175237 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -29,8 +29,8 @@
 
 #ifdef MACOSX
 ScpAction scp_Copy_Thirdpartylicense_Readme_Html
-    Copy = "THIRDPARTYLICENSEREADME.html";
-    Name= "THIRDPARTYLICENSEREADME.html";
+    Copy = "LICENSE.html";
+    Name= "LICENSE.html";
     Subdir = "LICENSEs";
 End
 #endif
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index c0e53020d1f9..fa7d1c268737 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#if defined(WITH_VC90_REDIST)
+
 MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
     Feature = gm_Root;
     Name = "Microsoft_VC90_CRT_x86.msm";
@@ -34,6 +36,15 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
     ComponentCondition = "VC_REDIST=1";
 End
 
+MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
+    Feature = gm_Root;
+    Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
+    RootDir = "TARGETDIR";
+    ComponentCondition = "VC_REDIST=1";
+End
+
+#endif
+
 #if defined(WITH_VC100_REDIST)
 
 MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86
@@ -45,15 +56,21 @@ End
 
 #endif
 
-MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
+#if defined(WITH_VC110_REDIST)
+
+MergeModule gid_MergeModule_Microsoft_VC110_CRT_x86
     Feature = gm_Root;
-    Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
+    Name = "Microsoft_VC110_CRT_x86.msm";
     RootDir = "TARGETDIR";
     ComponentCondition = "VC_REDIST=1";
 End
 
+#endif
+
 #if defined(BUILD_X64)
 
+#if defined(WITH_VC90_REDIST)
+
 MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64
     Feature = gm_Root;
     Name = "Microsoft_VC90_CRT_x86_x64.msm";
@@ -69,3 +86,27 @@ MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64
 End
 
 #endif
+
+#if defined(WITH_VC100_REDIST)
+
+MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64
+    Feature = gm_Root;
+    Name = "Microsoft_VC100_CRT_x64.msm";
+    RootDir = "TARGETDIR";
+    ComponentCondition = "VC_REDIST=1";
+End
+
+#endif
+
+#if defined(WITH_VC110_REDIST)
+
+MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64
+    Feature = gm_Root;
+    Name = "Microsoft_VC110_CRT_x64.msm";
+    RootDir = "TARGETDIR";
+    ComponentCondition = "VC_REDIST=1";
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 6d3b11b69d7c..b489c3298b5f 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -401,16 +401,6 @@ WindowsCustomAction gid_Customaction_SortTree
     Assignment1 = ("ControlEvent", "CustomSetup", "Tree", "DoAction", "SortTree", "1", "1");
 End
 
-WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
-	Name = "RebaseLibrariesOnProperties";
-	Typ = "65";
-	Source = "rebase.dll";
-	Target = "RebaseLibrariesOnProperties";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
-	Assignment2 = ("AdminExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
-End
-
 WindowsCustomAction gid_Customaction_LookForRegisteredExtensions
 	Name = "LookForRegisteredExtensions";
 	Typ = "65";
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index fc363b974a56..88eb508a5f43 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -97,6 +97,13 @@ File gid_File_Txt_License
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
+File gid_File_Html_License
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Share_Readme_Sdk;
+    Name = "LICENSE.html";
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
 File gid_File_Txt_Readme
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Readme_Sdk;