CWS-TOOLING: integrate CWS hde01

2009-02-03 12:12:56 +0100 tbo  r267312 : #95523#
2009-02-03 11:48:18 +0100 hde  r267309 : #i98775#
2009-02-03 10:09:02 +0100 wg  r267299 : i98572
2009-02-03 10:07:30 +0100 hde  r267298 : #i98775#
2009-02-02 13:15:48 +0100 hde  r267263 : #i96583#
2009-01-30 18:42:04 +0100 hde  r267223 : #i96583#
2009-01-30 15:40:21 +0100 hde  r267203 : #i98567#
2009-01-30 15:36:37 +0100 hde  r267202 : #i96582#
2009-01-30 15:35:52 +0100 hde  r267201 : #i96931#
2009-01-30 09:48:13 +0100 hde  r267179 : i98638
2009-01-30 09:42:39 +0100 hde  r267178 : i98638
2009-01-30 09:39:20 +0100 hde  r267177 : i98638
2009-01-30 09:36:07 +0100 hde  r267176 : i98638
2009-01-30 09:22:36 +0100 hde  r267174 : i98638
2009-01-29 15:16:09 +0100 wg  r267147 : i98606
2009-01-29 15:02:00 +0100 wg  r267145 : i98606
2009-01-29 15:01:01 +0100 wg  r267144 : i98606
2009-01-29 14:57:40 +0100 wg  r267141 : i98606
2009-01-29 14:20:52 +0100 wg  r267136 : i98606

1 files changed, 23 insertions, 12 deletions

diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc
index eb70fc160db2..f760a65e874e 100755
--- a/testautomation/writer/optional/includes/navigator/w_navigator.inc
+++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc
@@ -40,13 +40,11 @@ sub w_navigator
     printLog Chr(13) + "---------   Navigator Functions -   ----------"
 
     Call tViewNavigator1                ' alle Methoden am Dockingwindow  - Navigator
-    if gApplication = "WRITER" then
-        Call tViewNavigator2            ' dokument?bergreifenden Methoden am Dockingwindow
-        Call tViewNavigator3            ' Funktionen testen
-        Call tViewNavigator4            ' Inhaltsansicht des Navigators ?berpr?fen
-        Call tViewNavigator5            ' Anspringen von Punkten im Dokument ?ber die Inhaltsansicht
-        Call tViewNavigator6            ' Umbenennen von Objekten aus dem Navigator
-    end if
+    Call tViewNavigator2            ' dokument?bergreifenden Methoden am Dockingwindow
+    Call tViewNavigator3            ' Funktionen testen
+    Call tViewNavigator4            ' Inhaltsansicht des Navigators ?berpr?fen
+    Call tViewNavigator5            ' Anspringen von Punkten im Dokument ?ber die Inhaltsansicht
+    Call tViewNavigator6            ' Umbenennen von Objekten aus dem Navigator
 
 end sub
 
@@ -128,6 +126,9 @@ endcase
 testcase tViewNavigator2
     Dim xPos% : Dim yPos% : Dim xSize% : Dim ySize%
     Dim datgeht as boolean
+    if gApplication <> "WRITER" then
+        goto endsub
+    endif
     '/// Edit / Navigator ( document-spreading methods with Navigator as Window ) ///
     printlog "- Edit / Navigator : document-spreading methods with Navigator as Window"
     '/// New document ///
@@ -216,8 +217,8 @@ endcase
 ' **********************************************************************
 
 testcase tViewNavigator3
-QaErrorLog "#i94614# - tEditNavigator3 outcommented"
-exit sub
+    QaErrorLog "#i94614# - tEditNavigator3 outcommented"
+    goto endsub
 
     Dim NavigationTearOff as boolean
 	'/// Edit / Navigator : check some Navigator-Functions ///
@@ -365,7 +366,9 @@ testcase tViewNavigator4
     Dim i : Dim j : Dim Ende : Dim k
     Dim AlteGruppe$ : Dim AlterUnterwert$
     Ende=1000
-
+    if gApplication <> "WRITER" then
+        goto endsub
+    endif
     printlog "- Edit / Navigator : check entry's in Navigator Index"
     '/// File / Open / 'gTesttoolpath + "writer\optional\input\navigator\navigator.odt"' ///
     Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" )
@@ -423,8 +426,12 @@ endcase
 ' **********************************************************************
 
 testcase tViewNavigator5
-QaErrorLog "#i94614# - tEditNavigator5 outcommented"
-exit sub
+    QaErrorLog "#i94614# - tEditNavigator5 outcommented"
+    goto endsub
+    
+    if gApplication <> "WRITER" then
+        goto endsub
+    endif
 
     Dim j as integer
     Dim Dummy as String
@@ -612,6 +619,10 @@ testcase tViewNavigator6
     Dim j as integer
     Dim datIsderAlte(4) as string
 
+    if gApplication <> "WRITER" then
+        goto endsub
+    endif
+    
     printlog "- Edit / Navigator : Rename Objects"
     '/// File / Open / 'gTesttoolpath + "writer\optional\input\navigator\st1_1.sxw" ' ///
     Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\st1_1.sxw" )