diff options
414 files changed, 228 insertions, 303 deletions
diff --git a/qadevOOo/runner/stats/Summarizer.java b/qadevOOo/runner/stats/Summarizer.java index b1fe5fe61dd3..5f4a58cc31f8 100644 --- a/qadevOOo/runner/stats/Summarizer.java +++ b/qadevOOo/runner/stats/Summarizer.java @@ -78,7 +78,7 @@ public class Summarizer { if (states.elementAt(j).equals("not part of the job")) { - state = "Not possible since not all Interfaces/Services have been checked"; + state = "PASSED(some interfaces/services not tested).OK"; } else { diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index dce88234885f..5ac071c38eb5 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -27,6 +27,7 @@ package mod._forms; import com.sun.star.beans.NamedValue; import com.sun.star.beans.PropertyValue; +import com.sun.star.container.XIndexAccess; import java.io.PrintWriter; import lib.StatusException; @@ -251,11 +252,10 @@ public class GenericModelTest extends TestCase { if (m_ConnectionColsed) return; try { + XIndexAccess forms = UnoRuntime.queryInterface( XIndexAccess.class, + FormTools.getForms( WriterTools.getDrawPage( m_xTextDoc ) ) ); XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), - (FormTools.getForms( - WriterTools.getDrawPage( - m_xTextDoc))) - .getByName("Standard")); + forms.getByIndex(0)); if (debug){ if (myForm == null){ @@ -269,18 +269,20 @@ public class GenericModelTest extends TestCase { } - XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, myForm); - XConnection connection = (XConnection) AnyConverter.toObject( - new Type(XConnection.class), - xSetProp.getPropertyValue("ActiveConnection")); - if (debug && connection == null){ - log.println("ERROR: could not get property 'ActiveConnection' from the XForm"); + XPropertySet xSetProp = UnoRuntime.queryInterface( XPropertySet.class, myForm ); + XConnection connection = UnoRuntime.queryInterface( XConnection.class, xSetProp.getPropertyValue( "ActiveConnection" ) ); + if ( connection == null ) + { + if ( debug ) + log.println("ERROR: could not get property 'ActiveConnection' from the XForm"); + } + else + { + connection.close(); } - - connection.close(); } catch (Exception e) { log.println("ERROR: Can't close the connection: " + e.toString()); + e.printStackTrace( log ); } log.println("closing data source..."); diff --git a/smoketestoo_native/data/Events.xml b/smoketestoo_native/data/Events.xml index 6536c1c5eafc..61272293f633 100644 --- a/smoketestoo_native/data/Events.xml +++ b/smoketestoo_native/data/Events.xml @@ -28,28 +28,6 @@ <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd"> <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Events" script:language="StarBasic">REM ***** BASIC ***** -Sub InitEvents - call ClickCutTest -End Sub - -Sub ClickSaveTest - if not OptionsDlg.cbSaveTest.Value then - OptionsDlg.cbOpenTest.Value = false - OptionsDlg.cbOpenTest.Enabled = false - else - OptionsDlg.cbOpenTest.Enabled = true - end If -End Sub - -Sub ClickCutTest - if not OptionsDlg.cbCutTest.Value then - OptionsDlg.cbPasteTest.Value = false - OptionsDlg.cbPasteTest.Enabled = false - else - OptionsDlg.cbPasteTest.Enabled = true - end If -End Sub - Sub PressCancel gDlgState = cDlgCancel end Sub diff --git a/smoketestoo_native/data/Global.xml b/smoketestoo_native/data/Global.xml index 364d2e2efcfb..1ff082b0a1eb 100644 --- a/smoketestoo_native/data/Global.xml +++ b/smoketestoo_native/data/Global.xml @@ -35,7 +35,7 @@ const cParagraphBreak = 0 global const cExtensionFileName = "TestExtension.oxt" -global const cDocNew = 0, cDocCut = 1, cDocPaste = 2, cDocSaveOpen8 = 3, cDocSaveOpenXML = 4, cDocSaveOpen50 = 5, cDocClose = 6, cDocWrite = 7 +global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocSaveOpen50 = 3, cDocClose = 4, cDocWrite = 5 global const cDBService = 0, cDBOpen = 1, cDBInsert = 2, cDBDelete = 3, cDBSeek = 4, cDBClose = 5 global const cEXTService = 0, cEXTInstall = 1, cEXTUninstall = 2 global const cLogfileFailed = 255 @@ -83,8 +83,8 @@ Global const cUserFieldTestWriter = "Writer", cUserFieldTestCalc = &qu Global const cUserFieldTestDraw = "Draw", cUserFieldTestMath = "Math", cUserFieldTestChart = "Chart" Global const cUserFieldTestHTML = "HTML", cUserFieldTestJava = "Java", cUserFieldTestDatabase = "Database" Global const cUserFieldTestExtension = "Extension" -Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpenSave50 = "SaveOpen50", cUserFieldTestCut = "Cut" -Global const cUserFieldTestPaste = "Paste", cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8" +Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpenSave50 = "SaveOpen50" +Global const cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8" Global const cOptionsDialogName = "OptionsDlg", cTest10Modul = "Standard" @@ -100,8 +100,8 @@ Global bMakeWriterTest as boolean, bMakeCalcTest as boolean, bMakeImpressTest a Global bMakeDrawTest as Boolean, bMakeMathTest as boolean, bMakeChartTest as boolean Global bMakeHTMLTest as boolean, bMakeJavaTest as boolean, bMakeDBTest as boolean Global bMakeExtensionTest as boolean -Global bMakeSaveOpenXMLTest as boolean, bMakeSaveOpen50Test as boolean, bMakeCutTest as boolean -Global bMakePasteTest as boolean, bMakeTerminateAfterTest as boolean, bShowTable as boolean +Global bMakeSaveOpenXMLTest as boolean, bMakeSaveOpen50Test as boolean +Global bMakeTerminateAfterTest as boolean, bShowTable as boolean Global bMakeSaveOpen8Test as boolean global sExtensionURL as string @@ -156,10 +156,8 @@ Sub CreateStatusTable tableHeaders(cStHTML) = "HTML" tableHeaders(cStJava) = "Java" - dim tableColums(5) as string + dim tableColums(3) as string tableColums(cDocNew) = "new" - tableColums(cDocCut) = "cut" - tableColums(cDocPaste) = "paste" tableColums(cDocSaveOpen8) = "V8.0" tableColums(cDocSaveOpenXML) = "XML" tableColums(cDocSaveOpen50) = "V5.0" @@ -211,7 +209,7 @@ Sub CreateStatusTable xCell.BackTransparent = False xCell.BackColor = cCoGrey - for i% = 0 to 5 + for i% = 0 to 3 tableCursor.goDown(1,FALSE) cName = tableCursor.getRangeName() xCell = table.getCellByName(cName) @@ -509,8 +507,6 @@ Sub SetOptions SetUserFieldState (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestOpenSave50, -(gOptionsDialog.getControl("cbSaveOpen50Test").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestCut, -(gOptionsDialog.getControl("cbCutTest").getState), gOutPutDoc) - SetUserFieldState (cUserFieldTestPaste, -(gOptionsDialog.getControl("cbPasteTest").getState), gOutPutDoc) SetUserFieldState (cUserFieldTestTerminateAfterTest, -(gOptionsDialog.getControl("cbTerminateAfterTest").getState), gOutPutDoc) end Sub @@ -529,8 +525,6 @@ Sub GetOptions gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutPutDoc))) gOptionsDialog.getControl("cbSaveOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave50, gOutPutDoc))) gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc))) - gOptionsDialog.getControl("cbCutTest").setState( -( GetUserFieldState (cUserFieldTestCut, gOutPutDoc))) - gOptionsDialog.getControl("cbPasteTest").setState( -( GetUserFieldState (cUserFieldTestPaste, gOutPutDoc))) gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutPutDoc))) End Sub @@ -549,8 +543,6 @@ Sub ReadOptions bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutPutDoc) bMakeSaveOpen50Test = GetUserFieldState (cUserFieldTestOpenSave50, gOutPutDoc) bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc) - bMakeCutTest = GetUserFieldState (cUserFieldTestCut, gOutPutDoc) - bMakePasteTest = GetUserFieldState (cUserFieldTestPaste, gOutPutDoc) bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutPutDoc) end Sub @@ -579,8 +571,6 @@ Sub SetDefaultOptions bMakeSaveOpen50Test = true End If bMakeSaveOpen8Test = true - bMakeCutTest = true - bMakePasteTest = true bMakeTerminateAfterTest = false end Sub @@ -614,10 +604,8 @@ Function StartTestWithDefaultOptions component(cStJava) = "Java" component(cStDataBase) = "Base" component(cStExtension) = "Extensions" - dim action(5) as string + dim action(3) as string action(cDocNew) = "new" - action(cDocCut) = "cut" - action(cDocPaste) = "paste" action(cDocSaveOpen8) = "V8.0" action(cDocSaveOpenXML) = "XML" action(cDocSaveOpen50) = "V5.0" @@ -700,14 +688,6 @@ Sub ExecuteSlot( SlotNr As String, oDoc as Object ) End Sub -Sub CutText (oDoc as Object) - ExecuteSlot ("5710", oDoc) -End Sub - -Sub PasteText (oDoc as Object) - ExecuteSlot ("5712", oDoc) -End Sub - Sub DelAllUserFields (aDoc as Object) Dim aFieldType as Object Dim aElements as Variant diff --git a/smoketestoo_native/data/OptionsDlg.xml b/smoketestoo_native/data/OptionsDlg.xml index b993a31c9a27..213c880d4d51 100644 --- a/smoketestoo_native/data/OptionsDlg.xml +++ b/smoketestoo_native/data/OptionsDlg.xml @@ -43,22 +43,20 @@ <dlg:checkbox dlg:id="cbChartTest" dlg:tab-index="8" dlg:left="126" dlg:top="105" dlg:width="80" dlg:height="8" dlg:value="Chart" dlg:checked="false"/> <dlg:checkbox dlg:id="cbSaveOpenXMLTest" dlg:tab-index="9" dlg:left="19" dlg:top="49" dlg:width="80" dlg:height="8" dlg:value="Save / Open XML" dlg:checked="false"/> <dlg:checkbox dlg:id="cbSaveOpen50Test" dlg:tab-index="10" dlg:left="19" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Save / Open V5.0" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbCutTest" dlg:tab-index="11" dlg:left="19" dlg:top="77" dlg:width="80" dlg:height="8" dlg:value="Cut" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbPasteTest" dlg:tab-index="12" dlg:left="19" dlg:top="91" dlg:width="80" dlg:height="8" dlg:value="Paste" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbTerminateAfterTest" dlg:tab-index="13" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/> - <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="14" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/> - <dlg:button dlg:id="btOk" dlg:tab-index="15" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok"> + <dlg:checkbox dlg:id="cbTerminateAfterTest" dlg:tab-index="11" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/> + <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="12" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/> + <dlg:button dlg:id="btOk" dlg:tab-index="13" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok"> <script:event script:event-name="on-performaction" script:location="document" script:macro-name="Standard.Events.PressOk" script:language="StarBasic"/> </dlg:button> - <dlg:button dlg:id="btCancel" dlg:tab-index="16" dlg:left="80" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Cancel" dlg:button-type="ok"> + <dlg:button dlg:id="btCancel" dlg:tab-index="14" dlg:left="80" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Cancel" dlg:button-type="ok"> <script:event script:event-name="on-performaction" script:location="document" script:macro-name="Standard.Events.PressCancel" script:language="StarBasic"/> </dlg:button> - <dlg:button dlg:id="btStart" dlg:tab-index="17" dlg:left="152" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Smoketest"> + <dlg:button dlg:id="btStart" dlg:tab-index="15" dlg:left="152" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Smoketest"> <script:event script:event-name="on-performaction" script:location="vnd.sun.star.script" script:macro-name="Standard.Events.PressTest?language=Basic&location=document" script:language="Script"/> </dlg:button> - <dlg:checkbox dlg:id="cbJavaTest" dlg:tab-index="18" dlg:left="126" dlg:top="119" dlg:width="80" dlg:height="8" dlg:value="Java" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbSaveOpen8Test" dlg:tab-index="19" dlg:left="19" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Save / Open V8.0" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbDatabaseTest" dlg:tab-index="20" dlg:left="126" dlg:top="133" dlg:width="80" dlg:height="8" dlg:value="Database" dlg:checked="false"/> - <dlg:checkbox dlg:id="cbExtensionTest" dlg:tab-index="21" dlg:left="126" dlg:top="147" dlg:width="80" dlg:height="8" dlg:value="Extension" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbJavaTest" dlg:tab-index="16" dlg:left="126" dlg:top="119" dlg:width="80" dlg:height="8" dlg:value="Java" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbSaveOpen8Test" dlg:tab-index="17" dlg:left="19" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Save / Open V8.0" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbDatabaseTest" dlg:tab-index="18" dlg:left="126" dlg:top="133" dlg:width="80" dlg:height="8" dlg:value="Database" dlg:checked="false"/> + <dlg:checkbox dlg:id="cbExtensionTest" dlg:tab-index="19" dlg:left="126" dlg:top="147" dlg:width="80" dlg:height="8" dlg:value="Extension" dlg:checked="false"/> </dlg:bulletinboard> </dlg:window> diff --git a/smoketestoo_native/data/Test_10er.xml b/smoketestoo_native/data/Test_10er.xml index 636dc2129120..e39a39eae2aa 100644 --- a/smoketestoo_native/data/Test_10er.xml +++ b/smoketestoo_native/data/Test_10er.xml @@ -42,8 +42,6 @@ const cMessageSaveOpenXMLDoc = "Save/Open Document XML (6/7)" const cMessageSaveOpen50Doc = "Save/Open Document 5.0" const cMessageNewDoc = "New Document" const cMessageCloseDoc = "Close Document" -const cMessageCutObj = "Cut Object" -const cMessagePasteObj = "Paste Object" Global sWorkPath$ Global sWorkPathURL$ @@ -294,12 +292,6 @@ Sub WriteTests (sText as string, bTestAll as boolean, nFileChannel as integer) sWriteStr = sText sWriteStr = sWriteStr + "new" if bTestAll then - if bMakeCutTest then - sWriteStr = sWriteStr + ", cut" - end if - if bMakePasteTest then - sWriteStr = sWriteStr + ", paste" - end if if bMakeSaveOpen8Test then sWriteStr = sWriteStr + ", save 8.0" end if @@ -364,9 +356,6 @@ Sub MakeDocTest (FilterType as Integer) LogState (not IsNull (oDoc), GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageNewDoc, MainFileChannel) SetStatus (FilterType, cDocNew, not IsNull (oDoc)) if not IsNull (oDoc) then - nCurrentAction = cDocCut - call CutAndPaste(FilterType, oDoc) -' bError = oDoc.CurrentController.frame.close nCurrentAction = cDocSaveOpen8 if bMakeSaveOpen8Test and IsFilterAvailable (FilterType or cFlt8) then sFileName8 = sWorkPathURL+cTempFileName+"."+GetDocEndings(FilterType or cFlt8) @@ -674,10 +663,6 @@ Function GetErrorMessageOnAction (nAction as Integer) as String Select Case ( nAction ) case cDocNew GetErrorMessageOnAction = cMessageNewDoc - case cDocCut - GetErrorMessageOnAction = cMessageCutObj - case cDocPaste - GetErrorMessageOnAction = cMessagePasteObj case cDocSaveOpen8 GetErrorMessageOnAction = cMessageSaveOpen8Doc case cDocSaveOpenXML @@ -712,152 +697,6 @@ Function TestJava (FilterType as Integer) as boolean TestJava = not IsNull (oObj) End Function -Sub CutAndPaste (DocType as Integer, oDoc as Object) - Dim sText as String - Dim oWin as Object - Dim oText as Object - Dim oView as Object - Dim bCutState as boolean, bPasteState as boolean - Select Case ( DocType ) - case frmWriter - Dim oCursor as Object - - sText = "AutomaticText" - oText = oDoc.GetText - oCursor = oText.CreateTextCursor - oText.InsertString(oCursor, sText, true) ' Cursor selektiert den Text - oView = oDoc.getCurrentController - oView.Select(oCursor) - - if bMakeCutTest then - call CutText (oDoc) - - if oText.GetString = "" Then - bCutState = True - else - bCutState = False - end If - SetStatus (DocType, cDocCut, bCutState) - LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, FileChannel) - LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, MainFileChannel) - end if - - if bMakePasteTest and bMakeCutTest then - call PasteText (oDoc) - - if oText.GetString = sText Then - bPasteState = True - else - bPasteState = False - end If - SetStatus (DocType, cDocPaste, bPasteState) - LogState (bPasteState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessagePasteObj, FileChannel) - LogState (bPasteState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessagePasteObj, MainFileChannel) - end if - - case frmCalc - DIM oCell as Object - - sText = "AutomaticText" - oCell = oDoc.Sheets(0).GetCellByPosition(0, 0) - oCell.String = sText - oView = oDoc.getCurrentController - oView.Select(oCell) - - if bMakeCutTest then - call CutText (oDoc) - - if oCell.String = "" Then - bCutState = True - else - bCutState = False - end If - SetStatus (DocType, cDocCut, bCutState) - LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, FileChannel) - LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, MainFileChannel) - end if - - if bMakePasteTest and bMakeCutTest then - call PasteText (oDoc) - - if oCell.String = sText Then - bPasteState = True - else - bPasteState = False - end If - SetStatus (DocType, cDocPaste, bPasteState) - LogState (bPasteState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessagePasteObj, FileChannel) - LogState (bPasteState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessagePasteObj, MainFileChannel) - end if - case frmMessage - case frmImpress, frmDraw - Dim oPage as Object - Dim oRect as Object - Dim xSize as Object - Dim xPoint as Object - Dim bObjState as Boolean - - xSize = CreateUnoStruct ("com.sun.star.awt.Size") - xPoint = CreateUnoStruct ("com.sun.star.awt.Point") - xSize.Width = 2000 - xSize.Height = 2000 - xPoint.x = 10000 - xPoint.y = 10000 - oPage = oDoc.DrawPages(0) - - if DocType = frmImpress Then - oPage.Layout = 20 ' set page layot to none - end If - - oRect = oDoc.CreateInstance("com.sun.star.drawing.RectangleShape") - oRect.Size = xSize - oRect.Position = xPoint - oPage.add(oRect) - - oView = oDoc.getCurrentController - oView.Select(oRect) - - ' Prüft ob überhaupt ein Object angelegt wurde - if oPage.count = 1 Then - bObjState = True - else - bObjState = False - end If - - if bMakeCutTest then - call CutText (oDoc) - - if (oPage.count = 0) and bObjState Then - bCutState = True - else - bCutState = False - end If - SetStatus (DocType, cDocCut, bCutState) - LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, FileChannel) - LogState (bCutState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessageCutObj, MainFileChannel) - end if - - wait (1000) 'wait after cut - - if bMakePasteTest and bMakeCutTest then - call PasteText (oDoc) - - if (oPage.count = 1) and bObjState Then - bPasteState = True - else - bPasteState = False - end If - SetStatus (DocType, cDocPaste, bPasteState) - LogState (bPasteState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessagePasteObj, FileChannel) - LogState (bPasteState, GetDocFilter(DocType or cFltNewDoc)+" "+ cMessagePasteObj, MainFileChannel) - end if - case frmMath - case frmImage - case frmHyperText - case frmChart - end Select -end Sub - Sub LoadLibrary( LibName as String ) dim args(1) diff --git a/smoketestoo_native/data/content.xml b/smoketestoo_native/data/content.xml index bc63d1d2c551..dcd31b1759e4 100644 --- a/smoketestoo_native/data/content.xml +++ b/smoketestoo_native/data/content.xml @@ -25,4 +25,4 @@ * for a copy of the LGPLv3 License. * **********************************************************************--> -<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/><style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/><style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph"><style:properties fo:text-align="center"/></style:style><style:style style:name="gr1" style:family="graphics"><style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style></office:automatic-styles><office:body><office:forms form:automatic-focus="false" form:apply-design-mode="false"><form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""><form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"><form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"><form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"><form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/></office:events></form:button></form:control></form:form></office:forms><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:user-field-decls><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Calc"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Chart"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpenXML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen50"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Cut"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Paste"/><text:user-field-decl text:value-type="string" text:string-value="n" text:name="Terminate"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Java"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen8"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Database"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/></text:user-field-decls><text:p text:style-name="Standard"><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/></text:p><text:p text:style-name="Standard"/></office:body></office:document-content> +<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/><style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/><style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph"><style:properties fo:text-align="center"/></style:style><style:style style:name="gr1" style:family="graphics"><style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style></office:automatic-styles><office:body><office:forms form:automatic-focus="false" form:apply-design-mode="false"><form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""><form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"><form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"><form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"><form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/></office:events></form:button></form:control></form:form></office:forms><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:user-field-decls><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Calc"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Chart"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpenXML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen50"/><text:user-field-decl text:value-type="string" text:string-value="n" text:name="Terminate"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Java"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen8"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Database"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/></text:user-field-decls><text:p text:style-name="Standard"><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/></text:p><text:p text:style-name="Standard"/></office:body></office:document-content> diff --git a/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas index 83ac7f78c3c9..83ac7f78c3c9 100644..100755 --- a/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas +++ b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas diff --git a/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas index 6feedeb8004e..6feedeb8004e 100644..100755 --- a/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas +++ b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas diff --git a/testautomation/chart2/optional/ch2_xml_format.bas b/testautomation/chart2/optional/ch2_xml_format.bas index 25f5d751b58f..25f5d751b58f 100644..100755 --- a/testautomation/chart2/optional/ch2_xml_format.bas +++ b/testautomation/chart2/optional/ch2_xml_format.bas diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc b/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc index b530b0c2a364..b530b0c2a364 100755..100644 --- a/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc +++ b/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc index 357fa89c4393..357fa89c4393 100755..100644 --- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc +++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas index 02cc2c883269..02cc2c883269 100755..100644 --- a/testautomation/chart2/required/ch2_updt_calc.bas +++ b/testautomation/chart2/required/ch2_updt_calc.bas diff --git a/testautomation/chart2/required/includes/ch2_file.inc b/testautomation/chart2/required/includes/ch2_file.inc index f7166df9c82e..f7166df9c82e 100755..100644 --- a/testautomation/chart2/required/includes/ch2_file.inc +++ b/testautomation/chart2/required/includes/ch2_file.inc diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc index 42048cbbb7de..42048cbbb7de 100755..100644 --- a/testautomation/chart2/required/includes/ch2_format.inc +++ b/testautomation/chart2/required/includes/ch2_format.inc diff --git a/testautomation/chart2/required/includes/ch2_format1.inc b/testautomation/chart2/required/includes/ch2_format1.inc index dbe1de149c9c..dbe1de149c9c 100755..100644 --- a/testautomation/chart2/required/includes/ch2_format1.inc +++ b/testautomation/chart2/required/includes/ch2_format1.inc diff --git a/testautomation/chart2/required/includes/ch2_insert.inc b/testautomation/chart2/required/includes/ch2_insert.inc index 79923a8198c6..79923a8198c6 100755..100644 --- a/testautomation/chart2/required/includes/ch2_insert.inc +++ b/testautomation/chart2/required/includes/ch2_insert.inc diff --git a/testautomation/chart2/required/includes/ch2_ole.inc b/testautomation/chart2/required/includes/ch2_ole.inc index 6daf6545de41..6daf6545de41 100755..100644 --- a/testautomation/chart2/required/includes/ch2_ole.inc +++ b/testautomation/chart2/required/includes/ch2_ole.inc diff --git a/testautomation/chart2/required/includes/ch2_toolbars.inc b/testautomation/chart2/required/includes/ch2_toolbars.inc index 32eed54ee370..32eed54ee370 100755..100644 --- a/testautomation/chart2/required/includes/ch2_toolbars.inc +++ b/testautomation/chart2/required/includes/ch2_toolbars.inc diff --git a/testautomation/chart2/required/includes/ch2_view.inc b/testautomation/chart2/required/includes/ch2_view.inc index 39beac14839c..39beac14839c 100755..100644 --- a/testautomation/chart2/required/includes/ch2_view.inc +++ b/testautomation/chart2/required/includes/ch2_view.inc diff --git a/testautomation/chart2/required/includes/ch2_window.inc b/testautomation/chart2/required/includes/ch2_window.inc index 407898e228d1..407898e228d1 100755..100644 --- a/testautomation/chart2/required/includes/ch2_window.inc +++ b/testautomation/chart2/required/includes/ch2_window.inc diff --git a/testautomation/chart2/required/includes/ch2_wizard.inc b/testautomation/chart2/required/includes/ch2_wizard.inc index df97ba6bda43..df97ba6bda43 100755..100644 --- a/testautomation/chart2/required/includes/ch2_wizard.inc +++ b/testautomation/chart2/required/includes/ch2_wizard.inc diff --git a/testautomation/dbaccess/optional/dba_misc_Macros.bas b/testautomation/dbaccess/optional/dba_misc_Macros.bas index 659396bb98aa..659396bb98aa 100644..100755 --- a/testautomation/dbaccess/optional/dba_misc_Macros.bas +++ b/testautomation/dbaccess/optional/dba_misc_Macros.bas diff --git a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc index 020f0bb8435b..020f0bb8435b 100755..100644 --- a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc diff --git a/testautomation/dbaccess/optional/includes/ctrl_General.inc b/testautomation/dbaccess/optional/includes/ctrl_General.inc index 9e137f4c7a70..b0ee0bea81dc 100755..100644 --- a/testautomation/dbaccess/optional/includes/ctrl_General.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_General.inc @@ -38,13 +38,14 @@ sub ctrl_General call tPosAndSize_Protect_Position call tPosAndSize_Protect_Size call tPosAndSize_Keyboard - call tPosAndSize_Dialog + call tPosAndSize_Dialog call tPosAndSize_KeepRatio 'TODO Control the Setting on tabpage Rotation & Slant (should be inactive). call tTabStop call tActivationOrder call tAddFields + call tLabelFieldSelection end sub @@ -1033,7 +1034,96 @@ testcase tAddFields call hCloseDocument endcase +'------------------------------------------------------------------------- +testcase tLabelFieldSelection + ' check if the assignment of lables to text fields work + dim sLabelText as String + + printlog "Open a new document," + call hNewDocument + Kontext "DocumentWriter" + DocumentWriter.TypeKeys "tt_doc" , true + sleep(1) + + printlog "open the form control toolbar" + call hToolbarSelect("FormControls",true) + + Kontext "FormControls" + Label.Click + sleep(1) + + printlog "insert a label field" + call hDrawingWithSelection ( 20, 20, 30, 30 ) + sleep(2) + + Kontext "FormControls" + Edit.Click + sleep(1) + + printlog "insert a text field" + call hDrawingWithSelection ( 40, 40, 50, 50 ) + sleep(2) + + printlog "open the control property browser" + call fOpenControlPropertyBrowser + + Kontext "ControlPropertiesTabControl" + ControlPropertiesTabControl.setPage TabGeneralControl 'make shure that tabpage general in property is choosen + sleep(2) + + printlog "click on button behind the lable field to open the field selection dialog" + Kontext "TabGeneralControl" + LabelFieldButton.Click + sleep(1) + + printlog "select the lable fiiel in the tree list box" + Kontext "LabelFieldSelection" + LabelFieldSelection.TypeKeys "<DOWN>",TRUE + LabelFieldSelection.TypeKeys "<DOWN>",TRUE + sleep(1) + printlog "close the field selection dialog" + LabelFieldSelection.OK + sleep(1) + printlog "check if the lable field property contains some text" + 'TODO: check for the correct text this has a language dependencie + Kontext "TabGeneralControl" + sLabelText = LabelField.getText() + if(sLabelText = "") then + warnlog "the lable for a text field is not set" + else + printlog "the label for the text field is set" + endif + + printlog "click on button behind the lable field to open the field selection dialog" + Kontext "TabGeneralControl" + LabelFieldButton.Click + sleep(1) + + Kontext "LabelFieldSelection" + LabelFieldSelection.TypeKeys "<DOWN>",TRUE + LabelFieldSelection.TypeKeys "<DOWN>",TRUE + sleep(1) + printlog "select the lable field and check the checkbox 'no assignment'" + CBNoAssignment.check + printlog "close the field selection dialog" + LabelFieldSelection.OK + sleep(1) + + printlog "check if the lable field property contains no text" + Kontext "TabGeneralControl" + sLabelText = LabelField.getText() + if(sLabelText <> "") then + warnlog "the lable for a text field is not deleted" + else + printlog "the label for the text field is deleted" + endif + + printlog "close the document" + call hCloseDocument + +endcase +'------------------------------------------------------------------------- function fOpenPositionAndSizeDialog call hToolbarSelect("FormDesignTools",true) diff --git a/testautomation/dbaccess/optional/includes/ctrl_Grid.inc b/testautomation/dbaccess/optional/includes/ctrl_Grid.inc index 4b41014a2257..4b41014a2257 100755..100644 --- a/testautomation/dbaccess/optional/includes/ctrl_Grid.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Grid.inc diff --git a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc index f51b14ea191b..f51b14ea191b 100755..100644 --- a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc index 4e0cd9334800..4e0cd9334800 100755..100644 --- a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc index 82fa9229b1f8..717cf149b902 100755..100644 --- a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc @@ -293,7 +293,7 @@ testcase tImageControl sleep(2) '/// set HelpURL printlog "set HelpURL" - fsetControlProperty("ImageControl","HelpURL","HID:1234567") + fsetControlProperty("ImageControl","HelpURL","customcontrol2") '/// save the document printlog "save the document" hFileSaveAsKill ( gOfficePath + ConvertPath("user/work/TT_ImageControl.odt")) @@ -315,7 +315,7 @@ testcase tImageControl Kontext "TabGeneralControl" dim bScrOK as boolean 'control variable if all properties are correct bScrOK = true - if fgetControlProperty("ImageControl","HelpURL") <> "HID:1234567" then + if fgetControlProperty("ImageControl","HelpURL") <> "customcontrol2" then warnlog "the imagecontrol is not saved with property: HelpURL" bScrOK = false endif diff --git a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc index 57a7973a8f89..57a7973a8f89 100755..100644 --- a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc diff --git a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc index 4abf5a19b73d..4abf5a19b73d 100755..100644 --- a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc index 49bcaceb6ac7..2f51183a40a1 100755..100644 --- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc @@ -239,7 +239,7 @@ testcase tGroupBoxWithDatasource Kontext "TabGeneralControl" TabGeneralControl.TypeKeys "<TAB>" , true 'this tab is importent, I don't not why but it is. sleep(1) - HelpURL.setText "HID:123456" + HelpURL.setText "customcontrol1" HelpURL.TypeKeys "<RETURN>",true sleep(1) Kontext "ControlPropertiesDialog" @@ -276,7 +276,7 @@ testcase tGroupBoxWithDatasource Kontext "TabGeneralControl" TabGeneralControl.TypeKeys "<TAB>" , true 'this tab is importent, I don't not why but it is. sleep(1) - HelpURL.setText "HID:1234567" + HelpURL.setText "customcontrol2" HelpURL.TypeKeys "<RETURN>", true sleep(1) Kontext "ControlPropertiesDialog" @@ -314,7 +314,7 @@ testcase tGroupBoxWithDatasource Kontext "TabGeneralControl" TabGeneralControl.TypeKeys "<TAB>" , true ' this tab is importent, I don't not why but it is. - HelpURL.setText "HID:12345678" + HelpURL.setText "customcontrol3" HelpURL.TypeKeys "<RETURN>", true sleep(1) Kontext "ControlPropertiesDialog" @@ -660,7 +660,7 @@ testcase tListBox warnlog "The dropdown style is not active." endif sleep(1) - fSetControlProperty("ListBox","HelpURL","HID:123456") + fSetControlProperty("ListBox","HelpURL","customcontrol1") sleep(1) '/// save the document printlog "save the document" diff --git a/testautomation/dbaccess/optional/includes/db_ADOAccess.inc b/testautomation/dbaccess/optional/includes/db_ADOAccess.inc index aeb14d7616ac..aeb14d7616ac 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_ADOAccess.inc +++ b/testautomation/dbaccess/optional/includes/db_ADOAccess.inc diff --git a/testautomation/dbaccess/optional/includes/db_AdabasD.inc b/testautomation/dbaccess/optional/includes/db_AdabasD.inc index d5498582fa0a..d5498582fa0a 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_AdabasD.inc +++ b/testautomation/dbaccess/optional/includes/db_AdabasD.inc diff --git a/testautomation/dbaccess/optional/includes/db_Dbase.inc b/testautomation/dbaccess/optional/includes/db_Dbase.inc index 7b5a67e7496d..7b5a67e7496d 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_Dbase.inc +++ b/testautomation/dbaccess/optional/includes/db_Dbase.inc diff --git a/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc b/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc index 6d690a29225a..6d690a29225a 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc +++ b/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc diff --git a/testautomation/dbaccess/optional/includes/db_IndexDesign.inc b/testautomation/dbaccess/optional/includes/db_IndexDesign.inc index a41f2b396042..a41f2b396042 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_IndexDesign.inc +++ b/testautomation/dbaccess/optional/includes/db_IndexDesign.inc diff --git a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc index 93f864d7e0d4..93f864d7e0d4 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc +++ b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc diff --git a/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc index 0fd0a8bcfb5f..0fd0a8bcfb5f 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc +++ b/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc diff --git a/testautomation/dbaccess/optional/includes/db_Query.inc b/testautomation/dbaccess/optional/includes/db_Query.inc index 46dce6e903c6..46dce6e903c6 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_Query.inc +++ b/testautomation/dbaccess/optional/includes/db_Query.inc diff --git a/testautomation/dbaccess/optional/includes/db_Relations.inc b/testautomation/dbaccess/optional/includes/db_Relations.inc index 98a94562c743..98a94562c743 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_Relations.inc +++ b/testautomation/dbaccess/optional/includes/db_Relations.inc diff --git a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc index 87eb5e1ce240..87eb5e1ce240 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc +++ b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc diff --git a/testautomation/dbaccess/optional/includes/db_Text.inc b/testautomation/dbaccess/optional/includes/db_Text.inc index 6130aee378b8..6130aee378b8 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_Text.inc +++ b/testautomation/dbaccess/optional/includes/db_Text.inc diff --git a/testautomation/dbaccess/optional/includes/db_Windows.inc b/testautomation/dbaccess/optional/includes/db_Windows.inc index 6d675f2dd07f..6d675f2dd07f 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_Windows.inc +++ b/testautomation/dbaccess/optional/includes/db_Windows.inc diff --git a/testautomation/dbaccess/optional/includes/db_hsqldb.inc b/testautomation/dbaccess/optional/includes/db_hsqldb.inc index 061f786017ba..061f786017ba 100755..100644 --- a/testautomation/dbaccess/optional/includes/db_hsqldb.inc +++ b/testautomation/dbaccess/optional/includes/db_hsqldb.inc diff --git a/testautomation/dbaccess/optional/includes/misc_Macros.inc b/testautomation/dbaccess/optional/includes/misc_Macros.inc index e707682e3218..e707682e3218 100755..100644 --- a/testautomation/dbaccess/optional/includes/misc_Macros.inc +++ b/testautomation/dbaccess/optional/includes/misc_Macros.inc diff --git a/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc b/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc index 7e9eabf664d9..7e9eabf664d9 100755..100644 --- a/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc +++ b/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc diff --git a/testautomation/dbaccess/optional/includes/rpt_DateTime.inc b/testautomation/dbaccess/optional/includes/rpt_DateTime.inc index 53c9570a5d75..53c9570a5d75 100755..100644 --- a/testautomation/dbaccess/optional/includes/rpt_DateTime.inc +++ b/testautomation/dbaccess/optional/includes/rpt_DateTime.inc diff --git a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc index 91270481ca7b..91270481ca7b 100755..100644 --- a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc +++ b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc diff --git a/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc index 810b2168c3ce..810b2168c3ce 100755..100644 --- a/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc +++ b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc diff --git a/testautomation/dbaccess/optional/includes/rpt_Grouping.inc b/testautomation/dbaccess/optional/includes/rpt_Grouping.inc index 229aebb7f599..229aebb7f599 100755..100644 --- a/testautomation/dbaccess/optional/includes/rpt_Grouping.inc +++ b/testautomation/dbaccess/optional/includes/rpt_Grouping.inc diff --git a/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc b/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc index a7fae4c7ffd4..a7fae4c7ffd4 100755..100644 --- a/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc +++ b/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc diff --git a/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc b/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc index b3ee038a2f81..b3ee038a2f81 100755..100644 --- a/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc +++ b/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc diff --git a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc index 34f6cb3e3ecf..34f6cb3e3ecf 100755..100644 --- a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc index df9026ba2dd9..df9026ba2dd9 100755..100644 --- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc diff --git a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc index b3949b40ed49..b3949b40ed49 100755..100644 --- a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc diff --git a/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc b/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc index 19411fd4f105..19411fd4f105 100755..100644 --- a/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc diff --git a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc index 67010e64fbfb..67010e64fbfb 100755..100644 --- a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc diff --git a/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc index cce02149942f..cce02149942f 100755..100644 --- a/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc diff --git a/testautomation/dbaccess/required/includes/DatabaseTypes.inc b/testautomation/dbaccess/required/includes/DatabaseTypes.inc index ae5688374c75..ae5688374c75 100755..100644 --- a/testautomation/dbaccess/required/includes/DatabaseTypes.inc +++ b/testautomation/dbaccess/required/includes/DatabaseTypes.inc diff --git a/testautomation/dbaccess/required/includes/Forms.inc b/testautomation/dbaccess/required/includes/Forms.inc index 45c308f2b1f7..45c308f2b1f7 100755..100644 --- a/testautomation/dbaccess/required/includes/Forms.inc +++ b/testautomation/dbaccess/required/includes/Forms.inc diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc index fddb8d34667f..fddb8d34667f 100755..100644 --- a/testautomation/dbaccess/required/includes/MainApp.inc +++ b/testautomation/dbaccess/required/includes/MainApp.inc diff --git a/testautomation/dbaccess/required/includes/Query.inc b/testautomation/dbaccess/required/includes/Query.inc index 0fa9d6addb24..0fa9d6addb24 100755..100644 --- a/testautomation/dbaccess/required/includes/Query.inc +++ b/testautomation/dbaccess/required/includes/Query.inc diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc index d1cce59d4d3f..d1cce59d4d3f 100755..100644 --- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc +++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc index 6d478bd35540..6d478bd35540 100755..100644 --- a/testautomation/dbaccess/required/includes/Table.inc +++ b/testautomation/dbaccess/required/includes/Table.inc diff --git a/testautomation/dbaccess/required/includes/TableDesign.inc b/testautomation/dbaccess/required/includes/TableDesign.inc index 9da4d602a6d9..9da4d602a6d9 100755..100644 --- a/testautomation/dbaccess/required/includes/TableDesign.inc +++ b/testautomation/dbaccess/required/includes/TableDesign.inc diff --git a/testautomation/dbaccess/required/includes/Wizards.inc b/testautomation/dbaccess/required/includes/Wizards.inc index 4cde075d0e35..4cde075d0e35 100755..100644 --- a/testautomation/dbaccess/required/includes/Wizards.inc +++ b/testautomation/dbaccess/required/includes/Wizards.inc diff --git a/testautomation/dbaccess/required/includes/Xforms01.inc b/testautomation/dbaccess/required/includes/Xforms01.inc index fcf3e03a98ea..fcf3e03a98ea 100755..100644 --- a/testautomation/dbaccess/required/includes/Xforms01.inc +++ b/testautomation/dbaccess/required/includes/Xforms01.inc diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc index 28b0583c0b42..28b0583c0b42 100755..100644 --- a/testautomation/dbaccess/tools/controltools.inc +++ b/testautomation/dbaccess/tools/controltools.inc diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc index 2658281f65be..cc99d8d203c5 100755..100644 --- a/testautomation/dbaccess/tools/dbcreatetools.inc +++ b/testautomation/dbaccess/tools/dbcreatetools.inc @@ -1375,8 +1375,17 @@ function fRegisterDatabaseFile( sFileName, sName) NewBtn.Click sleep(1) Kontext "CreateDatabaseLink" - DatabaseFile.setText(sFileName) + RegisteredName.setText(sName) + + ' this does not work due to issue 115468 + ' DatabaseFile.setText(sFileName) + ' workaround + CreatedatabaseLink.typeKeys("<shift tab>") + CreatedatabaseLink.typeKeys("<shift tab>") + CreatedatabaseLink.typeKeys(sFileName) + ' - + CreateDatabaseLink.OK sleep(1) diff --git a/testautomation/dbaccess/tools/dbinit.inc b/testautomation/dbaccess/tools/dbinit.inc index 53f192747926..53f192747926 100755..100644 --- a/testautomation/dbaccess/tools/dbinit.inc +++ b/testautomation/dbaccess/tools/dbinit.inc diff --git a/testautomation/dbaccess/tools/dbtools.inc b/testautomation/dbaccess/tools/dbtools.inc index 2e40a3f25726..2e40a3f25726 100755..100644 --- a/testautomation/dbaccess/tools/dbtools.inc +++ b/testautomation/dbaccess/tools/dbtools.inc diff --git a/testautomation/dbaccess/tools/formtools.inc b/testautomation/dbaccess/tools/formtools.inc index ef7105ccef22..ef7105ccef22 100755..100644 --- a/testautomation/dbaccess/tools/formtools.inc +++ b/testautomation/dbaccess/tools/formtools.inc diff --git a/testautomation/dbaccess/tools/querytools.inc b/testautomation/dbaccess/tools/querytools.inc index 29416dac7bf3..29416dac7bf3 100755..100644 --- a/testautomation/dbaccess/tools/querytools.inc +++ b/testautomation/dbaccess/tools/querytools.inc diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc index 99c4abf723b3..99c4abf723b3 100755..100644 --- a/testautomation/dbaccess/tools/tabletools.inc +++ b/testautomation/dbaccess/tools/tabletools.inc diff --git a/testautomation/extensions/optional/includes/display_name.inc b/testautomation/extensions/optional/includes/display_name.inc index 080c22fa3a98..080c22fa3a98 100755..100644 --- a/testautomation/extensions/optional/includes/display_name.inc +++ b/testautomation/extensions/optional/includes/display_name.inc diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc index db115274e19d..db115274e19d 100755..100644 --- a/testautomation/extensions/optional/includes/extensions.inc +++ b/testautomation/extensions/optional/includes/extensions.inc diff --git a/testautomation/extensions/optional/includes/fileopen.inc b/testautomation/extensions/optional/includes/fileopen.inc index 922e5ece9adc..922e5ece9adc 100755..100644 --- a/testautomation/extensions/optional/includes/fileopen.inc +++ b/testautomation/extensions/optional/includes/fileopen.inc diff --git a/testautomation/extensions/optional/includes/help.inc b/testautomation/extensions/optional/includes/help.inc index 004fd70ac429..004fd70ac429 100755..100644 --- a/testautomation/extensions/optional/includes/help.inc +++ b/testautomation/extensions/optional/includes/help.inc diff --git a/testautomation/extensions/optional/includes/identifiers.inc b/testautomation/extensions/optional/includes/identifiers.inc index 1a183f6c8025..1a183f6c8025 100755..100644 --- a/testautomation/extensions/optional/includes/identifiers.inc +++ b/testautomation/extensions/optional/includes/identifiers.inc diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc index 262495666cbb..262495666cbb 100755..100644 --- a/testautomation/extensions/optional/includes/location.inc +++ b/testautomation/extensions/optional/includes/location.inc diff --git a/testautomation/extensions/optional/includes/meta-inf.inc b/testautomation/extensions/optional/includes/meta-inf.inc index 4d36586dd908..4d36586dd908 100755..100644 --- a/testautomation/extensions/optional/includes/meta-inf.inc +++ b/testautomation/extensions/optional/includes/meta-inf.inc diff --git a/testautomation/extensions/optional/includes/online_update.inc b/testautomation/extensions/optional/includes/online_update.inc index 24739132beaa..24739132beaa 100755..100644 --- a/testautomation/extensions/optional/includes/online_update.inc +++ b/testautomation/extensions/optional/includes/online_update.inc diff --git a/testautomation/extensions/optional/includes/options.inc b/testautomation/extensions/optional/includes/options.inc index ff30ba00847b..ff30ba00847b 100755..100644 --- a/testautomation/extensions/optional/includes/options.inc +++ b/testautomation/extensions/optional/includes/options.inc diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc index 739b28edaef8..739b28edaef8 100755..100644 --- a/testautomation/extensions/optional/includes/publisher.inc +++ b/testautomation/extensions/optional/includes/publisher.inc diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties index e69de29bb2d1..e69de29bb2d1 100755..100644 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl index 7820e3d52c59..75e1ceb1e019 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="192" dlg:top="127" dlg:width="174" dlg:height="147" dlg:closeable="true" dlg:moveable="true" dlg:help-url="HID:123456" dlg:withtitlebar="false"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="192" dlg:top="127" dlg:width="174" dlg:height="147" dlg:closeable="true" dlg:moveable="true" dlg:help-url="customcontrol1" dlg:withtitlebar="false"> <dlg:bulletinboard> <dlg:button dlg:id="CommandButton1" dlg:tab-index="0" dlg:left="6" dlg:top="8" dlg:width="64" dlg:height="20" dlg:value="a wonderful button"/> <dlg:textfield dlg:id="TextField1" dlg:textarea-vertical-align="top" dlg:tab-index="1" dlg:left="6" dlg:top="38" dlg:width="64" dlg:height="59" dlg:value="a wonderful text"/> diff --git a/testautomation/extensions/optional/input/issues/Logging.xcu b/testautomation/extensions/optional/input/issues/Logging.xcu index 8bf0f34b6f1b..8bf0f34b6f1b 100755..100644 --- a/testautomation/extensions/optional/input/issues/Logging.xcu +++ b/testautomation/extensions/optional/input/issues/Logging.xcu diff --git a/testautomation/extensions/required/e_update.bas b/testautomation/extensions/required/e_update.bas index 89c85cb139fc..89c85cb139fc 100644..100755 --- a/testautomation/extensions/required/e_update.bas +++ b/testautomation/extensions/required/e_update.bas diff --git a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc index ab6e04c33e3a..ab6e04c33e3a 100755..100644 --- a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc +++ b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc diff --git a/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc b/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc index 13411aeb849f..13411aeb849f 100755..100644 --- a/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc +++ b/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc diff --git a/testautomation/framework/optional/includes/basic_delete_modules.inc b/testautomation/framework/optional/includes/basic_delete_modules.inc index c35900b012e4..c35900b012e4 100755..100644 --- a/testautomation/framework/optional/includes/basic_delete_modules.inc +++ b/testautomation/framework/optional/includes/basic_delete_modules.inc diff --git a/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc b/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc index 89d5614c5b11..89d5614c5b11 100755..100644 --- a/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc +++ b/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc diff --git a/testautomation/framework/optional/includes/basic_documents.inc b/testautomation/framework/optional/includes/basic_documents.inc index 7e6613cdfcbc..7e6613cdfcbc 100755..100644 --- a/testautomation/framework/optional/includes/basic_documents.inc +++ b/testautomation/framework/optional/includes/basic_documents.inc diff --git a/testautomation/framework/optional/includes/basic_eventbinding.inc b/testautomation/framework/optional/includes/basic_eventbinding.inc index 4d5ee502df66..4d5ee502df66 100755..100644 --- a/testautomation/framework/optional/includes/basic_eventbinding.inc +++ b/testautomation/framework/optional/includes/basic_eventbinding.inc diff --git a/testautomation/framework/optional/includes/basic_ide.inc b/testautomation/framework/optional/includes/basic_ide.inc index eabaadf3176a..eabaadf3176a 100755..100644 --- a/testautomation/framework/optional/includes/basic_ide.inc +++ b/testautomation/framework/optional/includes/basic_ide.inc diff --git a/testautomation/framework/optional/includes/basic_library_export.inc b/testautomation/framework/optional/includes/basic_library_export.inc index 9d539e2a82a0..9d539e2a82a0 100755..100644 --- a/testautomation/framework/optional/includes/basic_library_export.inc +++ b/testautomation/framework/optional/includes/basic_library_export.inc diff --git a/testautomation/framework/optional/includes/basic_library_import.inc b/testautomation/framework/optional/includes/basic_library_import.inc index f6b62e99c7ea..f6b62e99c7ea 100755..100644 --- a/testautomation/framework/optional/includes/basic_library_import.inc +++ b/testautomation/framework/optional/includes/basic_library_import.inc diff --git a/testautomation/framework/optional/includes/basic_macros.inc b/testautomation/framework/optional/includes/basic_macros.inc index dc58e21f1dea..dc58e21f1dea 100755..100644 --- a/testautomation/framework/optional/includes/basic_macros.inc +++ b/testautomation/framework/optional/includes/basic_macros.inc diff --git a/testautomation/framework/optional/includes/basic_modulehide.inc b/testautomation/framework/optional/includes/basic_modulehide.inc index fe492590c41b..fe492590c41b 100755..100644 --- a/testautomation/framework/optional/includes/basic_modulehide.inc +++ b/testautomation/framework/optional/includes/basic_modulehide.inc diff --git a/testautomation/framework/optional/includes/basic_modulenames.inc b/testautomation/framework/optional/includes/basic_modulenames.inc index 6b166c54680a..6b166c54680a 100755..100644 --- a/testautomation/framework/optional/includes/basic_modulenames.inc +++ b/testautomation/framework/optional/includes/basic_modulenames.inc diff --git a/testautomation/framework/optional/includes/basic_modules.inc b/testautomation/framework/optional/includes/basic_modules.inc index 14e3aedca6db..14e3aedca6db 100755..100644 --- a/testautomation/framework/optional/includes/basic_modules.inc +++ b/testautomation/framework/optional/includes/basic_modules.inc diff --git a/testautomation/framework/optional/includes/basic_package_export.inc b/testautomation/framework/optional/includes/basic_package_export.inc index b389c750e51d..b389c750e51d 100755..100644 --- a/testautomation/framework/optional/includes/basic_package_export.inc +++ b/testautomation/framework/optional/includes/basic_package_export.inc diff --git a/testautomation/framework/optional/includes/basic_protected_libraries.inc b/testautomation/framework/optional/includes/basic_protected_libraries.inc index 6162352d710f..6162352d710f 100755..100644 --- a/testautomation/framework/optional/includes/basic_protected_libraries.inc +++ b/testautomation/framework/optional/includes/basic_protected_libraries.inc diff --git a/testautomation/framework/optional/includes/basic_usertemplate.inc b/testautomation/framework/optional/includes/basic_usertemplate.inc index 97ec55c91505..97ec55c91505 100755..100644 --- a/testautomation/framework/optional/includes/basic_usertemplate.inc +++ b/testautomation/framework/optional/includes/basic_usertemplate.inc diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc index 81b2764a28f1..81b2764a28f1 100755..100644 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc index 970b8249a412..970b8249a412 100755..100644 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc index dfade69eaafb..dfade69eaafb 100755..100644 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc diff --git a/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc b/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc index 201dd8eb9862..201dd8eb9862 100755..100644 --- a/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc diff --git a/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc b/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc index 4c6f7c20a076..4c6f7c20a076 100755..100644 --- a/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc diff --git a/testautomation/framework/optional/includes/basic_vba_compat_tools.inc b/testautomation/framework/optional/includes/basic_vba_compat_tools.inc index 8fc37badb55f..8fc37badb55f 100755..100644 --- a/testautomation/framework/optional/includes/basic_vba_compat_tools.inc +++ b/testautomation/framework/optional/includes/basic_vba_compat_tools.inc diff --git a/testautomation/framework/optional/includes/configuration.inc b/testautomation/framework/optional/includes/configuration.inc index 0fce11bddd1b..0fce11bddd1b 100755..100644 --- a/testautomation/framework/optional/includes/configuration.inc +++ b/testautomation/framework/optional/includes/configuration.inc diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc index b4de32acd917..b4de32acd917 100755..100644 --- a/testautomation/framework/optional/includes/extras_file_open.inc +++ b/testautomation/framework/optional/includes/extras_file_open.inc diff --git a/testautomation/framework/optional/includes/extras_preview.inc b/testautomation/framework/optional/includes/extras_preview.inc index ca3a24ec9995..ca3a24ec9995 100755..100644 --- a/testautomation/framework/optional/includes/extras_preview.inc +++ b/testautomation/framework/optional/includes/extras_preview.inc diff --git a/testautomation/framework/optional/includes/extras_table_autoformat.inc b/testautomation/framework/optional/includes/extras_table_autoformat.inc index 7ecb2ce9bf30..7ecb2ce9bf30 100755..100644 --- a/testautomation/framework/optional/includes/extras_table_autoformat.inc +++ b/testautomation/framework/optional/includes/extras_table_autoformat.inc diff --git a/testautomation/framework/optional/includes/f_usage_tracking.inc b/testautomation/framework/optional/includes/f_usage_tracking.inc index ef20c2a2f1e5..ef20c2a2f1e5 100755..100644 --- a/testautomation/framework/optional/includes/f_usage_tracking.inc +++ b/testautomation/framework/optional/includes/f_usage_tracking.inc diff --git a/testautomation/framework/optional/includes/filedlg_allowed_names.inc b/testautomation/framework/optional/includes/filedlg_allowed_names.inc index a6d54077f4b5..a6d54077f4b5 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_allowed_names.inc +++ b/testautomation/framework/optional/includes/filedlg_allowed_names.inc diff --git a/testautomation/framework/optional/includes/filedlg_autocomplete.inc b/testautomation/framework/optional/includes/filedlg_autocomplete.inc index bfa424378ef4..bfa424378ef4 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_autocomplete.inc +++ b/testautomation/framework/optional/includes/filedlg_autocomplete.inc diff --git a/testautomation/framework/optional/includes/filedlg_cjk_files.inc b/testautomation/framework/optional/includes/filedlg_cjk_files.inc index f9a049c6dbc9..f9a049c6dbc9 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_cjk_files.inc +++ b/testautomation/framework/optional/includes/filedlg_cjk_files.inc diff --git a/testautomation/framework/optional/includes/filedlg_cjk_folders.inc b/testautomation/framework/optional/includes/filedlg_cjk_folders.inc index cdeb2f922c98..cdeb2f922c98 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_cjk_folders.inc +++ b/testautomation/framework/optional/includes/filedlg_cjk_folders.inc diff --git a/testautomation/framework/optional/includes/filedlg_document_properties.inc b/testautomation/framework/optional/includes/filedlg_document_properties.inc index 53917531e275..53917531e275 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_document_properties.inc +++ b/testautomation/framework/optional/includes/filedlg_document_properties.inc diff --git a/testautomation/framework/optional/includes/filedlg_filternames.inc b/testautomation/framework/optional/includes/filedlg_filternames.inc index 1d0b91e2710d..1d0b91e2710d 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_filternames.inc +++ b/testautomation/framework/optional/includes/filedlg_filternames.inc diff --git a/testautomation/framework/optional/includes/filedlg_folders1.inc b/testautomation/framework/optional/includes/filedlg_folders1.inc index 99cf0831f12c..99cf0831f12c 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_folders1.inc +++ b/testautomation/framework/optional/includes/filedlg_folders1.inc diff --git a/testautomation/framework/optional/includes/filedlg_folders2.inc b/testautomation/framework/optional/includes/filedlg_folders2.inc index e7b6f6e0dcbf..e7b6f6e0dcbf 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_folders2.inc +++ b/testautomation/framework/optional/includes/filedlg_folders2.inc diff --git a/testautomation/framework/optional/includes/filedlg_folders3.inc b/testautomation/framework/optional/includes/filedlg_folders3.inc index 354c95fbc23c..354c95fbc23c 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_folders3.inc +++ b/testautomation/framework/optional/includes/filedlg_folders3.inc diff --git a/testautomation/framework/optional/includes/filedlg_folders4.inc b/testautomation/framework/optional/includes/filedlg_folders4.inc index 6c0bbb881730..6c0bbb881730 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_folders4.inc +++ b/testautomation/framework/optional/includes/filedlg_folders4.inc diff --git a/testautomation/framework/optional/includes/filedlg_folders5.inc b/testautomation/framework/optional/includes/filedlg_folders5.inc index ed3959a6e7e4..ed3959a6e7e4 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_folders5.inc +++ b/testautomation/framework/optional/includes/filedlg_folders5.inc diff --git a/testautomation/framework/optional/includes/filedlg_folders6.inc b/testautomation/framework/optional/includes/filedlg_folders6.inc index e82589bbe1d0..e82589bbe1d0 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_folders6.inc +++ b/testautomation/framework/optional/includes/filedlg_folders6.inc diff --git a/testautomation/framework/optional/includes/filedlg_folders7.inc b/testautomation/framework/optional/includes/filedlg_folders7.inc index df9c399c7253..df9c399c7253 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_folders7.inc +++ b/testautomation/framework/optional/includes/filedlg_folders7.inc diff --git a/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc b/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc index b4b538b85cf6..b4b538b85cf6 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc +++ b/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc diff --git a/testautomation/framework/optional/includes/filedlg_multiselection.inc b/testautomation/framework/optional/includes/filedlg_multiselection.inc index 32754ec00553..32754ec00553 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_multiselection.inc +++ b/testautomation/framework/optional/includes/filedlg_multiselection.inc diff --git a/testautomation/framework/optional/includes/filedlg_passwords.inc b/testautomation/framework/optional/includes/filedlg_passwords.inc index b9442cd2bfbd..b9442cd2bfbd 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_passwords.inc +++ b/testautomation/framework/optional/includes/filedlg_passwords.inc diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc index 7758fbe55783..7758fbe55783 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc +++ b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc index 48ed1a59e4a3..48ed1a59e4a3 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc +++ b/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc diff --git a/testautomation/framework/optional/includes/filedlg_tools.inc b/testautomation/framework/optional/includes/filedlg_tools.inc index b04fdc3f92ec..b04fdc3f92ec 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_tools.inc +++ b/testautomation/framework/optional/includes/filedlg_tools.inc diff --git a/testautomation/framework/optional/includes/filedlg_triggers.inc b/testautomation/framework/optional/includes/filedlg_triggers.inc index 1e39d2900895..1e39d2900895 100755..100644 --- a/testautomation/framework/optional/includes/filedlg_triggers.inc +++ b/testautomation/framework/optional/includes/filedlg_triggers.inc diff --git a/testautomation/framework/optional/includes/fontworkgallery.inc b/testautomation/framework/optional/includes/fontworkgallery.inc index c83ce1fb5740..c83ce1fb5740 100755..100644 --- a/testautomation/framework/optional/includes/fontworkgallery.inc +++ b/testautomation/framework/optional/includes/fontworkgallery.inc diff --git a/testautomation/framework/optional/includes/help_bookmarks.inc b/testautomation/framework/optional/includes/help_bookmarks.inc index 04a16951c0a9..04a16951c0a9 100755..100644 --- a/testautomation/framework/optional/includes/help_bookmarks.inc +++ b/testautomation/framework/optional/includes/help_bookmarks.inc diff --git a/testautomation/framework/optional/includes/help_compare_applications.inc b/testautomation/framework/optional/includes/help_compare_applications.inc index 3028c41ecedf..3028c41ecedf 100755..100644 --- a/testautomation/framework/optional/includes/help_compare_applications.inc +++ b/testautomation/framework/optional/includes/help_compare_applications.inc diff --git a/testautomation/framework/optional/includes/help_compare_content.inc b/testautomation/framework/optional/includes/help_compare_content.inc index 73c11940e0dc..73c11940e0dc 100755..100644 --- a/testautomation/framework/optional/includes/help_compare_content.inc +++ b/testautomation/framework/optional/includes/help_compare_content.inc diff --git a/testautomation/framework/optional/includes/help_compare_topics.inc b/testautomation/framework/optional/includes/help_compare_topics.inc index ef060eb18275..ef060eb18275 100755..100644 --- a/testautomation/framework/optional/includes/help_compare_topics.inc +++ b/testautomation/framework/optional/includes/help_compare_topics.inc diff --git a/testautomation/framework/optional/includes/help_search.inc b/testautomation/framework/optional/includes/help_search.inc index 92243b538c4f..92243b538c4f 100755..100644 --- a/testautomation/framework/optional/includes/help_search.inc +++ b/testautomation/framework/optional/includes/help_search.inc diff --git a/testautomation/framework/optional/includes/help_view_topics.inc b/testautomation/framework/optional/includes/help_view_topics.inc index b14c5d5a8511..b14c5d5a8511 100755..100644 --- a/testautomation/framework/optional/includes/help_view_topics.inc +++ b/testautomation/framework/optional/includes/help_view_topics.inc diff --git a/testautomation/framework/optional/includes/loadsave_files.inc b/testautomation/framework/optional/includes/loadsave_files.inc index a9eac8164c22..a9eac8164c22 100755..100644 --- a/testautomation/framework/optional/includes/loadsave_files.inc +++ b/testautomation/framework/optional/includes/loadsave_files.inc diff --git a/testautomation/framework/optional/includes/loadsave_new.inc b/testautomation/framework/optional/includes/loadsave_new.inc index 02e734382fa2..02e734382fa2 100755..100644 --- a/testautomation/framework/optional/includes/loadsave_new.inc +++ b/testautomation/framework/optional/includes/loadsave_new.inc diff --git a/testautomation/framework/optional/includes/menuentries.inc b/testautomation/framework/optional/includes/menuentries.inc index f2006915c8b1..f2006915c8b1 100755..100644 --- a/testautomation/framework/optional/includes/menuentries.inc +++ b/testautomation/framework/optional/includes/menuentries.inc diff --git a/testautomation/framework/optional/includes/ole_1.inc b/testautomation/framework/optional/includes/ole_1.inc index de7efa3bae8d..de7efa3bae8d 100755..100644 --- a/testautomation/framework/optional/includes/ole_1.inc +++ b/testautomation/framework/optional/includes/ole_1.inc diff --git a/testautomation/framework/optional/includes/ole_2.inc b/testautomation/framework/optional/includes/ole_2.inc index a45c885428fb..a45c885428fb 100755..100644 --- a/testautomation/framework/optional/includes/ole_2.inc +++ b/testautomation/framework/optional/includes/ole_2.inc diff --git a/testautomation/framework/optional/includes/ole_3.inc b/testautomation/framework/optional/includes/ole_3.inc index 0636bfacb576..0636bfacb576 100755..100644 --- a/testautomation/framework/optional/includes/ole_3.inc +++ b/testautomation/framework/optional/includes/ole_3.inc diff --git a/testautomation/framework/optional/includes/ole_tools.inc b/testautomation/framework/optional/includes/ole_tools.inc index fdcfb6c62166..fdcfb6c62166 100755..100644 --- a/testautomation/framework/optional/includes/ole_tools.inc +++ b/testautomation/framework/optional/includes/ole_tools.inc diff --git a/testautomation/framework/optional/includes/options_asia.inc b/testautomation/framework/optional/includes/options_asia.inc index 76e990ca69fa..76e990ca69fa 100755..100644 --- a/testautomation/framework/optional/includes/options_asia.inc +++ b/testautomation/framework/optional/includes/options_asia.inc diff --git a/testautomation/framework/optional/includes/options_data.inc b/testautomation/framework/optional/includes/options_data.inc index 4b60f9c99942..4b60f9c99942 100755..100644 --- a/testautomation/framework/optional/includes/options_data.inc +++ b/testautomation/framework/optional/includes/options_data.inc diff --git a/testautomation/framework/optional/includes/options_int1.inc b/testautomation/framework/optional/includes/options_int1.inc index 9c79a79a7d97..9c79a79a7d97 100755..100644 --- a/testautomation/framework/optional/includes/options_int1.inc +++ b/testautomation/framework/optional/includes/options_int1.inc diff --git a/testautomation/framework/optional/includes/options_lan1.inc b/testautomation/framework/optional/includes/options_lan1.inc index ac7f70d18de2..ac7f70d18de2 100755..100644 --- a/testautomation/framework/optional/includes/options_lan1.inc +++ b/testautomation/framework/optional/includes/options_lan1.inc diff --git a/testautomation/framework/optional/includes/options_loadsave_html.inc b/testautomation/framework/optional/includes/options_loadsave_html.inc index d1b7790f539b..d1b7790f539b 100755..100644 --- a/testautomation/framework/optional/includes/options_loadsave_html.inc +++ b/testautomation/framework/optional/includes/options_loadsave_html.inc diff --git a/testautomation/framework/optional/includes/options_loadsave_msoffice.inc b/testautomation/framework/optional/includes/options_loadsave_msoffice.inc index c04a110e7ce5..c04a110e7ce5 100755..100644 --- a/testautomation/framework/optional/includes/options_loadsave_msoffice.inc +++ b/testautomation/framework/optional/includes/options_loadsave_msoffice.inc diff --git a/testautomation/framework/optional/includes/options_loadsave_vba.inc b/testautomation/framework/optional/includes/options_loadsave_vba.inc index be367449553b..be367449553b 100755..100644 --- a/testautomation/framework/optional/includes/options_loadsave_vba.inc +++ b/testautomation/framework/optional/includes/options_loadsave_vba.inc diff --git a/testautomation/framework/optional/includes/options_ooo_accessibility.inc b/testautomation/framework/optional/includes/options_ooo_accessibility.inc index 6e553bd336a3..6e553bd336a3 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_accessibility.inc +++ b/testautomation/framework/optional/includes/options_ooo_accessibility.inc diff --git a/testautomation/framework/optional/includes/options_ooo_appearance.inc b/testautomation/framework/optional/includes/options_ooo_appearance.inc index 72b016b72582..72b016b72582 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_appearance.inc +++ b/testautomation/framework/optional/includes/options_ooo_appearance.inc diff --git a/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc b/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc index ccf22af0680e..ccf22af0680e 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc +++ b/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc diff --git a/testautomation/framework/optional/includes/options_ooo_java.inc b/testautomation/framework/optional/includes/options_ooo_java.inc index 4b3c1b9dd51d..4b3c1b9dd51d 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_java.inc +++ b/testautomation/framework/optional/includes/options_ooo_java.inc diff --git a/testautomation/framework/optional/includes/options_ooo_memory.inc b/testautomation/framework/optional/includes/options_ooo_memory.inc index 6c2038556af4..6c2038556af4 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_memory.inc +++ b/testautomation/framework/optional/includes/options_ooo_memory.inc diff --git a/testautomation/framework/optional/includes/options_ooo_paths.inc b/testautomation/framework/optional/includes/options_ooo_paths.inc index 85c797665a1e..85c797665a1e 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_paths.inc +++ b/testautomation/framework/optional/includes/options_ooo_paths.inc diff --git a/testautomation/framework/optional/includes/options_ooo_print.inc b/testautomation/framework/optional/includes/options_ooo_print.inc index 35e83eb0d5f2..35e83eb0d5f2 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_print.inc +++ b/testautomation/framework/optional/includes/options_ooo_print.inc diff --git a/testautomation/framework/optional/includes/options_ooo_security.inc b/testautomation/framework/optional/includes/options_ooo_security.inc index 5c839a249af5..5c839a249af5 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_security.inc +++ b/testautomation/framework/optional/includes/options_ooo_security.inc diff --git a/testautomation/framework/optional/includes/options_ooo_userdata.inc b/testautomation/framework/optional/includes/options_ooo_userdata.inc index c1adc7709e70..c1adc7709e70 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_userdata.inc +++ b/testautomation/framework/optional/includes/options_ooo_userdata.inc diff --git a/testautomation/framework/optional/includes/options_ooo_view.inc b/testautomation/framework/optional/includes/options_ooo_view.inc index 52130dcd09d4..52130dcd09d4 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_view.inc +++ b/testautomation/framework/optional/includes/options_ooo_view.inc diff --git a/testautomation/framework/optional/includes/scripting_organizers.inc b/testautomation/framework/optional/includes/scripting_organizers.inc index c3da1313da9c..c3da1313da9c 100755..100644 --- a/testautomation/framework/optional/includes/scripting_organizers.inc +++ b/testautomation/framework/optional/includes/scripting_organizers.inc diff --git a/testautomation/framework/optional/includes/security_broken_signature.inc b/testautomation/framework/optional/includes/security_broken_signature.inc index 1cce0f33af3d..1cce0f33af3d 100755..100644 --- a/testautomation/framework/optional/includes/security_broken_signature.inc +++ b/testautomation/framework/optional/includes/security_broken_signature.inc diff --git a/testautomation/framework/optional/includes/security_evilmacro1.inc b/testautomation/framework/optional/includes/security_evilmacro1.inc index 9927f1652cb3..9927f1652cb3 100755..100644 --- a/testautomation/framework/optional/includes/security_evilmacro1.inc +++ b/testautomation/framework/optional/includes/security_evilmacro1.inc diff --git a/testautomation/framework/optional/includes/security_evilmacro2.inc b/testautomation/framework/optional/includes/security_evilmacro2.inc index 0c687976fba7..0c687976fba7 100755..100644 --- a/testautomation/framework/optional/includes/security_evilmacro2.inc +++ b/testautomation/framework/optional/includes/security_evilmacro2.inc diff --git a/testautomation/framework/optional/includes/security_evilmacro3.inc b/testautomation/framework/optional/includes/security_evilmacro3.inc index c891163ef3e2..c891163ef3e2 100755..100644 --- a/testautomation/framework/optional/includes/security_evilmacro3.inc +++ b/testautomation/framework/optional/includes/security_evilmacro3.inc diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc index 3df134d83d33..3df134d83d33 100755..100644 --- a/testautomation/framework/optional/includes/security_macrosecurity.inc +++ b/testautomation/framework/optional/includes/security_macrosecurity.inc diff --git a/testautomation/framework/optional/includes/security_recommend_password.inc b/testautomation/framework/optional/includes/security_recommend_password.inc index ab914fe5125b..ab914fe5125b 100755..100644 --- a/testautomation/framework/optional/includes/security_recommend_password.inc +++ b/testautomation/framework/optional/includes/security_recommend_password.inc diff --git a/testautomation/framework/optional/includes/security_trusted_path.inc b/testautomation/framework/optional/includes/security_trusted_path.inc index 9115ba2e9f5a..9115ba2e9f5a 100755..100644 --- a/testautomation/framework/optional/includes/security_trusted_path.inc +++ b/testautomation/framework/optional/includes/security_trusted_path.inc diff --git a/testautomation/framework/optional/includes/standardbar2.inc b/testautomation/framework/optional/includes/standardbar2.inc index 2b9f8a95d129..2b9f8a95d129 100755..100644 --- a/testautomation/framework/optional/includes/standardbar2.inc +++ b/testautomation/framework/optional/includes/standardbar2.inc diff --git a/testautomation/framework/optional/includes/toolbar_behavior.inc b/testautomation/framework/optional/includes/toolbar_behavior.inc index e9e96f6bb72e..e9e96f6bb72e 100755..100644 --- a/testautomation/framework/optional/includes/toolbar_behavior.inc +++ b/testautomation/framework/optional/includes/toolbar_behavior.inc diff --git a/testautomation/framework/required/includes/basic_dialog_export.inc b/testautomation/framework/required/includes/basic_dialog_export.inc index ecdb26cc6ac0..ecdb26cc6ac0 100755..100644 --- a/testautomation/framework/required/includes/basic_dialog_export.inc +++ b/testautomation/framework/required/includes/basic_dialog_export.inc diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc index 162f0cc040cd..162f0cc040cd 100755..100644 --- a/testautomation/framework/required/includes/basic_dialog_i18n.inc +++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc diff --git a/testautomation/framework/required/includes/basic_macroassignment.inc b/testautomation/framework/required/includes/basic_macroassignment.inc index 6dda14b07698..6dda14b07698 100755..100644 --- a/testautomation/framework/required/includes/basic_macroassignment.inc +++ b/testautomation/framework/required/includes/basic_macroassignment.inc diff --git a/testautomation/framework/required/includes/basic_organizer.inc b/testautomation/framework/required/includes/basic_organizer.inc index 7df67c82cd62..7df67c82cd62 100755..100644 --- a/testautomation/framework/required/includes/basic_organizer.inc +++ b/testautomation/framework/required/includes/basic_organizer.inc diff --git a/testautomation/framework/required/includes/first.inc b/testautomation/framework/required/includes/first.inc index 478ba7cd6b90..478ba7cd6b90 100755..100644 --- a/testautomation/framework/required/includes/first.inc +++ b/testautomation/framework/required/includes/first.inc diff --git a/testautomation/framework/required/includes/help_browser.inc b/testautomation/framework/required/includes/help_browser.inc index 858dc46c2779..858dc46c2779 100755..100644 --- a/testautomation/framework/required/includes/help_browser.inc +++ b/testautomation/framework/required/includes/help_browser.inc diff --git a/testautomation/framework/required/includes/printer_administration.inc b/testautomation/framework/required/includes/printer_administration.inc index 6349f381d194..6349f381d194 100755..100644 --- a/testautomation/framework/required/includes/printer_administration.inc +++ b/testautomation/framework/required/includes/printer_administration.inc diff --git a/testautomation/framework/required/includes/security_dialogs.inc b/testautomation/framework/required/includes/security_dialogs.inc index d8f5a096595a..d8f5a096595a 100755..100644 --- a/testautomation/framework/required/includes/security_dialogs.inc +++ b/testautomation/framework/required/includes/security_dialogs.inc diff --git a/testautomation/framework/required/includes/smoketest.inc b/testautomation/framework/required/includes/smoketest.inc index d4e327a21ad7..d4e327a21ad7 100755..100644 --- a/testautomation/framework/required/includes/smoketest.inc +++ b/testautomation/framework/required/includes/smoketest.inc diff --git a/testautomation/framework/required/includes/standard_toolbar_1.inc b/testautomation/framework/required/includes/standard_toolbar_1.inc index b7d54bb89180..b7d54bb89180 100755..100644 --- a/testautomation/framework/required/includes/standard_toolbar_1.inc +++ b/testautomation/framework/required/includes/standard_toolbar_1.inc diff --git a/testautomation/framework/required/includes/standard_toolbar_3.inc b/testautomation/framework/required/includes/standard_toolbar_3.inc index 46c71bd93409..46c71bd93409 100755..100644 --- a/testautomation/framework/required/includes/standard_toolbar_3.inc +++ b/testautomation/framework/required/includes/standard_toolbar_3.inc diff --git a/testautomation/framework/required/includes/standard_toolbar_4.inc b/testautomation/framework/required/includes/standard_toolbar_4.inc index fbd21e46d032..fbd21e46d032 100755..100644 --- a/testautomation/framework/required/includes/standard_toolbar_4.inc +++ b/testautomation/framework/required/includes/standard_toolbar_4.inc diff --git a/testautomation/framework/required/includes/standard_toolbar_5.inc b/testautomation/framework/required/includes/standard_toolbar_5.inc index 8e03d1253f84..8e03d1253f84 100755..100644 --- a/testautomation/framework/required/includes/standard_toolbar_5.inc +++ b/testautomation/framework/required/includes/standard_toolbar_5.inc diff --git a/testautomation/framework/required/includes/standard_toolbar_6.inc b/testautomation/framework/required/includes/standard_toolbar_6.inc index ab357cd81013..ab357cd81013 100755..100644 --- a/testautomation/framework/required/includes/standard_toolbar_6.inc +++ b/testautomation/framework/required/includes/standard_toolbar_6.inc diff --git a/testautomation/framework/required/includes/tools_customize.inc b/testautomation/framework/required/includes/tools_customize.inc index 36089018a589..36089018a589 100755..100644 --- a/testautomation/framework/required/includes/tools_customize.inc +++ b/testautomation/framework/required/includes/tools_customize.inc diff --git a/testautomation/framework/required/includes/tools_options.inc b/testautomation/framework/required/includes/tools_options.inc index 928d533cbe3a..928d533cbe3a 100755..100644 --- a/testautomation/framework/required/includes/tools_options.inc +++ b/testautomation/framework/required/includes/tools_options.inc diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc index fdfdb49fec97..fdfdb49fec97 100755..100644 --- a/testautomation/framework/required/includes/topten.inc +++ b/testautomation/framework/required/includes/topten.inc diff --git a/testautomation/framework/required/includes/wizard_agenda.inc b/testautomation/framework/required/includes/wizard_agenda.inc index d423d2fd7c62..d423d2fd7c62 100755..100644 --- a/testautomation/framework/required/includes/wizard_agenda.inc +++ b/testautomation/framework/required/includes/wizard_agenda.inc diff --git a/testautomation/framework/required/includes/wizard_documentconverter.inc b/testautomation/framework/required/includes/wizard_documentconverter.inc index b99cef0a9c6c..b99cef0a9c6c 100755..100644 --- a/testautomation/framework/required/includes/wizard_documentconverter.inc +++ b/testautomation/framework/required/includes/wizard_documentconverter.inc diff --git a/testautomation/framework/required/includes/wizard_euroconverter.inc b/testautomation/framework/required/includes/wizard_euroconverter.inc index aeee35c59282..aeee35c59282 100755..100644 --- a/testautomation/framework/required/includes/wizard_euroconverter.inc +++ b/testautomation/framework/required/includes/wizard_euroconverter.inc diff --git a/testautomation/framework/required/includes/wizard_fax.inc b/testautomation/framework/required/includes/wizard_fax.inc index 07fcc562dddc..07fcc562dddc 100755..100644 --- a/testautomation/framework/required/includes/wizard_fax.inc +++ b/testautomation/framework/required/includes/wizard_fax.inc diff --git a/testautomation/framework/required/includes/wizard_firsttime.inc b/testautomation/framework/required/includes/wizard_firsttime.inc index 657a68ada3d0..657a68ada3d0 100755..100644 --- a/testautomation/framework/required/includes/wizard_firsttime.inc +++ b/testautomation/framework/required/includes/wizard_firsttime.inc diff --git a/testautomation/framework/required/includes/wizard_letter.inc b/testautomation/framework/required/includes/wizard_letter.inc index 4f68a04cbd8b..4f68a04cbd8b 100755..100644 --- a/testautomation/framework/required/includes/wizard_letter.inc +++ b/testautomation/framework/required/includes/wizard_letter.inc diff --git a/testautomation/framework/required/includes/wizard_mailmerge.inc b/testautomation/framework/required/includes/wizard_mailmerge.inc index 95f8d6d19a54..95f8d6d19a54 100755..100644 --- a/testautomation/framework/required/includes/wizard_mailmerge.inc +++ b/testautomation/framework/required/includes/wizard_mailmerge.inc diff --git a/testautomation/framework/required/includes/wizard_presentation.inc b/testautomation/framework/required/includes/wizard_presentation.inc index 53e2e0d3a50b..53e2e0d3a50b 100755..100644 --- a/testautomation/framework/required/includes/wizard_presentation.inc +++ b/testautomation/framework/required/includes/wizard_presentation.inc diff --git a/testautomation/framework/required/includes/wizard_webpage.inc b/testautomation/framework/required/includes/wizard_webpage.inc index 465fae368db1..465fae368db1 100755..100644 --- a/testautomation/framework/required/includes/wizard_webpage.inc +++ b/testautomation/framework/required/includes/wizard_webpage.inc diff --git a/testautomation/framework/tools/includes/CJK_tools.inc b/testautomation/framework/tools/includes/CJK_tools.inc index 38664ef78501..38664ef78501 100755..100644 --- a/testautomation/framework/tools/includes/CJK_tools.inc +++ b/testautomation/framework/tools/includes/CJK_tools.inc diff --git a/testautomation/framework/tools/includes/customize_tools.inc b/testautomation/framework/tools/includes/customize_tools.inc index 9fbdb6928b08..9fbdb6928b08 100755..100644 --- a/testautomation/framework/tools/includes/customize_tools.inc +++ b/testautomation/framework/tools/includes/customize_tools.inc diff --git a/testautomation/framework/tools/includes/fileoperations.inc b/testautomation/framework/tools/includes/fileoperations.inc index 061f9f606f48..061f9f606f48 100755..100644 --- a/testautomation/framework/tools/includes/fileoperations.inc +++ b/testautomation/framework/tools/includes/fileoperations.inc diff --git a/testautomation/framework/tools/includes/formcontrols.inc b/testautomation/framework/tools/includes/formcontrols.inc index 6755ed2a2cdd..6755ed2a2cdd 100755..100644 --- a/testautomation/framework/tools/includes/formcontrols.inc +++ b/testautomation/framework/tools/includes/formcontrols.inc diff --git a/testautomation/framework/tools/includes/help_tools.inc b/testautomation/framework/tools/includes/help_tools.inc index 9c81084952df..9c81084952df 100755..100644 --- a/testautomation/framework/tools/includes/help_tools.inc +++ b/testautomation/framework/tools/includes/help_tools.inc diff --git a/testautomation/framework/tools/includes/i18n_tools.inc b/testautomation/framework/tools/includes/i18n_tools.inc index f918b1fe5076..f918b1fe5076 100755..100644 --- a/testautomation/framework/tools/includes/i18n_tools.inc +++ b/testautomation/framework/tools/includes/i18n_tools.inc diff --git a/testautomation/framework/tools/includes/options_tools.inc b/testautomation/framework/tools/includes/options_tools.inc index 4f7a05154795..4f7a05154795 100755..100644 --- a/testautomation/framework/tools/includes/options_tools.inc +++ b/testautomation/framework/tools/includes/options_tools.inc diff --git a/testautomation/framework/tools/includes/pbrowser_tools.inc b/testautomation/framework/tools/includes/pbrowser_tools.inc index a6a089150a96..a6a089150a96 100755..100644 --- a/testautomation/framework/tools/includes/pbrowser_tools.inc +++ b/testautomation/framework/tools/includes/pbrowser_tools.inc diff --git a/testautomation/framework/tools/includes/private_environment.inc b/testautomation/framework/tools/includes/private_environment.inc index af81110b3f18..af81110b3f18 100755..100644 --- a/testautomation/framework/tools/includes/private_environment.inc +++ b/testautomation/framework/tools/includes/private_environment.inc diff --git a/testautomation/framework/tools/includes/scriptorganizer_tools.inc b/testautomation/framework/tools/includes/scriptorganizer_tools.inc index 8cf067913d64..8cf067913d64 100755..100644 --- a/testautomation/framework/tools/includes/scriptorganizer_tools.inc +++ b/testautomation/framework/tools/includes/scriptorganizer_tools.inc diff --git a/testautomation/framework/tools/includes/spadmin_tools.inc b/testautomation/framework/tools/includes/spadmin_tools.inc index 77cbdf61a44b..77cbdf61a44b 100755..100644 --- a/testautomation/framework/tools/includes/spadmin_tools.inc +++ b/testautomation/framework/tools/includes/spadmin_tools.inc diff --git a/testautomation/framework/tools/includes/toolbar_tools.inc b/testautomation/framework/tools/includes/toolbar_tools.inc index 66c6c27982d0..66c6c27982d0 100755..100644 --- a/testautomation/framework/tools/includes/toolbar_tools.inc +++ b/testautomation/framework/tools/includes/toolbar_tools.inc diff --git a/testautomation/framework/tools/includes/webtools.inc b/testautomation/framework/tools/includes/webtools.inc index 424ace8c959e..424ace8c959e 100755..100644 --- a/testautomation/framework/tools/includes/webtools.inc +++ b/testautomation/framework/tools/includes/webtools.inc diff --git a/testautomation/framework/tools/includes/window_tools.inc b/testautomation/framework/tools/includes/window_tools.inc index 93a09ccf533d..93a09ccf533d 100755..100644 --- a/testautomation/framework/tools/includes/window_tools.inc +++ b/testautomation/framework/tools/includes/window_tools.inc diff --git a/testautomation/framework/tools/includes/wizards.inc b/testautomation/framework/tools/includes/wizards.inc index 380f84141d34..380f84141d34 100755..100644 --- a/testautomation/framework/tools/includes/wizards.inc +++ b/testautomation/framework/tools/includes/wizards.inc diff --git a/testautomation/global/hid/hid.lst b/testautomation/global/hid/hid.lst index 3257e92a9066..a07f54c87773 100755 --- a/testautomation/global/hid/hid.lst +++ b/testautomation/global/hid/hid.lst @@ -1,5 +1,3 @@ -DEV300.m85 010101010101010 - 1 1 SID_OPENDOC 5501 SID_SAVEASDOC 5502 diff --git a/testautomation/global/input/empty/please_do_not_delete_this_file b/testautomation/global/input/empty/please_do_not_delete_this_file index 0b366e10364f..0b366e10364f 100644..100755 --- a/testautomation/global/input/empty/please_do_not_delete_this_file +++ b/testautomation/global/input/empty/please_do_not_delete_this_file diff --git a/testautomation/global/required/includes/g_001.inc b/testautomation/global/required/includes/g_001.inc index 8cbc1bb24526..8cbc1bb24526 100755..100644 --- a/testautomation/global/required/includes/g_001.inc +++ b/testautomation/global/required/includes/g_001.inc diff --git a/testautomation/global/required/includes/g_009.inc b/testautomation/global/required/includes/g_009.inc index 61ef7dd95c37..61ef7dd95c37 100755..100644 --- a/testautomation/global/required/includes/g_009.inc +++ b/testautomation/global/required/includes/g_009.inc diff --git a/testautomation/global/required/includes/g_numberformatter1.inc b/testautomation/global/required/includes/g_numberformatter1.inc index 2539e12455e5..2539e12455e5 100755..100644 --- a/testautomation/global/required/includes/g_numberformatter1.inc +++ b/testautomation/global/required/includes/g_numberformatter1.inc diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc index 2f7b6aa33ac2..2f7b6aa33ac2 100755..100644 --- a/testautomation/global/required/includes/g_option.inc +++ b/testautomation/global/required/includes/g_option.inc diff --git a/testautomation/global/required/includes/g_option_application.inc b/testautomation/global/required/includes/g_option_application.inc index 233b6cb9d9cc..233b6cb9d9cc 100755..100644 --- a/testautomation/global/required/includes/g_option_application.inc +++ b/testautomation/global/required/includes/g_option_application.inc diff --git a/testautomation/global/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc index 15ee12c4308d..2d0bd716e551 100644 --- a/testautomation/global/required/includes/g_printing.inc +++ b/testautomation/global/required/includes/g_printing.inc @@ -408,7 +408,7 @@ testcase tPrintLayout() endif endif - lb_test( PrintOrder, 2, 1, "" ) + lb_test( PrintOrder, 4, 1, "" ) cb_test( BorderAroundPages, false, "" ) select case( gApplication ) diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid index 227c3108277e..227c3108277e 100755..100644 --- a/testautomation/global/sid/bars.sid +++ b/testautomation/global/sid/bars.sid diff --git a/testautomation/global/sid/context.sid b/testautomation/global/sid/context.sid index 72d6dba96cb1..72d6dba96cb1 100755..100644 --- a/testautomation/global/sid/context.sid +++ b/testautomation/global/sid/context.sid diff --git a/testautomation/global/sid/others.sid b/testautomation/global/sid/others.sid index 99f9cb479ce2..99f9cb479ce2 100755..100644 --- a/testautomation/global/sid/others.sid +++ b/testautomation/global/sid/others.sid diff --git a/testautomation/global/system/includes/declare.inc b/testautomation/global/system/includes/declare.inc index 5fed58be6cfd..5fed58be6cfd 100755..100644 --- a/testautomation/global/system/includes/declare.inc +++ b/testautomation/global/system/includes/declare.inc diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc index 0b83af421eeb..0b83af421eeb 100755..100644 --- a/testautomation/global/system/includes/iniinfo.inc +++ b/testautomation/global/system/includes/iniinfo.inc diff --git a/testautomation/global/system/includes/inivalue.inc b/testautomation/global/system/includes/inivalue.inc index 2cc13be957cb..2cc13be957cb 100755..100644 --- a/testautomation/global/system/includes/inivalue.inc +++ b/testautomation/global/system/includes/inivalue.inc diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc index 3825dadff409..40a1f504ed64 100644 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -84,6 +84,10 @@ sub GetUseFiles Call GetIniInformation '///+<li><b>GetIniInformation</b>: Get all information out of the <i>testtool.ini/.testtoolrc</i> and set it on global variables (iniinfo.inc)</li> Call GetOfficeInformation '///+<li><b>GetOfficeInformation</b>: Set <i>sAppExe</i> for startup (iniinfo.inc)</li> + gVersionsnummer = FindBuildID + ' split versionstring into its parts + call hSetBuildVersionInformation(False) + Call LoadDeclaration '///+<ul><li><b>LoadDeclaration</b>: Load all declaration files (master.inc)</li> Call FirstOfficeStart '///+<li><b>FirstOfficeStart</b>: Try to start the office for first time (master.inc)</li> diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc index 83430bfaa332..83430bfaa332 100755..100644 --- a/testautomation/global/system/includes/status.inc +++ b/testautomation/global/system/includes/status.inc diff --git a/testautomation/global/system/includes/sysinfo.inc b/testautomation/global/system/includes/sysinfo.inc index 30e00585d517..30e00585d517 100755..100644 --- a/testautomation/global/system/includes/sysinfo.inc +++ b/testautomation/global/system/includes/sysinfo.inc diff --git a/testautomation/global/tools/closeoffice.bas b/testautomation/global/tools/closeoffice.bas index da402ecd40f7..da402ecd40f7 100644..100755 --- a/testautomation/global/tools/closeoffice.bas +++ b/testautomation/global/tools/closeoffice.bas diff --git a/testautomation/global/tools/includes/optional/t_accels.inc b/testautomation/global/tools/includes/optional/t_accels.inc index 04718449b13b..04718449b13b 100755..100644 --- a/testautomation/global/tools/includes/optional/t_accels.inc +++ b/testautomation/global/tools/includes/optional/t_accels.inc diff --git a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc index f7537d52700c..f7537d52700c 100755..100644 --- a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc +++ b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc diff --git a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc index f63d610dbdb8..f63d610dbdb8 100755..100644 --- a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc +++ b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc diff --git a/testautomation/global/tools/includes/optional/t_control_objects.inc b/testautomation/global/tools/includes/optional/t_control_objects.inc index b1da7d7e8d95..4ee8b908c93f 100755..100644 --- a/testautomation/global/tools/includes/optional/t_control_objects.inc +++ b/testautomation/global/tools/includes/optional/t_control_objects.inc @@ -115,7 +115,7 @@ function lb_test( oControl as object, items as integer, preset as integer, issue endif endif - for con_iterator = 1 to items + for con_iterator = 1 to con_items oControl.select( con_iterator ) next con_iterator diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc index 7f43b7211630..7f43b7211630 100755..100644 --- a/testautomation/global/tools/includes/optional/t_docfuncs.inc +++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc diff --git a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc index 654b1b76c515..654b1b76c515 100755..100644 --- a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc +++ b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc diff --git a/testautomation/global/tools/includes/optional/t_key_tools.inc b/testautomation/global/tools/includes/optional/t_key_tools.inc index 14906c127c68..14906c127c68 100755..100644 --- a/testautomation/global/tools/includes/optional/t_key_tools.inc +++ b/testautomation/global/tools/includes/optional/t_key_tools.inc diff --git a/testautomation/global/tools/includes/optional/t_listfuncs.inc b/testautomation/global/tools/includes/optional/t_listfuncs.inc index c90d077db651..c90d077db651 100755..100644 --- a/testautomation/global/tools/includes/optional/t_listfuncs.inc +++ b/testautomation/global/tools/includes/optional/t_listfuncs.inc diff --git a/testautomation/global/tools/includes/optional/t_locale_strings1.inc b/testautomation/global/tools/includes/optional/t_locale_strings1.inc index 29c4bcf3cb6b..29c4bcf3cb6b 100755..100644 --- a/testautomation/global/tools/includes/optional/t_locale_strings1.inc +++ b/testautomation/global/tools/includes/optional/t_locale_strings1.inc diff --git a/testautomation/global/tools/includes/optional/t_ole.inc b/testautomation/global/tools/includes/optional/t_ole.inc index 13138dfc52ab..13138dfc52ab 100755..100644 --- a/testautomation/global/tools/includes/optional/t_ole.inc +++ b/testautomation/global/tools/includes/optional/t_ole.inc diff --git a/testautomation/global/tools/includes/optional/t_security_tools.inc b/testautomation/global/tools/includes/optional/t_security_tools.inc index 28625be35880..28625be35880 100755..100644 --- a/testautomation/global/tools/includes/optional/t_security_tools.inc +++ b/testautomation/global/tools/includes/optional/t_security_tools.inc diff --git a/testautomation/global/tools/includes/optional/t_stringtools.inc b/testautomation/global/tools/includes/optional/t_stringtools.inc index 7f946fd3b046..7f946fd3b046 100755..100644 --- a/testautomation/global/tools/includes/optional/t_stringtools.inc +++ b/testautomation/global/tools/includes/optional/t_stringtools.inc diff --git a/testautomation/global/tools/includes/optional/t_treelist_tools.inc b/testautomation/global/tools/includes/optional/t_treelist_tools.inc index e9c254ac07b4..e9c254ac07b4 100755..100644 --- a/testautomation/global/tools/includes/optional/t_treelist_tools.inc +++ b/testautomation/global/tools/includes/optional/t_treelist_tools.inc diff --git a/testautomation/global/tools/includes/optional/t_xml1.inc b/testautomation/global/tools/includes/optional/t_xml1.inc index 5afd05cbb22f..5afd05cbb22f 100755..100644 --- a/testautomation/global/tools/includes/optional/t_xml1.inc +++ b/testautomation/global/tools/includes/optional/t_xml1.inc diff --git a/testautomation/global/tools/includes/optional/t_xml2.inc b/testautomation/global/tools/includes/optional/t_xml2.inc index 46dc9b350393..46dc9b350393 100755..100644 --- a/testautomation/global/tools/includes/optional/t_xml2.inc +++ b/testautomation/global/tools/includes/optional/t_xml2.inc diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc index 243483be9e7d..243483be9e7d 100755..100644 --- a/testautomation/global/tools/includes/required/t_filters.inc +++ b/testautomation/global/tools/includes/required/t_filters.inc diff --git a/testautomation/global/tools/includes/required/t_lists.inc b/testautomation/global/tools/includes/required/t_lists.inc index 9fa2172fbccf..9fa2172fbccf 100755..100644 --- a/testautomation/global/tools/includes/required/t_lists.inc +++ b/testautomation/global/tools/includes/required/t_lists.inc diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc index 4f4467263072..4f4467263072 100755..100644 --- a/testautomation/global/tools/includes/required/t_option.inc +++ b/testautomation/global/tools/includes/required/t_option.inc diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc index 051afec0ad24..051afec0ad24 100755..100644 --- a/testautomation/global/tools/includes/required/t_tools1.inc +++ b/testautomation/global/tools/includes/required/t_tools1.inc diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc index 4b29928a1b93..4b29928a1b93 100755..100644 --- a/testautomation/global/tools/includes/required/t_tools3.inc +++ b/testautomation/global/tools/includes/required/t_tools3.inc diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win index 6a80e4209cbc..ba6673edb39d 100644 --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -401,7 +401,7 @@ Schattenfarbe sym:svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR FormName sym:sw:Edit:DLG_NUM_NAMES:ED_FORM FormListe sym:sw:ListBox:DLG_NUM_NAMES:LB_FORM -*FormularNavigator .uno:ShowFmExplorer +*FormularNavigator sym:SFXDOCKINGWINDOW_ShowFmExplorer Liste sym:SVX_HID_FORM_NAVIGATOR *FussnoteBearbeiten .uno:EditFootnote diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win index ca8fb3659c1d..39d90d8d1c97 100644 --- a/testautomation/global/win/edia_i_o.win +++ b/testautomation/global/win/edia_i_o.win @@ -154,6 +154,7 @@ RightFieldCell sym:DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL *LabelFieldSelection sym:extensions:ModalDialog:RID_DLG_SELECTLABELCONTROL +CBNoAssignment sym:extensions:CheckBox:RID_DLG_SELECTLABELCONTROL:1 *JPGOptions sym:svtools:ModalDialog:DLG_EXPORT Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win index b63417e56b9f..15e8035d8b74 100644 --- a/testautomation/global/win/sys_dial.win +++ b/testautomation/global/win/sys_dial.win @@ -126,3 +126,8 @@ OrdnerName sym:fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_N ' **** *TranslationWindow sym:svtools:WorkWindow:TT_INLINE_TRANSLATION svtools:FloatingWindow:TT_INLINE_TRANSLATION +' **** specal longnames for bas test +' **** author marc.neumann@oracle.com +*MSC_Special_Dialog sym:customcontrol1 +*MSC_Special_Dialog2 sym:customcontrol2 +*MSC_Special_Dialog3 sym:customcontrol3
\ No newline at end of file diff --git a/testautomation/graphics/optional/g_accessability.bas b/testautomation/graphics/optional/g_accessability.bas index 1113dcb4324f..1113dcb4324f 100644..100755 --- a/testautomation/graphics/optional/g_accessability.bas +++ b/testautomation/graphics/optional/g_accessability.bas diff --git a/testautomation/graphics/optional/g_area.bas b/testautomation/graphics/optional/g_area.bas index 3ad024ced1f6..3ad024ced1f6 100644..100755 --- a/testautomation/graphics/optional/g_area.bas +++ b/testautomation/graphics/optional/g_area.bas diff --git a/testautomation/graphics/optional/g_arrangealign.bas b/testautomation/graphics/optional/g_arrangealign.bas index 3d9f2e2ab4ab..3d9f2e2ab4ab 100644..100755 --- a/testautomation/graphics/optional/g_arrangealign.bas +++ b/testautomation/graphics/optional/g_arrangealign.bas diff --git a/testautomation/graphics/optional/g_autocorrection.bas b/testautomation/graphics/optional/g_autocorrection.bas index b4fb2af0b472..b4fb2af0b472 100644..100755 --- a/testautomation/graphics/optional/g_autocorrection.bas +++ b/testautomation/graphics/optional/g_autocorrection.bas diff --git a/testautomation/graphics/optional/g_character.bas b/testautomation/graphics/optional/g_character.bas index e13eccb813c3..e13eccb813c3 100644..100755 --- a/testautomation/graphics/optional/g_character.bas +++ b/testautomation/graphics/optional/g_character.bas diff --git a/testautomation/graphics/optional/g_clipboard.bas b/testautomation/graphics/optional/g_clipboard.bas index 47b48949a162..47b48949a162 100644..100755 --- a/testautomation/graphics/optional/g_clipboard.bas +++ b/testautomation/graphics/optional/g_clipboard.bas diff --git a/testautomation/graphics/optional/g_clipexport.bas b/testautomation/graphics/optional/g_clipexport.bas index d75eef694394..d75eef694394 100644..100755 --- a/testautomation/graphics/optional/g_clipexport.bas +++ b/testautomation/graphics/optional/g_clipexport.bas diff --git a/testautomation/graphics/optional/g_convertto.bas b/testautomation/graphics/optional/g_convertto.bas index 8283981462ee..8283981462ee 100644..100755 --- a/testautomation/graphics/optional/g_convertto.bas +++ b/testautomation/graphics/optional/g_convertto.bas diff --git a/testautomation/graphics/optional/g_crossfading.bas b/testautomation/graphics/optional/g_crossfading.bas index 0c8102e70bde..0c8102e70bde 100644..100755 --- a/testautomation/graphics/optional/g_crossfading.bas +++ b/testautomation/graphics/optional/g_crossfading.bas diff --git a/testautomation/graphics/optional/g_customshapes.bas b/testautomation/graphics/optional/g_customshapes.bas index 960fb7a2e19b..960fb7a2e19b 100644..100755 --- a/testautomation/graphics/optional/g_customshapes.bas +++ b/testautomation/graphics/optional/g_customshapes.bas diff --git a/testautomation/graphics/optional/g_demoguide.bas b/testautomation/graphics/optional/g_demoguide.bas index c3a8fe861724..c3a8fe861724 100644..100755 --- a/testautomation/graphics/optional/g_demoguide.bas +++ b/testautomation/graphics/optional/g_demoguide.bas diff --git a/testautomation/graphics/optional/g_dimensions.bas b/testautomation/graphics/optional/g_dimensions.bas index 3644dfd3b0d8..3644dfd3b0d8 100644..100755 --- a/testautomation/graphics/optional/g_dimensions.bas +++ b/testautomation/graphics/optional/g_dimensions.bas diff --git a/testautomation/graphics/optional/g_edit.bas b/testautomation/graphics/optional/g_edit.bas index 305967f73112..305967f73112 100644..100755 --- a/testautomation/graphics/optional/g_edit.bas +++ b/testautomation/graphics/optional/g_edit.bas diff --git a/testautomation/graphics/optional/g_export_html.bas b/testautomation/graphics/optional/g_export_html.bas index faa2783b6d2f..faa2783b6d2f 100644..100755 --- a/testautomation/graphics/optional/g_export_html.bas +++ b/testautomation/graphics/optional/g_export_html.bas diff --git a/testautomation/graphics/optional/g_findreplace.bas b/testautomation/graphics/optional/g_findreplace.bas index 9de7acfa2bc5..9de7acfa2bc5 100644..100755 --- a/testautomation/graphics/optional/g_findreplace.bas +++ b/testautomation/graphics/optional/g_findreplace.bas diff --git a/testautomation/graphics/optional/g_format.bas b/testautomation/graphics/optional/g_format.bas index 1c03f7bf8801..1c03f7bf8801 100644..100755 --- a/testautomation/graphics/optional/g_format.bas +++ b/testautomation/graphics/optional/g_format.bas diff --git a/testautomation/graphics/optional/g_group.bas b/testautomation/graphics/optional/g_group.bas index 93f542bcc027..93f542bcc027 100644..100755 --- a/testautomation/graphics/optional/g_group.bas +++ b/testautomation/graphics/optional/g_group.bas diff --git a/testautomation/graphics/optional/g_imagemap.bas b/testautomation/graphics/optional/g_imagemap.bas index b2dd4a62c182..b2dd4a62c182 100644..100755 --- a/testautomation/graphics/optional/g_imagemap.bas +++ b/testautomation/graphics/optional/g_imagemap.bas diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas index a006e2f04c3e..a006e2f04c3e 100644..100755 --- a/testautomation/graphics/optional/g_insert.bas +++ b/testautomation/graphics/optional/g_insert.bas diff --git a/testautomation/graphics/optional/g_line.bas b/testautomation/graphics/optional/g_line.bas index c1327e21bc96..c1327e21bc96 100644..100755 --- a/testautomation/graphics/optional/g_line.bas +++ b/testautomation/graphics/optional/g_line.bas diff --git a/testautomation/graphics/optional/g_load_save.bas b/testautomation/graphics/optional/g_load_save.bas index b68da93657fc..b68da93657fc 100644..100755 --- a/testautomation/graphics/optional/g_load_save.bas +++ b/testautomation/graphics/optional/g_load_save.bas diff --git a/testautomation/graphics/optional/g_mediaplayer.bas b/testautomation/graphics/optional/g_mediaplayer.bas index e237ce752a2d..e237ce752a2d 100644..100755 --- a/testautomation/graphics/optional/g_mediaplayer.bas +++ b/testautomation/graphics/optional/g_mediaplayer.bas diff --git a/testautomation/graphics/optional/g_navigator.bas b/testautomation/graphics/optional/g_navigator.bas index cc165c76b37e..cc165c76b37e 100644..100755 --- a/testautomation/graphics/optional/g_navigator.bas +++ b/testautomation/graphics/optional/g_navigator.bas diff --git a/testautomation/graphics/optional/g_ole.bas b/testautomation/graphics/optional/g_ole.bas index 98f99e4ab931..98f99e4ab931 100644..100755 --- a/testautomation/graphics/optional/g_ole.bas +++ b/testautomation/graphics/optional/g_ole.bas diff --git a/testautomation/graphics/optional/g_paneview.bas b/testautomation/graphics/optional/g_paneview.bas index 021a95cfbfad..021a95cfbfad 100644..100755 --- a/testautomation/graphics/optional/g_paneview.bas +++ b/testautomation/graphics/optional/g_paneview.bas diff --git a/testautomation/graphics/optional/g_paragraph.bas b/testautomation/graphics/optional/g_paragraph.bas index 502728773a6e..502728773a6e 100644..100755 --- a/testautomation/graphics/optional/g_paragraph.bas +++ b/testautomation/graphics/optional/g_paragraph.bas diff --git a/testautomation/graphics/optional/g_savepictureas.bas b/testautomation/graphics/optional/g_savepictureas.bas index 332632dcdac6..332632dcdac6 100644..100755 --- a/testautomation/graphics/optional/g_savepictureas.bas +++ b/testautomation/graphics/optional/g_savepictureas.bas diff --git a/testautomation/graphics/optional/g_shaddow.bas b/testautomation/graphics/optional/g_shaddow.bas index c6e963ae1658..c6e963ae1658 100644..100755 --- a/testautomation/graphics/optional/g_shaddow.bas +++ b/testautomation/graphics/optional/g_shaddow.bas diff --git a/testautomation/graphics/optional/g_slidelayer.bas b/testautomation/graphics/optional/g_slidelayer.bas index 3ffd9a4ab37a..3ffd9a4ab37a 100644..100755 --- a/testautomation/graphics/optional/g_slidelayer.bas +++ b/testautomation/graphics/optional/g_slidelayer.bas diff --git a/testautomation/graphics/optional/g_stylist.bas b/testautomation/graphics/optional/g_stylist.bas index 50da6610c41a..50da6610c41a 100644..100755 --- a/testautomation/graphics/optional/g_stylist.bas +++ b/testautomation/graphics/optional/g_stylist.bas diff --git a/testautomation/graphics/optional/g_tables.bas b/testautomation/graphics/optional/g_tables.bas index dee2e14c67a5..dee2e14c67a5 100644..100755 --- a/testautomation/graphics/optional/g_tables.bas +++ b/testautomation/graphics/optional/g_tables.bas diff --git a/testautomation/graphics/optional/g_toolbars.bas b/testautomation/graphics/optional/g_toolbars.bas index b643e02c9e9b..b643e02c9e9b 100644..100755 --- a/testautomation/graphics/optional/g_toolbars.bas +++ b/testautomation/graphics/optional/g_toolbars.bas diff --git a/testautomation/graphics/optional/g_tools.bas b/testautomation/graphics/optional/g_tools.bas index 4e79a89ca469..4e79a89ca469 100644..100755 --- a/testautomation/graphics/optional/g_tools.bas +++ b/testautomation/graphics/optional/g_tools.bas diff --git a/testautomation/graphics/optional/g_zoom.bas b/testautomation/graphics/optional/g_zoom.bas index 1b494950ce44..1b494950ce44 100644..100755 --- a/testautomation/graphics/optional/g_zoom.bas +++ b/testautomation/graphics/optional/g_zoom.bas diff --git a/testautomation/graphics/optional/gallery.bas b/testautomation/graphics/optional/gallery.bas index 9b81954f8902..9b81954f8902 100644..100755 --- a/testautomation/graphics/optional/gallery.bas +++ b/testautomation/graphics/optional/gallery.bas diff --git a/testautomation/graphics/optional/gallery2.bas b/testautomation/graphics/optional/gallery2.bas index d467b0a74876..d467b0a74876 100644..100755 --- a/testautomation/graphics/optional/gallery2.bas +++ b/testautomation/graphics/optional/gallery2.bas diff --git a/testautomation/graphics/optional/i_animation.bas b/testautomation/graphics/optional/i_animation.bas index 85503fc790c1..85503fc790c1 100644..100755 --- a/testautomation/graphics/optional/i_animation.bas +++ b/testautomation/graphics/optional/i_animation.bas diff --git a/testautomation/graphics/optional/i_headerfooter.bas b/testautomation/graphics/optional/i_headerfooter.bas index e050b914ca9e..e050b914ca9e 100644..100755 --- a/testautomation/graphics/optional/i_headerfooter.bas +++ b/testautomation/graphics/optional/i_headerfooter.bas diff --git a/testautomation/graphics/optional/i_pengine.bas b/testautomation/graphics/optional/i_pengine.bas index 5ddefe26ca94..5ddefe26ca94 100644..100755 --- a/testautomation/graphics/optional/i_pengine.bas +++ b/testautomation/graphics/optional/i_pengine.bas diff --git a/testautomation/graphics/optional/i_saveloadlayout.bas b/testautomation/graphics/optional/i_saveloadlayout.bas index 137007da7c8f..137007da7c8f 100644..100755 --- a/testautomation/graphics/optional/i_saveloadlayout.bas +++ b/testautomation/graphics/optional/i_saveloadlayout.bas diff --git a/testautomation/graphics/optional/i_shape.bas b/testautomation/graphics/optional/i_shape.bas index 0ebb3c1e4864..0ebb3c1e4864 100644..100755 --- a/testautomation/graphics/optional/i_shape.bas +++ b/testautomation/graphics/optional/i_shape.bas diff --git a/testautomation/graphics/optional/i_slidecopy.bas b/testautomation/graphics/optional/i_slidecopy.bas index c780904e542d..c780904e542d 100644..100755 --- a/testautomation/graphics/optional/i_slidecopy.bas +++ b/testautomation/graphics/optional/i_slidecopy.bas diff --git a/testautomation/graphics/optional/i_view.bas b/testautomation/graphics/optional/i_view.bas index 7dacea82d1b2..7dacea82d1b2 100644..100755 --- a/testautomation/graphics/optional/i_view.bas +++ b/testautomation/graphics/optional/i_view.bas diff --git a/testautomation/graphics/required/d_opt.bas b/testautomation/graphics/required/d_opt.bas index 1447b1f4e276..1447b1f4e276 100644..100755 --- a/testautomation/graphics/required/d_opt.bas +++ b/testautomation/graphics/required/d_opt.bas diff --git a/testautomation/graphics/required/d_updt.bas b/testautomation/graphics/required/d_updt.bas index 40dd64e3b50c..40dd64e3b50c 100644..100755 --- a/testautomation/graphics/required/d_updt.bas +++ b/testautomation/graphics/required/d_updt.bas diff --git a/testautomation/graphics/required/i_opt.bas b/testautomation/graphics/required/i_opt.bas index eb159ac83a55..eb159ac83a55 100644..100755 --- a/testautomation/graphics/required/i_opt.bas +++ b/testautomation/graphics/required/i_opt.bas diff --git a/testautomation/graphics/required/i_updt_1.bas b/testautomation/graphics/required/i_updt_1.bas index f829cc9b8713..f829cc9b8713 100644..100755 --- a/testautomation/graphics/required/i_updt_1.bas +++ b/testautomation/graphics/required/i_updt_1.bas diff --git a/testautomation/graphics/required/i_updt_2.bas b/testautomation/graphics/required/i_updt_2.bas index 3d61eea42a4b..3d61eea42a4b 100644..100755 --- a/testautomation/graphics/required/i_updt_2.bas +++ b/testautomation/graphics/required/i_updt_2.bas diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc index 9c771f102080..4cdd6a595cc6 100644 --- a/testautomation/graphics/required/includes/impress/im_003_.inc +++ b/testautomation/graphics/required/includes/impress/im_003_.inc @@ -206,13 +206,14 @@ testcase tiViewToolbar_1 TestFile = ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp") printlog "open application " Call hNewDocument + + printlog "use the empty layout" Call sSelectEmptyLayout + printlog "delete default content" hUseAsyncSlot( "EditSelectAll" ) Kontext "DocumentImpress" DocumentImpress.typeKeys("<DELETE>",true) - printlog "use the empty layout" - call sSelectEmptyLayout printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp " hUseAsyncSlot( "InsertGraphicsFromFile" ) Kontext "GrafikEinfuegenDlg" diff --git a/testautomation/math/optional/includes/m_106_.inc b/testautomation/math/optional/includes/m_106_.inc index 6136ebfdeb9f..6136ebfdeb9f 100755..100644 --- a/testautomation/math/optional/includes/m_106_.inc +++ b/testautomation/math/optional/includes/m_106_.inc diff --git a/testautomation/math/required/includes/m_002_.inc b/testautomation/math/required/includes/m_002_.inc index eff8ba5b82a8..eff8ba5b82a8 100755..100644 --- a/testautomation/math/required/includes/m_002_.inc +++ b/testautomation/math/required/includes/m_002_.inc diff --git a/testautomation/math/required/includes/m_003_.inc b/testautomation/math/required/includes/m_003_.inc index 152fd1429849..152fd1429849 100755..100644 --- a/testautomation/math/required/includes/m_003_.inc +++ b/testautomation/math/required/includes/m_003_.inc diff --git a/testautomation/math/required/includes/m_004_.inc b/testautomation/math/required/includes/m_004_.inc index 8f49d5633c4f..8f49d5633c4f 100755..100644 --- a/testautomation/math/required/includes/m_004_.inc +++ b/testautomation/math/required/includes/m_004_.inc diff --git a/testautomation/math/required/includes/m_006_.inc b/testautomation/math/required/includes/m_006_.inc index cea7bb704512..cea7bb704512 100755..100644 --- a/testautomation/math/required/includes/m_006_.inc +++ b/testautomation/math/required/includes/m_006_.inc diff --git a/testautomation/math/required/includes/m_007_.inc b/testautomation/math/required/includes/m_007_.inc index fc8269c05c21..fc8269c05c21 100755..100644 --- a/testautomation/math/required/includes/m_007_.inc +++ b/testautomation/math/required/includes/m_007_.inc diff --git a/testautomation/math/required/includes/m_010_.inc b/testautomation/math/required/includes/m_010_.inc index 7f3cd8944a50..7f3cd8944a50 100755..100644 --- a/testautomation/math/required/includes/m_010_.inc +++ b/testautomation/math/required/includes/m_010_.inc diff --git a/testautomation/math/required/includes/m_020_.inc b/testautomation/math/required/includes/m_020_.inc index ae79e24300b2..ae79e24300b2 100755..100644 --- a/testautomation/math/required/includes/m_020_.inc +++ b/testautomation/math/required/includes/m_020_.inc diff --git a/testautomation/spreadsheet/optional/c_solver.bas b/testautomation/spreadsheet/optional/c_solver.bas index 60744c0ef319..60744c0ef319 100644..100755 --- a/testautomation/spreadsheet/optional/c_solver.bas +++ b/testautomation/spreadsheet/optional/c_solver.bas diff --git a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc index d53c23fbbe3d..a12fbb764115 100755..100644 --- a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc +++ b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc @@ -57,31 +57,6 @@ end sub ' '------------------------------------------------------------------------------- ' -function IsItLoaded as boolean - '/// IsItLoaded - '/// Wait until document is loaded - Dim iLoop as integer - - IsItLoaded = FALSE - sleep(3) - for iLoop =1 to 20 - try - 'Calling slot 'IsDocLoading' - IsItLoaded = IsDocLoading - catch - IsItLoaded = FALSE - endcatch - - if IsItLoaded = TRUE then - exit for - end if - sleep(1) - next iLoop - sleep(2) -end function -' -'------------------------------------------------------------------------------- -' testcase tLoadSpreadsheetDocument (SourceFile) Dim sOnlyFileName as string @@ -102,7 +77,7 @@ testcase tLoadSpreadsheetDocument (SourceFile) if sOnlyFileName > "" then 'Some extensions make no sense to load if sOnlyFileExtension <> "so" AND sOnlyFileExtension <> "tmp" AND sOnlyFileExtension <> "dbt" then - if fCalcFileOpen(SourceFile) AND IsItLoaded()then + if fCalcFileOpen(SourceFile) then if (hIsNamedDocLoaded (SourceFile)) then printlog "- loaded" sleep(15) diff --git a/testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc b/testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc index 25926d626bd4..25926d626bd4 100755..100644 --- a/testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc +++ b/testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc diff --git a/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc b/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc index 6bfa955a483a..6bfa955a483a 100755..100644 --- a/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc +++ b/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc diff --git a/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc b/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc index 301bac08a49c..301bac08a49c 100755..100644 --- a/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc +++ b/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc diff --git a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc index 9e25d898d8ce..f55bd6318ffd 100644 --- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc +++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc @@ -125,10 +125,10 @@ testcase tIBIS111158 Kontext "TabGeneralControl" '/// Enter in 'Help URL' as value exactly 'HID:123456' TabGeneralControl.TypeKeys "<TAB>" , true - HelpURL.setText "HID:123456" + HelpURL.setText "customcontrol1" HelpURL.TypeKeys "<RETURN>",true - if HelpURL.GetText <> "HID:123456" then - warnlog "'HID:123456' has not been accepted as 'Help URL' value." + if HelpURL.GetText <> "customcontrol1" then + warnlog "'customcontrol1' has not been accepted as 'Help URL' value." end if Kontext "ControlPropertiesDialog" diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc index c90e44d30f01..c90e44d30f01 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc index 89495d36907e..89495d36907e 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc index b8c749c27cd9..b8c749c27cd9 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc index f11857cf44ad..f11857cf44ad 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc index e7568390c38a..e7568390c38a 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc index 56adf3af682a..56adf3af682a 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc diff --git a/testautomation/spreadsheet/tools/includes/c_cell_tools.inc b/testautomation/spreadsheet/tools/includes/c_cell_tools.inc index 0693f1daf19c..0693f1daf19c 100755..100644 --- a/testautomation/spreadsheet/tools/includes/c_cell_tools.inc +++ b/testautomation/spreadsheet/tools/includes/c_cell_tools.inc diff --git a/testautomation/spreadsheet/tools/includes/c_select_tools.inc b/testautomation/spreadsheet/tools/includes/c_select_tools.inc index f1087ca3fe8b..f1087ca3fe8b 100755..100644 --- a/testautomation/spreadsheet/tools/includes/c_select_tools.inc +++ b/testautomation/spreadsheet/tools/includes/c_select_tools.inc diff --git a/testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc b/testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc index 43dd2945c22a..43dd2945c22a 100755..100644 --- a/testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc +++ b/testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc diff --git a/testautomation/spreadsheet/tools/includes/c_tool_options.inc b/testautomation/spreadsheet/tools/includes/c_tool_options.inc index 89bc7a4e0ad3..89bc7a4e0ad3 100755..100644 --- a/testautomation/spreadsheet/tools/includes/c_tool_options.inc +++ b/testautomation/spreadsheet/tools/includes/c_tool_options.inc diff --git a/testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc b/testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc index 90e1c423a51f..90e1c423a51f 100755..100644 --- a/testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc +++ b/testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc index 694c3dec0de4..694c3dec0de4 100755..100644 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc diff --git a/testautomation/writer/optional/includes/autotext/w_autotext.inc b/testautomation/writer/optional/includes/autotext/w_autotext.inc index 19e2955f27ab..19e2955f27ab 100755..100644 --- a/testautomation/writer/optional/includes/autotext/w_autotext.inc +++ b/testautomation/writer/optional/includes/autotext/w_autotext.inc diff --git a/testautomation/writer/optional/includes/calculate/w_calculate.inc b/testautomation/writer/optional/includes/calculate/w_calculate.inc index ccbc196d46aa..ccbc196d46aa 100755..100644 --- a/testautomation/writer/optional/includes/calculate/w_calculate.inc +++ b/testautomation/writer/optional/includes/calculate/w_calculate.inc diff --git a/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc b/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc index 9c432380228a..9c432380228a 100755..100644 --- a/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc +++ b/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc diff --git a/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate2.inc b/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate2.inc index 85e2ae9aa1f0..85e2ae9aa1f0 100755..100644 --- a/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate2.inc +++ b/testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate2.inc diff --git a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc index 75db278c25ef..729659dfc54d 100644 --- a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc +++ b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc @@ -194,7 +194,14 @@ testcase tPickGraphic Call wOpenContextMenu(true) printlog " Select 'ImageMap' in context menu" - Call hMenuSelectNr(9) + try + CALL hMenuFindSelect (".uno:ImageMapDialog", true, 11, true) 'Find "ImageMap" and call the slot. + wait 500 + catch + Warnlog "Unable to open context menu" + Call hCloseDocument + goto endsub + endcatch Printlog " The graphic has to be selected and the context menu has to show graphics related commands" Kontext "ImageMapEditor" if Not ImageMapEditor.Exists(3) then @@ -240,13 +247,13 @@ testcase tPickHyperlink printlog " Empty clipboard" SetClipBoard = "" printlog " Insert a hyperlink in document" - Call wTypeKeys "www.sun.com" + Call wTypeKeys "www.oracle.com" Call wTypeKeys " " Call wTypeKeys "<HOME>" printlog " Open context menu on hyperlink" Call wTypeKeys "<SHIFT F10>" printlog " Last entry in menu has to be 'Open hyperlink' ...." - CALL hMenuFindSelect (10955, true, 17, true) 'Find "Hyperlink-dialog" and call the slot. + CALL hMenuFindSelect (10955, false, 17, true) 'Find "Hyperlink-dialog" and call the slot. kontext "TabHyperlinkInternet" if TabHyperlinkInternet.Exists(3) then Warnlog "Hyperlink-Dialog opened!" diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc index 659bb2a4ddb7..659bb2a4ddb7 100755..100644 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc index 25a762297df7..08ebbfed45d4 100644 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc @@ -283,7 +283,7 @@ testcase tGroup_6 Sleep 2 Call gMouseClick(80,80) - Call wObjektSelektieren ( 28, 28, 70, 80 ) + Call wObjektSelektieren ( 31, 31, 70, 80 ) Sleep 2 FormatGroupGroup Sleep 1 @@ -351,7 +351,7 @@ testcase tGroup_7 Sleep 2 Call gMouseClick(80,80) - Call wObjektSelektieren ( 28, 28, 70, 80 ) + Call wObjektSelektieren ( 31, 31, 70, 80 ) Sleep 2 FormatGroupGroup Sleep 1 @@ -667,7 +667,7 @@ testcase tEncapsulatedGroup_1 Sleep 1 Call wZeichenobjektEinfuegen("ELLIPSE", 40, 45, 60, 70, false) Sleep 1 - Call wObjektSelektieren ( 28, 28, 70, 80 ) + Call wObjektSelektieren ( 31, 31, 70, 80 ) Sleep 1 FormatGroupGroup @@ -677,20 +677,37 @@ testcase tEncapsulatedGroup_1 PrintLog "- insert 2 drawing objects (rectangle and ellipse) in the group" Call wZeichenobjektEinfuegen("RECHTECK", 35, 40, 38, 45, false) - Call wZeichenobjektEinfuegen("ELLIPSE", 52, 40, 78, 45, false) - Call wObjektSelektieren ( 28, 38, 80, 48 ) + Call wZeichenobjektEinfuegen("ELLIPSE", 40, 40, 58, 45, false, true) + Call wObjektSelektieren ( 31, 31, 80, 80 ) + + Sleep 1 + PrintLog "- generate a new group" try - PrintLog "- generate a new group" FormatGroupGroup - PrintLog "- edit the new group" + catch + Warnlog "Unable to execute Format / Group" + endcatch + + PrintLog "- edit the new group" + try FormatGroupEditGroup - PrintLog "- leave the new group" + catch + Warnlog "Unable to execute Group / Enter Group" + endcatch + + PrintLog "- leave the new group" + try FormatGroupExitGroup - PrintLog "- Undo the new group" + catch + Warnlog "Unable to exceute Format / Exit Group" + endcatch + + PrintLog "- Undo the new group" + try FormatGroupUnGroup catch - Warnlog "Something wrong where operating the Encapsulated group!" + Warnlog "Unable to execute Format / Ungroup" endcatch Call hCloseDocument diff --git a/testautomation/writer/optional/includes/fields/w_fields1.inc b/testautomation/writer/optional/includes/fields/w_fields1.inc index 2f727260b6c2..c6caf2c5fade 100755..100644 --- a/testautomation/writer/optional/includes/fields/w_fields1.inc +++ b/testautomation/writer/optional/includes/fields/w_fields1.inc @@ -151,13 +151,23 @@ testcase tInsertFieldsTime if NOT Len(sTime2) > 7 then Warnlog "Time-format is wrong !" printlog "Stop for a while ..." + '/// Stop for a while , check if the time is still correct Sleep 2 + ' update fields + Call wTypeKeys "<F9>" + ' read field content Call wTypeKeys "<MOD1 Home>" Call wTypeKeys "<Shift Right>" EditCopy if GetClipboard <> sTime1 then Warnlog "Fixed time is wrong !" - + + '/// Stop for a while , check if the time is still correct + Sleep 2 + ' update fields + Call wTypeKeys "<F9>" + ' read field content + Call wTypeKeys "<MOD1 Home>" Call wTypeKeys "<Down><Home>" Call wTypeKeys "<Shift Right>" EditCopy diff --git a/testautomation/writer/optional/includes/filter/w_filter.inc b/testautomation/writer/optional/includes/filter/w_filter.inc index 43a47baf0d2a..43a47baf0d2a 100755..100644 --- a/testautomation/writer/optional/includes/filter/w_filter.inc +++ b/testautomation/writer/optional/includes/filter/w_filter.inc diff --git a/testautomation/writer/optional/includes/fontwork/w_fontwork1.inc b/testautomation/writer/optional/includes/fontwork/w_fontwork1.inc index 6fff78a962fe..6fff78a962fe 100755..100644 --- a/testautomation/writer/optional/includes/fontwork/w_fontwork1.inc +++ b/testautomation/writer/optional/includes/fontwork/w_fontwork1.inc diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc index c6c38ddfe934..c6c38ddfe934 100755..100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc index 1a3624487ffb..1a3624487ffb 100755..100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc index 561768ee8320..561768ee8320 100755..100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc index 23ec4e96ff06..23ec4e96ff06 100755..100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc diff --git a/testautomation/writer/optional/includes/option/wh_o_3.inc b/testautomation/writer/optional/includes/option/wh_o_3.inc index 58b87a72ea08..58b87a72ea08 100755..100644 --- a/testautomation/writer/optional/includes/option/wh_o_3.inc +++ b/testautomation/writer/optional/includes/option/wh_o_3.inc diff --git a/testautomation/writer/optional/includes/option/wr_o_5.inc b/testautomation/writer/optional/includes/option/wr_o_5.inc index c8676fb164f2..c8676fb164f2 100755..100644 --- a/testautomation/writer/optional/includes/option/wr_o_5.inc +++ b/testautomation/writer/optional/includes/option/wr_o_5.inc diff --git a/testautomation/writer/optional/includes/redlining/w_redlining2.inc b/testautomation/writer/optional/includes/redlining/w_redlining2.inc index 4b442a8b3464..4b442a8b3464 100755..100644 --- a/testautomation/writer/optional/includes/redlining/w_redlining2.inc +++ b/testautomation/writer/optional/includes/redlining/w_redlining2.inc diff --git a/testautomation/writer/optional/includes/section/w_section_1.inc b/testautomation/writer/optional/includes/section/w_section_1.inc index da7417779401..da7417779401 100755..100644 --- a/testautomation/writer/optional/includes/section/w_section_1.inc +++ b/testautomation/writer/optional/includes/section/w_section_1.inc diff --git a/testautomation/writer/optional/includes/section/w_section_2.inc b/testautomation/writer/optional/includes/section/w_section_2.inc index 1d79405dfd82..1d79405dfd82 100755..100644 --- a/testautomation/writer/optional/includes/section/w_section_2.inc +++ b/testautomation/writer/optional/includes/section/w_section_2.inc diff --git a/testautomation/writer/optional/includes/section/w_section_tools.inc b/testautomation/writer/optional/includes/section/w_section_tools.inc index 2d441cad8450..2d441cad8450 100755..100644 --- a/testautomation/writer/optional/includes/section/w_section_tools.inc +++ b/testautomation/writer/optional/includes/section/w_section_tools.inc diff --git a/testautomation/writer/optional/includes/stylist/w_stylist.inc b/testautomation/writer/optional/includes/stylist/w_stylist.inc index 65f156412f83..65f156412f83 100755..100644 --- a/testautomation/writer/optional/includes/stylist/w_stylist.inc +++ b/testautomation/writer/optional/includes/stylist/w_stylist.inc diff --git a/testautomation/writer/optional/includes/table/w_204_.inc b/testautomation/writer/optional/includes/table/w_204_.inc index a5a94662c350..a5a94662c350 100755..100644 --- a/testautomation/writer/optional/includes/table/w_204_.inc +++ b/testautomation/writer/optional/includes/table/w_204_.inc diff --git a/testautomation/writer/optional/includes/table/w_204a_.inc b/testautomation/writer/optional/includes/table/w_204a_.inc index 0132f14ebe5d..0132f14ebe5d 100755..100644 --- a/testautomation/writer/optional/includes/table/w_204a_.inc +++ b/testautomation/writer/optional/includes/table/w_204a_.inc diff --git a/testautomation/writer/optional/includes/table/w_204b_.inc b/testautomation/writer/optional/includes/table/w_204b_.inc index 56b6e8781b2b..56b6e8781b2b 100755..100644 --- a/testautomation/writer/optional/includes/table/w_204b_.inc +++ b/testautomation/writer/optional/includes/table/w_204b_.inc diff --git a/testautomation/writer/optional/w_CJKCTLDependency.bas b/testautomation/writer/optional/w_CJKCTLDependency.bas index f19d922cab47..f19d922cab47 100644..100755 --- a/testautomation/writer/optional/w_CJKCTLDependency.bas +++ b/testautomation/writer/optional/w_CJKCTLDependency.bas diff --git a/testautomation/writer/optional/w_alternative_text.bas b/testautomation/writer/optional/w_alternative_text.bas index 0096aed4ad3c..0096aed4ad3c 100644..100755 --- a/testautomation/writer/optional/w_alternative_text.bas +++ b/testautomation/writer/optional/w_alternative_text.bas diff --git a/testautomation/writer/optional/w_autotext.bas b/testautomation/writer/optional/w_autotext.bas index e30eb667cc7f..e30eb667cc7f 100644..100755 --- a/testautomation/writer/optional/w_autotext.bas +++ b/testautomation/writer/optional/w_autotext.bas diff --git a/testautomation/writer/optional/w_calculate.bas b/testautomation/writer/optional/w_calculate.bas index cb38acdb02ca..cb38acdb02ca 100644..100755 --- a/testautomation/writer/optional/w_calculate.bas +++ b/testautomation/writer/optional/w_calculate.bas diff --git a/testautomation/writer/optional/w_chinesetranslate.bas b/testautomation/writer/optional/w_chinesetranslate.bas index 07c14cf06f5a..07c14cf06f5a 100644..100755 --- a/testautomation/writer/optional/w_chinesetranslate.bas +++ b/testautomation/writer/optional/w_chinesetranslate.bas diff --git a/testautomation/writer/optional/w_drawing_tools.bas b/testautomation/writer/optional/w_drawing_tools.bas index 888e94d4ec4f..888e94d4ec4f 100644..100755 --- a/testautomation/writer/optional/w_drawing_tools.bas +++ b/testautomation/writer/optional/w_drawing_tools.bas diff --git a/testautomation/writer/optional/w_dropdownLB.bas b/testautomation/writer/optional/w_dropdownLB.bas index c3978bd8e0cc..c3978bd8e0cc 100644..100755 --- a/testautomation/writer/optional/w_dropdownLB.bas +++ b/testautomation/writer/optional/w_dropdownLB.bas diff --git a/testautomation/writer/optional/w_fields.bas b/testautomation/writer/optional/w_fields.bas index 6a9d363dae3c..6a9d363dae3c 100644..100755 --- a/testautomation/writer/optional/w_fields.bas +++ b/testautomation/writer/optional/w_fields.bas diff --git a/testautomation/writer/optional/w_fontwork.bas b/testautomation/writer/optional/w_fontwork.bas index 99c2574cc175..99c2574cc175 100644..100755 --- a/testautomation/writer/optional/w_fontwork.bas +++ b/testautomation/writer/optional/w_fontwork.bas diff --git a/testautomation/writer/optional/w_formatpage.bas b/testautomation/writer/optional/w_formatpage.bas index 5354809b1696..5354809b1696 100644..100755 --- a/testautomation/writer/optional/w_formatpage.bas +++ b/testautomation/writer/optional/w_formatpage.bas diff --git a/testautomation/writer/optional/w_formatparagraph.bas b/testautomation/writer/optional/w_formatparagraph.bas index 785e177a9d15..785e177a9d15 100644..100755 --- a/testautomation/writer/optional/w_formatparagraph.bas +++ b/testautomation/writer/optional/w_formatparagraph.bas diff --git a/testautomation/writer/optional/w_hhConversion.bas b/testautomation/writer/optional/w_hhConversion.bas index 594623540f25..594623540f25 100644..100755 --- a/testautomation/writer/optional/w_hhConversion.bas +++ b/testautomation/writer/optional/w_hhConversion.bas diff --git a/testautomation/writer/optional/w_hyphenation.bas b/testautomation/writer/optional/w_hyphenation.bas index 666ec36b75fd..666ec36b75fd 100644..100755 --- a/testautomation/writer/optional/w_hyphenation.bas +++ b/testautomation/writer/optional/w_hyphenation.bas diff --git a/testautomation/writer/optional/w_insertgraphic.bas b/testautomation/writer/optional/w_insertgraphic.bas index 381dcd9d3f89..381dcd9d3f89 100644..100755 --- a/testautomation/writer/optional/w_insertgraphic.bas +++ b/testautomation/writer/optional/w_insertgraphic.bas diff --git a/testautomation/writer/optional/w_loadsave.bas b/testautomation/writer/optional/w_loadsave.bas index b0fd90f259b9..b0fd90f259b9 100644..100755 --- a/testautomation/writer/optional/w_loadsave.bas +++ b/testautomation/writer/optional/w_loadsave.bas diff --git a/testautomation/writer/optional/w_navigator.bas b/testautomation/writer/optional/w_navigator.bas index 97a188ea5ff9..97a188ea5ff9 100644..100755 --- a/testautomation/writer/optional/w_navigator.bas +++ b/testautomation/writer/optional/w_navigator.bas diff --git a/testautomation/writer/optional/w_redlining.bas b/testautomation/writer/optional/w_redlining.bas index 13babf613ebf..13babf613ebf 100644..100755 --- a/testautomation/writer/optional/w_redlining.bas +++ b/testautomation/writer/optional/w_redlining.bas diff --git a/testautomation/writer/optional/w_section.bas b/testautomation/writer/optional/w_section.bas index e0cabbb27c01..e0cabbb27c01 100644..100755 --- a/testautomation/writer/optional/w_section.bas +++ b/testautomation/writer/optional/w_section.bas diff --git a/testautomation/writer/optional/w_sorting.bas b/testautomation/writer/optional/w_sorting.bas index 18fa47675597..18fa47675597 100644..100755 --- a/testautomation/writer/optional/w_sorting.bas +++ b/testautomation/writer/optional/w_sorting.bas diff --git a/testautomation/writer/optional/w_spellcheck.bas b/testautomation/writer/optional/w_spellcheck.bas index 13d20ffb860f..13d20ffb860f 100644..100755 --- a/testautomation/writer/optional/w_spellcheck.bas +++ b/testautomation/writer/optional/w_spellcheck.bas diff --git a/testautomation/writer/optional/w_stylist.bas b/testautomation/writer/optional/w_stylist.bas index f91a4ca9ea22..f91a4ca9ea22 100644..100755 --- a/testautomation/writer/optional/w_stylist.bas +++ b/testautomation/writer/optional/w_stylist.bas diff --git a/testautomation/writer/optional/w_textframes.bas b/testautomation/writer/optional/w_textframes.bas index 80f2f2bfaec3..80f2f2bfaec3 100644..100755 --- a/testautomation/writer/optional/w_textframes.bas +++ b/testautomation/writer/optional/w_textframes.bas diff --git a/testautomation/writer/optional/w_undo.bas b/testautomation/writer/optional/w_undo.bas index 52c5f73b3045..52c5f73b3045 100644..100755 --- a/testautomation/writer/optional/w_undo.bas +++ b/testautomation/writer/optional/w_undo.bas diff --git a/testautomation/writer/required/includes/w_001b_.inc b/testautomation/writer/required/includes/w_001b_.inc index 297d04b579bb..4d8e6883891a 100644 --- a/testautomation/writer/required/includes/w_001b_.inc +++ b/testautomation/writer/required/includes/w_001b_.inc @@ -198,6 +198,7 @@ testcase tFileSendOutlineToClipboard PrintLog "Paste outline in new document" hUseAsyncSlot( "EditPaste" ) + WaitSlot(1000) Call wTypeKeys("<Up>", 6) Call wTypeKeys("<Home><Shift End>") hUseAsyncSlot( "EditCopy" ) diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc index 20ddaf92a6b9..20ddaf92a6b9 100755..100644 --- a/testautomation/writer/required/includes/w_002_.inc +++ b/testautomation/writer/required/includes/w_002_.inc diff --git a/testautomation/writer/required/includes/w_003_.inc b/testautomation/writer/required/includes/w_003_.inc index 1e9f5a7b65ce..1e9f5a7b65ce 100755..100644 --- a/testautomation/writer/required/includes/w_003_.inc +++ b/testautomation/writer/required/includes/w_003_.inc diff --git a/testautomation/writer/required/includes/w_005_.inc b/testautomation/writer/required/includes/w_005_.inc index a1f4d1d4f8f3..a1f4d1d4f8f3 100755..100644 --- a/testautomation/writer/required/includes/w_005_.inc +++ b/testautomation/writer/required/includes/w_005_.inc diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc index 707af57a1b6a..707af57a1b6a 100755..100644 --- a/testautomation/writer/required/includes/w_005b_.inc +++ b/testautomation/writer/required/includes/w_005b_.inc diff --git a/testautomation/writer/required/includes/w_006_.inc b/testautomation/writer/required/includes/w_006_.inc index ba671b26d1ff..ba671b26d1ff 100755..100644 --- a/testautomation/writer/required/includes/w_006_.inc +++ b/testautomation/writer/required/includes/w_006_.inc diff --git a/testautomation/writer/required/includes/w_008_.inc b/testautomation/writer/required/includes/w_008_.inc index 1cd171219a65..1cd171219a65 100755..100644 --- a/testautomation/writer/required/includes/w_008_.inc +++ b/testautomation/writer/required/includes/w_008_.inc diff --git a/testautomation/writer/required/includes/w_009_.inc b/testautomation/writer/required/includes/w_009_.inc index fcc0b0e64cf8..fcc0b0e64cf8 100755..100644 --- a/testautomation/writer/required/includes/w_009_.inc +++ b/testautomation/writer/required/includes/w_009_.inc diff --git a/testautomation/writer/required/includes/w_010_.inc b/testautomation/writer/required/includes/w_010_.inc index 5e2a596fbfd9..5e2a596fbfd9 100755..100644 --- a/testautomation/writer/required/includes/w_010_.inc +++ b/testautomation/writer/required/includes/w_010_.inc diff --git a/testautomation/writer/required/includes/w_011_.inc b/testautomation/writer/required/includes/w_011_.inc index bc2fc42cf6b7..bc2fc42cf6b7 100755..100644 --- a/testautomation/writer/required/includes/w_011_.inc +++ b/testautomation/writer/required/includes/w_011_.inc diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc index 9235d1b83d7b..9235d1b83d7b 100755..100644 --- a/testautomation/writer/required/includes/w_020_.inc +++ b/testautomation/writer/required/includes/w_020_.inc diff --git a/testautomation/writer/tools/includes/w_locale_strings2.inc b/testautomation/writer/tools/includes/w_locale_strings2.inc index 354bcc44b936..354bcc44b936 100755..100644 --- a/testautomation/writer/tools/includes/w_locale_strings2.inc +++ b/testautomation/writer/tools/includes/w_locale_strings2.inc diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc index a39fa5773102..a39fa5773102 100755..100644 --- a/testautomation/writer/tools/includes/w_tool1.inc +++ b/testautomation/writer/tools/includes/w_tool1.inc diff --git a/testautomation/writer/tools/includes/w_tool4.inc b/testautomation/writer/tools/includes/w_tool4.inc index c2133c1ff4bc..c2133c1ff4bc 100755..100644 --- a/testautomation/writer/tools/includes/w_tool4.inc +++ b/testautomation/writer/tools/includes/w_tool4.inc diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc index 33ddca87709e..33ddca87709e 100755..100644 --- a/testautomation/writer/tools/includes/w_tool6.inc +++ b/testautomation/writer/tools/includes/w_tool6.inc diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc index e6bd4f92afa0..cfe0aa6e07f3 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -141,11 +141,14 @@ end function ' ----------------------------------------------------------------------- -sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optional sCloseToolbar as boolean ) +sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optional sCloseToolbar as boolean, optional bLeaveSelected as boolean ) Kontext "DrawBar" if Not DrawBar.Exists then Call hToolbarSelect("Drawing", true) Sleep 2 + if IsMissing(bLeaveSelected) then + bLeaveSelected = false + endif Objekt = UCase( Objekt ) select case Objekt @@ -187,8 +190,10 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona end if if Objekt <> "TEXT" and Objekt <> "VTEXT" then Kontext "DocumentWriter" - Call gMouseClick (10, 10) - wait 100 + if bLeaveSelected = false then + Call gMouseClick (10, 10) + wait 100 + endif end if Case "MASTERDOCUMENT" @@ -205,8 +210,10 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona end if if Objekt <> "TEXT" and Objekt <> "VTEXT" then Kontext "DocumentMasterDoc" - Call gMouseClick (10, 10) - wait 100 + if bLeaveSelected = false then + Call gMouseClick (10, 10) + wait 100 + endif end if end select sleep (1) @@ -215,18 +222,21 @@ end sub ' ----------------------------------------------------------------------- sub wObjektSelektieren ( xStart%, yStart%, xEnde%, yEnde% ) - ' Call gMouseClick(90,90) Call hToolbarSelect("DRAWING",true) - Auswahl.Click + if Auswahl.Getstate(2) = 0 then + Auswahl.Click + endif Select Case gApplication Case "WRITER" Kontext "DocumentWriter" DocumentWriter.MouseDown xStart%, yStart% + wait 500 DocumentWriter.MouseMove xEnde%, yEnde% DocumentWriter.MouseUp xEnde%, yEnde% Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown xStart%, yStart% + wait 500 DocumentMasterDoc.MouseMove xEnde%, yEnde% DocumentMasterDoc.MouseUp xEnde%, yEnde% end select diff --git a/testautomation/xml/optional/docbook_losa.bas b/testautomation/xml/optional/docbook_losa.bas index e622c279d185..e622c279d185 100644..100755 --- a/testautomation/xml/optional/docbook_losa.bas +++ b/testautomation/xml/optional/docbook_losa.bas diff --git a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc index 0cbf8244512e..0cbf8244512e 100755..100644 --- a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc +++ b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc diff --git a/testautomation/xml/optional/includes/sxd7_01.inc b/testautomation/xml/optional/includes/sxd7_01.inc index 0c1069ff930f..0c1069ff930f 100755..100644 --- a/testautomation/xml/optional/includes/sxd7_01.inc +++ b/testautomation/xml/optional/includes/sxd7_01.inc diff --git a/testautomation/xml/optional/includes/sxd7_02.inc b/testautomation/xml/optional/includes/sxd7_02.inc index 74212989c26b..74212989c26b 100755..100644 --- a/testautomation/xml/optional/includes/sxd7_02.inc +++ b/testautomation/xml/optional/includes/sxd7_02.inc diff --git a/testautomation/xml/optional/includes/sxd7_03.inc b/testautomation/xml/optional/includes/sxd7_03.inc index 22d812bc93f2..22d812bc93f2 100755..100644 --- a/testautomation/xml/optional/includes/sxd7_03.inc +++ b/testautomation/xml/optional/includes/sxd7_03.inc diff --git a/testautomation/xml/optional/includes/sxd7_04.inc b/testautomation/xml/optional/includes/sxd7_04.inc index 5c32c2a48d05..5c32c2a48d05 100755..100644 --- a/testautomation/xml/optional/includes/sxd7_04.inc +++ b/testautomation/xml/optional/includes/sxd7_04.inc diff --git a/testautomation/xml/optional/includes/sxd7_05.inc b/testautomation/xml/optional/includes/sxd7_05.inc index a958ebe1841f..a958ebe1841f 100755..100644 --- a/testautomation/xml/optional/includes/sxd7_05.inc +++ b/testautomation/xml/optional/includes/sxd7_05.inc diff --git a/testautomation/xml/optional/includes/sxi7_01.inc b/testautomation/xml/optional/includes/sxi7_01.inc index 43ebe8a8c99c..43ebe8a8c99c 100755..100644 --- a/testautomation/xml/optional/includes/sxi7_01.inc +++ b/testautomation/xml/optional/includes/sxi7_01.inc diff --git a/testautomation/xml/optional/includes/sxm7_01.inc b/testautomation/xml/optional/includes/sxm7_01.inc index e8f7fd94260e..e8f7fd94260e 100755..100644 --- a/testautomation/xml/optional/includes/sxm7_01.inc +++ b/testautomation/xml/optional/includes/sxm7_01.inc diff --git a/testautomation/xml/optional/includes/sxw7_01.inc b/testautomation/xml/optional/includes/sxw7_01.inc index 7f1452ad687b..7f1452ad687b 100755..100644 --- a/testautomation/xml/optional/includes/sxw7_01.inc +++ b/testautomation/xml/optional/includes/sxw7_01.inc diff --git a/testautomation/xml/optional/includes/sxw7_01a.inc b/testautomation/xml/optional/includes/sxw7_01a.inc index f0121277b1e0..f0121277b1e0 100755..100644 --- a/testautomation/xml/optional/includes/sxw7_01a.inc +++ b/testautomation/xml/optional/includes/sxw7_01a.inc diff --git a/testautomation/xml/optional/includes/sxw7_02.inc b/testautomation/xml/optional/includes/sxw7_02.inc index 659e574ed720..659e574ed720 100755..100644 --- a/testautomation/xml/optional/includes/sxw7_02.inc +++ b/testautomation/xml/optional/includes/sxw7_02.inc diff --git a/testautomation/xml/optional/includes/sxw7_03.inc b/testautomation/xml/optional/includes/sxw7_03.inc index 6dc71c8e663a..6dc71c8e663a 100755..100644 --- a/testautomation/xml/optional/includes/sxw7_03.inc +++ b/testautomation/xml/optional/includes/sxw7_03.inc diff --git a/testautomation/xml/optional/includes/w_xml_vertical_alignment.inc b/testautomation/xml/optional/includes/w_xml_vertical_alignment.inc index f38ed4158049..f38ed4158049 100755..100644 --- a/testautomation/xml/optional/includes/w_xml_vertical_alignment.inc +++ b/testautomation/xml/optional/includes/w_xml_vertical_alignment.inc diff --git a/testautomation/xml/required/includes/oasis_graphics_01.inc b/testautomation/xml/required/includes/oasis_graphics_01.inc index 9c323d46386b..9c323d46386b 100755..100644 --- a/testautomation/xml/required/includes/oasis_graphics_01.inc +++ b/testautomation/xml/required/includes/oasis_graphics_01.inc diff --git a/testautomation/xml/tools/includes/itools1.inc b/testautomation/xml/tools/includes/itools1.inc index 762856de69cf..762856de69cf 100755..100644 --- a/testautomation/xml/tools/includes/itools1.inc +++ b/testautomation/xml/tools/includes/itools1.inc diff --git a/testgraphical/prj/d.lst b/testgraphical/prj/d.lst index e69de29bb2d1..e69de29bb2d1 100755..100644 --- a/testgraphical/prj/d.lst +++ b/testgraphical/prj/d.lst |