l10ntooling18: merge

author: Ivo Hinkelmann <ihi@openoffice.org> 2010-05-26 16:11:12 +0200
committer: Ivo Hinkelmann <ihi@openoffice.org> 2010-05-26 16:11:12 +0200
commit: 0d148d90842ea79d5a7e1b53937574af7f729d05 (patch)
tree: f5d95bdd298a0974d34faa1a760462c56d805b77 /instsetoo_native
parent: 710a2a1798790ece870f519861242aa5ba65db12 (diff)
parent: d0317057eb7e0f10889a33961a9d6f3ff2b9828b (diff)
24 files changed, 88 insertions, 924 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
new file mode 100644
index 000000000000..9b367631b65c
--- /dev/null
+++ 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
new file mode 100644
index 000000000000..8b160e68ec8c
--- /dev/null
+++ b/instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
index 5078e379c37d..d7f7f635917e 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.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 e69b561f9165..515f8faecc7a 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/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 5468076d22d4..7fcb566af0e3 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -284,7 +284,7 @@ en-US = "< &Back"
 en-US = "Cancel"
 
 [OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html"
 
 [OOO_CONTROL_125]
 en-US = "&Next >"
@@ -668,10 +668,10 @@ en-US = "Microsoft Po&werPoint Presentations"
 en-US = "&[ProductName] Writer/Web"
 
 [OOO_CONTROL_274]
-en-US = "Set [DEFINEDPRODUCT] to be the default application for these file types."
+en-US = "Set [DEFINEDPRODUCT] to be the default application for Microsoft Office file types."
 
 [OOO_CONTROL_275]
-en-US = "[ProductName] can be set as the default application to open the following file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the progam that opens it now."
+en-US = "[ProductName] can be set as the default application to open Microsoft Office file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the program that opens it now."
 
 [OOO_CONTROL_276]
 en-US = "File types"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
index 5078e379c37d..d7f7f635917e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
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 e69b561f9165..515f8faecc7a 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/inc_openoffice/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
index d3b7a6027356..f335fb6828e1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
@@ -12,6 +12,12 @@ CustomerInformation	SerialNumber	Show	SERIALNUMSHOW
 CustomSetup	ChangeFolder	Hide	Installed
 CustomSetup	Details	Hide	Installed
 CustomSetup	InstallLabel	Hide	Installed
+FileTypeDialog	CheckBox1	Enable	&gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 )
+FileTypeDialog	CheckBox1	Disable	NOT ( &gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 ) )
+FileTypeDialog	CheckBox2	Enable	&gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 )
+FileTypeDialog	CheckBox2	Disable	NOT ( &gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 ) )
+FileTypeDialog	CheckBox3	Enable	&gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 )
+FileTypeDialog	CheckBox3	Disable	NOT ( &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) )
 InstallWelcome	Copyright	Hide	SHOWCOPYRIGHT="No"
 InstallWelcome	Copyright	Show	SHOWCOPYRIGHT="Yes"
 LicenseAgreement	Next	Disable	AgreeToLicense <> "Yes"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 9aff71e515d9..2200f4d28a3a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -33,7 +33,7 @@ CustomSetup	Details	SelectionBrowse	DiskSpaceRequirements	1	1
 CustomSetup	Help	SpawnDialog	CustomSetupTips	1	1
 CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
 CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1)	9
+CustomSetup	Next	NewDialog	FileTypeDialog	OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1)	9
 CustomSetup	Next	DoAction	ResetLanguageSelected	1	1
 CustomSetup	Next	DoAction	SetLanguageSelected	(isMulti <> 1) Or Installed	3
 CustomSetup	Next	DoAction	SetLanguageSelected	(isMulti = 1) And Not Installed And (LANGUAGECONDITIONINSTALL)	4
@@ -57,8 +57,7 @@ DiskSpaceRequirements	OK	EndDialog	Return	1	0
 FilesInUse	Exit	EndDialog	Exit	1	0
 FilesInUse	Ignore	EndDialog	Ignore	1	0
 FilesInUse	Retry	EndDialog	Retry	1	0
-FileTypeDialog	Back	NewDialog	CustomSetup	Installed OR _IsSetupTypeMin = "Custom"	2
-FileTypeDialog	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
+FileTypeDialog	Back	NewDialog	CustomSetup	1	1
 FileTypeDialog	Cancel	SpawnDialog	CancelSetup	1	0
 FileTypeDialog	Next	NewDialog	ReadyToInstall	1	0
 InstallChangeFolder	Cancel	EndDialog	Return	1	2
@@ -102,7 +101,7 @@ PatchWelcome	Cancel	SpawnDialog	CancelSetup	1	1
 PatchWelcome	Next	EndDialog	Return	1	3
 PatchWelcome	Next	Reinstall	ALL	PATCH And REINSTALL=""	1
 PatchWelcome	Next	ReinstallMode	omus	PATCH And REINSTALLMODE=""	2
-ReadyToInstall	Back	NewDialog	CustomSetup	Installed OR _IsSetupTypeMin = "Custom"	2
+ReadyToInstall	Back	NewDialog	FileTypeDialog	Installed OR _IsSetupTypeMin = "Custom"	2
 ReadyToInstall	Back	NewDialog	MaintenanceType	Installed AND _IsMaintenance = "Reinstall"	3
 ReadyToInstall	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
 ReadyToInstall	Cancel	SpawnDialog	CancelSetup	1	0
@@ -148,6 +147,7 @@ SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
 SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
-SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
+SetupType	Next	[FILETYPEDIALOGUSED]	0	_IsSetupTypeMin <> "Custom"	5
+SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	6
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
 SplashBitmap	Next	NewDialog	InstallWelcome	1	0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index c53ccda8d736..3fe0c2062177 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,4 +2,4 @@ Condition	Description
 s255	l255
 WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
 Privileged	OOO_LAUNCH_1
-SETUP_USED=1 Or Installed	OOO_LAUNCH_2
+(VersionNT < 600) or (SETUP_USED=1) or Installed	OOO_LAUNCH_2 
+\ No newline at end of file
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index c9f672b2548e..6009edf00041 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -21,6 +21,7 @@ DisplayNameMinimal	IDPROP_SETUPTYPE_COMPACT
 DisplayNameTypical	IDPROP_SETUPTYPE_TYPICAL
 DWUSINTERVAL	30
 ErrorDialog	SetupError
+FILETYPEDIALOGUSED	0
 InstallChoice	AR
 INSTALLLEVEL	INSTALLLEVELTEMPLATE
 ISCHECKFORPRODUCTUPDATES	ISCHECKFORPRODUCTUPDATESTEMPLATE
@@ -45,6 +46,9 @@ ReinstallModeText	omus
 REMOVEOLDPRODUCTS	1
 SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS;O2LPENUS;O2LPPT;O2LPRU;O2LPEL;O2LPNL;O2LPFR;O2LPES;O2LPFI;O2LPHU;O2LPCA;O2LPIT;O2LPCS;O2LPSK;O2LPENGB;O2LPDA;O2LPSV;O2LPNO;O2LPPL;O2LPDE;O2LPPTBR;O2LPTH;O2LPET;O2LPJA;O2LPKO;O2LPZHCN;O2LPZHTW;O2LPTR;O2LPHI;O2LPAR;O2LPHE
 SetupType	Typical
+SELECT_WORD	0
+SELECT_EXCEL	0
+SELECT_POWERPOINT	0
 STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT	OOO_STR_EDIT
 STR_MS_WORD_DOCUMENT	OOO_STR_MS_WORD_DOCUMENT
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
index 5078e379c37d..d7f7f635917e 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
diff --git a/instsetoo_native/macosx/application/PostInstall.applescript b/instsetoo_native/macosx/application/PostInstall.applescript
deleted file mode 100644
index 3c302ab2daad..000000000000
--- a/instsetoo_native/macosx/application/PostInstall.applescript
+++ /dev/null
@@ -1,290 +0,0 @@
-(*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * 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.
- *
- *************************************************************************)
-
--- This is the PostInstall -script for .pkg installation
--- 
--- Currently this script does the following things:
---   1) Uses fondu to extract and convert .dfont -fonts from Mac OS X system to .ttf -fonts for OpenOffice.org
-
-
-(*==== (global variables as get-functions) ====*)
-
-on getOOInstallPath()
-	return (((path to me) as string) & "Contents:")
-end getOOInstallPath
-
-on getOOResourcesPath()
-	return (((path to me) as string) & "Contents:Resources:")
-end getOOResourcesPath
-
-on getOOProgramPath()
-	return (getOOInstallPath() & "MacOS:")
-end getOOProgramPath
-
--- OSXSystemFontPathList : {"/System/Library/Fonts/", "/Library/Fonts/"}
--- OSXUserFontPathList : {"~/Library/Fonts/"}
-
-on getOSXSystemFontPathList()
-	return {(path to fonts folder from system domain) as string, �
-		(path to fonts folder from local domain) as string}
-end getOSXSystemFontPathList
-
-on getOSXUserFontPathList()
-	return {(path to fonts folder from user domain) as string}
-end getOSXUserFontPathList
-
-on getOOSystemFontPath()
-	return (getOOInstallPath() & "share:fonts:truetype:")
-end getOOSystemFontPath
-
-on getOOUserSettingsPath()
-	return (((path to home folder) as string) & "Library:Application Support:OpenOffice.org:%USERDIRPRODUCTVERSION:")
-end getOOUserSettingsPath
-
-on getOOUserFontPath()
-	return (getOOUserSettingsPath() & "user:fonts:")
-end getOOUserFontPath
-
-
-on getOOCookieSystemFondu()
-	-- nosystemfondu : file does exist if user does not want to use fondu for system fonts
-	return "no_system_fondu"
-end getOOCookieSystemFondu
-
-on getOOCookieSystemFonduDone()
-	-- systemfondudone : file does exist if native fonts already extracted from system fonts
-	return "system_fondu_done"
-end getOOCookieSystemFonduDone
-
-on getOOCookieUserFondu()
-	-- nouserfondu : file does exist if user does not want to use fondu for user fonts
-	return "no_user_fondu"
-end getOOCookieUserFondu
-
-on getOOCookieUserFonduDone()
-	-- userfondudone : file does exist if native fonts already extracted from user fonts
-	return "user_fondu_done"
-end getOOCookieUserFonduDone
-
---
--- the default handler: run
---
-
-on run
-	-- Check for that OOo can be found
-	if (not isRealPath(getOOProgramPath())) then
-		logEvent("(scripts/PostInstall) ERROR: could not find OOo installation from " & POSIX path of getOOProgramPath())
-		return
-	end if
-	
-	-- checks are ok, now we can start doing the real stuff
-	firstLaunch()
-	runSystemFondu()
-	runUserFondu()
-	
-	return
-end run
-
-
--------------------------------------------------------------
-
-
-on runSystemFondu()
-	-- check if user does not want font conversion 
-	if (isRealPath(getOOSystemFontPath() & getOOCookieSystemFondu())) then
-		return
-	end if
-	
-	-- check if font conversion was already run
-	if (isRealPath(getOOSystemFontPath() & getOOCookieSystemFonduDone())) then
-		return
-	end if
-	
-	logEvent("(scripts/PostInstall) Extracting system fonts...")
-	-- else try to create footprint
-	if (setCookie(getOOSystemFontPath(), getOOCookieSystemFonduDone())) then
-		-- call fondu for each font (i.e. without wildcard), so if it crashes only one font is missing
-		fonduConvertFonts(getOOSystemFontPath(), getOSXSystemFontPathList())
-	end if
-	logEvent("(scripts/PostInstall) Extracting system fonts completed.")
-end runSystemFondu
-
-
-on runUserFondu()
-	-- check if user does not want font conversion 
-	if (isRealPath(getOOUserFontPath() & getOOCookieUserFondu())) then
-		return
-	end if
-	
-	-- check if font conversion was already run
-	if (isRealPath(getOOUserFontPath() & getOOCookieUserFonduDone())) then
-		return
-	end if
-	
-	logEvent("(scripts/PostInstall) Extracting user fonts...")
-	-- try to create footprint
-	if (setCookie(getOOUserFontPath(), getOOCookieUserFonduDone())) then
-		-- call fondu for each font (i.e. without wildcard), so if it crashes only one font is missing
-		fonduConvertFonts(getOOUserFontPath(), getOSXUserFontPathList())
-	end if
-	logEvent("(scripts/PostInstall) Extracting user fonts completed.")
-end runUserFondu
-
-
-on firstLaunch()
-	-- continue only if OOSysFontdir exists	
-	if (not isRealPath(getOOSystemFontPath())) then
-		logEvent("(scripts/PostInstall) ERROR: could not find System font folder from " & POSIX path of getOOSystemFontPath())
-		return
-	end if
-	
-	if (setCookie(getOOSystemFontPath(), getOOCookieSystemFondu() & ".in_progress")) then
-		-- Has user already decided that he does not want to extract system fonts ?
-		if (not isRealPath(getOOSystemFontPath() & getOOCookieSystemFondu())) then
-			-- Are system fonts already extracted ?
-			if (not isRealPath(getOOSystemFontPath() & getOOCookieSystemFonduDone())) then
-				-- ask if the user wants to use fondu to extract system fonts
-				set yesKey to getMessage("YES_KEY")
-				set noKey to getMessage("NO_KEY")
-				display dialog getMessage("OOO_EXTRACT_NATIVE_SYSFONTS") buttons {noKey, yesKey} default button yesKey
-				set theResult to the button returned of the result
-				if theResult is noKey then
-					-- not use fondu for system fonts extraction !
-					setCookie(getOOSystemFontPath(), getOOCookieSystemFondu())
-					logEvent("(scripts/PostInstall) Setting: no system fonts")
-				end if
-			end if
-		end if
-	end if
-	
-	-- continue only if OOUserFontdir exists	
-	if (not isRealPath(getOOUserFontPath())) then
-		logEvent("(scripts/PostInstall) ERROR: could not find User font folder from " & POSIX path of getOOUserFontPath())
-		return
-	end if
-	
-	-- Has user already decided that he does not want to extract user fonts ?
-	if (not isRealPath(getOOUserFontPath() & getOOCookieUserFondu())) then
-		-- Are system fonts already extracted ?
-		if (not isRealPath(getOOUserFontPath() & getOOCookieUserFonduDone())) then
-			-- ask if the user wants to use fondu to extract user fonts
-			set yesKey to getMessage("YES_KEY")
-			set noKey to getMessage("NO_KEY")
-			display dialog getMessage("OOO_EXTRACT_NATIVE_USERFONTS") buttons {noKey, yesKey} default button yesKey
-			set theResult to the button returned of the result
-			if theResult is noKey then
-				-- not use fondu for user fonts extraction !
-				setCookie(getOOUserFontPath(), getOOCookieUserFondu())
-				logEvent("(scripts/PostInstall) Setting: no user fonts")
-			end if
-		end if
-	end if
-	
-end firstLaunch
-
-
-on fonduConvertFonts(targetPath, sourcePathList)
-	
-	-- define the location of fondu
-	set fondu to quoted form of (POSIX path of getOOProgramPath() & "fondu")
-	
-	-- first go to the target directory
-	set fonduCmd to "cd " & (quoted form of POSIX path of targetPath) & "; "
-	
-	repeat with q from 1 to number of items in sourcePathList
-		set aPath to POSIX path of (item q of sourcePathList)
-		set fonduCmd to fonduCmd & "for i in " & aPath & "*; do " & fondu & " -force \"$i\" >> /dev/null 2>&1; done; "
-	end repeat
-	try
-		-- ignore errors
-		-- with admin privileges does not work well on panther
-		do shell script "sh -c " & quoted form of fonduCmd
-	end try
-	logEvent("fonduCMD: " & fonduCmd)
-	
-end fonduConvertFonts
-
-
-(* ===== (Helper functions) ======= *)
-
--- set a cookiefile. The content is empty.
-on setCookie(aPath, cookieFile)
-	try
-		if (isRealPath(aPath)) then
-			set newFile to (aPath & cookieFile)
-			open for access file newFile
-			close access file newFile
-			return true
-		else
-			return false
-		end if
-	on error
-		return false
-	end try
-end setCookie
-
--- get a localized string
-on getMessage(aKey)
-	try
-		if (aKey is equal to "YES_KEY") then
-			return "Yes"
-		end if
-		
-		if (aKey is equal to "NO_KEY") then
-			return "No"
-		end if
-		
-		if (aKey is equal to "OOO_EXTRACT_NATIVE_SYSFONTS") then
-			return "Do you want OpenOffice.org to use the Apple system fonts?"
-		end if
-		
-		if (aKey is equal to "OOO_EXTRACT_NATIVE_USERFONTS") then
-			return "Do you want OpenOffice.org to use the fonts you have installed on this system?"
-		end if
-	end try
-end getMessage
-
--- function for checking if a path exists
-on isRealPath(aPath)
-	try
-		alias aPath
-		return true
-	on error
-		-- error number -43 from aPath
-		-- display dialog "NotRP -- " & aPath
-		return false
-	end try
-end isRealPath
-
--- function for logging script messages
-on logEvent(themessage)
-	set theLine to (do shell script �
-		"date  +'%Y-%m-%d %H:%M:%S'" as string) �
-		& " " & themessage
-	do shell script "echo " & quoted form of theLine & �
-		" >> ~/Library/Logs/OpenOffice%USERDIRPRODUCTVERSION.log"
-end logEvent
diff --git a/instsetoo_native/macosx/application/main.applescript b/instsetoo_native/macosx/application/main.applescript
deleted file mode 100644
index c5c100004ac8..000000000000
--- a/instsetoo_native/macosx/application/main.applescript
+++ /dev/null
@@ -1,363 +0,0 @@
-(*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * 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.
- *
- *************************************************************************)
-
-(*==== (global variables as get-functions) ====*)
-
-on getOOInstallPath()
-	return (((path to me) as string) & "Contents:")
-end getOOInstallPath
-
-on getOOResourcesPath()
-	return (((path to me) as string) & "Contents:Resources:")
-end getOOResourcesPath
-
-on getOOProgramPath()
-	return (getOOInstallPath() & "MacOS:")
-end getOOProgramPath
-
-on getScriptPath()
-	-- set this to absolute path when debugging
-	return (((path to me) as string) & "Contents:Resources:Scripts:")
-end getScriptPath
-
-on getOOUserSettingsPath()
-	return (((path to home folder) as string) & "Library:Application Support:OpenOffice.org:%USERDIRPRODUCTVERSION:")
-end getOOUserSettingsPath
-
-on getOOUserFontPath()
-	return (getOOUserSettingsPath() & "user:fonts:")
-end getOOUserFontPath
-
-on getUserLogsPath()
-	return (((path to home folder) as string) & "Library:Logs:")
-end getUserLogsPath
-
-on shellTerminator()
-	return (" &>/dev/null & echo $!") as string
-end shellTerminator
-
---
--- the default handlers: run, open, idle, quit
---
-
-on run
-	if (preRun()) then
-		logEvent("(Scripts/main) Running OpenOffice.org")
-		openSoffice("-")
-	end if
-end run
-
-on open (theFiles)
-	if (preRun()) then
-		openFiles(theFiles)
-	end if
-end open
-
-on idle
-	-- close icon only if ooo has terminated
-	if (hasOOoQuit()) then
-		tell me to quit
-	end if
-	-- check all x seconds if ok to quit
-	return 3
-end idle
-
-on quit
-	if (hasOOoQuit()) then
-		continue quit
-	end if
-end quit
-
--------------------------------------------------------------
-
-on preRun()
-	
-	
-	-- Check for the required version of Mac OS X
-	if (not atLeastOSXVersion(10, 3, 0)) then
-		display dialog getMessage("ERROR_NEED_PANTHER")
-		return false
-	end if
-	
-	-- Check for that OOo can be found
-	if (not isRealPath(getOOProgramPath())) then
-		display dialog getMessage("ERROR_OOO_NOT_FOUND")
-		return false
-	end if
-	
-	if (not isRealPath(getOOUserFontPath())) then
-		set createUserFont to "mkdir -p " & (quoted form of POSIX path of getOOUserFontPath()) & "; "
-		do shell script createUserFont
-	end if
-
-	-- If no crash occured before, ~/Library/Logs does not exist, and OpenOffice.org cannot be started
-	if (not isRealPath(getUserLogsPath())) then
-		set createUserLogsPath to "mkdir -p " & (quoted form of POSIX path of getUserLogsPath()) & "; "
-		do shell script createUserLogsPath
-	end if
-
-	-- Checks are ok, now do the PostInstall stuff (e.g. fondu)
-	
-	-- load helper library
-	set postinstall to load script alias �
-		(getScriptPath() & "PostInstall.scpt")
-	-- execute the postinstall script
-	run of postinstall
-	
-	
-	return true
-end preRun
-
-
-on hasOOoQuit()
-	if (isRealPath(getOOProgramPath())) then
-		-- set the location of soffice binary
-		set soffice to (quoted form of (POSIX path of getOOProgramPath() & "soffice"))
-		
-		set isRunning to do shell script "_FOUND_=`ps -wx -o command | grep " & soffice & " | grep -v grep`; echo $_FOUND_"
-		if isRunning � "" then
-			return false
-		else
-			return true
-		end if
-	else
-		return true
-	end if
-end hasOOoQuit
-
-
-on openSoffice(aFile)
-	set theDisplay to startXServer()
-	if (theDisplay is equal to "error") then
-		return
-	end if
-	set theEnv to "DISPLAY=" & theDisplay & " ; export DISPLAY; "
-	set theCmd to "sh " & (quoted form of (POSIX path of getOOProgramPath() & "soffice")) & " "
-	do shell script theEnv & theCmd & aFile & shellTerminator()
-	-- logEvent("open CMD: " & theEnv & theCmd & aFile)
-end openSoffice
-
-
--- helper function to start X11 server
-on startXServer()
-	
-	-- get X settings
-	set XSettingsList to findXServer()
-	set whichserver to item 1 of XSettingsList
-	set Xserverloc to item 2 of XSettingsList
-	
-	-- debug:
-	-- logEvent("(scripts/main) X settings: " & whichserver & "--" & POSIX path of Xserverloc)
-	-- set whichserver to "NOXSERVER"
-	
-	-- if nothing really was found, display an error message.
-	if (whichserver is equal to "NOXSERVER") then
-		
-		display dialog getMessage("ERROR_NEED_X11") buttons {"Quit", "More Info"} default button "More Info"
-		if the button returned of the result is "Quit" then
-			quit
-		else
-			-- if more info is chosen, then open a help web page
-			do shell script "open http://porting.openoffice.org/mac/faq/installing/X11.html"
-			-- cannot continue, so quit the script
-			return "error"
-		end if
-		
-	end if
-	
-	set now_running to ""
-	set now_running to do shell script "INX=`ps -wcx | grep  " & quoted form of (whichserver & "$") & "`; echo $INX"
-	if whichserver = "NOXSERVER" then
-		-- display dialog "No XServer Found"
-		set now_running to "Skip"
-	end if
-	if now_running = "" then
-		if whichserver = "X11" then
-			set x11cmd to quoted form of (Xserverloc & "/Contents/MacOS/X11") & shellTerminator()
-			do shell script x11cmd
-			-- save process id
-			set x11pid to the result
-			-- wait until the window manager is started which is the second child process of x11
-			set numchildrencmd to "ps -x -o ppid | grep " & x11pid & " | wc -l"
-			set numchildren to 0
-			set d to current date
-			set t1 to time of d
-			repeat while numchildren � 2
-				set d to current date
-				set t2 to time of d
-				-- give up after 30 seconds
-				if t2 - t1 > 30 then
-					display dialog "Command timed out"
-					exit repeat
-				end if
-				set result to do shell script numchildrencmd
-				set numchildren to result as integer
-			end repeat
-		else -- startup XDarwin
-			do shell script "open " & quoted form of Xserverloc & shellTerminator()
-			do shell script "sleep 4"
-		end if
-	end if
-	if whichserver is equal to "X11" then
-		-- the DISPLAY variable is different for every user currently logged in
-		-- X11 passes the DISPLAY as the last command line parameter to its child process
-		-- we can use ps to read the command line and parse the trailing :0, :1, or whatever
-		set xdisplay to do shell script "ps -wx -o command | grep X11.app | grep \":.$\" | sed \"s/^.*:/:/g\""
-		--display dialog xdisplay
-		return xdisplay
-	else
-		-- TODO: find out how XDarwin does it
-		return ":0"
-	end if
-end startXServer
-
-
-on openFiles(fileList)
-	if (count of fileList) > 0 then
-		repeat with i from 1 to the count of fileList
-			set theDocument to (item i of fileList)
-			set theFilePath to (quoted form of POSIX path of theDocument)
-			set theFileInfo to (info for theDocument)
-			openSoffice(theFilePath)
-			logEvent("(Scripts/main) Open file: " & theFilePath)
-		end repeat
-	end if
-end openFiles
-
-
-(* ===== (Helper functions) ======= *)
-
--- get a localized string
-on getMessage(aKey)
-	try
-		if (aKey is equal to "YES_KEY") then
-			return "Yes"
-		end if
-		
-		if (aKey is equal to "NO_KEY") then
-			return "No"
-		end if
-		
-		if (aKey is equal to "ERROR_OOO_NOT_FOUND") then
-			return "OpenOffice.org was not found on your system. Please (re-)install OpenOffice.org first."
-		end if
-		
-		if (aKey is equal to "ERROR_NEED_PANTHER") then
-			return "This build of OpenOffice.org cannot be run on this system, OpenOffice.org requires MacOSX 10.3 (Panther) or newer system"
-		end if
-		
-		if (aKey is equal to "ERROR_NEED_X11") then
-			return "OpenOffice.org for Mac OS X cannot be started, because the X11 software is not installed. Please install Apple X11 first from the Mac OS X install DVD. More information: http://porting.openoffice.org/mac/faq/installing/X11.html"
-		end if
-	end try
-end getMessage
-
-
--- function for logging script messages
-on logEvent(themessage)
-	set theLine to (do shell script �
-		"date  +'%Y-%m-%d %H:%M:%S'" as string) �
-		& " " & themessage
-	do shell script "echo " & quoted form of theLine & �
-		" >> ~/Library/Logs/OpenOffice%USERDIRPRODUCTVERSION.log"
-end logEvent
-
-
--- function for checking if a path exists
-on isRealPath(aPath)
-	try
-		alias aPath
-		return true
-	on error
-		-- error number -43 from aPath
-		-- display dialog "NotRP -- " & aPath
-		return false
-	end try
-end isRealPath
-
--- try to find X11 server on the Mac OS X system
--- return value: the found server or "NOXSERVER"
-on findXServer()
-	-- First try standard X11 location, then try standard XDarwin location
-	
-	set whichserver to "NOXSERVER"
-	--Utilities folder of system
-	set Xserverloc to ((path to utilities folder from system domain) as string) & "X11.app:"
-	--display dialog " Xserverloc" & Xserverloc
-	if (isRealPath(Xserverloc)) then
-		set whichserver to "X11"
-		set Xserverloc to (POSIX path of Xserverloc)
-	else
-		--Applications folder of system
-		set Xserverloc to ((path to applications folder from system domain) as string) & "XDarwin.app:"
-		if (isRealPath(Xserverloc)) then
-			set whichserver to "XDarwin"
-			set Xserverloc to (POSIX path of Xserverloc)
-		end if
-	end if
-	
-	-- if nothing found yet try using locate, first with X11.app and then with XDarwin.app
-	if (whichserver is equal to "NOXSERVER") then
-		set Xserverloc to do shell script "locate X11.app/Contents/MacOS/X11 | sed -e 's-/Contents/MacOS/X11--g'"
-		if Xserverloc � "" then
-			set whichserver to "X11"
-		end if
-	end if
-	
-	if (whichserver is equal to "NOXSERVER") then
-		set Xserverloc to do shell script "locate XDarwin.app/Contents/MacOS/XDarwin | sed -e 's-/Contents/MacOS/XDarwin--g'"
-		if Xserverloc � "" then
-			set whichserver to "XDarwin"
-		end if
-	end if
-	
-	return {whichserver, Xserverloc}
-end findXServer
-
-
--- Test for a minimum version of Mac OS X
-on atLeastOSXVersion(verMajor, verMinor, verStep)
-	-- The StandardAdditions's 'system attribute' used to be the Finder's 'computer' command.
-	tell application "Finder" to set sysv to (system attribute "sysv")
-	
-	-- Generate sysv-compatible number from given version
-	set reqVer to ((verMajor div 10) * 4096 + (verMajor mod 10) * 256 + verMinor * 16 + verStep)
-	
-	-- DEBUGGING:	
-	-- display dialog ("RV:" & reqVer & " < " & sysv as string)
-	
-	-- set major to ((sysv div 4096) * 10 + (sysv mod 4096 div 256))
-	-- set minor to (sysv mod 256 div 16)
-	-- set step to (sysv mod 16)
-	-- display dialog ("Your Mac OS X version: " & major & "." & minor & "." & step)
-	
-	if (reqVer > sysv) then
-		return false
-	else
-		return true
-	end if
-end atLeastOSXVersion
diff --git a/instsetoo_native/macosx/delzip b/instsetoo_native/macosx/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/instsetoo_native/macosx/delzip
+++ /dev/null
diff --git a/instsetoo_native/macosx/make_versioned.sh b/instsetoo_native/macosx/make_versioned.sh
deleted file mode 100755
index 04dbfb062d58..000000000000
--- a/instsetoo_native/macosx/make_versioned.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-#
-# Make versioned
-# Uses openoffice.lst to create versioned files for Mac OS X
-#
-
-# version commands, similar to other OOo code
-MAJOR=`sed -n '/^OpenOffice$/,/^}$/ s/.*USERDIRPRODUCTVERSION //p' ../util/openoffice.lst`
-MAJOR_MINOR=`sed -n '/^OpenOffice$/,/PRODUCTVERSION/ s/.*PRODUCTVERSION //p' ../util/openoffice.lst`
-MAJOR_MINOR_STEP=`sed -n '/^OpenOffice$/,/^}$/ s/.*ABOUTBOXPRODUCTVERSION //p' ../util/openoffice.lst`
-
-
-if [ -z "$1" -o -z "$2" ]; then
-  echo "ERROR: missing argument(s):";
-  echo ""
-  echo "USAGE: $0 <source file> <target file>"
-  echo "   <source file>    File to be versioned"
-  echo "   <target file>    Path and filename where to put the versioned file"
-  exit
-fi
-
-if [ ! -e "$1" ]; then
-  echo "ERROR: source file not found"
-  exit
-fi
-
-TARGET_PATH=`dirname "$2"`
-mkdir -p "$TARGET_PATH"
-
-echo "make_versioned.sh: Using versions $MAJOR - $MAJOR_MINOR - $MAJOR_MINOR_STEP for $1, storing to $TARGET_PATH"
-
-sed -e "s/\%USERDIRPRODUCTVERSION/${MAJOR}/g" "$1" |           \
-sed -e "s/\%PRODUCTVERSION/${MAJOR_MINOR}/g" |                 \
-sed -e "s/\%ABOUTBOXPRODUCTVERSION/${MAJOR_MINOR_STEP}/g" >"$2"
diff --git a/instsetoo_native/macosx/makefile.mk b/instsetoo_native/macosx/makefile.mk
deleted file mode 100644
index 66b558d1038e..000000000000
--- a/instsetoo_native/macosx/makefile.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..
-TARGET=osxbundle
-
-# --- Settings -------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files ----------------------------------------------------
-
-.IF "$(OS)"!="MACOSX" || "$(GUIBASE)"=="aqua"
-
-dummy:
-        @echo "Nothing to build for OS $(OS) and GUIBASE $(GUIBASE)"
-
-.ELSE           # "$(OS)"!="MACOSX"
-
-BUNDLE = $(MISC)$/OpenOffice.org.app
-CONTENTS = $(BUNDLE)$/Contents
-VERSIONED = $(MISC)$/versioned
-
-scriptfiles = \
-    $(CONTENTS)$/Resources$/Scripts$/main.scpt	\
-    $(CONTENTS)$/Resources$/Scripts$/PostInstall.scpt
-
-ZIPFLAGS = -r
-ZIP1TARGET = osxbundle
-ZIP1DIR = $(CONTENTS)
-ZIP1LIST = * -x Info.plist -x PkgInfo
-
-# --- Targets --------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(ZIP1TARGETN) : $(scriptfiles) 
-
-# create application bundle from apple script source
-$(CONTENTS)$/Resources$/Scripts$/main.scpt : application/main.applescript
-    $(RM) -r $(BUNDLE)
-    make_versioned.sh "$<" "$(VERSIONED)/$<"
-    osacompile -o $(BUNDLE) -c OOo2 -s "$(VERSIONED)/$<"
-
-$(CONTENTS)$/Resources$/Scripts$/%.scpt : application/%.applescript
-    make_versioned.sh "$<" "$(VERSIONED)/$<"
-    osacompile -d -o "$@" "$(VERSIONED)/$<"
-    $(RM) "$(VERSIONED)/$<"
-
-# The InfoPlist.strings file has to be in UTF-16, thus a back-and-forth conversion
-# is needed for versioning
-#
-# THIS CODE IS PRESERVED FOR FUTURE LOCALIZATION EFFORTS
-#$(CONTENTS)$/Resources$/InfoPlist.strings : application/InfoPlist.strings	
-#	iconv -f UTF-16 -t UTF-8 "$<" > "$(VERSIONED)/tmp.utf8"
-#	make_versioned.sh "$(VERSIONED)/tmp.utf8" "$(VERSIONED)/$<"
-#	iconv -f UTF-8 -t UTF-16 "$(VERSIONED)/$<" > "$@"
-#	$(RM) "$(VERSIONED)/tmp.utf8" "$(VERSIONED)/$<"
-    
-.ENDIF		# "$(OS)"!="MACOSX"
-
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index 8e8079d64720..68edddfe9b28 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,6 +1,5 @@
-oon	instsetoo_native	::	l10n postprocess packimages testautomation NULL
+oon	instsetoo_native	::	l10n postprocess packimages testautomation ooo_custom_images NULL
 oon	instsetoo_native						usr1	-	all	oon_mkout NULL
 oon	instsetoo_native\inc_openoffice\unix	nmake	-	u	oon_unix NULL
 oon	instsetoo_native\inc_openoffice\windows\msi_languages	nmake	-	all	oon_msilang NULL
-oon	instsetoo_native\macosx					nmake	-	u	oon_macosx_bundle NULL
-oon	instsetoo_native\util					nmake	-	all	oon_util oon_macosx_bundle.u oon_msilang oon_unix.u NULL
+oon	instsetoo_native\util					nmake	-	all	oon_util oon_msilang oon_unix.u NULL
diff --git a/instsetoo_native/prj/d.lst b/instsetoo_native/prj/d.lst
index 2c5e38571b41..b417858098cc 100644
--- a/instsetoo_native/prj/d.lst
+++ b/instsetoo_native/prj/d.lst
@@ -1,4 +1,4 @@
-mkdir: %COMMON_DEST%\pus%_EXT%
+mkdir: %_DEST%\pus%_EXT%
 ..\%COMMON_OUTDIR%\bin\hid.lst %COMMON_DEST%\bin%_EXT%\hid.lst
 ..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin%_EXT%\userfeedback_VCL_names.csv
-..\%__SRC%\misc\*.update.xml %COMMON_DEST%\pus%_EXT%\*.update.xml
-\ No newline at end of file
+..\%__SRC%\misc\*.update.xml %_DEST%\pus%_EXT%\*.update.xml
diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store
deleted file mode 100644
index 3b7c9f7794b9..000000000000
--- a/instsetoo_native/res/DS_Store
+++ /dev/null
diff --git a/instsetoo_native/res/DS_Store_Langpack b/instsetoo_native/res/DS_Store_Langpack
deleted file mode 100644
index 1b53eba75b74..000000000000
--- a/instsetoo_native/res/DS_Store_Langpack
+++ /dev/null
diff --git a/instsetoo_native/res/osxdndinstall.png b/instsetoo_native/res/osxdndinstall.png
deleted file mode 100644
index 6d6e7dc596b0..000000000000
--- a/instsetoo_native/res/osxdndinstall.png
+++ /dev/null
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 2ef67e564fd5..b2f014f6ad58 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -76,21 +76,6 @@ LOCALPYFILES= \
     $(BIN)$/officehelper.py \
     $(BIN)$/mailmerge.py
 
-# PKGFORMAT taken from environment. See possible
-# values below.
-#
-# epm supports the following formats:
-# aix - AIX software distribution
-# bsd - FreeBSD, NetBSD, or OpenBSD software distribution
-# depot or swinstall - HP-UX software distribution
-# deb - Debian software distribution
-# inst or tardist - IRIX software distribution
-# osx - MacOS X software distribution
-# pkg - Solaris software distribution
-# rpm - RedHat software distribution
-# setld - Tru64 (setld) software distribution
-# native - "Native" software distribution for the platform
-# portable - Portable software distribution
 xxxx:
     echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
 
@@ -109,17 +94,18 @@ ALLTAR : updatepack
 .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 .ENDIF			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 
+.IF "$(FORCE2ARCHIVE)" == "TRUE"
+PKGFORMAT = archive
+.END
+
 .IF "$(MAKETARGETS:e)"!=""
 PKGFORMAT+=$(MAKETARGETS:e:s/.//)
 .ENDIF			# "$(MAKETARGETS:e)"!=""
 
-.IF "$(PKGFORMAT)"!=""
-.IF "$(FORCE2ARCHIVE)"!=""
-PKGFORMATSWITCH=-format archive
-.ELSE			# "$(FORCE2ARCHIVE)"!=""
-PKGFORMATSWITCH=-format xxx
-.ENDIF			# "$(FORCE2ARCHIVE)"!=""
-.ENDIF			# "$(PKGFORMAT)"!=""
+# Independent of PKGFORMAT, always build a default-language openoffice product
+# also in archive format, so that tests that require an OOo installation (like
+# smoketestoo_native) have one available:
+openoffice_$(defaultlangiso) : $$@.archive
 
 .IF "$(VERBOSE)"=="TRUE"
 VERBOSESWITCH=-verbose
@@ -171,13 +157,16 @@ MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
 NOLOGOSPLASH:=$(BIN)$/intro.zip
 DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
 BROFFICENOLOGOSPLASH:=$(BIN)$/broffice$/intro.zip
+BROFFICENOLOGOBRAND:=$(BIN)$/broffice$/images_brand.zip
 BROFFICEDEVNOLOGOSPLASH:=$(BIN)$/broffice_dev$/intro.zip
+BROFFICENDEVOLOGOBRAND:=$(BIN)$/broffice_dev$/images_brand.zip
 MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
 MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
 MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
 MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
 
-ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH) $(BROFFICEDEVNOLOGOSPLASH)
+ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH) $(BROFFICEDEVNOLOGOSPLASH) \
+    $(BROFFICENOLOGOBRAND) $(BROFFICEDEVNOLOGOBRAND)
 .IF "$(OS)" == "WNT"
 ADDDEPS+=hack_msitemplates
 .ENDIF
@@ -212,129 +201,76 @@ $(MAKETARGETS) : $(ADDDEPS)
 
 .ENDIF			# "$(BUILD_SPECIAL)"!=""
 
-.IF "$(OS)" == "MACOSX"
-DMGDEPS=$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack}
-$(foreach,i,$(alllangiso) {openoffice openofficedev openofficewithjre ooolanguagepack broffice brofficedev brofficewithjre}_$i) : $(DMGDEPS)
-.ENDIF # "$(OS)" == "MACOSX"
-
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
+.IF "$(MAKETARGETS)"!=""
 .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
 $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
-openoffice_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-openoffice_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+.ENDIF			# "$(MAKETARGETS)"!=""
+openoffice_%{$(PKGFORMAT:^".") .archive} :
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
 openofficewithjre_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-openofficewithjre_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
 openofficedev_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-openofficedev_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 ooolanguagepack_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-ooolanguagepack_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-ooodevlanguagepack_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
 sdkoo_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-sdkoo_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
 sdkoodev_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-sdkoodev_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
 ure_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-ure_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
 .IF "$(OS)" == "MACOSX"
     @echo 'for now, there is no standalone URE for Mac OS X'
 .ELSE
     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \
-        -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH)) \
+        -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -format $(@:e:s/.//) $(VERBOSESWITCH) \
         -msitemplate $(MSIURETEMPLATEDIR) \
         -msilanguage $(COMMONMISC)$/win_ulffiles
 .ENDIF
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) broffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
+.IF "$(MAKETARGETS)"!=""
 .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
 $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
+.ENDIF			# "$(MAKETARGETS)"!=""
 broffice_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-broffice_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
 brofficewithjre_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-brofficewithjre_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")}
 brofficedev_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-brofficedev_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 broolanguagepack_%{$(PKGFORMAT:^".")} :
-.ELSE			# "$(PKGFORMAT)"!=""
-broolanguagepack_% :
-.ENDIF			# "$(PKGFORMAT)"!=""
-    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+    +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
 .ELSE			# "$(alllangiso)"!=""
 openoffice:
@@ -343,11 +279,7 @@ openoffice:
 .ENDIF			# "$(alllangiso)"!=""
 
 .IF "$(LOCALPYFILES)"!=""
-.IF "$(PKGFORMAT)"==""
-$(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i openofficedev_$i broffice_$i brofficewithjre_$i brofficedev_$i sdkoo_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
-.ELSE			# "$(PKGFORMAT)"==""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".")} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
-.ENDIF			# "$(PKGFORMAT)"==""
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
 .ENDIF			# "$(LOCALPYFILES)"!=""
 
 $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
@@ -380,8 +312,9 @@ $(BIN)$/broffice$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_nologo$/intro.zip
     @-$(MKDIR) $(@:d)
     $(COPY) $< $@
 
-$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack} : $(PRJ)$/res$/$$(@:f)
-    @$(COPY) $< $@
+$(BIN)$/broffice$/images_brand.zip : $(SOLARCOMMONBINDIR)$/broffice_nologo$/images_brand.zip
+    @-$(MKDIR) $(@:d)
+    $(COPY) $< $@
 
 hack_msitemplates .PHONY:
     -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index f57bc5be44d1..dac3bb0dea1f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -25,10 +25,11 @@ Globals
             POOLPRODUCT 1
             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
-			PROGRESSBARCOLOR 4,68,155
-			PROGRESSSIZE 412,7
-			PROGRESSPOSITION 14,230
-			PROGRESSFRAMECOLOR 58,159,232
+			PROGRESSBARCOLOR 14,133,205
+			PROGRESSSIZE 320,7
+			PROGRESSPOSITION 185,206
+			PROGRESSFRAMECOLOR 207,208,211
+			NATIVEPROGRESS true
 			REGISTRYLAYERNAME Layers
             SERVICEPACK 1
             UPDATE_DATABASE 1
@@ -37,6 +38,10 @@ Globals
  			PACKAGEMAP package_names.txt,package_names_ext.txt
 			WINDOWSPATCHLEVEL 6
             OOOVENDOR Oracle
+			OOODOWNLOADNAME 1
+			STARTCENTER_LAYOUT_STYLE 0
+			BUILDIDCWS {buildidcws}
+            OPENSOURCE 1
 		}
 	}
 }
@@ -89,10 +94,12 @@ OpenOffice
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -135,6 +142,7 @@ OpenOffice_wJRE
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
+			WITHJREPRODUCT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 			SPELLCHECKERFILE spellchecker_selection.txt
@@ -153,10 +161,12 @@ OpenOffice_wJRE
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -223,11 +233,13 @@ OpenOffice_Dev
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			LOCALUSERDIR $ORIGIN/..
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -271,6 +283,7 @@ URE
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
 			PACKAGEMAP package_names_ext.txt
         }
@@ -316,6 +329,7 @@ OpenOffice_SDK
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
         }
         active 1
         compression 5
@@ -347,6 +361,7 @@ OpenOffice_Dev_SDK
             UREPACKAGEPREFIX ooodev
             SOLSUREPACKAGEPREFIX ooodev
             REGISTRYLAYERNAME LayerDev
+			DEVELOPMENTPRODUCT 1
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
@@ -365,6 +380,7 @@ OpenOffice_Dev_SDK
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
         }
         active 1
         compression 5
@@ -393,6 +409,7 @@ BrOffice
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
+			NATIVEPROGRESS
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
@@ -424,10 +441,12 @@ BrOffice
 			DOWNLOADBANNER	brobanner.bmp
 			DOWNLOADBITMAP	brobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -436,7 +455,7 @@ BrOffice
 		script			setup_osl
 		downloadname	BrOo_{productversion}_{os}_install_{languages}
 		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -460,6 +479,7 @@ BrOffice_wJRE
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
+			NATIVEPROGRESS
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
@@ -473,6 +493,7 @@ BrOffice_wJRE
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
+			WITHJREPRODUCT 1
 			SETSTATICPATH 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -492,10 +513,12 @@ BrOffice_wJRE
 			DOWNLOADBANNER	brobanner.bmp
 			DOWNLOADBITMAP	brobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -503,7 +526,7 @@ BrOffice_wJRE
 		compression		5
 		script			setup_osljre
 		downloadname	BrOo_{productversion}_{os}_installwjre_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -526,10 +549,6 @@ BrOffice_Dev
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.3.0
 			DEVELOPMENTPRODUCT 1
-			PROGRESSBARCOLOR 
-			PROGRESSSIZE 
-			PROGRESSPOSITION 
-			PROGRESSFRAMECOLOR 
 			BASISPACKAGEPREFIX ooobasis-dev
 			UREPACKAGEPREFIX ooodev
 			SOLSUREPACKAGEPREFIX ooodev
@@ -565,11 +584,13 @@ BrOffice_Dev
 			DOWNLOADBANNER	brobanner.bmp
 			DOWNLOADBITMAP	brobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
+			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
 			LOCALUSERDIR $ORIGIN/..
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
+            STARTCENTER_LAYOUT_STYLE 0
             REGISTRATION_PRODUCT OpenOffice.org
             REGISTRATION_CID 926117
 		}
@@ -578,6 +599,6 @@ BrOffice_Dev
 		script			setup_osljre
 		downloadname	BrOo-dev_{productversion}_{os}_install_{languages}
 		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/broffice_dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice_dev,{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice_dev,{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
author	Ivo Hinkelmann <ihi@openoffice.org>	2010-05-26 16:11:12 +0200
committer	Ivo Hinkelmann <ihi@openoffice.org>	2010-05-26 16:11:12 +0200
commit	0d148d90842ea79d5a7e1b53937574af7f729d05 (patch)
tree	f5d95bdd298a0974d34faa1a760462c56d805b77 /instsetoo_native
parent	710a2a1798790ece870f519861242aa5ba65db12 (diff)
parent	d0317057eb7e0f10889a33961a9d6f3ff2b9828b (diff)