summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-06-12 22:04:04 +0200
committerAndras Timar <atimar@suse.com>2012-06-12 22:07:05 +0200
commit1505ba77d8051dbcf1ff681c55031ea2f6a1b83b (patch)
tree39027572379ea1845a74643819fed74b265a1bad /instsetoo_native
parent1c18604836ce8063b80cc8090445bf0c0094c5d8 (diff)
delete problematic IsOfficeRunning custom action
Change-Id: Id68521b92f572366a68f35c09387a7ed45a835ff
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt1
-rw-r--r--instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt1
-rw-r--r--instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt1
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt1
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt1
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt1
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt1
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt1
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt1
10 files changed, 0 insertions, 12 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
index 7af1c7b26429..997515a9a62e 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
@@ -7,4 +7,3 @@ setUserProfileNT 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2
-RunningOffice 19 OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
index 90ba9c6a6005..7d22ecbbbe1a 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
@@ -49,7 +49,6 @@ RemoveIniValues 1550
RemoveODBC 1200
RemoveRegistryValues 1300
RemoveShortcuts 1600
-RunningOffice OFFICERUNS="1" 135
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
SameProductFound SAMEPRODUCTS 120
ScheduleReboot ISSCHEDULEREBOOT 3125
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 0f3ed1e1bba3..a4b5edc3b9a1 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -28,7 +28,6 @@ ISSCRIPT_VERSION_MISSING IDS_ISSCRIPT_VERSION_MISSING
ISSCRIPT_VERSION_OLD IDS_ISSCRIPT_VERSION_OLD
ISVROOT_PORT_NO 0
Manufacturer MANUFACTURERTEMPLATE
-OFFICERUNS 0
PIDTemplate 12345<###-%%%%%%%>@@@@@
ProductCode PRODUCTCODETEMPLATE
ProductID none
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
index 7af1c7b26429..997515a9a62e 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
@@ -7,4 +7,3 @@ setUserProfileNT 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2
-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 90ba9c6a6005..7d22ecbbbe1a 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
@@ -49,7 +49,6 @@ RemoveIniValues 1550
RemoveODBC 1200
RemoveRegistryValues 1300
RemoveShortcuts 1600
-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/Property.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
index 0f3ed1e1bba3..a4b5edc3b9a1 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
@@ -28,7 +28,6 @@ ISSCRIPT_VERSION_MISSING IDS_ISSCRIPT_VERSION_MISSING
ISSCRIPT_VERSION_OLD IDS_ISSCRIPT_VERSION_OLD
ISVROOT_PORT_NO 0
Manufacturer MANUFACTURERTEMPLATE
-OFFICERUNS 0
PIDTemplate 12345<###-%%%%%%%>@@@@@
ProductCode PRODUCTCODETEMPLATE
ProductID none
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
index b80d173a1262..29325b2bd42b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
@@ -6,6 +6,3 @@ 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 = "Setup detected a running soffice.bin process. Before you restart the installation, please exit the application that owns soffice.bin. It can be LibreOffice, OpenOffice.org, Lotus Symphony, etc. Also check for the running Quickstarter on Windows taskbar. If you are using a multi-user system, also make sure that no other user has this application open."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 4d7125f4c7de..41c2de258377 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -13,4 +13,3 @@ SetLanguageSelected 51 LANG_SELECTED 1
ResetLanguageSelected 51 LANG_SELECTED 0
SetApplicationSelected 51 APP_SELECTED 1
ResetApplicationSelected 51 APP_SELECTED 0
-RunningOffice 19 OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index c4db5c2797a7..bf9367bbf3a7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -50,7 +50,6 @@ RemoveIniValues 1550
RemoveODBC 1200
RemoveRegistryValues 1300
RemoveShortcuts 1600
-RunningOffice OFFICERUNS="1" 135
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
SameProductFound SAMEPRODUCTS 120
ScheduleReboot ISSCHEDULEREBOOT 3125
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 920251e1b406..979b58f0af49 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -29,7 +29,6 @@ ISSCRIPT_VERSION_MISSING IDS_ISSCRIPT_VERSION_MISSING
ISSCRIPT_VERSION_OLD IDS_ISSCRIPT_VERSION_OLD
ISVROOT_PORT_NO 0
Manufacturer MANUFACTURERTEMPLATE
-OFFICERUNS 0
PIDTemplate 12345<###-%%%%%%%>@@@@@
ProductCode PRODUCTCODETEMPLATE
ProductID none