CWS-TOOLING: rebase CWS printerpullpages to trunk@270723 (milestone: DEV300:m46)

13 files changed, 12 insertions, 17 deletions

diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_ooolangpack/windows/msi_languages/CustomAc.ulf
deleted file mode 100644
index 284aee68eebf..000000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_languages/CustomAc.ulf
+++ /dev/null
@@ -1,12 +0,0 @@
-[OOO_CUSTOMACTION_1]
-en-US  = "A newer version of [ProductName] was found. To install an older version, the newer version needs to be removed first."
-
-[OOO_CUSTOMACTION_2]
-en-US  = "The same version of this product is already installed."
-
-[OOO_CUSTOMACTION_3]
-en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first."
-
-[OOO_CUSTOMACTION_4]
-en-US = "Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open."
-
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
index 0399b8b46113..d9971918d3f5 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
@@ -10,4 +10,4 @@ SetBasisInstallLocation	51	BASISINSTALLLOCATION	[BASISDIRECTORYGID]
 SetUreInstallLocation	51	UREINSTALLLOCATION	[UREDIRECTORYGID]
 NewProductFound	19		OOO_CUSTOMACTION_1
 SameProductFound	19		OOO_CUSTOMACTION_2
-RunningOffice	19		"Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open."
+RunningOffice	19		OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
index 56d24dbc75bf..5db654cb045c 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
@@ -49,7 +49,7 @@ RemoveIniValues		1550
 RemoveODBC		1200
 RemoveRegistryValues		1300
 RemoveShortcuts		1600
-RunningOffice	OFFICERUNS="1" And VersionNT < 600	65
+RunningOffice	OFFICERUNS="1"	135
 RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
 SameProductFound	SAMEPRODUCTS	120
 ScheduleReboot	ISSCHEDULEREBOOT	3125
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt
index 204c6082bad6..204c6082bad6 100755..100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
index 073fad35d282..073fad35d282 100755..100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooodev_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooodev_patchcodes.txt
index cbc09ea89684..cbc09ea89684 100755..100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooodev_patchcodes.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooodev_patchcodes.txt
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
index 29325b2bd42b..110925c8d7d9 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
@@ -6,3 +6,6 @@ en-US  = "The same version of this product is already installed."
 
 [OOO_CUSTOMACTION_3]
 en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first."
+
+[OOO_CUSTOMACTION_4]
+en-US = "Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index f2d5eb2b8829..e3bb73b9ed90 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -46,4 +46,4 @@ SetLanguageSelected	51	LANG_SELECTED	1
 ResetLanguageSelected	51	LANG_SELECTED	0
 SetApplicationSelected	51	APP_SELECTED	1
 ResetApplicationSelected	51	APP_SELECTED	0
-RunningOffice	19		"Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open."
+RunningOffice	19		OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt
index d23d7cd0c15b..d23d7cd0c15b 100755..100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index 88e6e0bd5364..9aeff0a1df69 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,4 +1,4 @@
-oon	instsetoo_native	::	postprocess packimages NULL
+oon	instsetoo_native	::	postprocess packimages testautomation 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
diff --git a/instsetoo_native/prj/d.lst b/instsetoo_native/prj/d.lst
index 42016bb9cae5..2c5e38571b41 100644
--- a/instsetoo_native/prj/d.lst
+++ b/instsetoo_native/prj/d.lst
@@ -1,2 +1,4 @@
 mkdir: %COMMON_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
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index c106563a470e..d7cee0a598df 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -95,6 +95,8 @@ LOCALPYFILES= \
 # 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
 
 .IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 ALLTAR : $(LOCALPYFILES)
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index b73558c31dfc..514de56e4888 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -276,7 +276,7 @@ URE
         active 1
         compression 5
         script ure
-	include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
     }
 }