slidecopy: changes for the new taskpane implementation

10 files changed, 25 insertions, 42 deletions

diff --git a/testautomation/global/input/officeinfo.txt b/testautomation/global/input/officeinfo.txt
index dc334737d048..a6b692b15f01 100644..100755
--- a/testautomation/global/input/officeinfo.txt
+++ b/testautomation/global/input/officeinfo.txt
@@ -1,6 +1,5 @@
 [Current program versions]
-StarOffice=9
-StarSuite=9
+Oracle Open Office=3.2
 OpenOffice.org=3.1
 BrOffice.org=3.1
 
diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid
index de68cf13f79d..2fde9b77b5a4 100755
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -256,7 +256,7 @@ ViewSnapLinesFront SID_HELPLINES_FRONT
 ViewStatusBarVisible .uno:StatusBarVisible
 ViewShowImeStatusWindow .uno:ShowImeStatusWindow
 ViewShowRuler .uno:ShowRuler
-ViewTaskPane .uno:RightPane
+ViewTaskPane .uno:TaskPane
 ViewTaskSlide .uno:LeftPaneImpress
 ViewTitle SID_TITLE_MASTERPAGE
 ViewToolbarsOptionbar .uno:AvailableToolbars?Toolbar:string=optionsbar
diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win
index c37ad2512873..899254eb6519 100755
--- a/testautomation/global/win/dial_t_z.win
+++ b/testautomation/global/win/dial_t_z.win
@@ -170,10 +170,6 @@ Vorschau sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW
 *UndoRedoBox HID_SVXTBX_UNDO_REDO_CTRL
 UndoRedoList svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL
 
-*UrlOeffnen sfx2:ModalDialog:RID_URLOPEN
-URL sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL
-URLText sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL
-
 *Verbinder HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION
 Linie1 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
 Linie2 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win
index a53038e79394..099e62675963 100755
--- a/testautomation/global/win/edia_t_z.win
+++ b/testautomation/global/win/edia_t_z.win
@@ -40,8 +40,8 @@ FinishBtn HID_DLGTABLE_CMDFINISH
 CancelBtn HID_DLGTABLE_CMDCANCEL
 
 ' not nice solved, but can't do better right now; complains -> TBO
-*Tasks sd:DockingWindow:FLT_RIGHT_PANE_DOCKING_WINDOW
-View HID_SD_TASK_PANE_VIEW_MENU
+*Tasks sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW
+View HID_TASKPANE_VIEW_MENU
 '? HID_SD_WIN_DOCUMENT
 ' Master Pages
 UsedInThisPresentationPreview HID_SD_TASK_PANE_PREVIEW_CURRENT
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index d4c6f46ed272..67c456201b45 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -146,7 +146,7 @@ testcase tSVM
     hFileOpen (sDocument)
     sleep (10)
 
-    sMakeReadOnlyDocumentEditable
+    call fMakeDocumentWritable
 
     hTypeKeys ("<escape><tab>")
     fGetSizeXY sx1, sY, TRUE
@@ -763,14 +763,8 @@ qaerrorlog
    endif
 
    ' check if the document is writable
-    if fIsDocumentWritable = false then
-        ' make the document writable and check if it's succesfull
-        if fMakeDocumentWritable = false then
-            warnlog "The document can't be make writeable. Test stopped."
-            goto endsub
-        endif
-    endif
-
+   call fMakeDocumentWritable
+    
    hTypeKeys ("<escape><tab>")
    fGetSizeXY sx1, sy, TRUE
    if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
@@ -948,9 +942,8 @@ testcase tEMF
         Filterauswahl.Cancel
         goto endsub
     endif
-   printlog "making doc editable if it is readonly"
-   sMakeReadOnlyDocumentEditable
-
+   printlog "making doc editable if it is readonly"   
+    call fMakeDocumentWritable
     hTypeKeys ("<escape><tab>")
     fGetSizeXY sx1, sY, TRUE
     if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then
@@ -1139,7 +1132,7 @@ testcase tMET
     sleep (10)
    
     printlog "making doc editable if it is readonly"
-    sMakeReadOnlyDocumentEditable
+    call fMakeDocumentWritable
 
     hTypeKeys ("<escape><tab>")
     fGetSizeXY sx1, sY, TRUE
@@ -1341,7 +1334,7 @@ testcase tWMF
     sleep (10)
    
     printlog "making doc editable if it is readonly"
-    sMakeReadOnlyDocumentEditable
+    call fMakeDocumentWritable
 
     hTypeKeys ("<escape><tab>")
     fGetSizeXY sx1, sY, TRUE
diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
index b0a0326a6f3f..e73d72b074ed 100755
--- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc
+++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
@@ -159,7 +159,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean)
     printlog "File opened: " + sFileName
     Sleep 3
 
-    Call sMakeReadOnlyDocumentEditable
+    call fMakeDocumentWritable
 
     if bSimple then
         Printlog "- Tools/Autocorrect -single quotes"
diff --git a/testautomation/graphics/optional/includes/global/g_customshapes.inc b/testautomation/graphics/optional/includes/global/g_customshapes.inc
index 3cd31dac77b6..98fbe7bb43af 100755
--- a/testautomation/graphics/optional/includes/global/g_customshapes.inc
+++ b/testautomation/graphics/optional/includes/global/g_customshapes.inc
@@ -646,15 +646,15 @@ testcase tFormatPaintbrush
          sleep 1
       else '(Impress)
          Kontext "DocumentImpress"
-         DocumentImpress.Mousedown 20, 20
-         DocumentImpress.Mouseup 20, 20
+         DocumentImpress.typekeys("<F6>",true)
+         DocumentImpress.typekeys("<ESCAPE>",true)
+         DocumentImpress.typekeys("<TAB>",true)
          sleep 1
          kontext "Standardbar"
          FormatPaintbrush.Click
          kontext "DocumentImpress"
          sleep 1
-         DocumentImpress.Mousedown 80, 80
-         DocumentImpress.Mouseup 80, 80
+         DocumentImpress.typekeys("<TAB>",true)
          sleep 1
       endif
 
diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc
index 56dd1f89e294..e8784eb67228 100755
--- a/testautomation/graphics/optional/includes/global/g_demoguide.inc
+++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc
@@ -385,7 +385,7 @@ testcase t_DrawingEngine
     printlog "Open a drawing"
     hFileOpen (Convertpath (gTesttoolPath + "graphics/required/input/Blueprint.odg"))
 
-    Call sMakeReadOnlyDocumentEditable
+    Call fMakeDocumentWritable
 
     '///Select grouped object and enter group
     printlog "Select group"
diff --git a/testautomation/graphics/optional/includes/global/g_load_save.inc b/testautomation/graphics/optional/includes/global/g_load_save.inc
index 9bc422f99ff3..6622c9c7a452 100755
--- a/testautomation/graphics/optional/includes/global/g_load_save.inc
+++ b/testautomation/graphics/optional/includes/global/g_load_save.inc
@@ -302,14 +302,9 @@ testcase tFileOpenImport
     Dateiname.SetText (ConvertPath (gTesttoolpath + "graphics\required\input\imsusmap.cgm"))
     Oeffnen.Click
     Sleep 2
-    ' check if the document is writable
-    if fIsDocumentWritable = false then
-        ' make the document writable and check if it's succesfull
-        if fMakeDocumentWritable = false then
-            warnlog "The document can't be make writeable. Test stopped."
-            goto endsub
-        endif
-    endif
+    
+    call fMakeDocumentWritable
+    
     kontext "DocumentImpress"
     if DocumentImpress.exists(5) then
         DocumentImpress.TypeKeys ("<Tab>")
diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc
index 117fa47725e2..e71c9f7653f0 100755
--- a/testautomation/graphics/tools/id_tools.inc
+++ b/testautomation/graphics/tools/id_tools.inc
@@ -289,10 +289,10 @@ end function
 '-------------------------------------------------------------------------------
 function fMakeDocumentWritable() as boolean
 
-    printlog " make a document is writeable"
-    printlog " <u>parameter:</u>"
-    printlog " <u>return:</u>"
-    printlog " true if the document can make writeable otherwise false"
+    'make a document is writeable
+    'parameter:</u>
+    '<u>return:</u>
+    'true if the document can make writeable otherwise false
 
     Kontext "Standardbar"
     sleep (1)
@@ -310,7 +310,7 @@ function fMakeDocumentWritable() as boolean
             printlog "Document is allready writable."
             fMakeDocumentWritable = true
         endif
-
+    sleep (1)
 end function
 
 '-------------------------------------------------------------------------------