native317 #i112626# typical instead of complete installation

7 files changed, 3 insertions, 7 deletions

diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index dea5e9767a6e..21f7fe7726a5 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -132,7 +132,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 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
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 7fcb566af0e3..ec904cd5e904 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -620,7 +620,7 @@ en-US = "< &Back"
 en-US = "Cancel"
 
 [OOO_CONTROL_255]
-en-US = "All program features will be installed. (Requires the most disk space.)"
+en-US = "The main components will be installed. Recommended for most users."
 
 [OOO_CONTROL_256]
 en-US = "Choose which program features you want installed and where they will be installed. Recommended for advanced users."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
index da2d44cdb983..24b51774bacb 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
@@ -8,7 +8,7 @@ en-US = "{&MSSansBold8}Re&pair"
 en-US = "{&MSSansBold8}&Remove"
 
 [OOO_RADIOBUTTON_4]
-en-US = "{&MSSansBold8}&Complete"
+en-US = "{&MSSansBold8}&Typical"
 
 [OOO_RADIOBUTTON_5]
 en-US = "{&MSSansBold8}Cu&stom"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 2200f4d28a3a..56bf6b92d757 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -145,7 +145,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 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	[FILETYPEDIALOGUSED]	0	_IsSetupTypeMin <> "Custom"	5
 SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	6
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 332945b50bdb..49407d4770da 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -133,7 +133,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 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
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
index 332945b50bdb..49407d4770da 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
@@ -133,7 +133,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 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
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 72f4262b1c4e..19a6214f8dc6 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -210,7 +210,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 .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) -log
+    $(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
 
 $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}