summaryrefslogtreecommitdiff
path: root/testautomation/spreadsheet
diff options
context:
space:
mode:
authorJoerg Skottke [jsk] <jsk@openoffice.org>2010-09-13 08:09:47 +0200
committerJoerg Skottke [jsk] <jsk@openoffice.org>2010-09-13 08:09:47 +0200
commitfda546871f70bab4f351bd0c912bfdb454366763 (patch)
tree00392c5fd8f134e51a7c7f7489c27b987237fc28 /testautomation/spreadsheet
parentae4f862150a0e65096908778b7e21d745d5d0a09 (diff)
automationdev300m87: #i112208# - Changed all sMakeReadOnlyDocumentEditable() statements to hFileOpenLocally() in Spreadsheet update tests
Diffstat (limited to 'testautomation/spreadsheet')
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_datamenu.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc6
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc26
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc29
5 files changed, 34 insertions, 51 deletions
diff --git a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc
index 2975a7b1c9e2..40c42d849d34 100755..100644
--- a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc
@@ -885,10 +885,10 @@ testcase tDataDataPilot
'/// Open testdocument 'gTesttoolPath + spreadsheet\required\input\datapilot.ods'
printlog " Open testdocument 'gTesttoolPath + spreadsheet\required\input\datapilot.ods'"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\datapilot.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\datapilot.ods" )
'/// If the file is not editable, click the edit button on standardbar
- printlog " If the file is not editable, click the edit button on standardbar"
- Call sMakeReadOnlyDocumentEditable
+ 'printlog " If the file is not editable, click the edit button on standardbar"
+ 'Call sMakeReadOnlyDocumentEditable
'/// Select cell C34
printlog " Select cell C34"
Call fCalcSelectRange ( "C34" )
@@ -1030,10 +1030,10 @@ testcase tDataRefreshRange
'/// Load testdocument Database_Refresh
printlog " Load testdocument Database_Refresh"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\Database_Refresh.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\Database_Refresh.ods" )
'/// If the file is not editable, click the edit button on standardbar
- printlog " If the file is not editable, click the edit button on standardbar"
- Call sMakeReadOnlyDocumentEditable
+ 'printlog " If the file is not editable, click the edit button on standardbar"
+ 'Call sMakeReadOnlyDocumentEditable
'/// Refresh Database by 'Data – Refresh Range'
printlog " Refresh Database by 'Data – Refresh Range'"
DataRefreshRange
diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
index fed4fd764f17..361b4ba1c132 100755..100644
--- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
@@ -638,10 +638,10 @@ testcase tEditObjectEdit
'/// Load testdocument 'spreadsheet/required/input/tEditObject.ods'
printlog " Load testdocument 'spreadsheet/required/input/tEditObject.ods'"
- Call hFileOpen ( ConvertPath ( gTesttoolPath + "spreadsheet\required\input\tEditObject.ods"))
+ hFileOpenLocally( gTesttoolPath + "spreadsheet\required\input\tEditObject.ods" )
'/// If the file is not editable, click the edit button on standardbar
- printlog "If the file is not editable, click the edit button on standardbar"
- sMakeReadOnlyDocumentEditable()
+ 'printlog "If the file is not editable, click the edit button on standardbar"
+ 'sMakeReadOnlyDocumentEditable()
'/// Select OLE-object
printlog " Select OLE-object"
fselectFirstOLE
diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc
index 6ec04a89c260..52a228d58a52 100755..100644
--- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc
@@ -635,10 +635,10 @@ testcase tFormatAlignment
'/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"'
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" )
'/// If the file is not editable, click the edit button on standardbar
- printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'printlog "If the file is not editable, click the edit button on standardbar"
+ 'call sMakeReadOnlyDocumentEditable
'/// Select first object by Navigator
printlog " Select first object by Navigator"
Call fNavigatorSelectObject ("drawing objects", 1)
@@ -747,10 +747,10 @@ testcase tFormatGroup
'/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"'
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" )
'/// If the file is not editable, click the edit button on standardbar
- printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'printlog "If the file is not editable, click the edit button on standardbar"
+ 'call sMakeReadOnlyDocumentEditable
'/// Select first object by Navigator
printlog " Select first object by Navigator"
Call fNavigatorSelectObject ("drawing objects", 1)
diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc
index 08ea0cd1a3af..d898f30d03e6 100755..100644
--- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc
@@ -58,10 +58,10 @@ testcase tFormatGraphicPositionAndSize
'/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"'
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ))
+ hFileOpenLocally( gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )
'/// If the file is not editable, click the edit button on standardbar
printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'call sMakeReadOnlyDocumentEditable
'/// Select first object by Navigator
printlog " Select first object by Navigator"
Call fNavigatorSelectObject ("drawing objects", 1)
@@ -144,10 +144,10 @@ testcase tFormatGraphicLine
'/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"'
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" )
'/// If the file is not editable, click the edit button on standardbar
- printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'printlog "If the file is not editable, click the edit button on standardbar"
+ 'call sMakeReadOnlyDocumentEditable
'/// Select first object by Navigator
printlog " Select first object by Navigator"
Call fNavigatorSelectObject ("drawing objects", 1)
@@ -384,10 +384,10 @@ testcase tFormatGraphicArea
'/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"'
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" )
'/// If the file is not editable, click the edit button on standardbar
- printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'printlog "If the file is not editable, click the edit button on standardbar"
+ 'call sMakeReadOnlyDocumentEditable
'/// Select first object by Navigator
printlog " Select first object by Navigator"
Call fNavigatorSelectObject ("drawing objects", 1)
@@ -929,10 +929,10 @@ testcase tFormatGraphicText
'/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"'
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" )
'/// If the file is not editable, click the edit button on standardbar
printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'call sMakeReadOnlyDocumentEditable
'/// Select first object by Navigator
printlog " Select first object by Navigator"
Call fNavigatorSelectObject ("drawing objects", 1)
@@ -1048,10 +1048,10 @@ testcase tFormatGraphicPoints
'/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"'
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" )
'/// If the file is not editable, click the edit button on standardbar
- printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'printlog "If the file is not editable, click the edit button on standardbar"
+ 'call sMakeReadOnlyDocumentEditable
'/// Select first object by Navigator
printlog " Select first object by Navigator"
Call fNavigatorSelectObject ("drawing objects", 1)
diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
index 9efc84907b78..2696bbb86624 100755..100644
--- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
@@ -29,23 +29,6 @@
'*
'* short description : Resource Test - Tools Menu Part I
'*
-'************************************************************************
-'*
-' #1 tToolsSpellcheck
-' #1 tToolsHangulHanjaConversion
-' #1 tToolsLanguageChineseTranslation
-' #1 tToolsLanguageThesaurus
-' #1 tToolsLanguageHyphenation
-' #1 tToolsDetective
-' #1 tToolsAutoCorrect
-' #1 tToolsGoalSeek
-' #1 tToolsScenario
-' #1 tToolsProtectSheet
-' #1 tToolsProtectDocument
-' #1 tToolsCellContents
-' #1 tToolsGallery
-' #1 tToolsMediaPlayer
-'*
'\***********************************************************************
sub c_upd_toolsmenu
@@ -77,10 +60,10 @@ testcase tToolsSpellcheck
Dim iDictionaries as integer
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\english.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\english.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\english.ods" )
'/// If the file is not editable, click the edit button on standardbar
printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'call sMakeReadOnlyDocumentEditable
'/// Enter 'fgsdftk' in a cell
printlog " Enter 'fgsdftk' in a cell"
Kontext "DocumentCalc"
@@ -228,10 +211,10 @@ testcase tToolsHangulHanjaConversion
bCTLLanguage = ActiveDeactivateCTLSupport(TRUE)
'/// Load document from 'gTesttoolPath + "spreadsheet\required\input\korean.ods"'
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\korean.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\korean.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\korean.ods" )
'/// If the file is not editable, click the edit button on standardbar
printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'call sMakeReadOnlyDocumentEditable
'/// Select cell B1
printlog " Select cell B1"
Call fCalcSelectRange ("B1")
@@ -392,9 +375,9 @@ testcase tToolsLanguageThesaurus
'///<u><b>Tools – Language – Chinese Translation</b></u>
printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\english.ods"
- Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\english.ods" ))
+ hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\english.ods" )
printlog "If the file is not editable, click the edit button on standardbar"
- call sMakeReadOnlyDocumentEditable
+ 'call sMakeReadOnlyDocumentEditable
Kontext "DocumentCalc"
printlog " Enter 'test' in a cell"
Call fCalcSelectRange ("B2")