From 3cfb1a05631cdb65ff91ccc8198f631629e66621 Mon Sep 17 00:00:00 2001
From: "Joerg Skottke [jsk]" <jsk@openoffice.org>
Date: Wed, 11 Aug 2010 13:50:19 +0200
Subject: jl154: #i113786# - Fix incorrect warning for non-executed basic
 script.

---
 .../extensions/optional/includes/location.inc      | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'testautomation/extensions/optional')

diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc
index c23fdfdf922b..9b5daebca62e 100755
--- a/testautomation/extensions/optional/includes/location.inc
+++ b/testautomation/extensions/optional/includes/location.inc
@@ -61,13 +61,14 @@ testcase tExtensionLocation
         warnlog( "Macro execution warning is missing" )
     endif
 
-    irc = hMacroOrganizerRunMacro( MACRO_NAME )
-    if ( irc = 0 ) then
-        warnlog( "No macro with the given name could be found, aborting" )
-        kontext "Makro"
-        if ( Makro.exists() ) then
-            Makro.close()
-        endif
+    hMacroOrganizerRunMacro( MACRO_NAME )
+
+    kontext "Makro"
+    if ( Makro.exists( 1 ) ) then
+        printlog( "Macro was executed")
+        Makro.close()
+    else
+        warnlog( "Macro was not executed")
         goto endsub
     endif
 
@@ -84,11 +85,8 @@ testcase tExtensionLocation
         warnlog( "No messagebox displayed, please check that the macro is executed" )
     endif
 
-    irc = hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" )
-    irc = hMacroOrganizerRunMacro( MACRO_NAME )
-    if ( irc = 0 ) then
-        warnlog( "No macro with the given name could be found" )
-    endif
+    hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" )
+    hMacroOrganizerRunMacro( MACRO_NAME )
 
     kontext "active"
     if ( active.exists( 2 ) ) then
-- 
cgit 


From dbd690b4ff6767e4bee3cf068a3a8791c286b110 Mon Sep 17 00:00:00 2001
From: "Joerg Skottke [jsk]" <jsk@openoffice.org>
Date: Wed, 11 Aug 2010 14:08:34 +0200
Subject: jl154: #i113786# - Inverted logic

---
 testautomation/extensions/optional/includes/location.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'testautomation/extensions/optional')

diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc
index 9b5daebca62e..262495666cbb 100755
--- a/testautomation/extensions/optional/includes/location.inc
+++ b/testautomation/extensions/optional/includes/location.inc
@@ -65,11 +65,11 @@ testcase tExtensionLocation
 
     kontext "Makro"
     if ( Makro.exists( 1 ) ) then
-        printlog( "Macro was executed")
-        Makro.close()
-    else
         warnlog( "Macro was not executed")
+        Makro.close()
         goto endsub
+    else
+        printlog( "Macro was executed")
     endif
 
     kontext "active"
-- 
cgit