instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt | 4 ++--
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt | 4 ++--
instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt | 4 ++--
instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt | 4 ++--
instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 7bfded003e8333b167c94f9f55ce7cc224f5cd7b
Author: Andras Timar <ati...@suse.com>
Date: Mon May 7 16:38:00 2012 +0200
fix condition for SetupCompleteSuccess
Change-Id: Ia134204af1747f570e3048b47c2e12415ceb56b3
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
index 99e5224..9e3faef 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
@@ -29,8 +29,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed"
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled"
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
index 99e5224..9e3faef 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
@@ -29,8 +29,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed"
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled"
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
index 6239d90..ae5f29d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
@@ -36,8 +36,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed"
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled"
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
index 99e5224..9e3faef 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
@@ -29,8 +29,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed"
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled"
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
b/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
index 99e5224..9e3faef 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
@@ -29,8 +29,8 @@ SetupCompleteError RestContText1 Hide NOT
UpdateStarted
SetupCompleteError RestContText1 Show UpdateStarted
SetupCompleteError RestContText2 Hide NOT UpdateStarted
SetupCompleteError RestContText2 Show UpdateStarted
-SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And
((ACTION<>"INSTALL")
-SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And
((ACTION<>"INSTALL")
+SetupCompleteSuccess TextLine2 Show ProgressType2="installed"
+SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled"
SetupInterrupted Back Default UpdateStarted
SetupInterrupted Back Disable NOT UpdateStarted
SetupInterrupted Back Enable UpdateStarted
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
