Merge commit 'libreoffice-3.3.0.2'

Conflicts:
	configure.in
	scp2/source/extensions/directory_extensions.scp
	scp2/source/extensions/module_extensions.scp
	scp2/source/ooo/file_ooo.scp
	set_soenv.in
	solenv/bin/modules/installer/download.pm
	solenv/bin/modules/installer/helppack.pm
	solenv/bin/modules/installer/windows/createfolder.pm
	solenv/bin/modules/installer/worker.pm
	solenv/bin/ooinstall

8 files changed, 13 insertions, 13 deletions

diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp
index 9b367631b65c..84840f36a3b4 100644
--- a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp
+++ b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp
diff --git a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp
index 8b160e68ec8c..75dc163eb719 100644
--- a/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp
+++ b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
index 11acb28b1aad..25b5b11bed20 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
index 61b63eb757f0..28a1219d08c1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
@@ -5,16 +5,16 @@ en-US = "Comment in the Add-Remove-Programs Applet"
 en-US = "Department for technical support"
 
 [OOO_ARPHELPLINKTEMPLATE]
-en-US = "http://www.openoffice.org"
+en-US = "http://www.documentfoundation.org"
 
 [OOO_ARPHELPTELEPHONETEMPLATE]
 en-US = "x-xxx-xxx-xxx"
 
 [OOO_ARPURLINFOABOUTTEMPLATE]
-en-US = "http://www.openoffice.org"
+en-US = "http://www.documentfoundation.org"
 
 [OOO_ARPURLUPDATEINFOTEMPLATE]
-en-US = "http://www.openoffice.org"
+en-US = "http://www.documentfoundation.org"
 
 [OOO_STR_NEW_DISPLAY_NAME]
 en-US = "~New"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
index 11acb28b1aad..25b5b11bed20 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp
index 11acb28b1aad..25b5b11bed20 100644
--- a/instsetoo_native/res/nologoinstall.bmp
+++ b/instsetoo_native/res/nologoinstall.bmp
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index c2670805e54b..f284ac35e8d3 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -84,9 +84,9 @@ ALLTAR  : $(LOCALPYFILES)
 .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack ooohelppack
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack ooohelppack sdkoo_en-US ure_en-US
 .ENDIF
 .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 ALLTAR : updatepack
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 47b1b70ecfc1..dccd310e7ef2 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -26,8 +26,8 @@ Globals
             REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
 			REGISTRATIONURL http://survey.libreoffice.org/user/index.php
 			PROGRESSBARCOLOR 126,170,23
-			PROGRESSSIZE 320,7
-			PROGRESSPOSITION 185,206
+			PROGRESSSIZE 319,10
+			PROGRESSPOSITION 164,225
 			PROGRESSFRAMECOLOR 207,208,211
 			NATIVEPROGRESS true
 			REGISTRYLAYERNAME Layers
@@ -57,7 +57,7 @@ LibreOffice
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION beta3
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
@@ -126,7 +126,7 @@ LibreOffice_wJRE
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION beta3
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
@@ -191,7 +191,7 @@ LibreOffice_Dev
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION beta3
+			SHORT_PRODUCTEXTENSION rc2
 			BASISROOTNAME LibO-dev
 			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
@@ -269,7 +269,7 @@ URE
             PRODUCTEXTENSION
             BRANDPACKAGEVERSION 3
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION beta3
+            SHORT_PRODUCTEXTENSION rc2
             LICENSENAME LGPL
             SERVICESPROJEKT 1
             SETSTATICPATH 1
@@ -310,7 +310,7 @@ LibreOffice_SDK
             PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION beta3
+            SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
@@ -355,7 +355,7 @@ LibreOffice_Dev_SDK
             PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION beta3
+            SHORT_PRODUCTEXTENSION rc2
             BASISROOTNAME LibO-dev
             UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION SDK