diff options
author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-01-12 14:54:42 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-01-12 14:54:42 +0100 |
commit | 2fe0b91052af0ad059be443ecee4d151e4e0de78 (patch) | |
tree | b06597e71c3c817cecb4ff13038ca2839ead8f18 /testautomation | |
parent | f9e98c2a8916e4003ed2014b88202cac0aad8a84 (diff) | |
parent | 5da890e767cac2ea2214edafde01c2a5fcb53a09 (diff) |
cbosdo01: merge with DEV300_m69
Diffstat (limited to 'testautomation')
72 files changed, 2976 insertions, 2271 deletions
diff --git a/testautomation/dbaccess/optional/includes/ctrl_General.inc b/testautomation/dbaccess/optional/includes/ctrl_General.inc index 5fc684f8f540..80fc173652b2 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_General.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_General.inc @@ -884,6 +884,8 @@ testcase tActivationOrder endif DocumentWriter.TypeKeys "<TAB>" , true sleep(1) + DocumentWriter.TypeKeys "<MOD1 HOME>" , true + sleep(1) DocumentWriter.TypeKeys "<MOD1 SHIFT END>" , true sleep(1) DocumentWriter.TypeKeys "<MOD1 C>" , true @@ -896,6 +898,8 @@ testcase tActivationOrder DocumentWriter.TypeKeys "<TAB>" , true sleep(1) + DocumentWriter.TypeKeys "<MOD1 HOME>" , true + sleep(1) DocumentWriter.TypeKeys "<MOD1 SHIFT END>" , true sleep(1) DocumentWriter.TypeKeys "<MOD1 C>" , true diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc index 4ce62f21b619..b7e93ba9e34c 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc @@ -581,7 +581,7 @@ testcase tListBox Kontext "FormControls" Listbox.Click - call hDrawingWithSelection ( 50, 20, 60, 30 ) + call hDrawingWithSelection ( 50, 20, 60, 25 ) sleep(3) Kontext "AutoPilotListComboBox" AutoPilotListComboBox.MouseDown(10,10) diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc index 5bc5b4c18131..5cfeeb7a709f 100755 --- a/testautomation/dbaccess/optional/includes/frm_Forms.inc +++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc @@ -530,9 +530,10 @@ testcase tCreateSubForms DataSource.setText(gDSName) TabDataForm.TypeKeys("<RETURN>") '/// set the table TT_Forms - printlog "set the table TT_Forms" - Content.setText("TT_Forms") - TabDataForm.TypeKeys("<RETURN>") + printlog "set the table TT_Forms" + Content.setText("TT_Forms") + sleep(1) + Content.TypeKeys("<RETURN>",true) sleep(1) Kontext "FormPropertiesDialog" sleep(1) @@ -607,7 +608,11 @@ testcase tCreateSubForms '/// set the sql string : select * from TT_Forms where id=:var1" printlog "set the sql string : select * from TT_Forms where id=:var1" TabDataForm.TypeKeys "<RETURN>" , true - TabDataForm.TypeKeys "select * from TT_Forms where id=:var1" , true + sleep(1) + Content.TypeKeys "select * from TT_Forms where id=:var1" , true + sleep(1) + TabDataForm.TypeKeys("<RETURN>") + sleep(1) '/// set link master field printlog "set link master field" TabDataForm.TypeKeys "<TAB>" , 11 , true diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc index cd73e5f068be..d7f8dce83a37 100755 --- a/testautomation/dbaccess/tools/controltools.inc +++ b/testautomation/dbaccess/tools/controltools.inc @@ -249,6 +249,7 @@ function fSetControlProperty(sControlType, sPropertyName, sPropertyValue as stri ControlPropertiesTabControl.setPage TabDataControl Kontext "TabDataControl" ReferenceValue.setText(sPropertyValue) + ReferenceValue.TypeKeys("<RETURN>",true) Kontext "ControlPropertiesTabControl" ControlPropertiesTabControl.setPage TabGeneralControl elseif sPropertyName = "Repeat" then @@ -266,6 +267,7 @@ function fSetControlProperty(sControlType, sPropertyName, sPropertyValue as stri ControlPropertiesTabControl.setPage TabDataControl Kontext "TabDataControl" ReferenceValueOff.setText(sPropertyValue) + ReferenceValueOff.TypeKeys("<RETURN>",true) Kontext "ControlPropertiesTabControl" ControlPropertiesTabControl.setPage TabGeneralControl elseif sPropertyName = "Readonly" then diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc index d873830df760..794e1bf44596 100755 --- a/testautomation/extensions/optional/includes/extensions.inc +++ b/testautomation/extensions/optional/includes/extensions.inc @@ -371,11 +371,18 @@ testcase tExtensionsFunction kontext if active.exists(5) then sTemp = active.getText - try - active.yes - catch - warnlog( "Try...catch: Failed to click Yes-button" ) - endcatch + printlog "Messagebox: " + sTemp + ' We only want to handle the installation target here which only + ' pops up if we have the choice (rights to write to shared layer) + if active.getButtonCount = 3 then + try + active.yes + catch + warnlog( "Try...catch: Failed to click Yes-button" ) + endcatch + else + printlog "No installation target message (this is probably a root-installation)" + endif endif '/// Progress dialog comes up ///' diff --git a/testautomation/extensions/optional/includes/help.inc b/testautomation/extensions/optional/includes/help.inc index 8bcddfe4f33c..78072873ed28 100755 --- a/testautomation/extensions/optional/includes/help.inc +++ b/testautomation/extensions/optional/includes/help.inc @@ -39,9 +39,6 @@ testcase tExtensibleHelp - warnlog( "#i105760# - Extensible help not displayed" ) - goto endsub - '///<h1>Extensible help</h1> '///<u><pre>Synopsis</pre></u>Beginning with CWS ab38 extensions can extend the help application with index entries and content<br> diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc index 9af9abb7b69d..aa6fe69e2617 100755 --- a/testautomation/extensions/optional/includes/publisher.inc +++ b/testautomation/extensions/optional/includes/publisher.inc @@ -56,15 +56,16 @@ testcase tExtensionPublisher cBasePath = convertpath( cBasePath ) ' Modify this file to add test cases or attributes - dim cInfoFile as string - cinfoFile = cBasePath & "extension.info" + dim cInfoFile as string : cinfoFile = cBasePath & "extension.info" ' The number of files to test. Information about this is stored in the file ' specified by cInfoFile dim iFileCount as integer dim iCurrentFile as integer - dim iExitCounter as integer dim iExtensionCount as integer + dim iExitCounter as integer + dim iCurrentExtensionCount as integer : iCurrentExtensionCount = 0 + dim iTry as integer ' This is the data we get from the configuration file dim cCurrentFileName as string @@ -78,6 +79,7 @@ testcase tExtensionPublisher dim cConfigArray( 60 ) as string dim cTestString as string + dim bInstallationComplete as boolean : bInstallationComplete = false iExtensionCount = hGetExtensionCount() @@ -85,6 +87,9 @@ testcase tExtensionPublisher hGetDataFileSection( cInfoFile, cConfigArray(), "info", "", "" ) iFileCount = int( hGetValueForKeyAsString( cConfigArray() , "filecount" ) ) printlog( cInfoFile & " specifies " & iFileCount & " documents to load" ) + + iExtensionCount = iExtensionCount + iFileCount + printlog( "Expected number of extensions after installation: " & iExtensionCount ) printlog( "Installing extensions" ) for iCurrentFile = 1 to iFileCount @@ -93,41 +98,51 @@ testcase tExtensionPublisher cCurrentFileName = hGetValueForKeyAsString( cConfigArray() , "file" ) cCurrentFileName = cBasePath & cCurrentFileName sExtensionCLI( "add" , cCurrentFileName ) - WaitSlot( 5000 ) + wait 1000 ' This is required, sExtensionCLI is asynchronous. next iCurrentFile - printlog( "Finished installing extensions" ) - + printlog( "Finished installing extensions, now verifying..." ) + + hNewDocument() + ToolsPackageManager + kontext "PackageManager" - if ( not PackageManager.exists() ) then - ToolsPackageManager - kontext "PackageManager" - if ( PackageManager.exists( 2 ) ) then - printlog( "Extension Manager UI has been opened" ) - else - warnlog( "Failed to open Extension Manager UI" ) + if ( PackageManager.exists( 3 ) ) then + + for iTry = 1 to 30 + + iCurrentExtensionCount = BrowsePackages.getItemCount() + + if ( iCurrentExtensionCount = iExtensionCount ) then + printlog( "All extensions have been installed, good." ) + bInstallationComplete = true + exit for + endif + + printlog( "Waiting for listbox: Number of extensions: " & iCurrentExtensionCount ) + + next iTry + + ' If one or more extensions have not been added to the list we better abort the + ' test as the remaining parts need all extensions to be installed causing + ' lots of cryptig errors to appear in the log. + if ( not bInstallationComplete ) then + warnlog( "Not all extensions have been installed. Aborting test." ) + kontext "PackageManager" + if ( PackageManager.exists() ) then + PackageManager.cancel() + PackageManager.notExists( 2 ) + endif goto endsub endif else - warnlog( "#i84786# Unopkg processes block UI" ) + warnlog( "The Extension Manager did not open, Aborting test" ) goto endsub endif + - iExitCounter = 0 - kontext "PackageManager" - WaitSlot() - do while ( BrowsePackages.getItemCount() < ( iExtensionCount + iFileCount ) ) - printlog( "Waiting for Extensions List to populate..." ) - Wait( 1000 ) - iExitCounter = iExitCounter + 1 - if ( iExitCounter = 30 ) then - kontext "PackageManager" - PackageManager.cancel() - goto endsub - endif - loop - kontext "PackageManager" + printlog( "Going for the update-dialog" ) if ( Updates.isEnabled() ) then printlog( "Updates-button is enabled" ) @@ -142,11 +157,14 @@ testcase tExtensionPublisher wait( 1000 ) iExitCounter = iExitCounter + 1 if ( iExitCounter = 200 ) then - warnlog( "Update list for extensions is stalled (expected: 7), found: " & AvailableUpdatesList.getItemCount() ) + warnlog( "Update list for extensions is stalled (expected: 7), " & _ + "found: " & AvailableUpdatesList.getItemCount() ) kontext "ExtensionUpdate" ExtensionUpdate.cancel() + ExtensionUpdate.notExists( 2 ) kontext "PackageManager" PackageManager.cancel() + PackageManager.notExists( 2 ) goto endsub endif loop @@ -246,6 +264,7 @@ testcase tExtensionPublisher kontext "ExtensionUpdate" ExtensionUpdate.cancel() + ExtensionUpdate.notExists( 2 ) else warnlog( "Extension Update dialog is not open" ) endif @@ -256,6 +275,7 @@ testcase tExtensionPublisher kontext "PackageManager" PackageManager.close() + PackageManager.notExists( 2 ) printlog( "Removing extensions" ) for iCurrentFile = 1 to iFileCount @@ -264,6 +284,8 @@ testcase tExtensionPublisher sExtensionCLI( "remove" , cCurrentFileName ) next iCurrentFile printlog( "Finished removing extensions" ) + + hFileCloseAll() endcase diff --git a/testautomation/extensions/optional/input/dependencies/version31.oxt b/testautomation/extensions/optional/input/dependencies/version31.oxt Binary files differindex ccc067cf2f09..870b4cc97a9a 100644 --- a/testautomation/extensions/optional/input/dependencies/version31.oxt +++ b/testautomation/extensions/optional/input/dependencies/version31.oxt diff --git a/testautomation/extensions/optional/input/files.txt b/testautomation/extensions/optional/input/files.txt index f4ba428cb2ce..5e37bbd64659 100755 --- a/testautomation/extensions/optional/input/files.txt +++ b/testautomation/extensions/optional/input/files.txt @@ -26,11 +26,11 @@ dependencies\version10000.oxt;1,0,0,0,0 dependencies\version21ns.oxt;0,0,1,0,0 dependencies\version21other.oxt;1,0,0,0,0 dependencies\version25.oxt;0,0,1,0,0 -dependencies\version30b.oxt;0,0,1,0,0 +dependencies\version30.oxt;0,0,1,0,0 dependencies\version300.oxt;0,0,1,0,0 dependencies\version301.oxt;0,0,1,0,0 dependencies\versionempty.oxt;0,0,1,0,0 -dependencies\version31b.oxt;1,0,0,0,0 +dependencies\version31.oxt;1,0,0,0,0 dependencies\version937.oxt;1,0,0,0,0 dependencies\versionnone.oxt;0,0,1,0,0 versions/plain.oxt;0,0,1,0,0 diff --git a/testautomation/framework/optional/f_CJK_GridLayout.bas b/testautomation/framework/optional/f_CJK_GridLayout.bas index fb33fa326802..d131afc451ba 100755 --- a/testautomation/framework/optional/f_CJK_GridLayout.bas +++ b/testautomation/framework/optional/f_CJK_GridLayout.bas @@ -60,17 +60,12 @@ sub main Call tGridDisplay_1 'Printgrid: The grid lines will be printed. (vice versa) - Call tUserDefineLayout_1 'Decrease characters per line will cause lines per page decrease accordingly - Call tFontSizeChanges_1 'Change the font size to bigger enough will change the layout Call tRubyText_1 'If Ruby Text is applied and longer than its Base Text it will stretch over more grid cells than the base text itself. Call tIndentsTest_1 'Indents should work and always indenting as close as possible to their measurements by snapping to the appropriate grid cell. Tabs therefore will be ignored. - 'Excluded until errors resolved by HLI. - 'Call tObjectsTest_1 'If objects are anchored to text they will "wander" with its surrounding text. If they are anchored as character they will snap to the appropriate grid cell (since they are a character). - Call hStatusOut if sAsianLanguageFlag = "Off" Then @@ -81,16 +76,11 @@ sub main end sub sub LoadIncludeFiles - use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - use "global\tools\includes\required\t_doc1.inc" use "global\tools\includes\required\t_tools1.inc" - use "framework\tools\includes\CJK_tools.inc" - gApplication = "WRITER" Call GetUseFiles - -End sub +end sub diff --git a/testautomation/framework/optional/f_basic_gridcontrol.bas b/testautomation/framework/optional/f_basic_gridcontrol.bas new file mode 100755 index 000000000000..06b9a40f7788 --- /dev/null +++ b/testautomation/framework/optional/f_basic_gridcontrol.bas @@ -0,0 +1,55 @@ +'encoding UTF-8 Do not remove or change this line! +'******************************************************************************* +'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +'* +'* Copyright 2008 by Sun Microsystems, Inc. +'* +'* OpenOffice.org - a multi-platform office productivity suite +'* +'* $RCSfile: gridcontrol.bas,v $ +'* +'* $Revision: 1.3 $ +'* +'* last change: $Author: jsk $ $Date: 2008/06/20 08:07:03 $ +'* +'* This file is part of OpenOffice.org. +'* +'* OpenOffice.org is free software: you can redistribute it and/or modify +'* it under the terms of the GNU Lesser General Public License version 3 +'* only, as published by the Free Software Foundation. +'* +'* OpenOffice.org is distributed in the hope that it will be useful, +'* but WITHOUT ANY WARRANTY; without even the implied warranty of +'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +'* GNU Lesser General Public License version 3 for more details +'* (a copy is included in the LICENSE file that accompanied this code). +'* +'* You should have received a copy of the GNU Lesser General Public License +'* version 3 along with OpenOffice.org. If not, see +'* <http://www.openoffice.org/license.html> +'* for a copy of the LGPLv3 License. +'* +'/****************************************************************************** +'* +'* owner : thorsten.bosbach@sun.com +'* +'* short description : test availablity of gridcontrol +'* +'\****************************************************************************** + +sub main + use "framework\optional\includes\basic_gridcontrol.inc" + call hStatusIn ("framework", "f_basic_gridcontrol.bas") + printlog "Load Document with gridcontrol" + call tGridcontrolLoad + hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT ) + call hStatusOut +end sub + +sub LoadIncludeFiles + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" + gApplication = "WRITER" + call GetUseFiles() +end sub + diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc index 13dac6822d0b..8e6f85afac01 100755 --- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc +++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc @@ -381,10 +381,6 @@ endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest9 - - qaerrorlog( "#i105756# - Test case outdated, needs adjustments" ) - goto endsub - call hNewDocument Call CheckAsianLanguageSupport("On") @@ -463,10 +459,6 @@ endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest11 - - qaerrorlog( "#i105756# - Test case outdated, needs adjustments" ) - goto endsub - Dim iHopeNumber1 , iHopeNumber2 as Integer dim i as integer dim iCount as integer diff --git a/testautomation/framework/optional/includes/basic_eventbinding.inc b/testautomation/framework/optional/includes/basic_eventbinding.inc index 165b1e9eda00..634021806a8e 100755 --- a/testautomation/framework/optional/includes/basic_eventbinding.inc +++ b/testautomation/framework/optional/includes/basic_eventbinding.inc @@ -231,7 +231,7 @@ testcase tAssignComponentFunction for i = 1 to x sTemp = LibraryTreeList.getItemText(i) 'printlog "("+i+"/"+x+"): '" + sTemp + "'" - if (("DialogComponent.odt"=sTemp) OR ("DIALOGCOMPONENT.ODT"=sTemp)) then + if (instr(stemp,"DialogComponent.odt") OR instr(stemp,"DIALOGCOMPONENT.ODT")) then a = i printlog "Found library ("+i+"/"+x+"): '" + sTemp + "'" endif diff --git a/testautomation/framework/optional/includes/basic_gridcontrol.inc b/testautomation/framework/optional/includes/basic_gridcontrol.inc new file mode 100755 index 000000000000..cf71748873bd --- /dev/null +++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc @@ -0,0 +1,137 @@ +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +'* +'* Copyright 2008 by Sun Microsystems, Inc. +'* +'* OpenOffice.org - a multi-platform office productivity suite +'* +'* $RCSfile: gridcontrol.inc,v $ +'* +'* $Revision: 1.2 $ +'* +'* last change: $Author: rt $ $Date: 2008/07/10 15:39:30 $ +'* +'* This file is part of OpenOffice.org. +'* +'* OpenOffice.org is free software: you can redistribute it and/or modify +'* it under the terms of the GNU Lesser General Public License version 3 +'* only, as published by the Free Software Foundation. +'* +'* OpenOffice.org is distributed in the hope that it will be useful, +'* but WITHOUT ANY WARRANTY; without even the implied warranty of +'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +'* GNU Lesser General Public License version 3 for more details +'* (a copy is included in the LICENSE file that accompanied this code). +'* +'* You should have received a copy of the GNU Lesser General Public License +'* version 3 along with OpenOffice.org. If not, see +'* <http://www.openoffice.org/license.html> +'* for a copy of the LGPLv3 License. +'* +'/************************************************************************ +'* +'* owner : thorsten.bosbach@sun.com +'* +'* short description : gridcontrol +'* +'\****************************************************************************** + +testcase tGridcontrolLoad + dim sLocation as string + dim i,x,a as integer + dim sTemp as string + dim lFiles(200) as string + dim bTemp as boolean + dim iError, iOK as integer + + sLocation = "framework/optional/include/basic_gridcontrol.inc::" + + hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW ) + + printlog "Open the test document" + call hFileOpen(convertPath(gTestToolPath + "framework/optional/input/gridcontrol.odt")) + printlog "Security dialog might come up" + kontext "SecurityWarning" + if SecurityWarning.exists(5) then + printlog "Allow to run macros" + SecurityWarning.ok + endif + call sleep 1 + + printlog "Start the macro, that performs the test" + printlog "Tools->Macros->Run Macro..." + ToolsMacrosRunMacro + Kontext "ScriptSelector" + if ScriptSelector.exists(10) then + x = LibraryTreeList.getItemCount + printlog "Look for library 'gridcontrol'" + for i = 1 to x + sTemp = LibraryTreeList.getItemText(i) + 'printlog "("+i+"/"+x+"): '" + sTemp + "'" + if (instr(sTemp,"gridcontrol")>0 OR instr(sTemp,"GRIDCONTROL")) then + a = i + printlog "Found library ("+i+"/"+x+"): '" + sTemp + "'" + endif + next i + if 0 <> a then + printlog "Select the library and unfold it" + LibraryTreeList.select(a) + LibraryTreeList.typeKeys("+") + printlog "Go to 'Standard' and unfold" + LibraryTreeList.typeKeys("<down>") + LibraryTreeList.typeKeys("+") + printlog "Go to 'Module1'" + LibraryTreeList.typeKeys("<down>") + + printlog "Select macro name 'VclTestTool'" + x = ScriptList.getItemCount + for i = 1 to x + sTemp = ScriptList.getItemText(i) + 'printlog "("+i+"/"+x+"): '" + sTemp + "'" + if "VclTestTool" = sTemp then + a = i + printlog "Found macro ("+i+"/"+x+"): '" + sTemp + "'" + endif + next i + if (0 <> a) then + printlog "Select the macro" + ScriptList.select(a) + printlog "Start the macro by pressing the button 'run'" + ScriptSelector.ok + printlog "sleep... at least 60 seconds" + call sleep(60) + printlog "If macro fails for whatever reason, a message comes up" + Kontext + if active.exists() then + warnlog "" + active.getText + active.ok + try + EditCopy + warnlog getclipboard() + catch + endcatch + printlog "close basic ide" + call hCloseDocument() + printlog "close document" + call hCloseDocument() + goto endsub + endif + + else + warnlog sLocation + "Macro not found: 'Main'" + endif + else + warnlog sLocation + "Library not found: 'gridcontrol'" + endif + else + warnlog sLocation + "'Run macro dialog' didn't came up" + endif + + printlog "clean up" + printlog "Close the document, else an error about the navigator will be thrown" + if getDocumentcount > 0 then + call hCloseDocument() + endif +endcase + diff --git a/testautomation/framework/optional/includes/basic_ide.inc b/testautomation/framework/optional/includes/basic_ide.inc index c60bf35f00a7..a5802e6da9d4 100755 --- a/testautomation/framework/optional/includes/basic_ide.inc +++ b/testautomation/framework/optional/includes/basic_ide.inc @@ -59,75 +59,37 @@ testcase tBasic_IDE_Toolbar_Module kontext "macrobar" printlog "- compile" - Compile.Click - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif + hClickToolbarButton( Compile ) printlog "- Run Basic" - BasicRun.Click - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif - + hClickToolbarButton( BasicRun ) printlog "- Step Procedure" - ProcedureStep.Click - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif - + hClickToolbarButton( ProcedureStep ) printlog "- Stop Basic" - BasicStop.Click - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif - + hClickToolbarButton( BasicStop ) printlog "- Single Step" - SingleStep.Click - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif - + hClickToolbarButton( SingleStep ) printlog "- Step Back" - StepBack.Click() - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif - + hClickToolbarButton( StepBack ) printlog "- Breakpoint => activate" - Breakpoint.Click - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif + hClickToolbarButton( Breakpoint ) printlog "- Breakpoint => deactivate" - Breakpoint.Click - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif - + hClickToolbarButton( Breakpoint ) printlog "- Add Watch => deactivate" - AddWatch.Click - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif - + hClickToolbarButton( AddWatch ) printlog "- Find Paranthese" kontext "macrobar" - FindParanthese.Click() - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif - + hClickToolbarButton( FindParanthese ) try Controls.TearOff() @@ -161,11 +123,7 @@ testcase tBasic_IDE_Toolbar_Module kontext "macrobar" printlog "- Save Source Test " - SaveSourceTest.Click - if ( WaitSlot <> WSFinished ) then - warnlog( "Slot not finished within 1 second" ) - endif - + hClickToolbarButton( SaveSourceTest ) kontext "speicherndlg" if ( SpeichernDlg.exists( 1 ) ) then @@ -177,6 +135,7 @@ testcase tBasic_IDE_Toolbar_Module kontext "active" if ( Active.Exists( 1 ) ) then + printlog( "Closing Messagebox with <Yes>") Active.Yes() endif @@ -347,4 +306,36 @@ testcase tBasic_IDE_Toolbar_Dialogs endcase +'******************************************************************************' + +function hClickToolbarButton( oButton as object ) as boolean + + const CFN = "hClickToolbarButton(): " + + dim iTry as integer + dim brc as boolean : brc = false + + printlog( CFN & "Clicking button on toolbar: " & oButton.name() ) + for iTry = 1 to 5 + + try + oButton.click() + brc = true + exit for + catch + printlog( CFN & "Retrying..." ) + endcatch + + if ( iTry = 5 ) then + exit for + endif + + wait( 500 ) + + next iTry + + if ( WaitSlot( 2000 ) <> WSFinished ) then + warnlog( CFN & "Slot not finished within 1 second" ) + endif +end function diff --git a/testautomation/framework/optional/includes/basic_package_export.inc b/testautomation/framework/optional/includes/basic_package_export.inc index 19784c25883f..7126ca5b9031 100755 --- a/testautomation/framework/optional/includes/basic_package_export.inc +++ b/testautomation/framework/optional/includes/basic_package_export.inc @@ -45,7 +45,7 @@ testcase tBasicPackageExport const PACKAGE_NAME = "tBasicExport.oxt" const LIBRARY_NAME = "tBasicExport" const DOCUMENT_POSITION = 4 - const PACKAGE_SIZE = 2000 + const PACKAGE_SIZE = 1325 dim cDocumentName as string dim cLibraryName as string @@ -162,16 +162,17 @@ testcase tBasicPackageExport Export.click() kontext "ExportBasicLibraryDlg" - if ( ExportBasicLibraryDlg.exists( 1 ) ) then - printlog( "Select to export as package" ) + if ( ExportBasicLibraryDlg.exists( 3 ) ) then + printlog( "Select to export as extension" ) ExportAsPackage.check() ExportBasicLibraryDlg.ok() kontext "SpeichernDlg" - if ( SpeichernDlg.exists( 1 ) ) then - printlog( "Save the file, automatic filename extension must be checked" ) - DateiName.setText( hGetWorkPath() & LIBRARY_NAME ) ' automatic filename extension/uno-pkg is default + if ( SpeichernDlg.exists( 3 ) ) then + printlog( "Save the file, suffix will be added automatically." ) + DateiName.setText( hGetWorkPath() & LIBRARY_NAME ) Speichern.click() + Speichern.notExists( 1 ) else warnlog( "Dialog <File Save> did not open" ) endif @@ -182,6 +183,7 @@ testcase tBasicPackageExport kontext "TabBibliotheken" printlog( "Close libraires tabpage" ) TabBibliotheken.cancel() + TabBibliotheken.notExists( 1 ) else warnlog( "Dialog <TabBibliotheken> is not available" ) endif @@ -189,6 +191,7 @@ testcase tBasicPackageExport kontext "Makro" printlog( "Close BASIC organizer" ) Makro.cancel() + Makro.notExists( 1 ) else warnlog( "Dialog <Makro> did not open" ) endif @@ -197,6 +200,7 @@ testcase tBasicPackageExport hFileCloseAll() printlog( "Verify automatic filename extension (dialog should append .oxt)" ) + printlog( "Checking for file: " & cFile ) if ( FileExists( cFile ) ) then printlog( "The test-package was saved with .oxt extension, good." ) cPackageFileName = cFile @@ -211,17 +215,11 @@ testcase tBasicPackageExport endif printlog( "Verify file size" ) -' if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then -' warnlog( "#i105719# - The exported test-package has an incorrect file size." ) - if ( FileLen( cPackageFileName ) = 0 ) then - printlog( "File has zero bytes, it is empty." ) - else - printlog( "Size is.: " & FileLen( cPackageFileName ) ) - printlog( "Expected: " & PACKAGE_SIZE ) - endif -' else -' printlog( "File has correct size" ) -' endif + if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then + warnlog( "#i105719# - The exported test-package has an incorrect file size." ) + else + printlog( "File has correct size." ) + endif endcase diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc index 69301789294c..8909045f288b 100755 --- a/testautomation/framework/optional/includes/w_grid_layout1.inc +++ b/testautomation/framework/optional/includes/w_grid_layout1.inc @@ -299,44 +299,6 @@ endcase '------------------------------------------------------------------------- -testcase tUserDefineLayout_1 - Dim sLinesPerPage , sCharsPerLine as String - Dim sExpectLinesPerPage , sExpectLinesPerPage1 as String - - sLinesPerPage = "20" - sCharsPerLine = "2" - sExpectLinesPerPage = "2" - sExpectLinesPerPage1 = "3" - - Call hNewDocument - - FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid - endif - Kontext "TabGrid" - CharsGrid.Check - - LinesPerPage.SetText sLinesPerPage - Sleep 2 - CharsPerLine.SetText sCharsPerLine - Sleep 2 - - 'This step is no use, just let the LinesPerPage change the number - CharsGrid.Check - - if LinesPerPage.GetText <> sExpectLinesPerPage AND LinesPerPage.GetText <> sExpectLinesPerPage1 then - Warnlog "The lines per page should be" + sExpectLinesPerPage + " OR " + sExpectLinesPerPage1 +" but get " +LinesPerPage.GetText - end if - - TabGrid.Cancel - - Call hCloseDocument -endcase - -'------------------------------------------------------------------------- - testcase tFontSizeChanges_1 Dim testFile , sCorrectResult as String Dim sLinesPerPage , sCharsPerLine as String @@ -488,51 +450,3 @@ testcase tIndentsTest_1 endcase '------------------------------------------------------------------------- - -testcase tObjectsTest_1 - Dim testFile , sCorrectPage1 , sCorrectPage2 as String - - testFile = "objectsTest.sxw" - sCorrectPage1 = "1" - sCorrectPage2 = "2" - - Call hNewDocument - - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - - fStartupNavigator( "OLEObject" , 1 ) - Sleep 1 - Auswahlliste.TypeKeys "<Return>" - Sleep 1 - fCloseNavigator - Sleep 2 - - Kontext - FormatAnchorAsCharacter - Sleep 1 - - ViewNavigator - Kontext "NavigatorWriter" - Seitennummer.SetText sCorrectPage2 - Sleep 5 - if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!" - fCloseNavigator - - fStartupNavigator( "OLEObject" , 1 ) - Auswahlliste.TypeKeys "<Return>" - fCloseNavigator - - Kontext - FormatAnchorToCharacter - - ViewNavigator - Kontext "NavigatorWriter" - Seitennummer.SetText sCorrectPage2 - Sleep 5 - if Seitennummer.GetText <> sCorrectPage1 then Warnlog "Something wrong when object is anchored to Character!" - fCloseNavigator - Kontext - - Call hCloseDocument -endcase - diff --git a/testautomation/framework/optional/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt Binary files differnew file mode 100755 index 000000000000..b3e5c6fb40bb --- /dev/null +++ b/testautomation/framework/optional/input/gridcontrol.odt diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas index a661ed5cfa7d..0b278ed80d60 100755 --- a/testautomation/framework/required/f_first.bas +++ b/testautomation/framework/required/f_first.bas @@ -39,7 +39,6 @@ sub main - ' Disable sleep() calls. If you encounter unexpected test interruptions ' you should try to outcomment this or set the value to FALSE. GLOBAL_USE_NEW_SLEEP = TRUE @@ -58,22 +57,14 @@ sub main gApplication = "WRITER" call tToolsOptionsTestFirst - call tToolsOptionsImprovementProgram call tDatabaseCheck call tHelpRegistration call hStatusOut - end sub -'******************************************************************************* - sub LoadIncludeFiles - use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - - use "global\required\includes\g_option.inc" - use "global\tools\includes\optional\t_ui_filters.inc" use "global\tools\includes\optional\t_filetools.inc" use "global\tools\includes\optional\t_docfuncs.inc" @@ -81,8 +72,5 @@ sub LoadIncludeFiles gApplication = "WRITER" call GetUseFiles() - end sub -'------------------------------------------------------------------------- - diff --git a/testautomation/framework/required/includes/basic_dialog_export.inc b/testautomation/framework/required/includes/basic_dialog_export.inc index 251efa7ac02a..5999decd2783 100755 --- a/testautomation/framework/required/includes/basic_dialog_export.inc +++ b/testautomation/framework/required/includes/basic_dialog_export.inc @@ -66,7 +66,7 @@ testcase tUpdtDialogExport hDestroyDocument() goto endsub endif - + sleep(1) printlog( "Click the Export button on the DialogBar" ) kontext "DialogBar" Export.click() diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc index 4947b72fa37b..5ac437ea1795 100755 --- a/testautomation/framework/required/includes/basic_dialog_i18n.inc +++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc @@ -54,6 +54,7 @@ testcase tUpdtBasicDialogI18n printlog( "Click Manage Languages on ToolsCollectionBar") kontext "ToolsCollectionBar" + sleep(1) if ( ToolsCollectionBar.exists() ) then ManageLanguage.click() else @@ -106,7 +107,7 @@ testcase tUpdtBasicDialogI18n printlog( "Back on Manage UI Languages Dialog, delete selected language") kontext "ManageUILanguages" Delete.click() - + sleep(1) printlog( "Confirm delete") kontext "active" if ( Active.exists( 1 ) ) then diff --git a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc index 8c26ab0d6bed..eaba271319be 100755..100644 --- a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc +++ b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc @@ -39,12 +39,15 @@ testcase tBasicDialogI18nImport - printlog( "Dialogs that show up when importing Multi locale dialogs into BASIC IDE" ) + printlog( "Dialogs that show up when importing multi locale dialogs into BASIC IDE" ) dim cDialogPath as string cDialogPath = gTesttoolPath & "framework\required\input\basic_ide\Dialog5.xdl" cDialogPath = convertpath( cDialogPath ) + dim iNumberOfLanguages as integer + dim iTry as integer + const LANGUAGE_COUNT = 5 printlog( "Open BASIC-IDE" ) @@ -82,15 +85,23 @@ testcase tBasicDialogI18nImport printlog( "Accept with yes" ) Active.Yes() - + sleep(1) Kontext "TranslationBar" if ( TranslationBar.exists() ) then + + for iTry = 1 to 5 + iNumberOfLanguages = CurrentLanguage.getItemCount() + if ( iNumberOfLanguages = LANGUAGE_COUNT ) then + exit for + endif + wait( 100 ) + next iTry printlog( "Check number of imported languages" ) - if ( CurrentLanguage.getItemCount() <> LANGUAGE_COUNT ) then + if ( iNumberOfLanguages <> LANGUAGE_COUNT ) then warnlog( "Incorrect language count in listbox <CurrentLanguage>" ) printlog( "Expected: " & LANGUAGE_COUNT ) - printlog( "Found...: " & CurrentLanguage.getItemCount() ) + printlog( "Found...: " & iNumberOfLanguages ) endif Kontext "DialogBar" diff --git a/testautomation/framework/required/includes/wizard_documentconverter.inc b/testautomation/framework/required/includes/wizard_documentconverter.inc index 6749601393ad..90b74049344c 100755 --- a/testautomation/framework/required/includes/wizard_documentconverter.inc +++ b/testautomation/framework/required/includes/wizard_documentconverter.inc @@ -46,7 +46,6 @@ testcase tUpdtWizardDocumentConverter dim iDialog as integer dim iDocumentType as integer dim iWait as integer - dim sKeys as string dim sSourcePathWriter as string sSourcePathWriter = gTesttoolpath & "framework\required\input\document_converter\" sSourcePathWriter = convertpath( sSourcePathWriter ) @@ -132,12 +131,14 @@ testcase tUpdtWizardDocumentConverter Kontext "DocumentConverter" printlog( "Page 7" ) - sKeys = hGetAccel( "DocumentConverter_ShowLog" ) qaerrorlog( "#i54265# Show Logfile button has no HID, using accelerator instead" ) iWait = 0 do while ( DocumentConverter.exists() ) - DocumentConverter.TypeKeys( sKeys ) + try + ContinueButton.click() + catch + endcatch Wait( 1 ) iWait = iWait + 1 if ( iWait = 20000 ) then diff --git a/testautomation/global/input/accelerators.txt b/testautomation/global/input/accelerators.txt index 1f1d88214986..cb518c9e3335 100755 --- a/testautomation/global/input/accelerators.txt +++ b/testautomation/global/input/accelerators.txt @@ -158,6 +158,7 @@ ko-KR=mod2 u zh-CN=mod2 u zh-TW=mod2 u sl=mod2 i +cs=mod2 a # This is the accelerator that switches tabs in the BASIC IDE. I found it by accident diff --git a/testautomation/global/required/includes/g_customize.inc b/testautomation/global/required/includes/g_customize.inc index 29b6dec58c61..733f5028880c 100644 --- a/testautomation/global/required/includes/g_customize.inc +++ b/testautomation/global/required/includes/g_customize.inc @@ -108,6 +108,7 @@ testcase tToolsCustomize Kontext "TabCustomizeMenu" '/// Click button 'Command' ///' + sleep(1) Command.click printlog "opened second one" WaitSlot() @@ -123,6 +124,7 @@ testcase tToolsCustomize WaitSlot() Kontext "TabCustomizeMenu" '/// Click button 'Command' ///' + sleep(1) Command.click printlog "opened third one" WaitSlot() @@ -192,8 +194,10 @@ testcase tToolsCustomize waitslot Kontext "TabCustomizeToolbars" + sleep(1) '/// Click button 'Command' ///' Command.click + waitslot '/// Select the firste entry 'Rename' ///' hMenuSelectNr(1) '/// Dialog 'Name' comes up ///' @@ -206,7 +210,9 @@ testcase tToolsCustomize endif Kontext "TabCustomizeToolbars" + sleep(1) Command.click + waitslot hMenuSelectNr(1) Kontext "CustomizeToolbarsReName" call DialogTest (CustomizeToolbarsReName) @@ -217,7 +223,9 @@ testcase tToolsCustomize waitslot Kontext "TabCustomizeToolbars" '/// Click button 'Command' ///' + sleep(1) Command.click + waitslot '/// Select the fifth entry 'Change Icon' ///' hMenuSelectNr(5) '/// Dialog 'Change Icon' comes up ///' @@ -252,6 +260,7 @@ testcase tToolsCustomize WaitSlot() Kontext "TabCustomizeToolbars" '/// On Tab Page 'Customize Menus' click on Button 'Toolbar' ///' + sleep(1) MenuBtn.openMenu WaitSlot() hMenuSelectNr(1) diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc index 515f37a83215..d590016bc8ba 100755 --- a/testautomation/global/required/includes/g_option.inc +++ b/testautomation/global/required/includes/g_option.inc @@ -699,6 +699,12 @@ testcase tToolsOptionsImprovementProgram printlog( "Update test for the tools/options dialog of the OOo Improvement Program" ) + if (gOOO AND NOT gOOoImprovementIsEnabled) then + 'In StarOffice this test should always work - but on OOo contributet builds the function is not available - only on OOo builds provided by Sun Microsystems + qaErrorlog ("This build does not participate in the OOo Improvement Program - test exit") + goto endsub + endif + dim cLogFile as string cLogFile = gOfficePath & "user\temp\feedback\Current.csv" cLogFile = convertpath( cLogFile ) diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc index b8895c7fa637..718a7cf066cc 100755 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -335,6 +335,13 @@ end sub sub FirstOfficeStart '/// First start-routine. Dim i as integer + ' To nail down a possible culprint on test runs, the availability of existing user settings is checked. + ' In some environments the deleting of the settings might fail before the test is started - this will log it: + if (fileExists(gOfficePath)) then + qaErrorLog ("QA_DEBUG: User settings directory was not deleted before test start!: '" + gOfficePath + "'") + else + printlog ("QA_DEBUG: User settings directory is unavailable before soffice is started - this is good. '" + gOfficePath + "'") + endif caselog "" '///+<ul><li>Stop the first default-output into the resultfile</li> Call hStartTheOffice '///+<li>Start the office</li> ResetApplication '///+<li>Make the first recovering without an error output.</li></ul> diff --git a/testautomation/global/system/includes/sysinfo.inc b/testautomation/global/system/includes/sysinfo.inc index eb5e91c9a459..761c8d397924 100755 --- a/testautomation/global/system/includes/sysinfo.inc +++ b/testautomation/global/system/includes/sysinfo.inc @@ -67,7 +67,6 @@ Global Const SYS_OSX = 12 Global Const SYS_PPC = 13 Global Const SYS_SCO = 14 Global Const SYS_AIX = 15 -Global Const SYS_IRI = 16 Global Const SYS_HP = 17 Global Const SYS_FBSD = 18 Global Const SYS_NBSD = 19 @@ -97,7 +96,6 @@ sub PlatFormInit '///+<TR><TD>Linux PPC</TD><TD>ppc</TD><TD>unx</TD></TR> '///+<TR><TD>SCO UNIX</TD><TD>sco</TD><TD>unx</TD></TR> '///+<TR><TD>AIX</TD><TD>aix</TD><TD>unx</TD></TR> -'///+<TR><TD>Irix</TD><TD>iri</TD><TD>unx</TD></TR> '///+<TR><TD>HP UNIX</TD><TD>hp</TD><TD>unx</TD></TR> '///+<TR><TD>FreeBSD</TD><TD>fbsd</TD><TD>unx</TD></TR> '///+<TR><TD>NetBSD</TD><TD>nbsd</TD><TD>unx</TD></TR> @@ -120,7 +118,6 @@ sub PlatFormInit PlatformName(SYS_PPC) = "Linux PPC" : PlatformExt(SYS_PPC) = "ppc" PlatFormName(SYS_SCO) = "SCO Unix" : PlatFormExt(SYS_SCO) = "sco" PlatFormName(SYS_AIX) = "AIX" : PlatFormExt(SYS_AIX) = "aix" - PlatFormName(SYS_IRI) = "IRIX" : PlatFormExt(SYS_IRI) = "iri" PlatFormName(SYS_HP) = "HP UNIX" : PlatFormExt(SYS_Hp) = "hp" PlatFormName(SYS_FBSD) = "FreeBSD" : PlatFormExt(SYS_FBSD) = "fbsd" PlatFormName(SYS_NBSD) = "NetBSD" : PlatFormExt(SYS_NBSD) = "nbsd" @@ -143,7 +140,6 @@ sub PlatFormInit PlatFormGroup(SYS_PPC) = "unx" PlatFormGroup(SYS_SCO) = "unx" PlatFormGroup(SYS_AIX) = "unx" - PlatFormGroup(SYS_IRI) = "unx" PlatFormGroup(SYS_HP) = "unx" PlatFormGroup(SYS_FBSD) = "unx" PlatFormGroup(SYS_NBSD) = "unx" @@ -221,7 +217,6 @@ sub GetToolPlatform '///+<TR><TD>Linux PPC</TD><TD>13</TD></TR> '///+<TR><TD>SCO UNIX</TD><TD>02</TD></TR> '///+<TR><TD>AIX</TD><TD>04</TD></TR> -'///+<TR><TD>Irix</TD><TD>06</TD></TR> '///+<TR><TD>HP UNIX</TD><TD>07</TD></TR> '///+<TR><TD>FreeBSD</TD><TD>08</TD></TR> '///+<TR><TD>NetBSD</TD><TD>14</TD></TR> @@ -254,7 +249,7 @@ sub GetToolPlatform qaErrorLog("The GUI-entry in '" + gTesttoolIni + "' is missing!"+Chr(13)+"Please insert the correct number for your operating system! In Section [GUI Platform], entry Current= "+Chr(13)+"Win95....: 100"+Chr(13)+"Win98....: 395"+Chr(13)+"WinNT....: 351 or 400"+Chr(13)+"WinSE....: 410"+Chr(13)+"WinME....: 490"+Chr(13)+"Win2000..: 500"+Chr(13)+"WinXP....: 501") else iGuiVersion = 01 - QAErrorLog("The GUI value in '" + gTesttoolIni + "' is missing!"+Chr(13)+"Please insert the correct number for your operating system! In Section [GUI Platform], entry Current= "+Chr(13)+"Solaris SPARC.: 01"+Chr(13)+"SCO UNIX......: 02"+Chr(13)+"Linux.........: 03"+Chr(13)+"AIX...........: 04"+Chr(13)+"Solaris x86...: 05"+Chr(13)+"Irix..........: 06"+Chr(13)+"HP-UX.........: 07"+Chr(13)+"FreeBSD........: 08"+Chr(13)+"Mac OS X......: 12"+Chr(13)+"Linux PPC.....: 13"+Chr(13)+"NetBSD.....: 14"+Chr(13)+"Linux 64 bit.....: 15"+Chr(13)+"Linux SPARC.....: 16") + QAErrorLog("The GUI value in '" + gTesttoolIni + "' is missing!"+Chr(13)+"Please insert the correct number for your operating system! In Section [GUI Platform], entry Current= "+Chr(13)+"Solaris SPARC.: 01"+Chr(13)+"SCO UNIX......: 02"+Chr(13)+"Linux.........: 03"+Chr(13)+"AIX...........: 04"+Chr(13)+"Solaris x86...: 05"+Chr(13)+"HP-UX.........: 07"+Chr(13)+"FreeBSD........: 08"+Chr(13)+"Mac OS X......: 12"+Chr(13)+"Linux PPC.....: 13"+Chr(13)+"NetBSD.....: 14"+Chr(13)+"Linux 64 bit.....: 15"+Chr(13)+"Linux SPARC.....: 16") end if end if '///Get the variable <b>gSamePC</b> @@ -302,7 +297,6 @@ sub GetToolPlatform case 03 : gSystemnummer = SYS_LIN case 04 : gSystemnummer = SYS_AIX case 05 : gSystemnummer = SYS_X86 - case 06 : gSystemnummer = SYS_IRI case 07 : gSystemnummer = SYS_HP case 08 : gSystemnummer = SYS_FBSD case 12 : gSystemnummer = SYS_OSX @@ -345,7 +339,6 @@ sub GetOfficePlatform '///+<TR><TD>Linux PPC</TD><TD>PPC</TD></TR> '///+<TR><TD>SCO UNIX</TD><TD>SCO</TD></TR> '///+<TR><TD>AIX</TD><TD>AIX</TD></TR> -'///+<TR><TD>Irix</TD><TD>IRI</TD></TR> '///+<TR><TD>HP UNIX</TD><TD>HP</TD></TR> '///+<TR><TD>FreeBSD</TD><TD>FBSD</TD></TR> '///+<TR><TD>NetBSD</TD><TD>NBSD</TD></TR> @@ -374,7 +367,6 @@ sub GetOfficePlatform case "PPC" : GUI = 13 case "SCO" : GUI = 14 case "AIX" : GUI = 15 - case "IRI" : GUI = 16 case "HP" : GUI = 17 case "FBSD" : GUI = 18 case "NBSD" : GUI = 19 diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc index f1bc0f538722..e85c321e2b7b 100755 --- a/testautomation/global/tools/includes/required/t_doc1.inc +++ b/testautomation/global/tools/includes/required/t_doc1.inc @@ -189,6 +189,7 @@ sub hNewDocument ( optional bANewDoc ) case else : WarnLog "hNewDocument: No Applikation named '" + gApplication + "' exists in this routine!" end select Sleep 2 + end sub ' '------------------------------------------------------------------------------- diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index db3205e58de0..ffcc0d4045df 100755 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -64,7 +64,7 @@ function hGrafikEinfuegen ( Grafik$ ) as Boolean if ( GrafikEinfuegenDlg.exists( 2 ) ) then Vorschau.Uncheck - if gApplication <> "HTML" AND gApplication <> "HTML" then + if gApplication <> "HTML" then Verknuepfen.UnCheck end if @@ -87,13 +87,15 @@ function hGrafikEinfuegen ( Grafik$ ) as Boolean Kontext "GrafikEinfuegenDlg" if GrafikEinfuegenDlg.Exists then GrafikEinfuegenDlg.Cancel + GarfikEinfuegenDlg.notExists( 4 ) endif else hGrafikEinfuegen = IsImageLoaded end if else - 'GrafikEinfuegeDlg not open + warnlog( "Insert graphics dialog not open" ) endif + end function ' '------------------------------------------------------------------------------- diff --git a/testautomation/global/tools/includes/required/t_option2.inc b/testautomation/global/tools/includes/required/t_option2.inc index 74f49d9e3916..fdf11f1e4411 100644 --- a/testautomation/global/tools/includes/required/t_option2.inc +++ b/testautomation/global/tools/includes/required/t_option2.inc @@ -136,9 +136,9 @@ sub DialogeFuerTypenKontrollieren if OeffnenDlg.Exists() then if ( Dateityp.IsVisible ) then Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!" - OeffnenDlg.Cancel - exit do endif + OeffnenDlg.Cancel + exit do endif Kontext "PfadeAuswaehlen" @@ -146,6 +146,8 @@ sub DialogeFuerTypenKontrollieren PfadeAuswaehlen.Cancel exit do end if + + iExitCounter = iExitCounter + 1 loop Kontext "TabPfade" else diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win index b353eb0622a5..dfb4686ad750 100755 --- a/testautomation/global/win/dial_a_c.win +++ b/testautomation/global/win/dial_a_c.win @@ -1,8 +1,8 @@ *Aehnlichkeitssuche HID_SEARCHSIMILARITY -ZeichenHinzufuegen svx:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER -ZeichenTauschen svx:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER -Kombinieren svx:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX -ZeichenEntfernen svx:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER +ZeichenHinzufuegen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER +ZeichenTauschen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER +Kombinieren cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX +ZeichenEntfernen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER *Aenderungenanzeigen FID_CHG_ACCEPT TabControl HID_REDLINING_TABCONTROL @@ -54,10 +54,10 @@ Abspielen sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY LetztesBild sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST *AppletEinfuegen SID_INSERT_APPLET -Klasse svx:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE -ClassLocation svx:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION -Suchen svx:PUSHBUTTON:MD_INSERT_OBJECT_APPLET:BTN_CLASS -Optionen svx:MULTILINEEDIT:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS +Klasse cui:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE +ClassLocation cui:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION +Suchen cui:PUSHBUTTON:MD_INSERT_OBJECT_APPLET:BTN_CLASS +Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS *AsciiFilterOptionen HID_ASCII_FILTER Zeichensatz sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET @@ -158,36 +158,36 @@ Minimieren32 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2 NewStyle3 sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW *Bemassung HID_PAGE_MEASURE -Liniendistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST -HLUeberhang svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG -HLDistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST -LinkeHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN -RechteHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN -AnzeigeUnterhalb svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE -AnzeigeParallel svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL -MetrikAnzeigen svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT -MetrikList svx:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT +Liniendistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST +HLUeberhang cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG +HLDistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST +LinkeHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN +RechteHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN +AnzeigeUnterhalb cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE +AnzeigeParallel cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL +MetrikAnzeigen cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT +MetrikList cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT Textposition HID_MEASURE_CTL_POSITION -AutomatischVertikal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV -AutomatischHorizontal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH +AutomatischVertikal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV +AutomatischHorizontal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH Preview HID_MEASURE_CTL_PREVIEW -DecimalPlaces svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES +DecimalPlaces cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES *BenutzerwoerterbuchAnlegen HID_OPTIONS_DICT_NEW -WoerterbuchName svx:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME -Sprache svx:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG -Ausnahme svx:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT +WoerterbuchName cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME +Sprache cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG +Ausnahme cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT *BenutzerwoerterbuchBearbeiten HID_OPTIONS_DICT_EDIT -Buch svx:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS -Sprache svx:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG -Inhalt svx:Edit:RID_SFXDLG_EDITDICT:ED_WORD -Wort svx:Edit:RID_SFXDLG_EDITDICT:ED_WORD -Aufnehmen svx:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE -Neu svx:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE -Entfernen svx:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE -Loeschen svx:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE -ReplaceBy svx:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE +Buch cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS +Sprache cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG +Inhalt cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD +Wort cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD +Aufnehmen cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE +Neu cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE +Entfernen cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE +Loeschen cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE +ReplaceBy cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE WordList HID_OPTIONS_DICT_EDIT_ENTRIES_LIST *BenutzerverzeichnisDefinieren HID_DLG_NEW_USER_IDX diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win index 0d64547f5e0a..2917c20d27d6 100755 --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -20,9 +20,9 @@ HideItems HID_SC_DPSUBT_HIDE Hierarchy sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_HIERARCHY *DateienAuswaehlen HID_FILEDLG_MAILMRGE2 -Hinzufuegen svx:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH -Loeschen svx:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH -Pfade svx:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH +Hinzufuegen cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH +Loeschen cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH +Pfade cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH *Datenpilot SID_OPENDLG_PIVOTTABLE Zusaetze sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE @@ -253,14 +253,14 @@ PopuplisteRechts sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP AddressBook sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE *EinfuegenSpalten FN_TABLE_INSERT_COL_DLG -Anzahl svx:NumericField:DLG_INS_ROW_COL:ED_COUNT -Davor svx:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE -Dahinter svx:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER +Anzahl cui:NumericField:DLG_INS_ROW_COL:ED_COUNT +Davor cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE +Dahinter cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER *EinfuegenZeilen FN_TABLE_INSERT_ROW_DLG -Anzahl svx:NumericField:DLG_INS_ROW_COL:ED_COUNT -Davor svx:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE -Dahinter svx:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER +Anzahl cui:NumericField:DLG_INS_ROW_COL:ED_COUNT +Davor cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE +Dahinter cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER *EbeneEinfuegenDlg SID_INSERTLAYER EbenenName sd:Edit:DLG_INSERT_LAYER:EDT_NAME @@ -326,7 +326,7 @@ Kennwort sc:Edit:RID_SCDLG_DAPISERVICE:ED_PASSWD *ExtrasOptionenDlg HID_OFADLG_OPTIONS_TREE Optionsliste HID_OFADLG_TREELISTBOX -Zurueck svx:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK +Zurueck cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK *FeldAuswahl HID_FIELD_SEL_WIN Liste HID_FIELD_SEL diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win index 78f203f1ffc5..629da180900d 100755 --- a/testautomation/global/win/dial_i_o.win +++ b/testautomation/global/win/dial_i_o.win @@ -23,12 +23,12 @@ Dokument HID_IMAPDLG_GRAPHWND Adresse SID_OPENURL BearbeitenText svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT -*ImageMapHyperlink svx:ModalDialog:RID_SVXDLG_IMAPURL -URL svx:Edit:RID_SVXDLG_IMAPURL:EDT_URL -Alternativetext svx:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION -Frame svx:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS -Name svx:Edit:RID_SVXDLG_IMAPURL:EDT_NAME -Description svx:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION +*ImageMapHyperlink cui:ModalDialog:RID_SVXDLG_IMAPURL +URL cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL +Alternativetext cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION +Frame cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS +Name cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME +Description cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION *IndividuellePraesentation SID_CUSTOMSHOW_DLG Neu SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_NEW @@ -59,11 +59,11 @@ Namen3 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3 Namen4 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4 *InhaltEinfuegen HID_PASTE_DLG -AlsSymbol svx:CHECKBOX:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON -AndersSymbol svx:PUSHBUTTON:MD_PASTE_OBJECT:PB_CHANGE_ICON -VerknuepfungMit svx:RADIOBUTTON:MD_PASTE_OBJECT:RB_PASTE_LINK -Auswahl svx:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST -EinfuegenAls svx:RadioButton:MD_PASTE_OBJECT:RB_PASTE +AlsSymbol cui:CHECKBOX:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON +AndersSymbol cui:PUSHBUTTON:MD_PASTE_OBJECT:PB_CHANGE_ICON +VerknuepfungMit cui:RADIOBUTTON:MD_PASTE_OBJECT:RB_PASTE_LINK +Auswahl cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST +EinfuegenAls cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE *InhalteEinfuegenCalc FID_INS_CELL_CONTENTS AllesEinfuegen sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSALL @@ -154,8 +154,8 @@ Toleranz svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE Auswahl HID_POPUP_LINEEND_CTRL *Linienstil HID_DLG_MESSBOX -Aendern svx:PushButton:RID_SVXDLG_MESSBOX:BTN_1 -Hinzufuegen svx:PushButton:RID_SVXDLG_MESSBOX:BTN_2 +Aendern cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1 +Hinzufuegen cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2 *LinksFuellen FID_FILL_TO_LEFT @@ -226,26 +226,26 @@ Beschreibung basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR HilfeIdentifikation basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID HilfeDateiname basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME -*MakroZuweisen svx:TabPage:RID_SVXPAGE_EVENTASSIGN +*MakroZuweisen cui:TabPage:RID_SVXPAGE_EVENTASSIGN Ereignis HID_MACRO_LB_EVENT Bereich HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP Makroname HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS -Zuweisen svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN -Aufheben svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE -Scripttyp svx:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE +Zuweisen cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN +Aufheben cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE +Scripttyp cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE *Massstab SID_ATTR_ZOOM -Optimal svx:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL -GanzeSeite svx:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE -Seitenbreite svx:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH -Vergroesserung100 svx:RadioButton:RID_SVXDLG_ZOOM:BTN_100 -VergroesserungStufenlos svx:RadioButton:RID_SVXDLG_ZOOM:BTN_USER -Stufenlos svx:MetricField:RID_SVXDLG_ZOOM:ED_USER -Automatic svx:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC -Singlepage svx:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE -Columns svx:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS -Columnsfield svx:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS -Bookmode svx:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK +Optimal cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL +GanzeSeite cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE +Seitenbreite cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH +Vergroesserung100 cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100 +VergroesserungStufenlos cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER +Stufenlos cui:MetricField:RID_SVXDLG_ZOOM:ED_USER +Automatic cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC +Singlepage cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE +Columns cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS +Columnsfield cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS +Bookmode cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK *MassstabSeitenansicht HID_PPREV_ZOOM Spalten sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_COL @@ -266,24 +266,24 @@ Breite GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX Hoehe GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY *ModuleBearbeiten HID_EDIT_MODULES -Sprache svx:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE +Sprache cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE Module HID_CLB_EDIT_MODULES_MODULES -PrioPLus svx:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP -PrioMinus svx:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN -Zurueck svx:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK +PrioPLus cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP +PrioMinus cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN +Zurueck cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK Benutzerwoerterbuch HID_CLB_EDIT_MODULES_DICS *DescriptionObject HID_DLG_OBJECT_TITLE_DESC -DescriptionTitle svx:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE -DescriptionText svx:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC +DescriptionTitle cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE +DescriptionText cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC *NameDlg HID_DLG_NAME -Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING +Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING +LinieName NameDlg *NameDlgObject HID_DLG_OBJECT_NAME -NameField svx:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME +NameField cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME +NameDlgGroup NameDlg NameField HID_FORMAT_NAME_OBJECT_NAME @@ -420,10 +420,10 @@ Y sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y Modulname basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME *NotizBearbeiten SID_POSTIT -Texteingabe svx:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT sw:MultiLineEdit:DLG_POSTIT:ED_EDIT -Autor svx:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR sw:PushButton:DLG_POSTIT:BTN_AUTHOR -Vor SVX:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_NEXT -Zurueck SVX:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_PREV +Texteingabe cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT sw:MultiLineEdit:DLG_POSTIT:ED_EDIT +Autor cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR sw:PushButton:DLG_POSTIT:BTN_AUTHOR +Vor cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_NEXT +Zurueck cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_PREV *NummernkreisOptionen HID_DLG_SEQUENCE_OPTION Ebene sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL @@ -432,7 +432,7 @@ Trenner sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR +NotizEinfuegen NotizBearbeiten +NotizEinfuegenCalc NotizBearbeiten -Text svx:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT +Text cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT *ObenFuellen FID_FILL_TO_TOP @@ -445,11 +445,11 @@ ObjektListe HID_BASICIDE_OBJECTCAT Objektname sw:Edit:DLG_RENAME_XNAMED:ED_NEW_NAME *OLEObjektEinfuegen SID_INSERT_OBJECT -NeuErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT -AusDateiErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE -Objekttyp svx:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE -OleDatei svx:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH -Verknuepfen svx:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK -Durchsuchen svx:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH +NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT +AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE +Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE +OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH +Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK +Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH +OptionenDlg ExtrasOptionenDlg diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win index 9db53f313aaf..30e5ae62e6e4 100755 --- a/testautomation/global/win/dial_p_s.win +++ b/testautomation/global/win/dial_p_s.win @@ -21,8 +21,8 @@ Ascii goodies:RadioButton:DLG_EXPORT_EPBM:RB_ASCII *PfadeAuswaehlen HID_MULTIPATH Pfade HID_OPTIONS_MULTIPATH_LIST -Hinzufuegen SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH -Loeschen SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH +Hinzufuegen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH +Loeschen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH *PGMOptionen goodies:ModalDialog:DLG_EXPORT_EPGM Binaer goodies:RadioButton:DLG_EXPORT_EPGM:RB_RAW @@ -71,9 +71,9 @@ RegularExpression sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP NoDuplication sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE *PlugInEinfuegen SID_INSERT_PLUGIN -DateiUrl svx:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL -Durchsuchen svx:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL -Optionen svx:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS +DateiUrl cui:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL +Durchsuchen cui:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL +Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS *PNGOptionen svtools:ModalDialog:DLG_EXPORT_EPNG Kompression svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION @@ -83,8 +83,8 @@ Interlaced svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED Binaer goodies:RadioButton:DLG_EXPORT_EPPM:RB_RAW Ascii goodies:RadioButton:DLG_EXPORT_EPPM:RB_ASCII -*ProxyWarnung svx:ModalDialog:RID_OFADLG_OPTIONS_TREE_HINT -NichtMehrAnzeigen svx:CheckBox:RID_OFADLG_OPTIONS_TREE_HINT:CB_DISABLE +*ProxyWarnung cui:ModalDialog:RID_OFADLG_OPTIONS_TREE_HINT +NichtMehrAnzeigen cui:CheckBox:RID_OFADLG_OPTIONS_TREE_HINT:CB_DISABLE *QuelleAuswaehlen HID_DATAPILOT_TYPE AktuelleSelektion sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_SELECTION @@ -93,12 +93,11 @@ ExterneQuelle sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_EXTERNAL *Rechtschreibung HID_SPELLCHECK Original HID_SPELLDLG_SETWORD -Wort HID_SPLDLG_EDIT_NEWWORD Ersetzen HID_SPLDLG_BUTTON_CHANGE AlleErsetzen HID_SPLDLG_BUTTON_CHANGEALL Ignorieren HID_SPLDLG_BUTTON_IGNORE AlleIgnorieren HID_SPLDLG_BUTTON_IGNOREALL -Sprache svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE +Sprache cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE RechtschreibungSchliessen HID_SPLDLG_BUTTON_CLOSE *Redlining HID_REDLINE_ACCEPT @@ -112,11 +111,11 @@ Ablehnen HID_REDLINING_VIEW_PB_REJECT AlleAblehnen HID_REDLINING_VIEW_PB_REJECTALL Undo HID_REDLINING_VIEW_PB_UNDO -TabFilter HID_REDLINING_FILTER_PAGE SVX:TABPAGE:SID_REDLIN_FILTER_PAGE -Datum HID_REDLINING_FILTER_CB_DATE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE -DatumListe HID_REDLINING_FILTER_LB_DATE SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE -Datum1 HID_REDLINING_FILTER_DF_DATE SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE -Zeit1 HID_REDLINING_FILTER_TF_DATE SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE +TabFilter HID_REDLINING_FILTER_PAGE cui:TABPAGE:SID_REDLIN_FILTER_PAGE +Datum HID_REDLINING_FILTER_CB_DATE cui:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE +DatumListe HID_REDLINING_FILTER_LB_DATE cui:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE +Datum1 HID_REDLINING_FILTER_DF_DATE cui:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE +Zeit1 HID_REDLINING_FILTER_TF_DATE cui:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE Aktuell1 HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK Datum2 HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 Zeit2 HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 @@ -126,8 +125,6 @@ AutoListe HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AU Bereich HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE BereichText HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE Button HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF -'Aktion HID_REDLINING_FILTER_CB_RANGE -'Aktionsliste HID_REDLINING_FILTER_LB_ACTION Aktion HID_REDLINING_FILTER_CB_ACTION SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_ACTION Aktionsliste HID_REDLINING_FILTER_LB_ACTION SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_ACTION Comment HID_REDLINING_FILTER_CB_COMMENT SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_COMMENT @@ -245,18 +242,18 @@ Weiter svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE Entfernen svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE *SilbentrennungOptionen HID_LNGDLG_NUM_PREBREAK -ZeichenVorUmbruch svx:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK +ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK *Sonderzeichen SID_CHARMAP -Schrift svx:ListBox:RID_SVXDLG_CHARMAP:LB_FONT +Schrift cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT SchriftListe HID_CHARMAP_CTL_SHOWSET -Loeschen svx:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE +Loeschen cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE Zeichenanzeige HID_CHARMAP_CTL_SHOWCHAR Textanzeige HID_CHARMAP_CTL_SHOWTEXT -Subset svx:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET +Subset cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET -*SonstigesJavaabschaltung svx:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE -NichtMehrAnzeigen svx:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE +*SonstigesJavaabschaltung cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE +NichtMehrAnzeigen cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE *Sortieren FN_SORTING_DLG Schluessel1 sw:CheckBox:DLG_SORTING:CB_KEY1 diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win index 6016206baeed..5c52f92c1de4 100755 --- a/testautomation/global/win/dial_t_z.win +++ b/testautomation/global/win/dial_t_z.win @@ -191,24 +191,24 @@ URL sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL URLText sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL *Verbinder HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION -Linie1 SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 -Linie2 SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 -Linie3 SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 -Typ SVX:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPE -AnfangHorizontal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 -AnfangVertikal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 -EndeHorizontal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 -EndeVertikal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 +Linie1 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 +Linie2 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 +Linie3 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 +Typ cui:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPE +AnfangHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 +AnfangVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 +EndeHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 +EndeVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 Vorschau HID_PAGE_CONNECTION_CTL_PREVIEW -*VerknuepfungenBearbeiten svx:ModalDialog:MD_UPDATE_BASELINKS +*VerknuepfungenBearbeiten cui:ModalDialog:MD_UPDATE_BASELINKS Liste HID_LINKDLG_TABLB -VerknuepfungBearbeiten svx:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE -Automatisch svx:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC -Manuell svx:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL -Aktualisieren svx:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW -Aendern svx:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE -Loesen svx:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK +VerknuepfungBearbeiten cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE +Automatisch cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC +Manuell cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL +Aktualisieren cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW +Aendern cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE +Loesen cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK *VersendenMonitor HID_MERGE_PRINTMONITOR @@ -225,51 +225,16 @@ Kommentar SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS Schliessen SFX2:PUSHBUTTON:DLG_COMMENTS:PB_CLOSE *VerteilenDlg HID_PAGE_DISTRIBUTE -KeineHorizontal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE -Links svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT -MitteHorizontal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER -AbstandHorizontal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE -Rechts svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT -KeineVertikal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE -Oben svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP -MitteVertikal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER -AbstandVertikal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE -Unten svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM - - -' *VerzeichnisformBearbeitenStichwort HID_FORMEDT_INDEX -' Aufbau sw:ListBox:DLG_FORMEDT:LB_ENTRY -' Aufbau1 sw:Edit:DLG_FORMEDT:ED_ENTRY -' Eintrag sw:PushButton:DLG_FORMEDT:BT_ENTRY -' Tab sw:PushButton:DLG_FORMEDT:BT_TAB -' Seite sw:PushButton:DLG_FORMEDT:BT_PAGE -' Stufen sw:ListBox:DLG_FORMEDT:LB_LEVEL -' Absatzvorlagen sw:ListBox:DLG_FORMEDT:LB_PARALAY -' Standard sw:PushButton:DLG_FORMEDT:BT_STD -' Zuordnen sw:PushButton:DLG_FORMEDT:BT_ASSIGN - -' *VerzeichnisformBearbeitenBenutzer HID_FORMEDT_USER -' Aufbau sw:ListBox:DLG_FORMEDT:LB_ENTRY -' Aufbau1 sw:Edit:DLG_FORMEDT:ED_ENTRY -' Eintrag sw:PushButton:DLG_FORMEDT:BT_ENTRY -' Tab sw:PushButton:DLG_FORMEDT:BT_TAB -' Seite sw:PushButton:DLG_FORMEDT:BT_PAGE -' Stufen sw:ListBox:DLG_FORMEDT:LB_LEVEL -' Absatzvorlagen sw:ListBox:DLG_FORMEDT:LB_PARALAY -' Standard sw:PushButton:DLG_FORMEDT:BT_STD -' Zuordnen sw:PushButton:DLG_FORMEDT:BT_ASSIGN - -' *VerzeichnisformBearbeitenInhalt HID_FORMEDT_CONTENT -' Aufbau sw:ListBox:DLG_FORMEDT:LB_ENTRY -' Aufbau1 sw:Edit:DLG_FORMEDT:ED_ENTRY -' Eintrag sw:PushButton:DLG_FORMEDT:BT_ENTRY -' Tab sw:PushButton:DLG_FORMEDT:BT_TAB -' Seite sw:PushButton:DLG_FORMEDT:BT_PAGE -' Stufen sw:ListBox:DLG_FORMEDT:LB_LEVEL -' Absatzvorlagen sw:ListBox:DLG_FORMEDT:LB_PARALAY -' Standard sw:PushButton:DLG_FORMEDT:BT_STD -' Zuordnen sw:PushButton:DLG_FORMEDT:BT_ASSIGN -' Hyperlink sw:PushButton:DLG_FORMEDT:BT_JUMP +KeineHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE +Links cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT +MitteHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER +AbstandHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE +Rechts cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT +KeineVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE +Oben cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP +MitteVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER +AbstandVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE +Unten cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM *VerzeichniseintragEinfuegen FN_INSERT_IDX_ENTRY_DLG EintragOk HID_INSERT_IDX_MRK_OK @@ -301,9 +266,6 @@ Vorheriger HID_INSERT_IDX_MRK_PREV *VorlageErzeugen SID_STYLE_NEW_BY_EXAMPLE SID_TEMPLATE_NEW_BY_EXAMPLE Vorlagenname sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL -' *VorlagenAuswaehlen HID_SEL_TEMPLATE -' Vorlagenliste SW:LISTBOX:DLG_SEL_TEMPLATE:LB_TEMPLATES - *Vorlagenkatalog SID_STYLE_CATALOG Vorlagen sfx2:ListBox:RID_STYLECATALOG:BT_TOOL Ansicht HID_TEMPLATE_FMT @@ -334,17 +296,17 @@ Breite svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC Hoehe svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC *Zahlenformat HID_NUMBERFORMAT -Kategorie svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY +Kategorie cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY KategorieFormat HID_NUMBERFORMAT_LB_FORMAT 'FormatZahl -FormatCode svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT +FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT Hinzufuegen HID_NUMBERFORMAT_TBI_ADD Entfernen HID_NUMBERFORMAT_TBI_REMOVE -Sprache svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE -Nachkommastellen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS -FuehrendeNullen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES -NegativInRot svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED -Tausenderpunkt svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND +Sprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE +Nachkommastellen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS +FuehrendeNullen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES +NegativInRot cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED +Tausenderpunkt cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND *ZeileAusblenden FID_ROW_HIDE @@ -377,11 +339,11 @@ GanzeSpalten sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELCOLS Hoehe sw:MetricField:DLG_ROW_HEIGHT:ED_HEIGHT Dynamisch sw:CheckBox:DLG_ROW_HEIGHT:CB_AUTOHEIGHT -*ZellenTeilen svx:ModalDialog:RID_SVX_SPLITCELLDLG -Anzahl svx:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT -Horizontal svx:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ -Vertikal svx:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT -GleichmaessigTeilen svx:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP +*ZellenTeilen cui:ModalDialog:RID_SVX_SPLITCELLDLG +Anzahl cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT +Horizontal cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ +Vertikal cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT +GleichmaessigTeilen cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP *ZielImDokument HID_HYPERLINK_MARKWND 'Uebernehmen Kein Eintrag in Hid.Lst @@ -395,4 +357,4 @@ VariableZelle sc:Edit:RID_SCDLG_SOLVER:ED_VARCELL Vorgaben2 sc:ImageButton:RID_SCDLG_SOLVER:RB_VARCELL *Zusammenfassen SID_AUTOFORMAT -Mindestgroesse svx:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN +Mindestgroesse cui:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win index aad530cf36e3..a062d5db9cf0 100755 --- a/testautomation/global/win/edia_a_c.win +++ b/testautomation/global/win/edia_a_c.win @@ -66,7 +66,7 @@ CheckRequiredFields HID_DSADMIN_CHECK_REQUIRED_FIELDS *Aging SID_GRFFILTER_SEPIA -AgingDegree svx:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA +AgingDegree cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA *AlienWarning HID_WARNING_ALIENFORMAT DoNotShowAgain sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF @@ -78,14 +78,14 @@ ReplaceExistingLibraries basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL *ApplyGallery HID_GALLERY_APPLY -*AssingComponent svx:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT -ComponentMethodName svx:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD +*AssingComponent cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT +ComponentMethodName cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD -*AssignMacro svx:TabPage:RID_SVXPAGE_MACROASSIGN +*AssignMacro cui:TabPage:RID_SVXPAGE_MACROASSIGN EventListBox HID_SVX_MACRO_LB_EVENT -AssignButton svx:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN -Component svx:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT -RemoveButton svx:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE +AssignButton cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN +Component cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT +RemoveButton cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE *AutopilotAgenda HID_AGWIZ ItemScrollbar HID_AGWIZ_5_SCROLL_BAR @@ -340,7 +340,7 @@ Pass basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS *CellWarning HID_SC_REPLCELLSWARN *ChangeIcon HID_SVX_CONFIG_ICON_SELECTOR -Import svx:PushButton:MD_ICONSELECTOR:BTN_IMPORT +Import cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT *ChangePassword HID_DLG_PASSWORD OldPassword dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD @@ -468,11 +468,11 @@ MoveUp sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_UP MoveDown sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DOWN *CustomizeMenuName HID_SVX_CONFIG_NAME_SUBMENU -Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING +Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING *CustomizeMenuReName HID_SVX_CONFIG_RENAME_MENU_ITEM -Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING +Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING *CustomizeToolbarsReName HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM -Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING +Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index ea63881d097d..de1b69ab4429 100755 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -53,10 +53,10 @@ MySQLHostName HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER MySQLPort HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT AdoURL HID_PAGE_DBWIZARD_ADO_ET_ADOURL -*CreateDatabaseLink svx:ModalDialog:DLG_DOCUMENTLINK +*CreateDatabaseLink cui:ModalDialog:DLG_DOCUMENTLINK DatabaseFile SID_OPENURL -Browse svx:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE -RegisteredName svx:Edit:DLG_DOCUMENTLINK:ET_NAME +Browse cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE +RegisteredName cui:Edit:DLG_DOCUMENTLINK:ET_NAME *DigitalSignature HID_XMLSEC_DLG_DIGSIG ViewCertificate xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT @@ -225,11 +225,11 @@ IndexFields HID_DLGINDEX_INDEXDETAILS_FIELD DatabaseIndexesClose dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE *RecordSearch HID_FM_DLG_SEARCH -SearchForText svx:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT -SearchForNull svx:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL -SearchForNotNull svx:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL +SearchForText cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT +SearchForNull cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL +SearchForNotNull cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL SearchText HID_SEARCH_TEXT -Formular svx:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM +Formular cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM AllFields HID_SEARCH_ALLFIELDS FieldSelection HID_SEARCH_FIELDSELECTION Position HID_SEARCH_POSITION @@ -427,18 +427,18 @@ Title HID_GALLERY_TITLE_EDIT *HangulHanjaConversion HID_DIALOG_HANGULHANJA Original HID_SPELLDLG_SETWORD Word HID_HANGULDLG_EDIT_NEWWORD -Find svx:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND +Find cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND Suggestions HID_HANGULDLG_SUGGESTIONS_LIST -HangulAndHanja svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION -HanjaHangul svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED -HangulHanja svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED -HanjaAsRubyAbove svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE -HanjaAsRubyBelow svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW -HangulAsRubyAbove svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE -HangulAsRubyBelow svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW -HangulOnly svx:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY -HanjaOnly svx:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY -ReplaceByCharacter svx:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER +HangulAndHanja cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION +HanjaHangul cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED +HangulHanja cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED +HanjaAsRubyAbove cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE +HanjaAsRubyBelow cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW +HangulAsRubyAbove cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE +HangulAsRubyBelow cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW +HangulOnly cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY +HanjaOnly cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY +ReplaceByCharacter cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER Ignore HID_HANGULDLG_BUTTON_IGNORE AlwaysIgnore HID_HANGULDLG_BUTTON_IGNOREALL Replace HID_HANGULDLG_BUTTON_CHANGE @@ -447,23 +447,23 @@ Options HID_HANGULDLG_BUTTON_OPTIONS Grid HID_HANGULDLG_SUGGESTIONS_GRID *HangulHanjaOptions HID_HANGULHANJA_OPT_DLG -NewDictionary svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW -EditDictionary svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT -DeleteDictionary svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE +NewDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW +EditDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT +DeleteDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE UserDefineDictionary HID_HANGULHANJA_OPT_DICTS_LB -IgnorePostPositionalWord svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST -ShowEntries svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST -ReplaceUniqueEntries svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE +IgnorePostPositionalWord cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST +ShowEntries cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST +ReplaceUniqueEntries cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE *HangulHanjaNewDictionary HID_HANGULHANJA_NEWDICT_DLG -DictionaryName svx:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME +DictionaryName cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME *HangulHanjaEditDictionary HID_HANGULHANJA_EDIT_DLG -Book svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK -Original svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL -Suggestion1 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1 -Suggestion2 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2 -Suggestion3 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3 -Suggestion4 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4 -NewEntry svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW -DeleteEntry svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE +Book cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK +Original cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL +Suggestion1 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1 +Suggestion2 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2 +Suggestion3 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3 +Suggestion4 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4 +NewEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW +DeleteEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win index 569012019ec0..17e3e286f237 100755 --- a/testautomation/global/win/edia_i_o.win +++ b/testautomation/global/win/edia_i_o.win @@ -134,16 +134,16 @@ ConstantValueMinus HID_SCH_STATISTIK_MINUS_VALUE ErrorIndicator HID_SCH_CT_INDICATE *JavaClassPath HID_OPTIONS_JAVA_CLASSPATH -ClassPath svx:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH -AddArchive svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE -AddFolder svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH -Remove svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH +ClassPath cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH +AddArchive cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE +AddFolder cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH +Remove cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH *JavaStartParameter HID_OPTIONS_JAVA_PARAMETER -StartParameter svx:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER -Assign svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN -AssignedStartParameters svx:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED -Remove svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE +StartParameter cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER +Assign cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN +AssignedStartParameters cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED +Remove cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE *JoinProperties HID_DLG_QRY_JOIN Type HID_DLG_QRY_JOINTYPE @@ -247,9 +247,9 @@ mZoomlistbox HID_AVMEDIA_ZOOMLISTBOX mTimeedit HID_AVMEDIA_TIMEEDIT *MenuOrganiser HID_SVX_CONFIG_MENU_ORGANIZER -MenuName svx:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME -ButtonUp svx:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP -ButtonDown svx:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN +MenuName cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME +ButtonUp cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP +ButtonDown cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN *ModifyLink sfx2:ModalDialog:MD_DDE_LINKEDIT ModifyDDEApplication sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_APP @@ -257,9 +257,9 @@ ModifyDDEFile sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_TOPIC ModifyDDECategory sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_ITEM *Mosaic SID_GRFFILTER_MOSAIC -Width svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH -Height svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT -EnhanceEdges svx:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES +Width cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH +Height cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT +EnhanceEdges cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES *NewAddressList HID_MM_CREATEADDRESSLIST New sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEW @@ -283,9 +283,9 @@ MoveRight sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT MoveDown sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN Select sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD -*NewToolbar svx:ModalDialog:MD_NEW_TOOLBAR -ToolbarName svx:Edit:MD_NEW_TOOLBAR:EDT_STRING -SaveIn svx:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN +*NewToolbar cui:ModalDialog:MD_NEW_TOOLBAR +ToolbarName cui:Edit:MD_NEW_TOOLBAR:EDT_STRING +SaveIn cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN *NewsletterLayout HID_DLGNEWSLTR_DIALOG Newsletter HID_DLGNEWSLTR_OPTSTANDARDLAYOUT @@ -296,15 +296,15 @@ Duplex HID_DLGNEWSLTR_OPTDOUBLESIDED OKButton HID_DLGNEWSLTR_CMDGOON *OLEObjektInsert SID_INSERT_OBJECT -NeuErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT -AusDateiErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE -Objekttyp svx:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE -OleDatei svx:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH -Verknuepfen svx:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK -Durchsuchen svx:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH - -*InsertTableImpress svx:ModalDialog:RID_SVX_NEWTABLE_DLG -NumberOfColumns svx:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS -NumberOfRows svx:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS +NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT +AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE +Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE +OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH +Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK +Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH + +*InsertTableImpress cui:ModalDialog:RID_SVX_NEWTABLE_DLG +NumberOfColumns cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS +NumberOfRows cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS *TableDesign sd:ModalDialog:DLG_TABLEDESIGNPANE diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win index ea5e9cf266db..0fd52589b6b5 100755 --- a/testautomation/global/win/edia_p_s.win +++ b/testautomation/global/win/edia_p_s.win @@ -64,7 +64,7 @@ HideToolbar filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR HideWindowControls filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL *Posterize SID_GRFFILTER_POSTER -PosterColors svx:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER +PosterColors cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER *PortfolioCurrency HID_DLGDEPOT_DIALOG_HISTORY Currency HID_DLGDEPOT_LSTMARKETS @@ -166,10 +166,10 @@ LightSource HID_GRFFILTER_EMBOSS_LIGHT FieldTitle sw:Edit:DLG_MM_ADD_RENAME_ENTRY:ED_FIELDNAME *RenameMenu HID_SVX_CONFIG_RENAME_MENU -NewName svx:Edit:RID_SVXDLG_NAME:EDT_STRING +NewName cui:Edit:RID_SVXDLG_NAME:EDT_STRING *RenameToolbar HID_SVX_CONFIG_RENAME_TOOLBAR -NewName svx:Edit:RID_SVXDLG_NAME:EDT_STRING +NewName cui:Edit:RID_SVXDLG_NAME:EDT_STRING *Registration HID_REGISTRATION_DIALOG Now svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW @@ -248,14 +248,14 @@ Type sw:Edit:DLG_SAVE_LABEL:ED_TYPE *ScriptOrganizer HID_SCRIPTORG_DIALOG ScriptTreeList HID_SCRIPTSBOX -PBRun svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN -PBCreate svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE -PBEdit svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT -PBRename svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME -PBDelete svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL +PBRun cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN +PBCreate cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE +PBEdit cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT +PBRename cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME +PBDelete cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL -*ScriptNameDlg svx:ModalDialog:RID_DLG_NEWLIB -EFObjectName svx:Edit:RID_DLG_NEWLIB:ED_LIBNAME +*ScriptNameDlg cui:ModalDialog:RID_DLG_NEWLIB +EFObjectName cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME *ScriptSelector HID_SELECTOR_DIALOG LibraryTreeList HID_SELECTOR_CATEGORIES @@ -336,8 +336,8 @@ Resolution chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION DataPointsOrder chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER *Solarization SID_GRFFILTER_SOLARIZE -Value svx:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD -Invert svx:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT +Value cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD +Invert cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT *Solver SID_OPENDLG_OPTSOLVER TargetCell sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL @@ -401,17 +401,17 @@ ExtendSelection sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_EXTSORT CurrentSelection sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_CURSORT *Spellcheck HID_SPELLCHECK -NotInDictionary svx:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD -Suggestions svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION -DictionaryLanguage svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE +NotInDictionary cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD +Suggestions cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION +DictionaryLanguage cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE IgnoreOnce HID_SPLDLG_BUTTON_IGNORE IgnoreAll HID_SPLDLG_BUTTON_IGNOREALL -AddToDictionary svx:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT +AddToDictionary cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT Change HID_SPLDLG_BUTTON_CHANGE ChangeAll HID_SPLDLG_BUTTON_CHANGEALL -AutoCorrect svx:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR -SpellcheckOptions svx:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS -SpellcheckUndo svx:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO +AutoCorrect cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR +SpellcheckOptions cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS +SpellcheckUndo cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO SpellcheckClose HID_SPLDLG_BUTTON_CLOSE *SQLException dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN @@ -522,7 +522,7 @@ Back HID_DLGHOLIDAYCAL_0_CMDOWNDATA Create HID_DLGHOLIDAYCAL_0_CMDOK *StoredPasswordsDialog HID_DLG_WEBCONNECTION_INFO -Remove svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE -RemoveAll svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL -changePassword svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE +Remove cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE +RemoveAll cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL +changePassword cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win index 65008b14a2db..f2214f266741 100755 --- a/testautomation/global/win/etab_a_d.win +++ b/testautomation/global/win/etab_a_d.win @@ -1,13 +1,13 @@ *TabAccessibility HID_OPTIONS_ACCESSIBILITYCONFIG -ForPagePreviews svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS -HelpTips svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP -After svx:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP -AllowAnimatedGraphics svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS -AllowAnimatedText svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS -AlwaysUseAutomaticFontColor svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR -SupportAssistiveTechnologyTools svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL -UseTextSelectionCursor svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION -AutomaticDetectHC svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC +ForPagePreviews cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS +HelpTips cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP +After cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP +AllowAnimatedGraphics cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS +AllowAnimatedText cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS +AlwaysUseAutomaticFontColor cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR +SupportAssistiveTechnologyTools cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL +UseTextSelectionCursor cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION +AutomaticDetectHC cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC *TabAdabas HID_DSADMIN_PAGE_ADABAS Hostname dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME @@ -42,9 +42,9 @@ UserName HID_DSADMIN_USER_ADO PasswordRequired HID_DSADMIN_PWDREC_ADO *TabAppearance HID_OPTIONS_COLORCONFIG -Scheme svx:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME -Save svx:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME -Delete svx:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME +Scheme cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME +Save cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME +Delete cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME ColorList HID_OPTIONS_COLORCONFIG_COLORLIST_WIN LBGeneralDocBg HID_COLORPAGE_DOCCOLOR_LB CBGeneralTextBd HID_COLORPAGE_DOCBOUNDARIES_CB @@ -93,47 +93,47 @@ LBBasicReservedExpression HID_COLORPAGE_BASICKEYWORD_LB LBBasicError HID_COLORPAGE_BASICERROR_LB *TabArea HID_AREA_AREA -BackgroundColour svx:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD -BackgroundColourList svx:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR -FillOptions svx:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE -ColourList svx:ListBox:RID_SVXPAGE_AREA:LB_COLOR -GradientList svx:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT -HatchingList svx:ListBox:RID_SVXPAGE_AREA:LB_HATCHING -BitmapList svx:ListBox:RID_SVXPAGE_AREA:LB_BITMAP -Automatic svx:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT -Increments svx:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT -Tile svx:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE -Stretch svx:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH -Relative svx:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE -Original svx:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL -Width svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE -Height svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE -XOffset svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET -YOffset svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET -Row svx:RadioButton:RID_SVXPAGE_AREA:RBT_ROW -Column svx:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN -Offset svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET +BackgroundColour cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD +BackgroundColourList cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR +FillOptions cui:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE +ColourList cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR +GradientList cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT +HatchingList cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING +BitmapList cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP +Automatic cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT +Increments cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT +Tile cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE +Stretch cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH +Relative cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE +Original cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL +Width cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE +Height cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE +XOffset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET +YOffset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET +Row cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW +Column cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN +Offset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET *TabAsianLayout HID_SVXPAGE_CHAR_TWOLINES -TwoLinesEachLine svx:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES -BeginningCharacter svx:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET -EndCharacter svx:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET +TwoLinesEachLine cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES +BeginningCharacter cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET +EndCharacter cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET *TabAsianLayoutOptions HID_OPTIONS_ASIAN_LAYOUT -WesternCharactersOnly svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING -WesternTextAndPunctuation svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT -NoCompression svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP -CompressPunctuationOnly svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP -CompressPunctuationAndJapaneseKana svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP -Language svx:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE -Standard svx:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD -NoStartOfLine svx:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START -NoEndOfLine svx:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END +WesternCharactersOnly cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING +WesternTextAndPunctuation cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT +NoCompression cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP +CompressPunctuationOnly cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP +CompressPunctuationAndJapaneseKana cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP +Language cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE +Standard cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD +NoStartOfLine cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START +NoEndOfLine cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END *TabAsianTypography HID_SVXPAGE_PARA_ASIAN -ApplyList svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN -AllowHangingPunctuation svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC -ApplySpacingBetween svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE +ApplyList cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN +AllowHangingPunctuation cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC +ApplySpacingBetween cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE *TabAutoCaption HID_OPTCAPTION_PAGE ObjectList HID_OPTCAPTION_CLB @@ -169,20 +169,20 @@ Remove HID_NUM_RESET TextDirection chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR *TabChartAxisNumbers HID_NUMBERFORMAT - Category svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY - FormatCurrency svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY + Category cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY + FormatCurrency cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY FormatString HID_NUMBERFORMAT_LB_FORMAT - Language svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE - Sourceformat svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT - DecimalPlaces svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS - LeadingZeroes svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES - NegativNumbersRed svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED - ThousandsSeparator svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND - FormatCode svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT + Language cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE + Sourceformat cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT + DecimalPlaces cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS + LeadingZeroes cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES + NegativNumbersRed cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED + ThousandsSeparator cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND + FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT AddButton HID_NUMBERFORMAT_TBI_ADD EditCommentButton HID_NUMBERFORMAT_TBI_INFO RemoveButton HID_NUMBERFORMAT_TBI_REMOVE - Comment svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT + Comment cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT *TabChartAxisScale chart2:TabPage:TP_SCALE MinimumValue chart2:SpinField:TP_SCALE:EDT_MIN @@ -270,11 +270,11 @@ InsertInSheet chart2:ListBox:TP_LOCATION:LB_TABLE *TabCreateOptionGroup extensions:TabPage:RID_PAGE_OPTIONS_FINAL GroupCaption extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT -*TabConnections svx:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS +*TabConnections cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS DriverList HID_OFA_CONNPOOL_DRIVERLIST -ConnectionPoolingEnabled svx:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS -EnablePoolingForThisDriver svx:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING -Timeout svx:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT +ConnectionPoolingEnabled cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS +EnablePoolingForThisDriver cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING +Timeout cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT *TabConnection dbaccess:TabPage:PAGE_CONNECTION dBasePath HID_DSADMIN_DBASE_PATH @@ -319,40 +319,40 @@ Reset sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_RESET Default sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_DEFAULT *TabComplexTextLayout HID_OPTIONS_CTL -UseSequenceChecking svx:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING -Logical svx:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL -Visual svx:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL -Numerals svx:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS -Restricted svx:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED -TypeAndReplace svx:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE +UseSequenceChecking cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING +Logical cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL +Visual cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL +Numerals cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS +Restricted cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED +TypeAndReplace cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE *TabCustomizeEvents HID_SVX_CONFIG_EVENT -SaveIn svx:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN +SaveIn cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN EventListbox HID_SVX_MACRO_LB_EVENT -AssignMacro svx:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN -RemoveMacro svx:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE +AssignMacro cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN +RemoveMacro cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE ResetBtn HID_TABDLG_RESET_BTN *TabCustomizeMenu HID_SVX_CONFIG_MENU -Menu svx:ListBox:RID_SVXPAGE_MENUS:LB_MENUS -BtnNew svx:PushButton:RID_SVXPAGE_MENUS:BTN_NEW -MenuBtn svx:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE -AddCommands svx:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS -Command svx:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY -BtnUp svx:ImageButton:RID_SVXPAGE_MENUS:BTN_UP -BtnDown svx:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN -SaveIn svx:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN +Menu cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS +BtnNew cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW +MenuBtn cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE +AddCommands cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS +Command cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY +BtnUp cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP +BtnDown cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN +SaveIn cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN ResetBtn HID_TABDLG_RESET_BTN Entries HID_SVX_CONFIG_MENU_CONTENTS *TabCustomizeToolbars HID_SVX_CONFIG_TOOLBAR -Menu svx:ListBox:RID_SVXPAGE_MENUS:LB_MENUS +Menu cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS BtnNew HID_SVX_NEW_TOOLBAR MenuBtn HID_SVX_MODIFY_TOOLBAR AddCommands HID_SVX_NEW_TOOLBAR_ITEM Command HID_SVX_MODIFY_TOOLBAR_ITEM -BtnUp svx:ImageButton:RID_SVXPAGE_MENUS:BTN_UP -BtnDown svx:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN +BtnUp cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP +BtnDown cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN SaveIn HID_SVX_SAVE_IN ToolbarContents HID_SVX_CONFIG_TOOLBAR_CONTENTS ResetBtn HID_TABDLG_RESET_BTN diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win index 69e4782a488e..09fd5e9067b8 100755 --- a/testautomation/global/win/etab_e_g.win +++ b/testautomation/global/win/etab_e_g.win @@ -7,8 +7,8 @@ TextAnimation sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM DelayBetweenCharacters sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY *TabEmail HID_OPTIONS_MAIL -EmailProgram svx:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL -EmailOpen svx:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL +EmailProgram cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL +EmailOpen cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL *TabEntrance HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE Effects sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS @@ -108,57 +108,57 @@ FathersName desktop:Edit:TP_USER:ED_USER_FATHER *TabFirstStartWelcome HID_FIRSTSTART_WELCOME *TabFont HID_SVXPAGE_CHAR_NAME -Font svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK -Style svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK -Size svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK -Language svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK -FontWest svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME -StyleWest svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE -SizeWest svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE -LanguageWest svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG -FontEast svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME -StyleEast svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE -SizeEast svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE -LanguageEast svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG -FontCTL svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME -StyleCTL svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE -SizeCTL svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE -LanguageCTL svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG -Color svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2 +Font cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK +Style cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK +Size cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK +Language cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK +FontWest cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME +StyleWest cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE +SizeWest cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE +LanguageWest cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG +FontEast cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME +StyleEast cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE +SizeEast cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE +LanguageEast cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG +FontCTL cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME +StyleCTL cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE +SizeCTL cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE +LanguageCTL cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG +Color cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2 *TabFontEffects HID_SVXPAGE_CHAR_EFFECTS -Underline svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE -Color svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR -Effects svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2 -StrikeThrough svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT -IndividualWords svx:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS -Emphasis svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS -Position svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION -Outline svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE -Overline svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE -OverlineColor svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR -Shadow svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW -Blinking svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING -Relief svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF -FontColor svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR -Hidden svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN +Underline cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE +Color cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR +Effects cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2 +StrikeThrough cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT +IndividualWords cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS +Emphasis cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS +Position cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION +Outline cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE +Overline cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE +OverlineColor cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR +Shadow cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW +Blinking cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING +Relief cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF +FontColor cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR +Hidden cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN *TabFontPosition HID_SVXPAGE_CHAR_POSITION -SuperScript svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS -Normal svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS -Subscript svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS -RaiseLower svx:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW -RelativeFontSize svx:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE -Automatic svx:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW -n0Degree svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG -n90Degree svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG -n270Degree svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG -FitToLine svx:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE -ScaleWith svx:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH -Spacing svx:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2 -SpacingBy svx:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2 -PairKerning svx:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING -Super svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS +SuperScript cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS +Normal cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS +Subscript cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS +RaiseLower cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW +RelativeFontSize cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE +Automatic cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW +n0Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG +n90Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG +n270Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG +FitToLine cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE +ScaleWith cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH +Spacing cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2 +SpacingBy cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2 +PairKerning cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING +Super cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS *TabFormat3dViewGeometry SID_3D_VIEW AxisRotationXaxis chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION @@ -194,22 +194,22 @@ Super svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS TextDirection2 HID_SCH_TEXTDIRECTION_EQUATION *TabFormatChartLine HID_LINE_LINE - Style svx:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE - Color svx:ListBox:RID_SVXPAGE_LINE:LB_COLOR - Width svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH - Transparency svx:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT - StyleLeft svx:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE - WidthLeft svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH - CenterLeft svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START - StyleRight svx:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE - WidthRight svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH - CenterRight svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END - SynchroniteEnds svx:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE - CornerStyle svx:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE - IconSelect svx:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP - IconWidth svx:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH - IconHeigth svx:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT - KeepRatio svx:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO + Style cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE + Color cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR + Width cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH + Transparency cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT + StyleLeft cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE + WidthLeft cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH + CenterLeft cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START + StyleRight cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE + WidthRight cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH + CenterRight cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END + SynchroniteEnds cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE + CornerStyle cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE + IconSelect cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP + IconWidth cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH + IconHeigth cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT + KeepRatio cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO +TabFormatChartBorders TabFormatChartLine diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win index 66ce34a2c5a6..60334e1c287d 100755 --- a/testautomation/global/win/etab_h_o.win +++ b/testautomation/global/win/etab_h_o.win @@ -11,38 +11,38 @@ URL sfx2:Edit:TP_DOCINFORELOAD:ED_URL BrowseURL sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL Frame sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME -*TabOOoImprovement svx:TabPage:RID_SVXPAGE_IMPROVEMENT -ParticipateYes svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES -ParticipateNo svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO -ShowData svx:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA +*TabOOoImprovement cui:TabPage:RID_SVXPAGE_IMPROVEMENT +ParticipateYes cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES +ParticipateNo cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO +ShowData cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA *TabJava HID_OPTIONS_JAVA -UseJava svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE +UseJava cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE JavaList HID_OPTIONS_JAVA_LIST -Add svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD -Parameters svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER -ClassPath svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH +Add cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD +Parameters cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER +ClassPath cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH *TabJapaneseFind HID_SVXPAGE_JSEARCH_OPTIONS -MatchCase svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE -MatchFullHalf svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH -MatchHiraganaKatakana svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA -MatchContractions svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS -MatchMinusDashChoOn svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON -MatchRepeatcharacterMarks svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS -MatchVariantFormKanji svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI -MatchOldKanaForms svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS -MatchDiZiDuZu svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU -MatchBaVaHaFa svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA -MatchTsiThiChiDhiZi svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI -MatchHyuFyuByuVyu svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU -MatchDeSheZeJe svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE -MatchIaIya svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA -MatchKiKu svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU -PunctuationCharacters svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION -WhitespaceCharacters svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES -ProlongedSoundmarks svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK -MiddleDots svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT +MatchCase cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE +MatchFullHalf cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH +MatchHiraganaKatakana cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA +MatchContractions cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS +MatchMinusDashChoOn cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON +MatchRepeatcharacterMarks cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS +MatchVariantFormKanji cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI +MatchOldKanaForms cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS +MatchDiZiDuZu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU +MatchBaVaHaFa cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA +MatchTsiThiChiDhiZi cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI +MatchHyuFyuByuVyu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU +MatchDeSheZeJe cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE +MatchIaIya cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA +MatchKiKu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU +PunctuationCharacters cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION +WhitespaceCharacters cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES +ProlongedSoundmarks cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK +MiddleDots cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT *TabJDBC HID_DSADMIN_PAGE_JDBC JDBCDriverClass HID_DSADMIN_DRIVERCLASS @@ -170,15 +170,15 @@ EditButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT *TabMemory HID_OFA_TP_MEMORY -UndoSteps svx:NumericField:OFA_TP_MEMORY:ED_UNDO -StarOffice svx:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE -MemoryPerObject svx:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE -RemoveFromMemoryAfter svx:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME -NumberOfObjects svx:NumericField:OFA_TP_MEMORY:NF_OLECACHE -LoadQuickstarter svx:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH +UndoSteps cui:NumericField:OFA_TP_MEMORY:ED_UNDO +StarOffice cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE +MemoryPerObject cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE +RemoveFromMemoryAfter cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME +NumberOfObjects cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE +LoadQuickstarter cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH -*TabMozillaPlugin svx:TabPage:RID_SVXPAGE_INET_MOZPLUGIN -Enable svx:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE +*TabMozillaPlugin cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN +Enable cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE *TabMySQLJDBC dbaccess:TabPage:PAGE_MYSQL_JDBC HostName HID_DSADMIN_HOSTNAME @@ -209,13 +209,13 @@ UseCatalogs HID_DSADMIN_USECATALOG +TabOfficeView TabAnsichtAllgemein *TabOnlineUpdate HID_SVX_OPTIONS_ONLINEUPDATE -CheckAutomatically svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK -EveryDay svx:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY -EveryWeek svx:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK -EveryMonth svx:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH -CheckNow svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW -DownloadAutomatically svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD -Change svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH +CheckAutomatically cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK +EveryDay cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY +EveryWeek cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK +EveryMonth cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH +CheckNow cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW +DownloadAutomatically cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD +Change cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH *TabOracleJDBC dbaccess:TabPage:PAGE_ORACLE_JDBC HostName HID_DSADMIN_HOSTNAME diff --git a/testautomation/global/win/etab_p_s.win b/testautomation/global/win/etab_p_s.win index 7a61877be522..49a253bdb128 100755 --- a/testautomation/global/win/etab_p_s.win +++ b/testautomation/global/win/etab_p_s.win @@ -2,39 +2,39 @@ TransferPersonalData desktop:CheckBox:TP_MIGRATION:CB_MIGRATION *TabPositionAndSize HID_TRANS_POSITION_SIZE -PositionX svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X -PositionY svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y -Width svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH -Height svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT -KeepRatio svx:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE -ProtectPosition svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT -ProtectSize svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT -FitWidthText svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH -FitHeightText svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT -AnchorPosition svx:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT -Anchor svx:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR +PositionX cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X +PositionY cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y +Width cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH +Height cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT +KeepRatio cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE +ProtectPosition cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT +ProtectSize cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT +FitWidthText cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH +FitHeightText cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT +AnchorPosition cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT +Anchor cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR PositionPosition HID_TPPOSITION_CTRL SizePosition HID_TPSIZE_CTRL *TabPositionAndSizeWriter HID_SVXPAGE_SWPOSSIZE -Width svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH -Height svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT -KeepRatio svx:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO -Topage svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE -Toparagraph svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA -Tocharacter svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR -Ascharacter svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR -ToFrame svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME -ProtectPosition svx:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION -ProtectSize svx:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE -Horizontal svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI -Horizontalby svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY -Horizontalto svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO -Mirror svx:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR -Vertical svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT -Verticalby svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY -Verticalto svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO -Followtextflow svx:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW +Width cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH +Height cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT +KeepRatio cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO +Topage cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE +Toparagraph cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA +Tocharacter cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR +Ascharacter cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR +ToFrame cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME +ProtectPosition cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION +ProtectSize cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE +Horizontal cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI +Horizontalby cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY +Horizontalto cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO +Mirror cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR +Vertical cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT +Verticalby cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY +Verticalto cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO +Followtextflow cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW *TabPrintStarOffice HID_TP_COMMONPRINTOPTIONS Printer sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT @@ -62,41 +62,41 @@ SuppressOutput sc:CheckBox:RID_SCPAGE_PRINT:BTN_SKIPEMPTYPAGES PrintOnly sc:CheckBox:RID_SCPAGE_PRINT:BTN_SELECTEDSHEETS *TabProxyServer HID_OPTIONS_PROXY -ProxyServer svx:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE -HttpProxy svx:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY -HttpPort svx:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT -FtpProxy svx:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY -FtpPort svx:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT -NoProxy svx:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR +ProxyServer cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE +HttpProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY +HttpPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT +FtpProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY +FtpPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT +NoProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR -*TabRegisteredDatabase svx:TabPage:RID_SFXPAGE_DBREGISTER +*TabRegisteredDatabase cui:TabPage:RID_SFXPAGE_DBREGISTER RegisteredDatabases HID_DBPATH_CTL_PATH -NewBtn svx:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW -EditBtn svx:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT -DeleteBtn svx:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE +NewBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW +EditBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT +DeleteBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE *TabSectionIndent HID_SECTION_INDENTS_PAGE IndentBefore sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE IndentAfter sw:MetricField:TP_SECTION_INDENTS:MF_AFTER -*TabSecurity svx:TabPage:RID_SVXPAGE_INET_SECURITY -MacroSecurity svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC -RecommendToOpenDocumentReadOnly svx:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECOMMREADONLY -RecordChanges svx:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECORDCHANGES -Protect svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_PROTRECORDS -PersistentlySavePasswords svx:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS -Options svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS -MasterPassword svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD -ShowPasswords svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS +*TabSecurity cui:TabPage:RID_SVXPAGE_INET_SECURITY +MacroSecurity cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC +RecommendToOpenDocumentReadOnly cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECOMMREADONLY +RecordChanges cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECORDCHANGES +Protect cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_PROTRECORDS +PersistentlySavePasswords cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS +Options cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS +MasterPassword cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD +ShowPasswords cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS *TabSecurityOptionsAndWarnings HID_DLG_SECURITY_OPTIONS -SavingOrSendingDocuments svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS -SigningDocuments svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS -PrintingDocuments svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS -CreatingPDFfiles svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF -RemovePersonalInformationOnSaving svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO -RecommendPasswordProtectionOnSaving svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD -CtrlClickRequiredToFollowHyperlinks svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK +SavingOrSendingDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS +SigningDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS +PrintingDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS +CreatingPDFfiles cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF +RemovePersonalInformationOnSaving cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO +RecommendPasswordProtectionOnSaving cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD +CtrlClickRequiredToFollowHyperlinks cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK *TabSecurityLevel HID_XMLSEC_TP_SECLEVEL VeryHigh xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win index 07bed1592061..aa0155908c5d 100755 --- a/testautomation/global/win/etab_t_z.win +++ b/testautomation/global/win/etab_t_z.win @@ -40,17 +40,17 @@ TriggerStart sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE Shape sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER *TabTransparency HID_AREA_TRANSPARENCE -NoTransparency svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF -Transparency svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR -Gradient svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT -TransparencyPercent svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT -Type svx:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES -CenterX svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X -CenterY svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y -Angle svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE -Border svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER -StartValue svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE -EndValue svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE +NoTransparency cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF +Transparency cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR +Gradient cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT +TransparencyPercent cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT +Type cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES +CenterX cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X +CenterY cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y +Angle cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE +Border cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER +StartValue cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE +EndValue cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE *TabTrendLineType chart2:TabPage:TP_TRENDLINE None HID_SCH_TRENDLINE_RB_NONE diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win index fbcba2599a74..10e2a8b50652 100755 --- a/testautomation/global/win/tab_a_d.win +++ b/testautomation/global/win/tab_a_d.win @@ -17,26 +17,26 @@ Einfuegungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT Verschiebungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE *TabAllgemein HID_OPTIONS_GENERAL -Firma svx:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY -VorName svx:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME -ZuName svx:Edit:RID_SFXPAGE_GENERAL:ED_NAME -NameDesVaters svx:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME -Strasse svx:Edit:RID_SFXPAGE_GENERAL:ED_STREET -Apartmentnummer svx:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR -Land svx:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY -PLZ svx:Edit:RID_SFXPAGE_GENERAL:ED_PLZ -Ort svx:Edit:RID_SFXPAGE_GENERAL:ED_CITY -Kuerzel svx:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME -TelPriv svx:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT -TelGe svx:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY -Fax svx:Edit:RID_SFXPAGE_GENERAL:ED_FAX -EMail svx:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL -Titel svx:Edit:RID_SFXPAGE_GENERAL:ED_TITLE -Position svx:Edit:RID_SFXPAGE_GENERAL:ED_POSITION -City svx:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY -Zip svx:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE -Street svx:Edit:RID_SFXPAGE_GENERAL:ED_STREET -State SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE +Firma cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY +VorName cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME +ZuName cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME +NameDesVaters cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME +Strasse cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET +Apartmentnummer cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR +Land cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY +PLZ cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ +Ort cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY +Kuerzel cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME +TelPriv cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT +TelGe cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY +Fax cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX +EMail cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL +Titel cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE +Position cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION +City cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY +Zip cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE +Street cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET +State cui:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE Zurueck HID_TABDLG_RESET_BTN +TabAllgemeines TabAllgemein @@ -45,60 +45,60 @@ Zurueck HID_TABDLG_RESET_BTN NeuesThema HID_GALLERY_EDIT_MSNAME *TabAnsichtAllgemein HID_OFA_TP_VIEW -FontScale svx:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE -IconStyle svx:ListBox:OFA_TP_VIEW:LB_ICONSTYLE -IconScale svx:ListBox:OFA_TP_VIEW:LB_ICONSIZE -FontAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING -AAPixel svx:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT -VorschauInSchriftlisten svx:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW -SchriftenHistorie svx:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY -UseHardwareAcceleration svx:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL -UseAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE -IconsInMenueAnzeigen svx:ListBox:OFA_TP_VIEW:LB_MENU_ICONS -MausAktion svx:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE -MousePositioning svx:ListBox:OFA_TP_VIEW:LB_MOUSEPOS -UseSystemFont svx:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT -Transparency svx:CheckBox:OFA_TP_VIEW:CB_SELECTION -SelectionOpacity svx:MetricField:OFA_TP_VIEW:MF_SELECTION +FontScale cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE +IconStyle cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE +IconScale cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE +FontAntiAliasing cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING +AAPixel cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT +VorschauInSchriftlisten cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW +SchriftenHistorie cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY +UseHardwareAcceleration cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL +UseAntiAliasing cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE +IconsInMenueAnzeigen cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS +MausAktion cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE +MousePositioning cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS +UseSystemFont cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT +Transparency cui:CheckBox:OFA_TP_VIEW:CB_SELECTION +SelectionOpacity cui:MetricField:OFA_TP_VIEW:MF_SELECTION *TabAusnahmen HID_OFAPAGE_AUTOCORR_EXCEPT -Abkuerzungen svx:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV -AbkuerzungenListe svx:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV -AbkuerzungenNeu svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV -AbkuerzungenLoeschen svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV -AbkuerzungenAutomatisch svx:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV -Woerter svx:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS -WoerterListe svx:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS -WoerterNeu svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS -WoerterLoeschen svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS -WoerterAutomatisch svx:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS +Abkuerzungen cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV +AbkuerzungenListe cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV +AbkuerzungenNeu cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV +AbkuerzungenLoeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV +AbkuerzungenAutomatisch cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV +Woerter cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS +WoerterListe cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS +WoerterNeu cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS +WoerterLoeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS +WoerterAutomatisch cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS Zurueck HID_TABDLG_RESET_BTN WelcheSprache HID_AUTOCORR_LANGUAGE *TabAusrichtung HID_ALIGNMENT -ListeHAusrichtung svx:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN -ListeVAusrichtung svx:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN -Einzug svx:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT -Zeilenumbruch svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP -Silbentrennung svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH -Grad SVX:NUMERICFIELD:RID_SVXPAGE_ALIGNMENT:NF_DEGREES +ListeHAusrichtung cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN +ListeVAusrichtung cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN +Einzug cui:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT +Zeilenumbruch cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP +Silbentrennung cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH +Grad cui:NUMERICFIELD:RID_SVXPAGE_ALIGNMENT:NF_DEGREES Bezugskante HID_ALIGNMENT_CTR_BORDER_LOCK -VertikaleAusrichtung svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL -Gestapelt svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED -ShrinkToFit svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK -SetAlignmentOptions svx:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR +VertikaleAusrichtung cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL +Gestapelt cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED +ShrinkToFit cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK +SetAlignmentOptions cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR AlignmentDial HID_ALIGNMENT_CTR_DIAL *TabAusrichtungAbsatz HID_FORMAT_PARAGRAPH_ALIGN -Links SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN -Rechts SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN -Zentriert SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN -Blocksatz SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN -LetzteZeile SVX:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE -EinzelnesWortAustreiben SVX:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND -VertikaleTextausrichtung svx:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN -TextrasterFangen svx:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP -TextDirection svx:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION +Links cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN +Rechts cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN +Zentriert cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN +Blocksatz cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN +LetzteZeile cui:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE +EinzelnesWortAustreiben cui:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND +VertikaleTextausrichtung cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN +TextrasterFangen cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP +TextDirection cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION *TabBedingung HID_COND_COLL AlsBedingteVorlage sw:CheckBox:TP_CONDCOLL:CB_CONDITION @@ -117,17 +117,17 @@ Zuweisen sw:PushButton:TP_CONDCOLL:PB_ASSIGN 'Zurueck HID_TABDLG_RESET_BTN *TabBemassung HID_PAGE_MEASURE -Liniendistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST -HLUebergang svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG -HLDistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST -LinkeHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN -RechteHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN -AnzeigeUnterhalb svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE -AnzeigeParallel svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL -MetrikAnzeigen svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT +Liniendistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST +HLUebergang cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG +HLDistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST +LinkeHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN +RechteHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN +AnzeigeUnterhalb cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE +AnzeigeParallel cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL +MetrikAnzeigen cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT Textposition HID_MEASURE_CTL_POSITION -AutomatischVertikal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV -AutomatischHorizontal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH +AutomatischVertikal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV +AutomatischHorizontal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH *TabBenutzer HID_DOCINFOUSER Info0 sfx2:Edit:TP_DOCINFOUSER:ED_INFO1 @@ -183,24 +183,24 @@ Loeschen basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE *TabBitmap HID_AREA_BITMAP 'PixelEditor -Vordergrund svx:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR -Hintergrund svx:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR -Tabelle svx:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS -Hinzufuegen svx:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD -Aendern svx:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY -Import svx:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT -Loeschen svx:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE -Oeffnen svx:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD -Speichern svx:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE +Vordergrund cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR +Hintergrund cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR +Tabelle cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS +Hinzufuegen cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD +Aendern cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY +Import cui:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT +Loeschen cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE +Oeffnen cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD +Speichern cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE Zurueck HID_TABDLG_RESET_BTN *TabDateien HID_GALLERY_BROWSER -Dateityp svx:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE -Suche svx:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH -Dateiliste svx:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND -Hinzufuegen svx:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE -HinzufuegenAlle svx:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL -Vorschau svx:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW +Dateityp cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE +Suche cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH +Dateiliste cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND +Hinzufuegen cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE +HinzufuegenAlle cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL +Vorschau cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW *TabDatenbank HID_FLD_DB Feldtyp SW:LISTBOX:TP_FLD_DB:LB_DBTYPE @@ -275,9 +275,9 @@ Einfuegen HID_FIELD_INSERT Schliessen HID_FIELD_CLOSE *TabDrehung HID_TRANS_ANGLE -PositionX svx:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X -PositionY svx:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y -Winkel svx:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE +PositionX cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X +PositionY cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y +Winkel cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE Drehpunkt HID_TPROTATION_CTRL1 Drehwinkel HID_TPROTATION_CTRL2 diff --git a/testautomation/global/win/tab_e_g.win b/testautomation/global/win/tab_e_g.win index f15a2948fddb..d34d387acffc 100755 --- a/testautomation/global/win/tab_e_g.win +++ b/testautomation/global/win/tab_e_g.win @@ -1,16 +1,16 @@ *TabEigenschaften SID_INSERT_FLOATINGFRAME -FrameName svx:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME -Inhalt svx:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL -Oeffnen svx:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN -An svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON -Aus svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF -Automatisch svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO -UmrandungAn svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON -UmrandungAus svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF -Breite svx:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH -Hoehe svx:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT -BreiteStandard svx:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT -HoeheStandard svx:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT +FrameName cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME +Inhalt cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL +Oeffnen cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN +An cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON +Aus cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF +Automatisch cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO +UmrandungAn cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON +UmrandungAus cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF +Breite cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH +Hoehe cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT +BreiteStandard cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT +HoeheStandard cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT *TabEingabehilfe SC:TABPAGE:TP_VALIDATION_INPUTHELP EingabehilfenbeiSelektion SC:TRISTATEBOX:TP_VALIDATION_INPUTHELP:TSB_HELP @@ -18,16 +18,16 @@ Titel SC:EDIT:TP_VALIDATION_INPUTHELP:EDT_TITLE EingabeHilfe SC:MULTILINEEDIT:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP *TabEinzuegeUndAbstaende HID_FORMAT_PARAGRAPH_STD -Automatisch svx:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO -Vonlinks svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT -ErsteZeile svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT -VonRechts svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT -Oben svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST -Unten svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST -Zeilenabstand svx:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST -Um svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT -Von SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC -Registerhaltigkeit svx:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER +Automatisch cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO +Vonlinks cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT +ErsteZeile cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT +VonRechts cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT +Oben cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST +Unten cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST +Zeilenabstand cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST +Um cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT +Von cui:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC +Registerhaltigkeit cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER *TabEndnoten HID_ENDNOTE_OPTIONS Numerierung sw:ListBox:TP_ENDNOTEOPTION:LB_NUMVIEW @@ -40,12 +40,12 @@ ZeichenvorlageEndnotenbereich sw:ListBox:TP_ENDNOTEOPTION:LB_TEXT_CHARFMT ZeichenvorlageTextbereich sw:ListBox:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT *TabErsetzung HID_OFAPAGE_AUTOCORR_REPLACE -NurText svx:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY -Kuerzel svx:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT -ErsetzenDurch svx:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE +NurText cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY +Kuerzel cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT +ErsetzenDurch cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE Liste HID_OFACTL_AUTOCORR_REPLACE -Neu svx:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE -Loeschen svx:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE +Neu cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE +Loeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE Zurueck HID_TABDLG_RESET_BTN WelcheSprache HID_AUTOCORR_LANGUAGE @@ -74,39 +74,39 @@ Zurueck HID_TABDLG_RESET_BTN *TabFangenEinrasten HID_SD_OPTIONS_SNAP sc:hidspecial:HID_SC_WIN_PREVIEW *TabFarben HID_OPTIONS_COLOR -FarbName svx:Edit:RID_SVXPAGE_COLOR:EDT_NAME -Farbe svx:ListBox:RID_SVXPAGE_COLOR:LB_COLOR -Farbmodell svx:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL +FarbName cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME +Farbe cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR +Farbmodell cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL R HID_TPCOLOR_RGB_1 G HID_TPCOLOR_RGB_2 B HID_TPCOLOR_RGB_3 C HID_TPCOLOR_CMYK_1 M HID_TPCOLOR_CMYK_2 Y HID_TPCOLOR_CMYK_3 -K svx:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4 -Aendern svx:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY -Hinzufuegen svx:PushButton:RID_SVXPAGE_COLOR:BTN_ADD -Loeschen svx:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE -Oeffnen svx:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD -Speichern svx:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE -Bearbeiten svx:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON +K cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4 +Aendern cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY +Hinzufuegen cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD +Loeschen cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE +Oeffnen cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD +Speichern cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE +Bearbeiten cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON *TabFarbverlaeufe HID_AREA_GRADIENT -Typ svx:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES -ZentrumX svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X -ZentrumY svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y -Winkel svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE -Rand svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER -Von svx:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM -Bis svx:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO -VonWert svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM -BisWert svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO -Tabelle svx:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS -Hinzufuegen svx:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD -Aendern svx:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY -Loeschen svx:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE -Oeffnen svx:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD -Speichern svx:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE +Typ cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES +ZentrumX cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X +ZentrumY cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y +Winkel cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE +Rand cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER +Von cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM +Bis cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO +VonWert cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM +BisWert cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO +Tabelle cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS +Hinzufuegen cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD +Aendern cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY +Loeschen cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE +Oeffnen cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD +Speichern cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE *TabFehlermeldung SC:TABPAGE:TP_VALIDATION_ERROR FehlermeldungbeiEingabe SC:TRISTATEBOX:TP_VALIDATION_ERROR:TSB_SHOW @@ -262,11 +262,11 @@ Durchsuchen sw:PushButton:TP_GRF_EXT:PB_BROWSE Auswahl HID_VALUESET_NUMBMP Optionen HID_NUM_FORMAT_BTN Zurueck HID_TABDLG_RESET_BTN -LinkGraphics svx:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED +LinkGraphics cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED *TabGrundfarben HID_OPTIONS_CHART_DEFCOLORS -Farbliste svx:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST -Standard svx:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT +Farbliste cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST +Standard cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT *TabGrundschriften HID_STD_FONT StandardSchrift sw:ComboBox:TP_STD_FONT:LB_STANDARD diff --git a/testautomation/global/win/tab_h_o.win b/testautomation/global/win/tab_h_o.win index e4335f279385..c31ece1bffe2 100755 --- a/testautomation/global/win/tab_h_o.win +++ b/testautomation/global/win/tab_h_o.win @@ -1,36 +1,36 @@ *TabHintergrund HID_BACKGROUND -Als svx:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR -Fuer svx:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX -FuerAbsatz SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX +Als cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR +Fuer cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX +FuerAbsatz cui:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX Hintergrundfarbe HID_BACKGROUND_CTL_BGDCOLORSET -Verknuepfen svx:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK -Vorschau svx:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW -Durchsuchen svx:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE -Position svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION -Flaeche svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA -Kachel svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE +Verknuepfen cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK +Vorschau cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW +Durchsuchen cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE +Position cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION +Flaeche cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA +Kachel cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE ArtPosition HID_BACKGROUND_CTL_POSITION -'ArtPosition svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION +'ArtPosition cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION 'Muster HID_BACKGROUND_CTL_PATTERNSET 'Musterfarbe HID_BACKGROUND_CTL_PATCOLORSET -*TabHTML svx:TabPage:RID_OFAPAGE_HTMLOPT -Groesse1 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1 -Groesse2 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2 -Groesse3 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3 -Groesse4 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4 -Groesse5 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5 -Groesse6 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6 -Groesse7 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7 -UnbekannteHTML svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS -FontEinstellungen svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES -Export svx:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT -StarBasic svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC -Grafikenkopieren svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF -Drucklayout svx:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION -WarnungAnzeigen svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING -Zeichensatz svx:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET -UseEnglishLocaleForNumbers svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US +*TabHTML cui:TabPage:RID_OFAPAGE_HTMLOPT +Groesse1 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1 +Groesse2 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2 +Groesse3 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3 +Groesse4 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4 +Groesse5 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5 +Groesse6 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6 +Groesse7 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7 +UnbekannteHTML cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS +FontEinstellungen cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES +Export cui:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT +StarBasic cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC +Grafikenkopieren cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF +Drucklayout cui:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION +WarnungAnzeigen cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING +Zeichensatz cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET +UseEnglishLocaleForNumbers cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US *TabHyperlinkRahmen HID_FRM_URL URL sw:Edit:TP_FRM_URL:ED_URL @@ -57,61 +57,61 @@ Zurueck HID_ICCDIALOG_RESET_BTN Uebernehmen HID_ICCDIALOG_OK_BTN +TabHyperlinkInternet Hyperlink -Internet svx:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET -FTP svx:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP -Telnet svx:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET +Internet cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET +FTP cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP +Telnet cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET ZielUrl HID_HYPERDLG_INET_PATH -Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME -Form svx:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM -Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION -NameText svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT -Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT -Loginname svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN -Passwort svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD -AnonymerBenutzer svx:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS -WWWBrowser svx:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE -Target svx:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET +Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME +Form cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM +Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION +NameText cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT +Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT +Loginname cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN +Passwort cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD +AnonymerBenutzer cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS +WWWBrowser cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE +Target cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET *TabHyperlinkMailUndNews HID_HYPERLINK_MAIL -EMail svx:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL -News svx:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS +EMail cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL +News cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS Receiver HID_HYPERDLG_MAIL_PATH -Betreff svx:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT -Adressbuch svx:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK -Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME -Form svx:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM -Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION -NameText svx:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT -Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT +Betreff cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT +Adressbuch cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK +Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME +Form cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM +Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION +NameText cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT +Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT Auswahl HID_ICCDIALOG_CHOICECTRL Zurueck HID_ICCDIALOG_RESET_BTN Uebernehmen HID_ICCDIALOG_OK_BTN *TabHyperlinkDokument HID_HYPERLINK_DOCUMENT Path HID_HYPERDLG_DOC_PATH -DateiOeffnen svx:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN -Ziel svx:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC -Target svx:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE -Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME -Form svx:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM -Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION -NameText svx:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT -Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT +DateiOeffnen cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN +Ziel cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC +Target cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE +Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME +Form cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM +Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION +NameText cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT +Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT Auswahl HID_ICCDIALOG_CHOICECTRL Zurueck HID_ICCDIALOG_RESET_BTN Uebernehmen HID_ICCDIALOG_OK_BTN *TabHyperlinkNeuesDokument HID_HYPERLINK_NEWDOCUMENT -SofortBearbeiten svx:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW -SpaeterBearbeiten svx:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER -Datei svx:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC -Dateityp svx:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES -Pfad svx:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE -Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME -Form svx:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM -Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION -NameText svx:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT -Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT +SofortBearbeiten cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW +SpaeterBearbeiten cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER +Datei cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC +Dateityp cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES +Pfad cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE +Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME +Form cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM +Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION +NameText cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT +Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT Auswahl HID_ICCDIALOG_CHOICECTRL Zurueck HID_ICCDIALOG_RESET_BTN Uebernehmen HID_ICCDIALOG_OK_BTN @@ -270,20 +270,20 @@ Diagramme sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS Masseinheit sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC Tabulatorenabstand sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB -*TabLauftext svx:TabPage:RID_SVXPAGE_TEXTANIMATION -Effekt svx:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT -NachOben svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP -NachLinks svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT -NachUnten svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN -NachRechts svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT -TextSichtbarBeimStarten svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE -TextSichtbarBeimBeenden svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE -Endlos svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS -Anzahl svx:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT -Automatisch svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO -Verzoegerung svx:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY -Pixel svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL -Schrittweite svx:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT +*TabLauftext cui:TabPage:RID_SVXPAGE_TEXTANIMATION . +Effekt cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT +NachOben cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP +NachLinks cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT +NachUnten cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN +NachRechts cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT +TextSichtbarBeimStarten cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE +TextSichtbarBeimBeenden cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE +Endlos cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS +Anzahl cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT +Automatisch cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO +Verzoegerung cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY +Pixel cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL +Schrittweite cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT *TabLayoutCalc HID_SCPAGE_LAYOUT Masseinheit SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT @@ -301,95 +301,83 @@ NieAktualisieren sc:RadioButton:RID_SCPAGE_LAYOUT:RB_NEVER Druckermasse sc:CheckBox:RID_SCPAGE_LAYOUT:CB_TEXTFMT Ueberschreibwarnung sc:CheckBox:RID_SCPAGE_LAYOUT:CB_REPLWARN -' *TabLayoutDraw HID_SD_OPTIONS_LAYOUT -' LinealeSichtbar SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_RULER -' Hilfslinien SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_HELPLINES -' Handles SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_HANDLES_BEZIER -' Umriss SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_MOVE_OUTLINE -' Masseinheit SD:LISTBOX:TP_OPTIONS_LAYOUT:LB_METRIC -' Tabulator SD:METRICFIELD:TP_OPTIONS_LAYOUT:MTR_FLD_TABSTOP - -' *TabLayoutHTML HID_LAYOUT_OPT - -' *TabLayoutWriter HID_LAYOUT_OPT - *TabLegende HID_CAPTION Art HID_CAPTION_CTL_TYPE -Abstand SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND -Ansatz SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ -Laenge SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE -Position SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL -Optimal SVX:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE +Abstand cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND +Ansatz cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ +Laenge cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE +Position cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL +Optimal cui:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE *TabLinguistik HID_OPTIONS_LINGU Sprachmodule HID_CLB_LINGU_MODULES -SprachmoduleBearbeiten svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT +SprachmoduleBearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT Optionen HID_CLB_LINGU_OPTIONS -OptionenBearbeiten svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT +OptionenBearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT Benutzerwoerterbuch HID_CLB_EDIT_MODULES_DICS -Neu svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC -Bearbeiten svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC -Loeschen svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC +Neu cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC +Bearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC +Loeschen cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC *TabLinie HID_LINE_LINE -Breite svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH -BreiteLinks svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH -BreiteRechts svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH -EndenSynchronisieren svx:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE -Farbe svx:ListBox:RID_SVXPAGE_LINE:LB_COLOR -Stil svx:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE -StilLinks svx:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE -StilRechts svx:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE -Transparenz svx:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT -ZentriertLinks svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START -ZentriertRechts svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END -CornerStyle svx:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE +Breite cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH +BreiteLinks cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH +BreiteRechts cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH +EndenSynchronisieren cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE +Farbe cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR +Stil cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE +StilLinks cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE +StilRechts cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE +Transparenz cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT +ZentriertLinks cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START +ZentriertRechts cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END +CornerStyle cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE *TabLinienenden HID_LINE_ENDDEF -Aendern svx:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY -Hinzufuegen svx:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD -Liste svx:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS -Loeschen svx:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE -Oeffnen svx:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD -Speichern svx:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE -Textfeld svx:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME +Aendern cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY +Hinzufuegen cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD +Liste cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS +Loeschen cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE +Oeffnen cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD +Speichern cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE +Textfeld cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME *TabLinienstile HID_LINE_DEF -Abstand svx:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE -Aendern svx:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY -AnLinienbreite svx:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE -AnzahlLinks svx:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1 -AnzahlRechts svx:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2 -Hinzufuegen svx:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD -LaengeLinks svx:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1 -LaengeRechts svx:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2 -Linienstil svx:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES -Loeschen svx:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE -Oeffnen svx:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD -Speichern svx:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE -TypLinks svx:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1 -TypRechts svx:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2 +Abstand cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE +Aendern cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY +AnLinienbreite cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE +AnzahlLinks cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1 +AnzahlRechts cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2 +Hinzufuegen cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD +LaengeLinks cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1 +LaengeRechts cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2 +Linienstil cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES +Loeschen cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE +Oeffnen cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD +Speichern cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE +TypLinks cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1 +TypRechts cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2 *TabLiteraturAllgemein HID_BIB_CONTROL_PAGE -*TabMakro svx:TabPage:RID_SVXPAGE_EVENTASSIGN +*TabMakro cui:TabPage:RID_SVXPAGE_EVENTASSIGN Ereignis HID_MACRO_LB_EVENT Bereich HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP Makroname HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS -Zuweisen svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN -Aufheben svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE -Scripttyp svx:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE - -*TabMicrosoftOffice97 svx:TabPage:RID_OFAPAGE_MSFILTEROPT -WinwordBasicLaden svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE -WinwordBasicSpeichern svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG -ExcelBasicLaden svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE -ExecutableCode svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL -ExcelBasicSpeichern svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG -PowerpointBasicLaden svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE -PowerpointBasicSpeichern svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG - -*TabMicrosoftOffice2 svx:TabPage:RID_OFAPAGE_MSFILTEROPT2 +Zuweisen cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN +Aufheben cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE +Scripttyp cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE + +*TabMicrosoftOffice97 cui:TabPage:RID_OFAPAGE_MSFILTEROPT +WinwordBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE +WinwordBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG +ExcelBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE +ExecutableCode cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL +ExcelBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG +PowerpointBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE +PowerpointBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG + +*TabMicrosoftOffice2 cui:TabPage:RID_OFAPAGE_MSFILTEROPT2 Auswahl HID_OFAPAGE_MSFLTR2_CLB *TabModule basctl:TabPage:RID_TP_MODULS @@ -437,20 +425,9 @@ OutlineLevel sw:ListBox:TP_NUMPARA:LB_OUTLINE_LEVEL *TabOptionen HID_OFAPAGE_AUTOCORR_OPTIONS Einstellungen HID_OFAPAGE_AUTOCORR_CLB -*TabOptionenDlgAllgemein HID_OFADLG_TREE_GENERAL -*TabOptionenDlgBild HID_OFADLG_TREE_IMAGE -*TabOptionenDlgBrowser HID_OFADLG_TREE_BROWSER -*TabOptionenDlgFormel HID_OFADLG_TREE_FORMULA -*TabOptionenDlgHTMLDokument HID_OFADLG_TREE_HTML -*TabOptionenDlgInternet HID_OFADLG_TREE_INTERNET -*TabOptionenDlgPraesentation HID_OFADLG_TREE_PRESENTATION -*TabOptionenDlgTabellendokument HID_OFADLG_TREE_CALC -*TabOptionenDlgTextdokument HID_OFADLG_TREE_TEXT -*TabOptionenDlgZeichnung HID_OFADLG_TREE_DRAWING - *TabOptionenAutokorrektur HID_OFAPAGE_AUTOFMT_OPTIONS Einstellungen HID_OFAPAGE_AUTOFORMAT_CLB -Bearbeiten svx:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT +Bearbeiten cui:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT *TabOptionenTeilergebnisse HID_SCPAGE_SUBT_OPTIONS NeueSeiteBeiGruppenwechsel sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK @@ -463,20 +440,20 @@ Aufsteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING Absteigend SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING *TabOptionenNumerierung HID_SVXPAGE_NUM_OPTIONS -Ebene svx:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL -Numerierung svx:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT -Davor svx:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX -Dahinter svx:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX -Zeichenvorlage svx:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT -Vollstaendig svx:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL -BeginnBei svx:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START -FortlaufeneNumerierung svx:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL -Zeichen svx:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET -Auswahl svx:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP -Breite svx:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH -Hoehe svx:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT -Abgleich svx:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO -Ausrichtung svx:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT +Ebene cui:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL +Numerierung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT +Davor cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX +Dahinter cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX +Zeichenvorlage cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT +Vollstaendig cui:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL +BeginnBei cui:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START +FortlaufeneNumerierung cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL +Zeichen cui:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET +Auswahl cui:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP +Breite cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH +Hoehe cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT +Abgleich cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO +Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT *TabHeaderFooterSlide HID_SD_TABPAGE_HEADERFOOTER_SLIDE DateTime sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME diff --git a/testautomation/global/win/tab_p_s.win b/testautomation/global/win/tab_p_s.win index b5d016228785..5a51e737b471 100755 --- a/testautomation/global/win/tab_p_s.win +++ b/testautomation/global/win/tab_p_s.win @@ -1,19 +1,19 @@ *TabPfade HID_OPTIONS_PATH -Standard svx:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD -Bearbeiten SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH +Standard cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD +Bearbeiten cui:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH Typ HID_OPTPATH_CTL_PATH *TabPositionNumerierung HID_SVXPAGE_NUM_POSITION -Level svx:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL -Alignment svx:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2 -NumberFollowedBy svx:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY -NumberFollowedByAt svx:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB -AlignedAt svx:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT -IndentAt svx:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT -Ausrichtung svx:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN -AbstandTextNumerierung svx:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST -Relativ svx:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE -Standard svx:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD +Level cui:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL +Alignment cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2 +NumberFollowedBy cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY +NumberFollowedByAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB +AlignedAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT +IndentAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT +Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN +AbstandTextNumerierung cui:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST +Relativ cui:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE +Standard cui:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD *TabPositionKapitelnumerierung HID_NUM_POSITION Level sw:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL @@ -75,69 +75,69 @@ Einfuegen HID_FIELD_INSERT Schliessen HID_FIELD_CLOSE *TabSchatten HID_AREA_SHADOW -Anzeigen svx:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW +Anzeigen cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW Position HID_TPSHADOW_CTRL -Entfernung svx:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE -Farbe svx:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR -Transparenz svx:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT +Entfernung cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE +Farbe cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR +Transparenz cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT *TabSchraegstellen HID_TRANS_SLANT -Radius svx:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS -Winkel svx:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE +Radius cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS +Winkel cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE *TabSchraffuren HID_AREA_HATCH -Abstand svx:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE -Winkel svx:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE +Abstand cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE +Winkel cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE Definition HID_TPHATCH_CTRL -Linientyp svx:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE -Linienfarbe svx:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR -Tabelle svx:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS -Hinzufuegen svx:PushButton:RID_SVXPAGE_HATCH:BTN_ADD -Aendern svx:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY -Loeschen svx:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE -Oeffnen svx:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD -Speichern svx:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE +Linientyp cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE +Linienfarbe cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR +Tabelle cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS +Hinzufuegen cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD +Aendern cui:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY +Loeschen cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE +Oeffnen cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD +Speichern cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE *TabSchriftErsetzung HID_OFA_FONT_SUBSTITUTION -Anwenden svx:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE -Schriftart svx:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1 +Anwenden cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE +Schriftart cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1 Liste HID_OFA_FONT_SUBST_CLB -ErsetzenDurch svx:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2 +ErsetzenDurch cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2 Uebernehmen HID_OFA_SUBST_APPLY Loeschen HID_OFA_SUBST_DELETE -Fonts svx:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME -NonProportional svx:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP -Size svx:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT +Fonts cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME +NonProportional cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP +Size cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT *TabSeite HID_FORMAT_PAGE -Links svx:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN -Rechts svx:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN -Oben svx:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN -Unten svx:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN -Seitenlayout svx:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT -Numerierung svx:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT -Papierformat svx:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE -Breite svx:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH -Hoehe svx:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT -Schacht svx:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY -Horizontal svx:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ -Vertikal svx:CheckBox:RID_SVXPAGE_PAGE:CB_VERT -Hoch svx:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT -Quer svx:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE -Einschalten SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER -AbsatzVorlage SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER -Textfluss svx:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW -FitObject svx:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT +Links cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN +Rechts cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN +Oben cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN +Unten cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN +Seitenlayout cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT +Numerierung cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT +Papierformat cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE +Breite cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH +Hoehe cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT +Schacht cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY +Horizontal cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ +Vertikal cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT +Hoch cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT +Quer cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE +Einschalten cui:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER +AbsatzVorlage cui:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER +Textfluss cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW +FitObject cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT *TabSonstigesAllgemein HID_OFA_TP_MISC -Zweistellig svx:NumericField:OFA_TP_MISC:NF_YEARVALUE -Aktivieren svx:CheckBox:OFA_TP_MISC:CB_HELPAGENT -Zuruecksetzen svx:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET -Tips svx:CheckBox:OFA_TP_MISC:CB_TOOLTIP -ExtendedTips svx:CheckBox:OFA_TP_MISC:CB_EXTHELP -StarOfficeDialogeBenutzen svx:CheckBox:OFA_TP_MISC:CB_FILEDLG -DruckenStatus svx:CheckBox:OFA_TP_MISC:CB_DOCSTATUS -StyleSheet svx:ListBox:OFA_TP_MISC:LB_HELPFORMAT +Zweistellig cui:NumericField:OFA_TP_MISC:NF_YEARVALUE +Aktivieren cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT +Zuruecksetzen cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET +Tips cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP +ExtendedTips cui:CheckBox:OFA_TP_MISC:CB_EXTHELP +StarOfficeDialogeBenutzen cui:CheckBox:OFA_TP_MISC:CB_FILEDLG +DruckenStatus cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS +StyleSheet cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT *TabSonstigesDraw HID_SD_OPTIONS_MISC Schnellbearbeitung SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT @@ -240,30 +240,30 @@ Weiter sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP Zuruecksetzen HID_TABDLG_RESET_BTN *TabSpeichern HID_OPTIONS_SAVE -BenutzerspezifischeEinstellungen svx:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS -DokumenteigenschaftenBearbeiten SVX:CHECKBOX:RID_SFXPAGE_SAVE:BTN_DOCINFO -Sicherungskopie svx:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP -AutomatischSpeichern svx:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE -Minuten SVX:NUMERICFIELD:RID_SFXPAGE_SAVE:ED_AUTOSAVE -NoPrettyPrinting svx:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING -URLimDateisystem SVX:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS -URLimInternet SVX:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET -Dokumenttyp svx:ListBox:RID_SFXPAGE_SAVE:LB_APP -Filter svx:ListBox:RID_SFXPAGE_SAVE:LB_FILTER -WarnWhenSavingAlienFormat svx:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT -LoadPrinterSettingsWithDocument svx:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER +BenutzerspezifischeEinstellungen cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS +DokumenteigenschaftenBearbeiten cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_DOCINFO +Sicherungskopie cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP +AutomatischSpeichern cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE +Minuten cui:NUMERICFIELD:RID_SFXPAGE_SAVE:ED_AUTOSAVE +NoPrettyPrinting cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING +URLimDateisystem cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS +URLimInternet cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET +Dokumenttyp cui:ListBox:RID_SFXPAGE_SAVE:LB_APP +Filter cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER +WarnWhenSavingAlienFormat cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT +LoadPrinterSettingsWithDocument cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER *TabSprachen HID_OFA_TP_LANGUAGES -UILanguage svx:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE -Gebietsschema svx:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING -DecimalSeparator svx:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR -StandardWaehrung svx:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY -Westlich svx:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG -Asiatisch svx:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG -AktuellesDokument svx:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC -Aktivieren svx:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT -LanguageComplexScript svx:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG -ComplexScriptEnabled svx:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT +UILanguage cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE +Gebietsschema cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING +DecimalSeparator cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR +StandardWaehrung cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY +Westlich cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG +Asiatisch cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG +AktuellesDokument cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC +Aktivieren cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT +LanguageComplexScript cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG +ComplexScriptEnabled cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT *TabStatistik HID_DOC_STAT Aktualisieren sw:PushButton:TP_DOC_STAT:PB_PDATE @@ -271,17 +271,17 @@ Aktualisieren sw:PushButton:TP_DOC_STAT:PB_PDATE *TabStatistikCalc sc:TabPage:RID_SCPAGE_STAT *TabSuche HID_OPTIONS_SEARCH -SuchenIn svx:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH -DienstName svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME -Und svx:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND -Oder svx:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR -Exakt svx:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT -Praefix svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL -Suffix svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX -Trenner svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR -Schreibstil svx:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE -Hinzufuegen svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD -Aendern svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE -Loeschen svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE -Neu svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW +SuchenIn cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH +DienstName cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME +Und cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND +Oder cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR +Exakt cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT +Praefix cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL +Suffix cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX +Trenner cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR +Schreibstil cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE +Hinzufuegen cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD +Aendern cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE +Loeschen cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE +Neu cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win index 6196e652b5b9..aa054c4b8406 100755 --- a/testautomation/global/win/tab_t_z.win +++ b/testautomation/global/win/tab_t_z.win @@ -53,50 +53,50 @@ Zahlenformaterkennung sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING AutomatischeAusrichtung sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT *TabTabulatoren HID_TABULATOR -AlleLoeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL -Fuellzeichen1 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO -Fuellzeichen2 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS -Fuellzeichen3 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE -Fuellzeichen4 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE -Fuellzeichen5 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER -FuellzeichenZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER -Loeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL -Neu svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW -Position svx:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS -TypLinks svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT -TypRechts svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT -TypZentriert svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER -TypDezimal svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL -TypZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR +AlleLoeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL +Fuellzeichen1 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO +Fuellzeichen2 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS +Fuellzeichen3 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE +Fuellzeichen4 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE +Fuellzeichen5 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER +FuellzeichenZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER +Loeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL +Neu cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW +Position cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS +TypLinks cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT +TypRechts cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT +TypZentriert cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER +TypDezimal cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL +TypZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR *TabTabulator HID_TABULATOR -AlleLoeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL -Fuellzeichen1 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO -Fuellzeichen2 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS -Fuellzeichen3 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE -Fuellzeichen4 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE -Fuellzeichen5 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER -FuellzeichenZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER -Loeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL -Neu svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW -Position svx:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS -TypLinks svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT -TypRechts svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT -TypZentriert svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER -TypDezimal svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL -TypZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR +AlleLoeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL +Fuellzeichen1 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO +Fuellzeichen2 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS +Fuellzeichen3 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE +Fuellzeichen4 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE +Fuellzeichen5 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER +FuellzeichenZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER +Loeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL +Neu cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW +Position cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS +TypLinks cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT +TypRechts cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT +TypZentriert cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER +TypDezimal cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL +TypZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR *TabTastatur HID_CONFIG_ACCEL Tastatur HID_ACCELCONFIG_LISTBOX Bereich HID_CONFIGGROUP_ACC_LISTBOX Funktion HID_CONFIGFUNCTION_ACC_LISTBOX -Aendern svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE -Loeschen svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE -Zuruecksetzen svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET -Laden svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD -Speichern svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE -StarOffice svx:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE -Application svx:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE +Aendern cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE +Loeschen cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE +Zuruecksetzen cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET +Laden cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD +Speichern cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE +StarOffice cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE +Application cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE *TabTeilergebnisseOptionen HID_SCPAGE_SUBT_OPTIONS NeueSeiteBeiGruppenwechsel sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK @@ -109,36 +109,36 @@ Aufsteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING Absteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING *TabText HID_PAGE_TEXTATTR -BreiteAnTextAnpassen svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH -HoeheAnTextAnpassen svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT -AmRahmenAnpassen svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE -Konturfluss svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR -WordWrap svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT -ResizeShape svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE -Links svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT -Rechts svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT -Oben svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP -Unten svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM +BreiteAnTextAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH +HoeheAnTextAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT +AmRahmenAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE +Konturfluss cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR +WordWrap cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT +ResizeShape cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE +Links cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT +Rechts cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT +Oben cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP +Unten cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM AnchorPosition HID_TEXTATTR_CTL_POSITION -GanzeBreite svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH +GanzeBreite cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH *TabTextfluss HID_FORMAT_PARAGRAPH_EXT -Automatisch svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN -AbZeichenende svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE -AbZeichenAnfang svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER -Trennstellen svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH -Umbruch svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK -UmbruchTyp svx:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE -UmbruchPosition svx:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION -MitSeitenvorlage svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL -Vorlage svx:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL -AbsatzNichtTrennen svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER -AbsaetzeZusammenhalten svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER -Schusterjungenregelung svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS -SchusterZeilen svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS -Hurenkinderregelung svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS -HurenkinderZeilen svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS -Seitenzahl SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM +Automatisch cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN +AbZeichenende cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE +AbZeichenAnfang cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER +Trennstellen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH +Umbruch cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK +UmbruchTyp cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE +UmbruchPosition cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION +MitSeitenvorlage cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL +Vorlage cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL +AbsatzNichtTrennen cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER +AbsaetzeZusammenhalten cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER +Schusterjungenregelung cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS +SchusterZeilen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS +Hurenkinderregelung cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS +HurenkinderZeilen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS +Seitenzahl cui:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM *TabTextflussTabelle HID_TABLE_TEXTFLOW Umbruch SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK @@ -157,27 +157,27 @@ TextDirection sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION VerticalAlignment sw:ListBox:TP_TABLE_TEXTFLOW:LB_VERTORIENT *TabTransparenz HID_AREA_TRANSPARENCE -KeineTransparenz svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF -LineareTransparenz svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR -Transparenzverlauf svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT -MFLinTransparenz svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT -TransparenzverlaufTyp svx:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES -MFZentrumX svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X -MFZentrumY svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y -MFWinkel svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE -MFRand svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER -MFStartwert svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE -MFEndwert svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE +KeineTransparenz cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF +LineareTransparenz cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR +Transparenzverlauf cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT +MFLinTransparenz cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT +TransparenzverlaufTyp cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES +MFZentrumX cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X +MFZentrumY cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y +MFWinkel cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE +MFRand cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER +MFStartwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE +MFEndwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE *TabTypografisch HID_OFAPAGE_AUTOCORR_QUOTE -EinfacheErsetzen svx:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO -DoppelteErsetzen svx:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO -EinfachWortanfang svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE -EinfachWortende svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE -EinfachStandard svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD -DoppeltWortanfang svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE -DoppeltWortende svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE -DoppeltStandard svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD +EinfacheErsetzen cui:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO +DoppelteErsetzen cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO +EinfachWortanfang cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE +EinfachWortende cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE +EinfachStandard cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD +DoppeltWortanfang cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE +DoppeltWortende cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE +DoppeltStandard cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD Zurueck HID_TABDLG_RESET_BTN *TabUmlauf HID_FRM_EXT @@ -198,18 +198,18 @@ NurAussen sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE *TabUmrandung HID_BORDER Vorgaben HID_BORDER_CTL_PRESETS -Stil svx:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE -StilFarbe svx:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR +Stil cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE +StilFarbe cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR Position HID_BORDER_CTL_SHADOWS -Groesse svx:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE -SchattenFarbe svx:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR +Groesse cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE +SchattenFarbe cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR Zurueck HID_TABDLG_RESET_BTN Standard HID_TABDLG_STANDARD_BTN -Links svx:MetricField:RID_SVXPAGE_BORDER:MF_LEFT -Rechts svx:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT -Oben svx:MetricField:RID_SVXPAGE_BORDER:MF_TOP -Unten svx:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM -Synchronisieren svx:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC +Links cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT +Rechts cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT +Oben cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP +Unten cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM +Synchronisieren cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC +TabUmrandungChart TabLinie @@ -230,14 +230,14 @@ Einfuegen HID_FIELD_INSERT Schliessen HID_FIELD_CLOSE *TabVerbinder HID_PAGE_CONNECTION -Linie1 svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 -Linie2 svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 -Linie3 svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 -AnfangHorizontal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 -AnfangVertikal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 -EndeHorizontal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 -EndeVertikal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 -Typ svx:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE +Linie1 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 +Linie2 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 +Linie3 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 +AnfangHorizontal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 +AnfangVertikal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 +EndeHorizontal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 +EndeVertikal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 +Typ cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE *TabVerwalten HID_MANAGE_STYLES VorlagenName sfx2:Edit:TP_MANAGE_STYLES:ED_NAME @@ -330,48 +330,39 @@ Maximum sc:Edit:TP_VALIDATION_VALUES:EDT_MAX ShowSelectionList sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST ListSortEntries sc:CheckBox:TP_VALIDATION_VALUES:CB_SORTLIST CriteriaListEntries sc:MultiLineEdit:TP_VALIDATION_VALUES:EDT_LIST +SourceShrink sc:ImageButton:TP_VALIDATION_VALUES:RB_VALIDITY_REF +ValidityReset HID_TABDLG_RESET_BTN *TabWortergaenzung HID_OFAPAGE_AUTOCOMPLETE_OPTIONS -WoerterErgaenzen svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV -VorschlaegeSammeln svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT -AlsTipphilfe svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP -MinWortlaenge svx:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN -MaxEintraege svx:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES -AnnehmenMit svx:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY -GesammelteWorte svx:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES -EintragLoeschen svx:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES -AppendSpace svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE -KeepList svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST +WoerterErgaenzen cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV +VorschlaegeSammeln cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT +AlsTipphilfe cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP +MinWortlaenge cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN +MaxEintraege cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES +AnnehmenMit cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY +GesammelteWorte cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES +EintragLoeschen cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES +AppendSpace cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE +KeepList cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST *TabZahlen HID_NUMBERFORMAT -Kategorie svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY +Kategorie cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY ZahlenFormat HID_NUMBERFORMAT_LB_FORMAT -Sprache svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE +Sprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE FormatPreview HID_NUMBERFORMAT_WND_NUMBER_PREVIEW -FormatCode svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT -FuehrendeNullen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES -Nachkommastellen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS -NegativInRot svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED -Tausenderpunkt svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND +FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT +FuehrendeNullen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES +Nachkommastellen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS +NegativInRot cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED +Tausenderpunkt cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND PBHinzufuegen HID_NUMBERFORMAT_TBI_ADD PBEntfernen HID_NUMBERFORMAT_TBI_REMOVE PBInfo HID_NUMBERFORMAT_TBI_INFO -Kommentar SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT +Kommentar cui:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT Zurueck HID_TABDLG_RESET_BTN -FormatSprache svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY +FormatSprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY Standard HID_TABDLG_STANDARD_BTN -Standardformat svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT - -' *TabZeichen HID_FORMAT_CHAR_STD -' Schriftart svx:ComboBox:RID_SVXPAGE_CHAR_STD:LB_FONT -' Schriftstil svx:ComboBox:RID_SVXPAGE_CHAR_STD:LB_STYLE -' Schriftgroesse svx:MetricBox:RID_SVXPAGE_CHAR_STD:LB_SIZE -' Kontur svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_OUTLINE -' Schatten svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_SHADOW -' Unterstreichen svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_UNDERLINE -' Durchstreichen svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_STRIKEOUT -' Farbe svx:ListBox:RID_SVXPAGE_CHAR_STD:LB_COLOR -' Sprache svx:ListBox:RID_SVXPAGE_CHAR_STD:LB_LANGUAGE +Standardformat cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT *TabZeilennumerierung HID_LINENUMBERING Einschalten SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON @@ -394,24 +385,17 @@ Zurueck HID_TABDLG_RESET_BTN Standard HID_TABDLG_STANDARD_BTN *TabZuschneiden HID_SVXPAGE_GRFCROP -Links svx:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT -Rechts svx:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT -Oben svx:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP -Unten svx:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM -GroesseBeibehalten svx:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST -MassstabBeibehalten svx:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST -GroesseBreite svx:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH -GroesseHoehe svx:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT -MassstabBreite svx:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM -MassstabHoehe svx:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM -Originalgroesse svx:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE - -'*TabZuweisen sfx2:TabPage:RID_SFX_TP_MACROASSIGN -'Ereignis sw:ListBox:TP_MACROASSIGN:LB_EVENT -'Bereich sw:ListBox:TP_MACROASSIGN:LB_GROUP -'Makroname sw:ListBox:TP_MACROASSIGN:LB_NAME -'Zuweisen sw:PushButton:TP_MACROASSIGN:PB_ASSIGN -'Aufheben sw:PushButton:TP_MACROASSIGN:PB_DELETE +Links cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT +Rechts cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT +Oben cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP +Unten cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM +GroesseBeibehalten cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST +MassstabBeibehalten cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST +GroesseBreite cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH +GroesseHoehe cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT +MassstabBreite cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM +MassstabHoehe cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM +Originalgroesse cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE *TabZusaetze HID_FRM_ADD ObjektName sw:Edit:TP_FRM_ADD:ED_NAME diff --git a/testautomation/math/required/m_updt.bas b/testautomation/math/required/m_updt.bas index 7472d02e2dfa..61b517b1ba65 100755 --- a/testautomation/math/required/m_updt.bas +++ b/testautomation/math/required/m_updt.bas @@ -47,6 +47,7 @@ sub main use "math\required\includes\m_007_.inc" ' help use "math\required\includes\m_010_.inc" use "math\required\includes\m_020_.inc" ' toolbars + use "global\required\includes\g_009.inc" Call hStatusIn ( "Math","m_updt.bas" ) @@ -75,7 +76,6 @@ sub LoadIncludeFiles use "global\required\includes\g_option.inc" use "global\required\includes\g_customize.inc" use "global\required\includes\g_001.inc" - use "global\required\includes\g_009.inc" use "global\tools\includes\optional\t_ui_filters.inc" ' for gMathFilter in m_001_.inc gApplication = "MATH" Call GetUseFiles diff --git a/testautomation/spreadsheet/optional/c_validity.bas b/testautomation/spreadsheet/optional/c_validity.bas new file mode 100755 index 000000000000..f277a37009bc --- /dev/null +++ b/testautomation/spreadsheet/optional/c_validity.bas @@ -0,0 +1,93 @@ +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +'* +'* Copyright 2008 by Sun Microsystems, Inc. +'* +'* OpenOffice.org - a multi-platform office productivity suite +'* +'* $RCSfile: c_validity.bas,v $ +'* +'* $Revision: 0.9 $ +'* +'* last change: $Author: oc $ $Date: 2009/08/04 15:41:38 $ +'* +'* This file is part of OpenOffice.org. +'* +'* OpenOffice.org is free software: you can redistribute it and/or modify +'* it under the terms of the GNU Lesser General Public License version 3 +'* only, as published by the Free Software Foundation. +'* +'* OpenOffice.org is distributed in the hope that it will be useful, +'* but WITHOUT ANY WARRANTY; without even the implied warranty of +'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +'* GNU Lesser General Public License version 3 for more details +'* (a copy is included in the LICENSE file that accompanied this code). +'* +'* You should have received a copy of the GNU Lesser General Public License +'* version 3 along with OpenOffice.org. If not, see +'* <http://www.openoffice.org/license.html> +'* for a copy of the LGPLv3 License. +'* +'/************************************************************************ +'** +'** owner : oliver.craemer@Sun.COM +'** +'** short description : extensive test for the validity functionality +'** +'\*********************************************************************** + +global giWhichSecurityLevel as integer + +sub main + + PrintLog "---------------------------------------------------------------------" + Printlog "----- Calc test validity -----" + PrintLog "---------------------------------------------------------------------" + + use "spreadsheet/optional/includes/validity/c_validity.inc" + use "spreadsheet/tools/includes/c_select_tools.inc" + use "spreadsheet/tools/includes/c_validity_tools.inc" + + printlog "Get the security level and set it to lower" + Call sPreconditions + + Call hStatusIn("spreadsheet", "c_validity.bas") + call tValidity_Check_Message + call tValidity_Check_Excel + Call hStatusOut + + printlog "Set the security level to starting value" + Call sResetSystemUnderTest +end sub +' +'------------------------------------------------------------------------------- +' +sub LoadIncludeFiles + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" + use "global\tools\includes\required\t_option2.inc" + gApplication = "CALC" + Call GetUseFiles +end sub + +' +'------------------------------------------------------------------------------- +' +sub sPreconditions + 'Init the iWhichSecurityLevel() variable with 2 + 'which would be the normal state if it's impossible + 'to detect the macro security level. + giWhichSecurityLevel = 2 + 'Get the macro security level and remember it. + 'and then set the Macro security level to (0) low + giWhichSecurityLevel = hSetMacroSecurity(0) +end sub +' +'------------------------------------------------------------------------------- +' +sub sResetSystemUnderTest + 'Set the macro security level back to the value + 'which has it before the system was under test + call hSetMacroSecurity(giWhichSecurityLevel) +end sub diff --git a/testautomation/spreadsheet/optional/includes/validity/c_validity.inc b/testautomation/spreadsheet/optional/includes/validity/c_validity.inc new file mode 100755 index 000000000000..05f71cd10b5c --- /dev/null +++ b/testautomation/spreadsheet/optional/includes/validity/c_validity.inc @@ -0,0 +1,384 @@ +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +'* +'* Copyright 2008 by Sun Microsystems, Inc. +'* +'* OpenOffice.org - a multi-platform office productivity suite +'* +'* $RCSfile: c_validity.inc,v $ +'* +'* $Revision: 1.0 $ +'* +'* last change: $Author: oc $ $Date: 2009/08/04 15:41:39 $ +'* +'* This file is part of OpenOffice.org. +'* +'* OpenOffice.org is free software: you can redistribute it and/or modify +'* it under the terms of the GNU Lesser General Public License version 3 +'* only, as published by the Free Software Foundation. +'* +'* OpenOffice.org is distributed in the hope that it will be useful, +'* but WITHOUT ANY WARRANTY; without even the implied warranty of +'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +'* GNU Lesser General Public License version 3 for more details +'* (a copy is included in the LICENSE file that accompanied this code). +'* +'* You should have received a copy of the GNU Lesser General Public License +'* version 3 along with OpenOffice.org. If not, see +'* <http://www.openoffice.org/license.html> +'* for a copy of the LGPLv3 License. +'* +'/************************************************************************ +'** +'** owner : oliver.craemer@Sun.COM +'** +'** short description : Complete test for data validity +'** +'************************************************************************ +' ** +' #1 tValidity_Check_Message +' #1 tValidity_Check_Excel +' ** +'\*********************************************************************** + +testcase tValidity_Check_Message + + printlog "This test checks, if an error messgae appears, when a wrong content is inserted into the appropriate cells" + + dim sInputFile as string + dim sOutputFile as string + dim sMType as string + dim sInfoStr as string + dim iCount as integer + + sInputFile = convertpath(gTesttoolPath & "spreadsheet/optional/input/validity.ods") + sOutputFile = convertpath (gOfficepath & "user/work/validity.ods.ods)" + + printlog " Open document <i>gTesttoolPath</i>spreadsheet/optional/input/validity.ods" + call hFileOpen (sInputFile) + printlog " Save the document under <i>gOfficePath</i>user/work/validity.ods" + if NOT hFileSaveAsWithFilter ( sOutputFile, "calc8" ) then + warnlog "Saving test document localy failed -> Aborting" + call hCloseDocument + goto endsub + endif + + printlog " Do the following operations (see values in table) with every of the 4 sheets." + printlog " Goto first cell and insert the correct value" + printlog " Press RETURN" + printlog " No warning or information message should appear" + printlog " Enter the incorrect value" + printlog " Press RETURN" + printlog " A warning or information message should appear" + for iCount = 1 to 4 + select case iCount + case 1 : sMType = "Stop" : sInfoStr = "First" + case 2 : sMType = "Warning" : sInfoStr = "Second" + case 3 : sMType = "Information" : sInfoStr = "Third" + case 4 : sMType = "Macro" : sInfoStr = "Macro" + end select + + call fCalcSelectSheet(sMType) + printlog " *** " & sInfoStr & " it is checked, if the " & sMType & " messages appears, if wrong contents are inserted into the appropriate cells" + '///+<UL> + '///+<LI>Goto first cell and insert the <i>correct value</i></LI> + '///+<LI>Press RETURN</LI> + '///+<LI><UL><LI>No warning or information message should appear</LI></UL></LI> + '///+<LI>Enter the <i>incorrect value</I> + '///+<LI>Press RETURN</LI> + '///+<LI><UL><LI>A warning or information message should appear</LI></UL></LI> + '///+<LI><TABLE BORDER=1> + '///+ <TR><TH>Cell address</TH><TH>correct value</TH><TH>incorrect value</TH></TR> + '///+ <TR><TD>B4</TD><TD>3</TD><TD>8</TD></TR> + call check_message(sMType, "B4", "3", "8") + '///+ <TR><TD>B5</TD><TD>9</TD><TD>10</TD></TR> + call check_message(sMType, "B5", "9", "10") + '///+ <TR><TD>B6</TD><TD>28</TD><TD>25</TD></TR> + call check_message(sMType, "B6", "28", "25") + '///+ <TR><TD>B7</TD><TD>10</TD><TD>12</TD></TR> + call check_message(sMType, "B7", "10", "12") + '///+ <TR><TD>B8</TD><TD>11</TD><TD>9</TD></TR> + call check_message(sMType, "B8", "11", "9") + '///+ <TR><TD>B9</TD><TD>5</TD><TD>3</TD></TR> + call check_message(sMType, "B9", "5", "3") + '///+ <TR><TD>B10</TD><TD>1</TD><TD>6</TD></TR> + call check_message(sMType, "B10", "1", "6") + '///+ <TR><TD>B11</TD><TD>1</TD><TD>6</TD></TR> + call check_message(sMType, "B11", "1", "6") + '///+ <TR><TD>B17</TD><TD>3,14</TD><TD>3,15</TD></TR> + call check_message(sMType, "B17", "3,14", "3,15") + '///+ <TR><TD>B18</TD><TD>10,14</TD><TD>10,16</TD></TR> + call check_message(sMType, "B18", "10,14", "10,16") + '///+ <TR><TD>B19</TD><TD>25,10</TD><TD>25,09</TD></TR> + call check_message(sMType, "B19", "25,10", "25,09") + '///+ <TR><TD>B20</TD><TD>10,5</TD><TD>10,7</TD></TR> + call check_message(sMType, "B20", "10,5", "10,7") + '///+ <TR><TD>B21</TD><TD>11,9</TD><TD>10</TD></TR> + call check_message(sMType, "B21", "11,9", "10") + '///+ <TR><TD>B22</TD><TD>3,145</TD><TD>3,14</TD></TR> + call check_message(sMType, "B22", "3,145", "3,14") + '///+ <TR><TD>B23</TD><TD>1,45</TD><TD>1,38</TD></TR> + call check_message(sMType, "B23", "1,45", "1,38") + '///+ <TR><TD>B24</TD><TD>2,03</TD><TD>2,15</TD></TR> + call check_message(sMType, "B24", "2,03", "2,15") + '///+ <TR><TD>E4</TD><TD>13.12.99</TD><TD>13.11.99</TD></TR> + call check_message(sMType, "E4", "13.12.99", "13.11.99") + '///+ <TR><TD>E5</TD><TD>12.12.99</TD><TD>13.12.99</TD></TR> + call check_message(sMType, "E5", "12.12.99", "13.12.99") + '///+ <TR><TD>E6</TD><TD>14.12.99</TD><TD>13.12.99</TD></TR> + call check_message(sMType, "E6", "14.12.99", "13.12.99") + '///+ <TR><TD>E7</TD><TD>13.12.99</TD><TD>14.12.99</TD></TR> + call check_message(sMType, "E7", "13.12.99", "14.12.99") + '///+ <TR><TD>E8</TD><TD>13.12.99</TD><TD>12.12.99</TD></TR> + call check_message(sMType, "E8", "13.12.99", "12.12.99") + '///+ <TR><TD>E9</TD><TD>13.11.99</TD><TD>13.12.99</TD></TR> + call check_message(sMType, "E9", "13.11.99", "13.12.99") + '///+ <TR><TD>E10</TD><TD>23.12.99</TD><TD>12.12.99</TD></TR> + call check_message(sMType, "E10", "23.12.99", "12.12.99") + '///+ <TR><TD>E11</TD><TD>24.12.99</TD><TD>23.12.99</TD></TR> + call check_message(sMType, "E11", "24.12.99", "23.12.99") + '///+ <TR><TD>E17</TD><TD>13:15</TD><TD>13:16</TD></TR> + call check_message(sMType, "E17", "13:15", "13:16") + '///+ <TR><TD>E18</TD><TD>10:15</TD><TD>14:16</TD></TR> + call check_message(sMType, "E18", "10:15", "14:16") + '///+ <TR><TD>E19</TD><TD>23:10</TD><TD>12:09</TD></TR> + call check_message(sMType, "E19", "23:10", "12:09") + '///+ <TR><TD>E20</TD><TD>13:15</TD><TD>13:16</TD></TR> + call check_message(sMType, "E20", "13:15", "13:16") + '///+ <TR><TD>E21</TD><TD>13:15</TD><TD>13:14</TD></TR> + call check_message(sMType, "E21", "13:15", "13:14") + '///+ <TR><TD>E22</TD><TD>13:16</TD><TD>13:15</TD></TR> + call check_message(sMType, "E22", "13:16", "13:15") + '///+ <TR><TD>E23</TD><TD>13:15</TD><TD>23:13</TD></TR> + call check_message(sMType, "E23", "13:15", "23:13") + '///+ <TR><TD>E24</TD><TD>12:59</TD><TD>13:00</TD></TR> + call check_message(sMType, "E24", "12:59", "13:00") + '///+ <TR><TD>H4</TD><TD>abc</TD><TD>abcd</TD></TR> + call check_message(sMType, "H4", "abc", "abcd") + '///+ <TR><TD>H5</TD><TD>abcdefgrd</TD><TD>aderfgtzjm</TD></TR> + call check_message(sMType, "H5", "abcdefgrd", "aderfgtzjm") + '///+ <TR><TD>H6</TD><TD>rftgzhujikolmnbvcxyaswqepk</TD><TD>ftgzhnujikm,lopredswqayx</TD></TR> + call check_message(sMType, "H6", "rftgzhujikolmnbvcxyaswqepk", "ftgzhnujikm,lopredswqayx") + '///+ <TR><TD>H7</TD><TD>asweqrfvbg</TD><TD>edcvfrtgbnh</TD></TR> + call check_message(sMType, "H7", "asweqrfvbg", "edcvfrtgbnh") + '///+ <TR><TD>H8</TD><TD>edcswxyaqtgb</TD><TD>ujnmkipztr</TD></TR> + call check_message(sMType, "H8", "edcswxyaqtgb", "ujnmkipztr") + '///+ <TR><TD>H9</TD><TD>sdxc</TD><TD>tgb</TD></TR> + call check_message(sMType, "H9", "sdxc", "tgb") + '///+ <TR><TD>H10</TD><TD>rfvbj</TD><TD>dfcvgb</TD></TR> + call check_message(sMType, "H10", "rfvbj", "dfcvgb") + '///+ <TR><TD>H11</TD><TD>g</TD><TD>we</TD></TR> + call check_message(sMType, "H11", "g", "we") + '///+ <TR><TH>New featurs OpenOffice 2.0</TH></TR> + '///+ <TR><TD>B30</TD><TD>February</TD><TD>January</TD></TR> + call check_message(sMType, "B30", "February", "January") + '///+ <TR><TD>B31</TD><TD>May</TD><TD>February</TD></TR> + call check_message(sMType, "B31", "May", "February") + '///+ <TR><TD>B32</TD><TD>June</TD><TD>January</TD></TR> + call check_message(sMType, "B32", "June", "January") + '///+ <TR><TD>B33</TD><TD>August</TD><TD>November</TD></TR> + call check_message(sMType, "B33", "August", "November") + '///+ <TR><TD>B34</TD><TD>September</TD><TD>December</TD></TR> + call check_message(sMType, "B34", "September", "December") + '///+ <TR><TD>B35</TD><TD>October</TD><TD>March</TD></TR> + call check_message(sMType, "B35", "October", "March") + '///+ <TR><TD>B36</TD><TD>July</TD><TD>August</TD></TR> + call check_message(sMType, "B36", "July", "August") + '///+ <TR><TD>B37</TD><TD>April</TD><TD>October</TD></TR> + call check_message(sMType, "B37", "April", "October") + '///+ <TR><TD>B38</TD><TD>Name03</TD><TD>Name07</TD></TR> + call check_message(sMType, "B38", "Name03", "Name07") + '///+ <TR><TD>E30</TD><TD>alpha</TD><TD>omega</TD></TR> + call check_message(sMType, "E30", "alpha", "omega") + '///+ <TR><TD>E31</TD><TD>beta</TD><TD>zeta</TD></TR> + call check_message(sMType, "E31", "beta", "zeta") + '///+ <TR><TD>E32</TD><TD>gamma</TD><TD>psi</TD></TR> + call check_message(sMType, "E32", "gamma", "psi") + '///+ <TR><TD>E33</TD><TD>delta</TD><TD>pi/2</TD></TR> + call check_message(sMType, "E33", "delta", "pi/2") + '///+ </TABLE></LI></UL> + next iCount + '/// Close the document + printlog "Close the document" + call hCloseDocument + +endcase +' +'------------------------------------------------------------------------------- +' +testcase tValidity_Check_Excel +'/// This test checks, if an error messgae appears, when a wrong content is inserted into the appropriate cells + + dim sInputFile as String + dim sOutputFile as String + dim sMType as String + dim iCount as integer + dim sInfoStr as String + dim sdecimalseperator as string + sDecimalseperator = GetDecimalSeperator + + sInputFile = convertpath(gTesttoolPath & "spreadsheet/optional/input/validity.ods") + sOutputFile = convertpath(gOfficePath & "user/work/validity.xls") + + '/// Open <i>gTesttoolPath</i>/calc/special/input/validity.ods + printlog "Open <i>gTesttoolPath</i>/calc/special/input/validity.ods" + call hFileOpen (sInputFile) + Kontext "SecurityWarning" + '/// If security warning occours click on 'Enable Macros'. + if SecurityWarning.exists(2) then + SecurityWarning.OK + endif + sleep (2) + '/// Save the document under <i>gOfficePath</i>user/work/validity.xls (MS Excel 97 format) + if NOT hFileSaveAsWithFilterKill ( sOutputFile, "MS Excel 97" ) then + warnlog "Saving test document localy failed -> Aborting" + call hCloseDocument + goto endsub + endif + sleep (2) + '/// Close the document + call hCloseDocument + sleep (2) + '/// Open the exported document + call hFileOpen ( sOutputFile ) + sleep (2) + printlog " Do the following operations (see values in table) with every of the 3 sheets." + printlog " Goto first cell and insert the correct value" + printlog " Press RETURN" + printlog " No warning or information message should appear" + printlog " Enter the incorrect value" + printlog " Press RETURN" + printlog " A warning or information message should appear" + for iCount = 1 to 3 + select case iCount + case 1 : sMType = "Stop" : sInfoStr = "First" + case 2 : sMType = "Warning" : sInfoStr = "Second" + case 3 : sMType = "Information" : sInfoStr = "Third" + end select + '/// Do the following operations (see values in table) with every of the 3 sheets. + call fCalcSelectSheet(sMType) + printlog " *** " & sInfoStr & " it is checked, if the " & sMType & " messages appears, if wrong contents are " & _ + "inserted into the appropriate cells" +'///+<UL> +'///+<LI>Goto first cell and insert the <i>correct value</i></LI> +'///+<LI>Press RETURN</LI> +'///+<LI><UL><LI>No warning or information message should appear</LI></UL></LI> +'///+<LI>Enter the <i>incorrect value</I> +'///+<LI>Press RETURN</LI> +'///+<LI><UL><LI>A warning or information message should appear</LI></UL></LI> +'///+<LI><TABLE BORDER=1> +'///+ <TR><TH>Cell address</TH><TH>correct value</TH><TH>incorrect value</TH></TR> +'///+ <TR><TD>B4</TD><TD>3</TD><TD>8</TD></TR> + call check_message(sMType, "B4", "3", "8") +'///+ <TR><TD>B5</TD><TD>9</TD><TD>10</TD></TR> + call check_message(sMType, "B5", "9", "10") +'///+ <TR><TD>B6</TD><TD>28</TD><TD>25</TD></TR> + call check_message(sMType, "B6", "28", "25") +'///+ <TR><TD>B7</TD><TD>10</TD><TD>12</TD></TR> + call check_message(sMType, "B7", "10", "12") +'///+ <TR><TD>B8</TD><TD>11</TD><TD>9</TD></TR> + call check_message(sMType, "B8", "11", "9") +'///+ <TR><TD>B9</TD><TD>5</TD><TD>3</TD></TR> + call check_message(sMType, "B9", "5", "3") +'///+ <TR><TD>B10</TD><TD>1</TD><TD>6</TD></TR> + call check_message(sMType, "B10", "1", "6") +'///+ <TR><TD>B11</TD><TD>1</TD><TD>6</TD></TR> + call check_message(sMType, "B11", "1", "6") +'///+ <TR><TD>B17</TD><TD>3,14</TD><TD>3,15</TD></TR> + call check_message(sMType, "B17", "3" & sdecimalseperator & "14", "3" & sdecimalseperator & "15") +'///+ <TR><TD>B18</TD><TD>10,14</TD><TD>10,16</TD></TR> + call check_message(sMType, "B18", "10" & sdecimalseperator & "14", "10" & sdecimalseperator & "16") +'///+ <TR><TD>B19</TD><TD>25,10</TD><TD>25,09</TD></TR> + call check_message(sMType, "B19", "25" & sdecimalseperator & "10", "25" & sdecimalseperator & "09") +'///+ <TR><TD>B20</TD><TD>10,5</TD><TD>10,7</TD></TR> + call check_message(sMType, "B20", "10" & sdecimalseperator & "5", "10" & sdecimalseperator & "7") +'///+ <TR><TD>B21</TD><TD>11,9</TD><TD>10</TD></TR> + call check_message(sMType, "B21", "11" & sdecimalseperator & "9", "10") +'///+ <TR><TD>B22</TD><TD>3,145</TD><TD>3,14</TD></TR> + call check_message(sMType, "B22", "3" & sdecimalseperator & "145", "3" & sdecimalseperator & "14") +'///+ <TR><TD>B23</TD><TD>1,45</TD><TD>1,38</TD></TR> + call check_message(sMType, "B23", "1" & sdecimalseperator & "45", "1" & sdecimalseperator & "38") +'///+ <TR><TD>B24</TD><TD>2,03</TD><TD>2,15</TD></TR> + call check_message(sMType, "B24", "2" & sdecimalseperator & "03", "2" & sdecimalseperator & "15") +'///+ <TR><TD>E4</TD><TD>13.12.99</TD><TD>13.11.99</TD></TR> + call check_message(sMType, "E4", "13.12.99", "13.11.99") +'///+ <TR><TD>E5</TD><TD>12.12.99</TD><TD>13.12.99</TD></TR> + call check_message(sMType, "E5", "12.12.99", "13.12.99") +'///+ <TR><TD>E6</TD><TD>14.12.99</TD><TD>13.12.99</TD></TR> + call check_message(sMType, "E6", "14.12.99", "13.12.99") +'///+ <TR><TD>E7</TD><TD>13.12.99</TD><TD>14.12.99</TD></TR> + call check_message(sMType, "E7", "13.12.99", "14.12.99") +'///+ <TR><TD>E8</TD><TD>13.12.99</TD><TD>12.12.99</TD></TR> + call check_message(sMType, "E8", "13.12.99", "12.12.99") +'///+ <TR><TD>E9</TD><TD>13.11.99</TD><TD>13.12.99</TD></TR> + call check_message(sMType, "E9", "13.11.99", "13.12.99") +'///+ <TR><TD>E10</TD><TD>23.12.99</TD><TD>12.12.99</TD></TR> + call check_message(sMType, "E10", "23.12.99", "12.12.99") +'///+ <TR><TD>E11</TD><TD>24.12.99</TD><TD>23.12.99</TD></TR> + call check_message(sMType, "E11", "24.12.99", "23.12.99") +'///+ <TR><TD>E17</TD><TD>13:15</TD><TD>13:16</TD></TR> + call check_message(sMType, "E17", "13:15", "13:16") +'///+ <TR><TD>E18</TD><TD>10:15</TD><TD>14:16</TD></TR> + call check_message(sMType, "E18", "10:15", "14:16") +'///+ <TR><TD>E19</TD><TD>23:10</TD><TD>12:09</TD></TR> + call check_message(sMType, "E19", "23:10", "12:09") +'///+ <TR><TD>E20</TD><TD>13:15</TD><TD>13:16</TD></TR> + call check_message(sMType, "E20", "13:15", "13:16") +'///+ <TR><TD>E21</TD><TD>13:15</TD><TD>13:15</TD></TR> + call check_message(sMType, "E21", "13:15", "13:14") +'///+ <TR><TD>E22</TD><TD>13:16</TD><TD>13:15</TD></TR> + call check_message(sMType, "E22", "13:16", "13:15") +'///+ <TR><TD>E23</TD><TD>13:15</TD><TD>23:13</TD></TR> + call check_message(sMType, "E23", "13:15", "23:13") +'///+ <TR><TD>E24</TD><TD>12:59</TD><TD>13:00</TD></TR> + call check_message(sMType, "E24", "12:59", "13:00") +'///+ <TR><TD>H4</TD><TD>abc</TD><TD>abcd</TD></TR> + call check_message(sMType, "H4", "abc", "abcd") +'///+ <TR><TD>H5</TD><TD>abcdefgrd</TD><TD>aderfgtzjm</TD></TR> + call check_message(sMType, "H5", "abcdefgrd", "aderfgtzjm") +'///+ <TR><TD>H6</TD><TD>rftgzhujikolmnbvcxyaswqepk</TD><TD>ftgzhnujikm,lopredswqayx</TD></TR> + call check_message(sMType, "H6", "rftgzhujikolmnbvcxyaswqepk", "ftgzhnujikm,lopredswqayx") +'///+ <TR><TD>H7</TD><TD>asweqrfvbg</TD><TD>edcvfrtgbnh</TD></TR> + call check_message(sMType, "H7", "asweqrfvbg", "edcvfrtgbnh") +'///+ <TR><TD>H8</TD><TD>edcswxyaqtgb</TD><TD>ujnmkipztr</TD></TR> + call check_message(sMType, "H8", "edcswxyaqtgb", "ujnmkipztr") +'///+ <TR><TD>H9</TD><TD>sdxc</TD><TD>tgb</TD></TR> + call check_message(sMType, "H9", "sdxc", "tgb") +'///+ <TR><TD>H10</TD><TD>rfvbj</TD><TD>dfcvgb</TD></TR> + call check_message(sMType, "H10", "rfvbj", "dfcvgb") +'///+ <TR><TD>H11</TD><TD>g</TD><TD>we</TD></TR> + call check_message(sMType, "H11", "g", "we") +'///+ <TR><TH>New featurs OpenOffice 2.0</TH></TR>we</TD></TR> +'///+ <TR><TD>B30</TD><TD>February</TD><TD>January</TD></TR> + call check_message(sMType, "B30", "February", "January") +'///+ <TR><TD>B31</TD><TD>May</TD><TD>February</TD></TR> + call check_message(sMType, "B31", "May", "February") +'///+ <TR><TD>B32</TD><TD>June</TD><TD>January</TD></TR> + call check_message(sMType, "B32", "June", "January") +'///+ <TR><TD>B33</TD><TD>August</TD><TD>November</TD></TR> + call check_message(sMType, "B33", "August", "November") +'///+ <TR><TD>B34</TD><TD>September</TD><TD>December</TD></TR> + call check_message(sMType, "B34", "September", "December") +'///+ <TR><TD>B35</TD><TD>October</TD><TD>March</TD></TR> + call check_message(sMType, "B35", "October", "March") +'///+ <TR><TD>B36</TD><TD>July</TD><TD>August</TD></TR> + call check_message(sMType, "B36", "July", "August") +'///+ <TR><TD>B37</TD><TD>April</TD><TD>October</TD></TR> + call check_message(sMType, "B37", "April", "October") +'///+ <TR><TD>B38</TD><TD>Name03</TD><TD>Name07</TD></TR> + call check_message(sMType, "B38", "Name03", "Name07") +'///+ <TR><TD>E30</TD><TD>alpha</TD><TD>omega</TD></TR> + call check_message(sMType, "E30", "alpha", "omega") +'///+ <TR><TD>E31</TD><TD>beta</TD><TD>zeta</TD></TR> + call check_message(sMType, "E31", "beta", "zeta") +'///+ <TR><TD>E32</TD><TD>gamma</TD><TD>psi</TD></TR> + call check_message(sMType, "E32", "gamma", "psi") +'///+ <TR><TD>E33</TD><TD>delta</TD><TD>pi/2</TD></TR> + call check_message(sMType, "E33", "delta", "pi/2") +'///+ </TABLE></LI></UL> + next iCount +'/// File / Close + call hCloseDocument +endcase + diff --git a/testautomation/spreadsheet/optional/input/validity.ods b/testautomation/spreadsheet/optional/input/validity.ods Binary files differnew file mode 100755 index 000000000000..06a980c67478 --- /dev/null +++ b/testautomation/spreadsheet/optional/input/validity.ods diff --git a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc index 0b2ae7c0dba4..01f982640293 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc @@ -549,14 +549,20 @@ testcase tDataValidity printlog " Choose last entry (not between) in 'Data' combobox" Daten.select (8) Call DialogTest ( TabWerte,3 ) - '/// Choose 7th entry (Cell range) in 'Allow' combobox - printlog " Choose 7th entry (Cell range) in 'Allow' combobox" + '/// Choose 7th entry (List) in 'Allow' combobox + printlog " Choose 7th entry (List) in 'Allow' combobox" Zulassen.select (7) - Call DialogTest ( TabWerte,4 ) - '/// Choose 6th entry (List) in 'Allow' combobox - printlog " Choose 6th entry (List) in 'Allow' combobox" + Call DialogTest ( TabWerte,4 ) + '/// Choose 6th entry (Cell range) in 'Allow' combobox + printlog " Choose 6th entry (Cell range) in 'Allow' combobox" Zulassen.select (6) Call DialogTest ( TabWerte,5 ) + printlog " Press Shrink button" + SourceShrink.Click + Kontext "TabWerte" + printlog " Close rangechooser" + SourceShrink.Click + Kontext "TabWerte" '/// Switch to tabpage 'Input Help' printlog " Switch to tabpage 'Input Help'" Kontext diff --git a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc index 6513f450a15d..000c8db5c961 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc @@ -332,6 +332,7 @@ testcase tViewNavigator '/// Check that the dragmodus has 3 modes printlog " Check that the dragmodus has 3 modes" Dragmodus.OpenMenu + waitslot(1000) if hMenuItemGetCount <> 3 then warnlog "Not enough modes for dragmodus" end if diff --git a/testautomation/spreadsheet/tools/includes/c_validity_tools.inc b/testautomation/spreadsheet/tools/includes/c_validity_tools.inc new file mode 100755 index 000000000000..0fb9277a7a5a --- /dev/null +++ b/testautomation/spreadsheet/tools/includes/c_validity_tools.inc @@ -0,0 +1,145 @@ +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +'* +'* Copyright 2008 by Sun Microsystems, Inc. +'* +'* OpenOffice.org - a multi-platform office productivity suite +'* +'* $RCSfile: c_validity_tools.inc,v $ +'* +'* $Revision: 1.0 $ +'* +'* last change: $Author: oc $ $Date: 2009/08/04 15:41:39 $ +'* +'* This file is part of OpenOffice.org. +'* +'* OpenOffice.org is free software: you can redistribute it and/or modify +'* it under the terms of the GNU Lesser General Public License version 3 +'* only, as published by the Free Software Foundation. +'* +'* OpenOffice.org is distributed in the hope that it will be useful, +'* but WITHOUT ANY WARRANTY; without even the implied warranty of +'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +'* GNU Lesser General Public License version 3 for more details +'* (a copy is included in the LICENSE file that accompanied this code). +'* +'* You should have received a copy of the GNU Lesser General Public License +'* version 3 along with OpenOffice.org. If not, see +'* <http://www.openoffice.org/license.html> +'* for a copy of the LGPLv3 License. +'* +'/************************************************************************ +'** +'** owner : oliver.craemer@Sun.COM +'** +'** short description : Subroutines for the data validity test +'** +'************************************************************************ +' ** +' #0 check_message ' Check if the messages in validity test are OK +' ** +'\*********************************************************************** + +sub check_message(MType as String, Celladdress as String, cellcontent as String, wrong as String) +'/// Sub routine for checking message + if MType <> "Macro" then + Kontext "RechenleisteCalc" + if not RechenleisteCalc.isvisible then + ViewToolbarsFormulaBar + end if + Kontext "RechenleisteCalc" + Bereich.TypeKeys "<MOD1 A>" + Bereich.TypeKeys Celladdress + sleep(1) + Bereich.TypeKeys "<RETURN>" + + Kontext "DocumentCalc" + DocumentCalc.TypeKeys cellcontent + DocumentCalc.TypeKeys "<RETURN>" + kontext "active" + if active.exists(2) then + warnlog "Value " & cellcontent & " is correct in cell "& Celladdress & ", so no " & MType & " message must not be appear" + if MType = "Stop" then + active.OK + else + active.Cancel + end if + else + printlog "OK, no " & MType & " message appears, by inserting the correct value into " & Celladdress + end if + + Kontext "RechenleisteCalc" + if not RechenleisteCalc.isvisible then + ViewToolbarsFormulaBar + end if + Kontext "RechenleisteCalc" + Bereich.TypeKeys "<MOD1 A>" + Bereich.TypeKeys Celladdress + sleep(1) + Bereich.TypeKeys "<RETURN>" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys wrong + DocumentCalc.TypeKeys "<RETURN>" + kontext "active" + if active.exists(2) then + printlog "OK, value " & wrong & " is not correct in cell " & Celladdress & ", so the " & MType & " message has to be appear" + if MType = "Stop" then + active.OK + else + active.Cancel + end if + else + warnlog "Value " & wrong & " is not correct for cell " & Celladdress & ", so the " & MType & " message has to be appears" + end if + else + Kontext "RechenleisteCalc" + if not RechenleisteCalc.isvisible then + ViewToolbarsFormulaBar + end if + Kontext "RechenleisteCalc" + Bereich.TypeKeys "<MOD1 A>" + Bereich.TypeKeys Celladdress + sleep(1) + Bereich.TypeKeys "<RETURN>" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys cellcontent + DocumentCalc.TypeKeys "<RETURN>" + DocumentCalc.TypeKeys "<UP><RIGHT>" + FormatCells + Kontext + Active.setPage TabFontEffects + Kontext "TabFontEffects" + if FontColor.getSelIndex = 1 then + printlog "OK, the macro detect the correct word in " & Celladdress + else + warnlog "The Fontcolor is " & FontColor.getSelText & " instead of automatic in cell " & Celladdress + end if + TabFontEffects.Cancel + + Kontext "RechenleisteCalc" + if not RechenleisteCalc.isvisible then + ViewToolbarsFormulaBar + end if + Kontext "RechenleisteCalc" + Bereich.TypeKeys "<MOD1 A>" + Bereich.TypeKeys Celladdress + sleep(1) + Bereich.TypeKeys "<RETURN>" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys wrong + DocumentCalc.TypeKeys "<RETURN>" + DocumentCalc.TypeKeys "<UP><RIGHT>" + FormatCells + Kontext + Active.setPage TabFontEffects + Kontext "TabFontEffects" + if FontColor.getSelIndex = 12 then + printlog "OK, the macro detect the wrong word in " & Celladdress + else + warnlog "The Fontcolor is " & FontColor.getSelText & " instead of light green in cell " & Celladdress + end if + TabFontEffects.Cancel + end if +end sub + diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc index f96238cb11a8..463ef593930c 100755 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc @@ -304,9 +304,9 @@ testcase tGroup_6 Call wTypeKeys "<Right>",2 PrintLog "- Set the focus to rectangle , check if it is moved (Should NOT)" - Call gMouseClick(35,35) + Call gMouseClick(41,40) Call fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX1 then Warnlog "Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX1 then Warnlog "#i106719#Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext if Verticalby.Gettext <> sPositionY1 then Warnlog "Rectangle should NOT be moved: Y Not -> "+sPositionY1+" but -> "+ Verticalby.Gettext TabPositionAndSizeWriter.Cancel @@ -377,7 +377,7 @@ testcase tGroup_7 PrintLog "- Set the focus to rectangle , check if it is moved (Should NOT)." Call gMouseClick(40,40) Call fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX1 then Warnlog "Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX1 then Warnlog "#i106719#Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext if Verticalby.Gettext <> sPositionY1 then Warnlog "Rectangle should NOT be moved: Y Not -> "+sPositionY1+" but -> "+ Verticalby.Gettext TabPositionAndSizeWriter.Cancel diff --git a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc index 1112d4b62551..3f7d55cb8be7 100755 --- a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc +++ b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc @@ -1032,6 +1032,10 @@ testcase tDropDownLB_17 PrintLog "- Open a word document which includes 2 entries." Call hFileOpen(sTestFile) Call sMakeReadOnlyDocumentEditable + + Kontext "EditInputList" + if EditInputList.Exists then EditInputList.Cancel + PrintLog "- Set focus in front of first line." Call wTypeKeys "<MOD1 Home>" PrintLog "- Edit/Fields." @@ -1085,7 +1089,9 @@ testcase tDropDownLB_17 FeldbefehlBearbeitenFunktionen.Cancel - Call hCloseDocument ' <- close word document + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase diff --git a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc index c663faf68001..8b7296d1d5a4 100755 --- a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc +++ b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc @@ -40,354 +40,347 @@ ' #1 tHyphenation_1 ' #1 tHyphenation_2 ' #1 tHyphenation_3 +' #1 tHyphenation_4 '* '\*********************************************************************** testcase tHyphenation_1 - Dim testFile as String - Dim testWord as String - Dim firstPartOfTestWord as String - Dim secondPartOfTestWord as String - - testFile = "tHyphenation.odt" - testWord = "following" - firstPartOfTestWord = "fol" - secondPartOfTestWord = "follow" - - PrintLog "- Test Hyphenation using ctrl and -" - - printlog "Test Hyphenation using ctrl and -" - - printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable - - Call wTypeKeys "<End><Shift Mod1 Left>" - - EditCopy - - printlog "add '-' between 'fol' and 'lowing' , then press 3 times 'space bar' (pc). (7 times on linux)" - printlog "+ check if fol in the end of the line" - if GetClipboardText = testWord then - Call wTypeKeys "<Right>" , 3 - Call wTypeKeys "<Mod1 SUBTRACT>" - Call wTypeKeys "<Home>" - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,7 - end if - - Call wTypeKeys "<End><Left><Shift Mod1 Left>" - EditCopy - - if GetClipboardText <> firstPartOfTestWord then - Warnlog "The hyphenation does NOT work well in first part!" - end if - - printlog "add '-' between 'follow' and 'ing' , then press 6 times 'space bar'" - printlog "+ check if follow in the end of the line ." - Call wTypeKeys "<Mod1 z>",2 - Call wTypeKeys "<End>" - Call wTypeKeys "<Left>",3 - Call wTypeKeys "<Mod1 SUBTRACT>" - Call wTypeKeys "<Home>" - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,6 - end if - Call wTypeKeys "<End><Left><Shift Mod1 Left>" - EditCopy - - if GetClipboardText = secondPartOfTestWord then - Call wTypeKeys "<Home>" - - printlog "press 5 times 'space bar'" - printlog "check if fol in the end of the line ." - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,5 - end if - Call wTypeKeys "<End><Shift Mod1 Left>" - EditCopy - - if GetClipboardText <> firstPartOfTestWord then - Warnlog "The hyphenation does NOT work well in first part, but it works fine in second part!" - end if - else - Warnlog "The hyphenation does NOT work well in second part!" - end if - - else - Warnlog "The test word is wrong !!" - end if - - Call hCloseDocument - -endcase + Dim testFile as String + Dim testWord as String + Dim PartOfTestWord as String + + testFile = "tHyphenation.odt" + testWord = "following" + PartOfTestWord = "fol" + + printlog "Test Hyphenation using ctrl and -" + + printlog "open a test file" + Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + Call sMakeReadOnlyDocumentEditable + + ' we must assure the word 'following' is the first word in second line + ' otherwise the test will not work correctly + if fPrepareHyphenationDocument(testWord) = false then + Warnlog "Unable to prepare document for hyphenation. Check testcase" + Call hCloseDocument + end if + + printlog "add '-' between 'fol' and 'lowing'" + printlog "+ check if fol in the end of the line" + + Call wTypeKeys "<Home>" + Call wTypeKeys "<Right>" , 3 + Call wTypeKeys "<Mod1 SUBTRACT>" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + Call wTypeKeys "<Delete>" + + Call wTypeKeys "<End><Left>" + Call wTypeKeys "<Mod1 Shift Left>" + EditCopy + + if GetClipboardText <> PartOfTestWord then + Warnlog "The hyphenation does NOT work ! Found '" & GetClipboardText & "' and not '" & PartOfTestWord & "'" + end if + + Call hCloseDocument + +endcase '------------------------------------------------------------------------- testcase tHyphenation_2 -warnlog "#i102304# - outcommenting tHyphenation_2 due to bug." -goto endsub - - Dim testFile as String - Dim testWord as String - Dim firstPartOfTestWord as String - Dim secondPartOfTestWord as String - Dim testWordInHyphenationDlg as String - - testFile = "tHyphenation.odt" - testWord = "following" - testWordInHyphenationDlg = "fol=low-ing" - firstPartOfTestWord = "fol" - secondPartOfTestWord = "follow" - - PrintLog "- Test Hyphenation using Tools/Hyphenation ,test like fol-lowing" - - printlog "Test Hyphenation using Tools/Hyphenation ,test like fol-lowing" - - printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable - - Call wTypeKeys "<End><Shift Mod1 Left>" - - EditCopy - - if GetClipboardText <> testWord then - Warnlog "The test word is wrong !!" - goto endsub - end if - - printlog "Press 3 times 'space bar'" - Call wTypeKeys "<Home>" - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,6 - end if - - printlog "Tools/Hyphenation" - ToolsLanguageHyphenate - Kontext "Silbentrennung" - - if Not Silbentrennung.Exists then - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then - Active.Yes - - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then Active.Ok - end if - end if - end if - Warnlog "Unable to bring up Dialog 'Hyphenation'!" - goto endsub - end if - - printlog "check if get 'fol=low-ing'" - if Wort.Gettext <> testWordInHyphenationDlg then - Warnlog "#i40561# The test can NOT be seperated two times , or something wrong!" - Silbentrennung.Cancel - goto NOTest - end if - - if NOT Vor.IsEnabled then - Warnlog "the Vor button is Not enabled, or something wrong!" - Silbentrennung.Cancel - goto NOTest - end if - - printlog "add '-' between 'fol' and 'lowing' using left arrow key" - Vor.Click - Silbentrennung.OK - - printlog "Close all dialogue, and recover the file to default" - Kontext "Active" - if NOT Active.Exists then - Kontext "Silbentrennung" - Silbentrennung.Cancel - Warnlog "The first message box is NOT pop up" - goto NOTest - end if - - Active.Yes - - Kontext "Active" - if NOT Active.Exists then - Warnlog "The second message box is NOT pop up" - goto endsub - end if - - Active.OK - - printlog "Press 3 times 'space bar' in front of the line" - Call wTypeKeys "<BACKSPACE>",3 - Call wTypeKeys "<SPACE>",3 - - Call wTypeKeys "<End><Left><Shift Mod1 Left>" - EditCopy - - printlog "Check if get 'fol'" - if GetClipboardText <> firstPartOfTestWord then - Warnlog "The hyphenation does NOT work well in first part!" - end if - -NOTest: - Call hCloseDocument - -endcase + Dim testFile as String + Dim testWord as String + Dim PartOfTestWord as String + + testFile = "tHyphenation.odt" + testWord = "following" + PartOfTestWord = "follow" + + printlog "Test Hyphenation using ctrl and -" + + printlog "open a test file" + Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + Call sMakeReadOnlyDocumentEditable + + ' we must assure the word 'following' is the first word in second line + ' otherwise the test will not work correctly + if fPrepareHyphenationDocument(testWord) = false then + Warnlog "Unable to prepare document for hyphenation. Check testcase" + Call hCloseDocument + end if + + printlog "add '-' between 'follow' and 'ing'" + printlog "+ check if 'follow' in the end of the line" + + Call wTypeKeys "<Home>" + Call wTypeKeys "<Right>" , 6 + Call wTypeKeys "<Mod1 SUBTRACT>" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + if gPlatgroup = "unx" then + Call wTypeKeys "<Delete>", 6 + else + Call wTypeKeys "<Delete>", 7 + end if + + Call wTypeKeys "<End><Left>" + Call wTypeKeys "<Mod1 Shift Left>" + EditCopy + + if GetClipboardText <> PartOfTestWord then + Warnlog "The hyphenation does NOT work ! Found '" & GetClipboardText & "' and not '" & PartOfTestWord & "'" + end if + + Call hCloseDocument + +endcase '------------------------------------------------------------------------- testcase tHyphenation_3 -warnlog "#i102304# - outcommenting tHyphenation_3 due to bug." -goto endsub - - Dim testFile as String - Dim testWord as String - Dim firstPartOfTestWord - Dim secondPartOfTestWord as String - Dim testWordInHyphenationDlg1 as String - Dim testWordInHyphenationDlg2 as String - - testFile = "tHyphenation.odt" - testWord = "following" - firstPartOfTestWord = "fol" - secondPartOfTestWord = "follow" - testWordInHyphenationDlg1 = "fol=low-ing" - testWordInHyphenationDlg2 = "fol-low=ing" - - printLog "- Test Hyphenation using Tools/Hyphenation ,test like follow-ing" - printlog "Test Hyphenation using Tools/Hyphenation ,test like follow-ing" - - printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable - - Call wTypeKeys "<End><Shift Mod1 Left>" - - EditCopy - - if GetClipboardText <> testWord then - Warnlog "The test word is wrong !!" - goto endsub - end if - - printlog "Press 3 times 'space bar'" - Call wTypeKeys "<Home>" - if gPlatGroup <> "unx" then - Call wTypeKeys "<SPACE>" ,3 - else - Call wTypeKeys "<SPACE>" ,6 - end if - - printlog "Tools/Hyphenation" - ToolsLanguageHyphenate - Kontext "Silbentrennung" - - if Not Silbentrennung.Exists then - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then - Active.Yes - - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then Active.Ok - end if - end if - end if - Warnlog "Unable to bring up Dialog 'Hyphenation'!" - goto endsub - end if - - printlog "check if get 'fol=low-ing'" - if Wort.Gettext <> testWordInHyphenationDlg1 then - Warnlog "#i40561# The test can NOT be seperated two times , or something wrong!" - Silbentrennung.Cancel - goto NOTest - end if - - printlog "click left arrow key" - if NOT Vor.IsEnabled then - Warnlog "the Vor button is Not enabled, or something wrong!" - Silbentrennung.Cancel - goto NOTest - end if - Vor.Click - - printlog "check if get ''fol-low=ing'" - if Wort.Gettext <> testWordInHyphenationDlg2 then - Warnlog "The test word should be changed after clicking Vor!" - goto endsub - end if - - printlog "add '-' between 'follow' and 'ing' pressing right arrow key" - if NOT Zurueck.IsEnabled then - Warnlog "the Zuruech button is Not enabled, or something wrong!" - goto endsub - end if - Zurueck.Click - - printlog "check if get 'fol-low=ing'" - if Wort.Gettext <> testWordInHyphenationDlg1 then - Warnlog "The test word should be changed after clicking Zurueck!" - goto endsub - end if - - Sleep 1 - - printlog "close all dialogue" - Silbentrennung.OK - - Kontext "Active" - if NOT Active.Exists then - Warnlog "The first message box is NOT pop up" - goto endsub - end if - - Active.Yes - - Kontext "Active" - if NOT Active.Exists then - Warnlog "The second message box is NOT pop up" - goto endsub - end if - - Active.OK - - printlog "recover to the default file and press 3 sparc bar in front of the line" - Call wTypeKeys "<BACKSPACE>",3 - Call wTypeKeys "<SPACE>",3 - - Call wTypeKeys "<End><Left><Shift Mod1 Left>" - EditCopy - - printlog "check if get 'follow' in the end of the line" - if GetClipboardText = secondPartOfTestWord then - Call wTypeKeys "<Home>" - Call wTypeKeys "<SPACE>" , 5 - - Call wTypeKeys "<End><Shift Mod1 Left>" - EditCopy + Dim testFile as String + Dim testWord as String + Dim firstPartOfTestWord as String + Dim secondPartOfTestWord as String + Dim testWordInHyphenationDlg as String + + testFile = "tHyphenation.odt" + testWord = "following" + testWordInHyphenationDlg = "fol=low-ing" + firstPartOfTestWord = "fol" + secondPartOfTestWord = "follow" + + printlog "Test Hyphenation using Tools/Hyphenation ,test like fol-lowing" + + printlog "open a test file" + Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + Call sMakeReadOnlyDocumentEditable + + ' we must assure the word 'following' is the first word in second line + ' otherwise the test will not work correctly + if fPrepareHyphenationDocument(testWord) = false then + Warnlog "Unable to prepare document for hyphenation. Check testcase" + Call hCloseDocument + end if + + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + if gPlatgroup = "unx" then + Call wTypeKeys "<Delete>", 6 + else + Call wTypeKeys "<Delete>", 7 + end if + + printlog "Tools/Hyphenation" + ToolsLanguageHyphenate + Kontext "Silbentrennung" + + if Not Silbentrennung.Exists then + Warnlog "Unable to bring up Dialog 'Hyphenation'!" + Call hCloseDocument + goto endsub + end if + + printlog "check if get 'fol=low-ing'" + if Wort.Gettext <> testWordInHyphenationDlg then + Warnlog "Expected " & testWordInHyphenationDlg & " but found " & Wort.Gettext + Silbentrennung.Cancel + Call hCloseDocument + goto endsub + end if + + if NOT Vor.IsEnabled then + Warnlog "the 'Vor' button is Not enabled, or something wrong!" + Silbentrennung.Cancel + Call hCloseDocument + goto endsub + end if + + printlog "add '-' between 'fol' and 'lowing' using left arrow key" + Vor.Click + Silbentrennung.OK + + ' Messagebox 'Start hypheantion from the beginning ? + Kontext "Active" + if Active.Exists then + if Active.GetRT = 304 then + try + Active.Yes + catch + Active.ok + endcatch + else + Warnlog "No messagebox asking for hyphenate at beginning of document" + end if + end if + + ' End of hyphenation message + if Active.Exists then + if Active.GetRT = 304 then + try + Active.Ok + catch + Active.yes + endcatch + else + Warning "No 'end of hyphenation' messagebox" + end if + end if + + printlog "Press 3 times 'space bar' in front of the line" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + Call wTypeKeys "<Left>" + Call wTypeKeys "<Shift Mod1 Left>" + EditCopy + + printlog "Check if get 'fol'" + if GetClipboardText <> firstPartOfTestWord then + Warnlog "The hyphenation does NOT work ! Found '" & GetClipboardText & "' and not '" & PartOfTestWord & "'" + end if + + Call hCloseDocument + +endcase - if GetClipboardText <> firstPartOfTestWord then - Warnlog "The hyphenation does NOT work well in first part, but it works fine in second part!" - end if - else - Warnlog "The hyphenation does NOT work well in second part!" - end if -NOTest: - Call hCloseDocument +'------------------------------------------------------------------------- +testcase tHyphenation_4 + + Dim testFile as String + Dim testWord as String + Dim firstPartOfTestWord as string + Dim secondPartOfTestWord as String + Dim testWordInHyphenationDlg1 as String + Dim testWordInHyphenationDlg2 as String + + testFile = "tHyphenation.odt" + testWord = "following" + firstPartOfTestWord = "fol" + secondPartOfTestWord = "follow" + testWordInHyphenationDlg1 = "fol=low-ing" + testWordInHyphenationDlg2 = "fol-low=ing" + + printLog "- Test Hyphenation using Tools/Hyphenation ,test like follow-ing" + printlog "Test Hyphenation using Tools/Hyphenation ,test like follow-ing" + + printlog "open a test file" + Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + Call sMakeReadOnlyDocumentEditable + + ' we must assure the word 'following' is the first word in second line + ' otherwise the test will not work correctly + if fPrepareHyphenationDocument(testWord) = false then + Warnlog "Unable to prepare document for hyphenation. Check testcase" + Call hCloseDocument + end if + + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + if gPlatgroup = "unx" then + Call wTypeKeys "<Delete>", 6 + else + Call wTypeKeys "<Delete>", 7 + end if + + printlog "Tools/Hyphenation" + ToolsLanguageHyphenate + Kontext "Silbentrennung" + + if Not Silbentrennung.Exists then + Call hCloseDocument + goto endsub + end if + + printlog "check if get 'fol=low-ing'" + if Wort.Gettext <> testWordInHyphenationDlg1 then + Warnlog "Expected " & testWordInHyphenationDlg1 & " but found " & Wort.Gettext + Silbentrennung.Cancel + Call hCloseDocument + goto endsub + end if + + printlog "click left arrow key" + if NOT Vor.IsEnabled then + Warnlog "the Vor button is Not enabled, or something wrong!" + Silbentrennung.Cancel + Call hCloseDocument + goto endsub + end if + Vor.Click + + printlog "check if get ''fol-low=ing'" + if Wort.Gettext <> testWordInHyphenationDlg2 then + Warnlog "Expected " & testWordInHyphenationDlg2 & " but found " & Wort.Gettext + Call hCloseDocument + goto endsub + end if + + printlog "add '-' between 'follow' and 'ing' pressing right arrow key" + if NOT Zurueck.IsEnabled then + Warnlog "the 'Back' button is Not enabled, or something wrong!" + Call hCloseDocument + goto endsub + end if + Zurueck.Click + + printlog "check if get 'fol-low=ing'" + if Wort.Gettext <> testWordInHyphenationDlg1 then + Warnlog "The test word should be changed after clicking Zurueck!" + Call hCloseDocument + goto endsub + end if + + Sleep 1 + + printlog "close all dialogs" + Silbentrennung.OK + + ' Messagebox 'Start hypheantion from the beginning ? + Kontext "Active" + if Active.Exists then + if Active.GetRT = 304 then + try + Active.Yes + catch + Active.ok + endcatch + else + Warnlog "No messagebox asking for hyphenate at beginning of document" + end if + end if + + ' End of hyphenation message + if Active.Exists then + if Active.GetRT = 304 then + try + Active.Ok + catch + Active.yes + endcatch + else + Warning "No 'end of hyphenation' messagebox" + end if + end if + + printlog "Press 3 times 'space bar' in front of the line" + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<End>" + Call wTypeKeys "<Left>" + Call wTypeKeys "<Shift Mod1 Left>" + EditCopy + + printlog "Check if get 'follow'" + if GetClipboardText <> secondPartOfTestWord then + Warnlog "The hyphenation does NOT work ! Found '" & GetClipboardText & "' and not '" & secondPartOfTestWord & "'" + end if + + Call hCloseDocument + endcase diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc index 3c0595bdff3f..d6eefcacad1e 100755 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc @@ -631,116 +631,116 @@ endcase testcase tInsertGraphic_18 - Dim sGraphicName1 as String - Dim sGraphicName2 as String - Dim sGraphicName3 as String - Dim sWidth as String - Dim sHeight as String - - sGraphicName1 = "TEST1" - sGraphicName2 = "TEST2" - sGraphicName3 = "TEST3" - - sWidth = "7"+ gSeperator + "00" + gMeasurementUnit - sHeight = "6"+ gSeperator + "00" + gMeasurementUnit + Dim sGraphicName1 as String + Dim sGraphicName2 as String + Dim sGraphicName3 as String + Dim sWidth as String + Dim sHeight as String - PrintLog "- Test Set different attributes via Contextmenu Arrange (send backward)" - '/// Test Set different attributes via Contextmenu Arrange (send backward) + sGraphicName1 = "TEST1" + sGraphicName2 = "TEST2" + sGraphicName3 = "TEST3" - Call hNewDocument + sWidth = "7"+ gSeperator + "00" + gMeasurementUnit + sHeight = "6"+ gSeperator + "00" + gMeasurementUnit - Call wTypeKeys "<Return>" + PrintLog "- Test Set different attributes via Contextmenu Arrange (send backward)" + '/// Test Set different attributes via Contextmenu Arrange (send backward) - '/// Insert three Graphics at the same place , and named in series + Call hNewDocument - 'the 1st graphic - fInsertGraphics("Bughunter.jpg") + Call wTypeKeys "<Return>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName1 - TabZusaetze.OK + '/// Insert three Graphics at the same place , and named in series - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + 'the 1st graphic + fInsertGraphics("Bughunter.jpg") - Call wTypeKeys "<ESCape>" + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName1 + Kontext + Active.Setpage TabType + Kontext "TabType" + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK - 'the 2nd graphic - fInsertGraphics("flowers.gif") + Call wTypeKeys "<ESCape>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName2 - TabZusaetze.OK + 'the 2nd graphic + fInsertGraphics("flowers.gif") - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName2 + TabZusaetze.OK - Call wTypeKeys "<ESCape>" + fFormatGraphic("TabType") + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK - 'the 3rd graphic - fInsertGraphics("game.bmp") + Call wTypeKeys "<ESCape>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName3 - TabZusaetze.OK + 'the 3rd graphic + fInsertGraphics("game.bmp") - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName3 + TabZusaetze.OK - '/// ContextMenu Arrange / Send backward - Call wOpenContextMenu + fFormatGraphic("TabType") + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK + + '/// ContextMenu Arrange / Send backward + Call wOpenContextMenu hMenuSelectNr(1) Sleep 2 hMenuSelectNr(3) Sleep 1 - Call wTypeKeys "<ESCape>" - Sleep 1 + Call wTypeKeys "<ESCape>" + Sleep 1 - '/// Check if the attributes Arrange (send to back) works well - Call wNavigatorAuswahl(4,1) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + '/// Check if the attributes Arrange (send to back) works well + Call wNavigatorAuswahl(4,1) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call wNavigatorAuswahl(4,2) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + Call wNavigatorAuswahl(4,2) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call wNavigatorAuswahl(4,3) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + Call wNavigatorAuswahl(4,3) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call hCloseDocument + Call hCloseDocument endcase @@ -748,120 +748,122 @@ endcase testcase tInsertGraphic_19 - Dim sGraphicName1 as String - Dim sGraphicName2 as String - Dim sGraphicName3 as String - Dim sWidth as String - Dim sHeight as String + Dim sGraphicName1 as String + Dim sGraphicName2 as String + Dim sGraphicName3 as String + Dim sWidth as String + Dim sHeight as String - sGraphicName1 = "TEST1" - sGraphicName2 = "TEST2" - sGraphicName3 = "TEST3" + sGraphicName1 = "TEST1" + sGraphicName2 = "TEST2" + sGraphicName3 = "TEST3" - sWidth = "7"+ gSeperator + "00" + gMeasurementUnit - sHeight = "6"+ gSeperator + "00" + gMeasurementUnit + sWidth = "7"+ gSeperator + "00" + gMeasurementUnit + sHeight = "6"+ gSeperator + "00" + gMeasurementUnit - PrintLog "- Test Set different attributes via Contextmenu Arrange (bring to front)" - '/// Test Set different attributes via Contextmenu Arrange (bring to front) + PrintLog "- Test Set different attributes via Contextmenu Arrange (bring to front)" + '/// Test Set different attributes via Contextmenu Arrange (bring to front) - Call hNewDocument + Call hNewDocument - Call wTypeKeys "<Return>" + Call wTypeKeys "<Return>" - '/// Insert three Graphics at the same place , and named in series + '/// Insert three Graphics at the same place , and named in series - 'the 1st graphic - fInsertGraphics("Bughunter.jpg") + 'the 1st graphic + fInsertGraphics("Bughunter.jpg") - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName1 - TabZusaetze.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName1 - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + Kontext + Active.Setpage TabType + Kontext "TabType" - Call wTypeKeys "<ESCape>" + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK - 'the 2nd graphic - fInsertGraphics("flowers.gif") + Call wTypeKeys "<ESCape>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName2 - TabZusaetze.OK + 'the 2nd graphic + fInsertGraphics("flowers.gif") - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName2 + TabZusaetze.OK - Call wTypeKeys "<ESCape>" + fFormatGraphic("TabType") + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK - 'the 3rd graphic - fInsertGraphics("game.bmp") + Call wTypeKeys "<ESCape>" - fFormatGraphic("TabZusaetze") - Sleep 1 - ObjektName.SetText sGraphicName3 - TabZusaetze.OK + 'the 3rd graphic + fInsertGraphics("game.bmp") - fFormatGraphic("TabType") - KeepRatio.UnCheck - Sleep 1 - Width.SetText sWidth - wait 500 - Height.SetText sHeight - wait 500 - TabType.OK + fFormatGraphic("TabZusaetze") + Sleep 1 + ObjektName.SetText sGraphicName3 + TabZusaetze.OK - '/// Format / Arrange / Send to back - FormatArrangeSendToBack - Sleep 2 + fFormatGraphic("TabType") + KeepRatio.UnCheck + Sleep 1 + Width.SetText sWidth + wait 500 + Height.SetText sHeight + wait 500 + TabType.OK + + '/// Format / Arrange / Send to back + FormatArrangeSendToBack + Sleep 2 - '/// ContextMenu Arrange / bring to front - Call wOpenContextMenu + '/// ContextMenu Arrange / bring to front + Call wOpenContextMenu hMenuSelectNr(1) Sleep 2 hMenuSelectNr(1) Sleep 1 - Call wTypeKeys "<ESCape>" - Sleep 1 + Call wTypeKeys "<ESCape>" + Sleep 1 - '/// Check if the attributes Arrange (send to back) works well - Call wNavigatorAuswahl(4,1) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + '/// Check if the attributes Arrange (send to back) works well + Call wNavigatorAuswahl(4,1) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call wNavigatorAuswahl(4,2) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + Call wNavigatorAuswahl(4,2) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call wNavigatorAuswahl(4,3) - Sleep 1 - fFormatGraphic("TabZusaetze") - Sleep 1 - if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText - TabZusaetze.Cancel + Call wNavigatorAuswahl(4,3) + Sleep 1 + fFormatGraphic("TabZusaetze") + Sleep 1 + if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText + TabZusaetze.Cancel - Call hCloseDocument + Call hCloseDocument endcase diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc index ad2c3122da63..fd927b339685 100644 --- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc +++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc @@ -51,7 +51,6 @@ testcase tExportAllReadableFormatsIntoODF end if Dim AvailableFilters( 35 ) as String - Dim TemplateFilterFile as String Dim ImportFileList ( 300 ) as String Dim ExportFileList ( 300 ) as String Dim WorkDirectory as String @@ -61,7 +60,6 @@ testcase tExportAllReadableFormatsIntoODF Dim sExportFile as string Dim i as Integer - TemplateFilterFile = ConvertPath ( gTesttoolPath + "writer\optional\input\filterlist.txt") WorkDirectory = ( ConvertPath ( gOfficePath + "user\work\" + gPlatgroup + "\export\")) ImportDir = ConvertPath ( gTesttoolPath + "writer\optional\input\import\") @@ -84,98 +82,103 @@ testcase tExportAllReadableFormatsIntoODF printlog "- Start loading files in list" For i = 1 to listCount(ImportFileList()) printlog "- " & i & ". load: " & ImportFileList(i) - Call hFileOpen ( ImportFileList(i) ) - printlog "- done" - - Kontext "TextImport" - if TextImport.Exists then - TextImport.Ok - printlog "- Text import dialog passed" - end if - - Kontext "Filterauswahl" - if Filterauswahl.Exists then - Filterauswahl.Cancel - printlog "- Filterdialog passed" - end if - - Kontext "AsciiFilterOptionen" - if AsciiFilterOptionen.Exists then - AsciiFilterOptionen.Ok - printlog "- ASCII-Filter dialog passed" - end if - - Kontext "SecurityWarning" - if SecurityWarning.Exists(3) then - SecurityWarning.Ok - printlog "- Security warning passed" - end if - - Kontext "DocumentWriter" - if DocumentWriter.Exists(3) then - Do until DocumentWriter.StatusIsProgress = false - wait 500 - Loop + sExportFile = ImportFileList(i) + if GetExtention ( sExportFile ) = "psw" then + QAErrorlog "#i102221#Pocket Word filter puts General I/O Error" else - Kontext "DocumentCalc" - if DocumentCalc.Exists(3) then - Do until DocumentCalc.StatusIsProgress = false + Call hFileOpen ( ImportFileList(i) ) + printlog "- done" + + Kontext "TextImport" + if TextImport.Exists then + TextImport.Ok + printlog "- Text import dialog passed" + end if + + Kontext "Filterauswahl" + if Filterauswahl.Exists then + Filterauswahl.Cancel + printlog "- Filterdialog passed" + end if + + Kontext "AsciiFilterOptionen" + if AsciiFilterOptionen.Exists then + AsciiFilterOptionen.Ok + printlog "- ASCII-Filter dialog passed" + end if + + Kontext "SecurityWarning" + if SecurityWarning.Exists(3) then + SecurityWarning.Ok + printlog "- Security warning passed" + end if + + Kontext "DocumentWriter" + if DocumentWriter.Exists(3) then + Do until DocumentWriter.StatusIsProgress = false wait 500 Loop else - Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" + Kontext "DocumentCalc" + if DocumentCalc.Exists(3) then + Do until DocumentCalc.StatusIsProgress = false + wait 500 + Loop + else + Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" + end if end if - end if - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(ImportFileList(i),"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(ImportFileList(i),"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 + + Kontext "AlienWarning" + if AlienWarning.Exists then + AlienWarning.Ok + printlog "- Alien warning passed" end if - SecurityWarning.Cancel - end if - Sleep 1 - - Kontext "AlienWarning" - if AlienWarning.Exists then - AlienWarning.Ok - printlog "- Alien warning passed" - end if - - ' HTML-File can't be exported as odf this way - if GetExtention(ImportFileList(i)) <> "html" then - - sExportFile = WorkDirectory & "ExportedFile" & i & ".odf" - Printlog "- Save as : " & ConvertPath ( sExportFile ) - if hFileSaveAsWithFilterKill (sExportFile, "writer8") = true then - printlog "- done" - printlog "- close file" - Call hCloseDocument - Printlog "- Open previous saved file" - Call hFileOpenWithFilter (sExportFile, "writer8") - printlog "- done" - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(ImportFileList(i),"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + ' HTML-File can't be exported as odf this way + if GetExtention(ImportFileList(i)) <> "html" then + + sExportFile = WorkDirectory & "ExportedFile" & i & ".odf" + Printlog "- Save as : " & ConvertPath ( sExportFile ) + if hFileSaveAsWithFilterKill (sExportFile, "writer8") = true then + printlog "- done" + printlog "- close file" + Call hCloseDocument + + Printlog "- Open previous saved file" + Call hFileOpenWithFilter (sExportFile, "writer8") + printlog "- done" + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(ImportFileList(i),"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel end if - SecurityWarning.Cancel + Sleep 1 + else + Warnlog "Unable to save file: " & sExportFile end if - Sleep 1 else - Warnlog "Unable to save file: " & sExportFile + printlog "- HTML-file is not exported this way" end if - else - printlog "- HTML-file is not exported this way" - end if - - printlog "- Close all open files." - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + + printlog "- Close all open files." + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + endif next i 'File endcase @@ -190,7 +193,6 @@ testcase tExportAllReadableFormatsIntoThemselves end if Dim AvailableFilters( 35 ) as String - Dim TemplateFilterFile as String Dim SavedCorrectly as Boolean Dim ImportFileList ( 300 ) as String Dim ExportFileList ( 300 ) as String @@ -205,7 +207,6 @@ testcase tExportAllReadableFormatsIntoThemselves Dim iCounter as integer Dim DocumentCount as integer - TemplateFilterFile = ConvertPath ( gTesttoolPath + "writer\optional\input\filterlist.txt") sWorkDirectory = ( ConvertPath ( gOfficePath + "user\work\" + gPlatgroup + "\export\")) sImportDir = ConvertPath ( gTesttoolPath + "writer\optional\input\import\") @@ -220,155 +221,150 @@ testcase tExportAllReadableFormatsIntoThemselves end if app.Mkdir sWorkDirectory - QAErrorlog "#i102221#Pocketword-filter seems broken." - - For iCurrentFileIndex = 1 to 16 + For iCurrentFileIndex = 7 to 7 select case iCurrentFileIndex - case 1 : sCurrentFile = "xml2.odt" - sCurrentFilter = "writer8" - case 2 : sCurrentFile = "wpsfile.wps" - sCurrentFilter = "Text (encoded)" - case 3 : sCurrentFile = "dostext.txt" - sCurrentFilter = "Text (encoded)" - case 4 : sCurrentFile = "sw30.sdw" - sCurrentFilter = "StarWriter 3.0" - case 5 : sCurrentFile = "sw50.vor" - sCurrentFilter = "StarWriter 5.0 Vorlage/Template" - case 6 : sCurrentFile = "sw31.sdw" - sCurrentFilter = "StarWriter 3.0" - case 7 : sCurrentFile = "sw31.vor" - sCurrentFilter = "StarWriter 3.0 Vorlage/Template" - case 8 : sCurrentFile = "sw40.sdw" - sCurrentFilter = "StarWriter 4.0" - case 9 : sCurrentFile = "sw40_sp2.vor" - sCurrentFilter = "StarWriter 4.0 Vorlage/Template" - case 10 : sCurrentFile = "sw50.sdw" - sCurrentFilter = "StarWriter 5.0" - case 11 : sCurrentFile = "html.html" - sCurrentFilter = "HTML (StarWriter)" - case 12 : sCurrentFile = "rtf.rtf" - sCurrentFilter = "Rich Text Format" - case 13 : sCurrentFile = "sw60.sxw" - sCurrentFilter = "StarOffice XML (Writer)" - case 14 : sCurrentFile = "winw97.doc" - sCurrentFilter = "MS Word 97" - case 15 : sCurrentFile = "winword6.doc" - sCurrentFilter = "MS Word 95" - case 16 : sCurrentFile = "wintext.txt" - sCurrentFilter = "Text (encoded)" -' case 17 : sCurrentFile = "pocketword.psw" -' sCurrentFilter = "PocketWord File" - - -'TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported. - -' case 18 : sCurrentFile = "unixtext.txt" -' sCurrentFilter = "Text" -' case 19 : sCurrentFile = "sw2.sdw" -' sCurrentFilter = "StarWriter 2.0" -' case 20 : sCurrentFile = "amipro3.sam" -' sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)" -' case 21 : sCurrentFile = "mactext.txt" -' sCurrentFilter = "Mac Write 4.x 5.0 (W4W)" -' case 22 : sCurrentFile = "sw1.sdw" -' sCurrentFilter = "StarWriter 1.0" -' case 23 : sCurrentFile = "swdoc.txt" -' sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)" -' case 24 : sCurrentFile = "hangul.hwp" -' sCurrentFilter = "writer_MIZI_Hwp_97" + case 1 : sCurrentFile = "xml2.odt" + sCurrentFilter = "writer8" + case 2 : sCurrentFile = "wpsfile.wps" + sCurrentFilter = "Text (encoded)" + case 3 : sCurrentFile = "dostext.txt" + sCurrentFilter = "Text (encoded)" + case 4 : sCurrentFile = "sw30.sdw" + sCurrentFilter = "StarWriter 3.0" + case 5 : sCurrentFile = "sw50.vor" + sCurrentFilter = "StarWriter 5.0 Vorlage/Template" + case 6 : sCurrentFile = "sw31.sdw" + sCurrentFilter = "StarWriter 3.0" + case 7 : sCurrentFile = "sw31.vor" + sCurrentFilter = "StarWriter 3.0 Vorlage/Template" + case 8 : sCurrentFile = "sw40.sdw" + sCurrentFilter = "StarWriter 4.0" + case 9 : sCurrentFile = "sw40_sp2.vor" + sCurrentFilter = "StarWriter 4.0 Vorlage/Template" + case 10 : sCurrentFile = "sw50.sdw" + sCurrentFilter = "StarWriter 5.0" + case 11 : sCurrentFile = "html.html" + sCurrentFilter = "HTML (StarWriter)" + case 12 : sCurrentFile = "rtf.rtf" + sCurrentFilter = "Rich Text Format" + case 13 : sCurrentFile = "sw60.sxw" + sCurrentFilter = "StarOffice XML (Writer)" + case 14 : sCurrentFile = "winw97.doc" + sCurrentFilter = "MS Word 97" + case 15 : sCurrentFile = "winword6.doc" + sCurrentFilter = "MS Word 95" + case 16 : sCurrentFile = "wintext.txt" + sCurrentFilter = "Text (encoded)" +' case 17 : sCurrentFile = "pocketword.psw" +' sCurrentFilter = "PocketWord File" +' TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported. +' case 18 : sCurrentFile = "unixtext.txt" +' sCurrentFilter = "Text" +' case 19 : sCurrentFile = "sw2.sdw" +' sCurrentFilter = "StarWriter 2.0" +' case 20 : sCurrentFile = "amipro3.sam" +' sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)" +' case 21 : sCurrentFile = "mactext.txt" +' sCurrentFilter = "Mac Write 4.x 5.0 (W4W)" +' case 22 : sCurrentFile = "sw1.sdw" +' sCurrentFilter = "StarWriter 1.0" +' case 23 : sCurrentFile = "swdoc.txt" +' sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)" +' case 24 : sCurrentFile = "hangul.hwp" +' sCurrentFilter = "writer_MIZI_Hwp_97" end select - printlog " - Export of File nr " + iCurrentFileIndex + " started." - sLoadFile = sImportDir & sCurrentFile - sSaveFile = sWorkDirectory & "filenr_" & iCurrentFileIndex - - try - - ' Load In-file - Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." - end if - - Kontext "TextImport" - if TextImport.Exists then - TextImport.Ok - end if - - Kontext "Filterauswahl" - if Filterauswahl.Exists then - Filterauswahl.Cancel - end if - - Kontext "AsciiFilterOptionen" - if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok - Kontext "SecurityWarning" - if SecurityWarning.Exists(3) then SecurityWarning.Ok - Kontext "DocumentWriter" - if DocumentWriter.Exists(3) then - Do until DocumentWriter.StatusIsProgress = false - wait 500 - Loop - else - Kontext "DocumentCalc" - if DocumentCalc.Exists(3) then - Do until DocumentCalc.StatusIsProgress = false - wait 500 - Loop - else - Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" - end if - end if - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - - Kontext "AlienWarning" - if AlienWarning.Exists then AlienWarning.Ok - - ' Save Out-file - Call hFileSaveAsWithFilterKill(sSaveFile, sCurrentFilter) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error saving file " + sLoadFile + " as " + sSaveFile + "." - goto Cleanup - end if - - ' Load Out-file again - Call hFileOpenWithFilter(sSaveFile, sCurrentFilter, false) - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") > 0 then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - - catch - Warnlog "Error with file: " + sLoadFile - endcatch + sSaveFile = sWorkDirectory & "filenr_" & iCurrentFileIndex & "." & GetExtention ( sCurrentFile ) + printlog "- Export of File nr " + iCurrentFileIndex + " started" + printlog " - Save file: " & sLoadFile + printlog " - to file: " & sSaveFile + + + ' Load In-file + Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) + + kontext "active" + if active.exists(2) then + active.ok + warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + end if + + Kontext "TextImport" + if TextImport.Exists then + TextImport.Ok + end if + + Kontext "Filterauswahl" + if Filterauswahl.Exists then + Filterauswahl.Cancel + end if + + Kontext "AsciiFilterOptionen" + if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok + Kontext "SecurityWarning" + if SecurityWarning.Exists(3) then SecurityWarning.Ok + Kontext "DocumentWriter" + if DocumentWriter.Exists(3) then + Do until DocumentWriter.StatusIsProgress = false + wait 500 + Loop + else + Kontext "DocumentCalc" + if DocumentCalc.Exists(3) then + Do until DocumentCalc.StatusIsProgress = false + wait 500 + Loop + else + Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" + end if + end if + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(currentfile,"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 + + Kontext "AlienWarning" + if AlienWarning.Exists then AlienWarning.Ok + + ' Save Out-file + Call hFileSaveAsWithFilterKill(sSaveFile, sCurrentFilter) + + kontext "active" + if active.exists(2) then + active.ok + warnlog "Error saving file " + sLoadFile + " as " + sSaveFile + "." + goto Cleanup + end if + + ' Load Out-file again + Call hFileOpenWithFilter(sSaveFile, sCurrentFilter, false) + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(currentfile,"sw40") > 0 then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 Cleanup: kontext "active" if active.exists(2) then active.ok - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + Select Case iCurrentFileIndex + case 7: QAErrorlog "#i106758#Saving StarWriter 3 template corrupts file" + case else + warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + end select end if printlog " Close all open files." @@ -420,132 +416,79 @@ testcase tExportTop5FormatsIntoTop5 '// Start of the LOAD-Loop For iCurrentLoadFileIndex = 1 to 4 Select case iCurrentLoadFileIndex - case 1 : sCurrentLoadFile = "xml2.odt" - sCurrentLoadFilter = "writer8" - case 2 : sCurrentLoadFile = "sw60.sxw" - sCurrentLoadFilter = "StarOffice XML (Writer)" - case 3 : sCurrentLoadFile = "winw97.doc" - sCurrentLoadFilter = "MS Word 97" - case 4 : sCurrentLoadFile = "rtf.rtf" - sCurrentLoadFilter = "Rich Text Format" - case 5 : sCurrentLoadFile = "html.html" - sCurrentLoadFilter = "HTML (StarWriter)" + case 1 : sCurrentLoadFile = sImportDir & "xml2.odt" + sCurrentLoadFilter = "writer8" + case 2 : sCurrentLoadFile = sImportDir & "sw60.sxw" + sCurrentLoadFilter = "StarOffice XML (Writer)" + case 3 : sCurrentLoadFile = sImportDir & "winw97.doc" + sCurrentLoadFilter = "MS Word 97" + case 4 : sCurrentLoadFile = sImportDir & "rtf.rtf" + sCurrentLoadFilter = "Rich Text Format" + case 5 : sCurrentLoadFile = sImportDir & "html.html" + sCurrentLoadFilter = "HTML (StarWriter)" End select - printlog " - Export of File nr " + iCurrentLoadFileIndex + " started." - - call fLoadTheFile((sImportDir & sCurrentLoadFile), sCurrentLoadFilter) - + printlog "- Export of File nr " + iCurrentLoadFileIndex + " started." + printlog " - Save file: " & sCurrentLoadFile + '/// Here comes the SAVE-Loop For iCurrentSaveFileIndex = 1 to 5 - Select case iCurrentSaveFileIndex - case 1 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s1.odt" - sCurrentSaveFilter = "writer8" - case 2 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s2.sxw" - sCurrentSaveFilter = "StarOffice XML (Writer)" - case 3 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s3.doc" - sCurrentSaveFilter = "MS Word 97" - case 4 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s4.rtf" - sCurrentSaveFilter = "Rich Text Format" - case 5 : sCurrentSaveFile = "SavedFile_l" + iCurrentLoadFileIndex + "_s5.html" - sCurrentSaveFilter = "HTML (StarWriter)" - End select - - Call hFileSaveAsWithFilterKill((sWorkDirectory & sCurrentSaveFile), sCurrentSaveFilter) - - if hFileExists (sWorkDirectory & sCurrentSaveFile) then - - 'Check if the saved file can be loaded - call fLoadTheFile((sWorkDirectory & sCurrentSaveFile), sCurrentSaveFilter) - - 'Close the opened file - Do Until GetDocumentCount = 1 - Call hCloseDocument - Loop - end if + if hFileOpenWithFilter((sCurrentLoadFile), sCurrentLoadFilter) = true then + Select case iCurrentSaveFileIndex + case 1 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s1.odt" + sCurrentSaveFilter = "writer8" + case 2 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s2.sxw" + sCurrentSaveFilter = "StarOffice XML (Writer)" + case 3 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s3.doc" + sCurrentSaveFilter = "MS Word 97" + case 4 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s4.rtf" + sCurrentSaveFilter = "Rich Text Format" + case 5 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s5.html" + sCurrentSaveFilter = "HTML (StarWriter)" + End select + + printlog " - " & iCurrentSaveFileIndex & ". to file: " & sCurrentSaveFile + if hFileSaveAsWithFilterKill(sCurrentSaveFile, sCurrentSaveFilter) = true then + printlog " - close all open documents" + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + printlog " - check if file exists" + if hFileExists (sCurrentSaveFile) then + printlog " - success" + printlog " - reload previously saved file" + if hFileOpenWithFilter(sCurrentSaveFile, sCurrentSaveFilter) = true then + printlog " - success" + else + Warnlog "error loading file: " & sCurrentSaveFile + end if + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + else + Warnlog "Saved file doesn't exist" + 'Close the opened file + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + end if + else + Warnlog "Error saving file: " & sCurrentLoadFile + 'Close the opened file + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + end if + else + Warnlog "Error loading file: " & sCurrentLoadFile + 'Close the opened file + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop + end if Next iCurrentSaveFileIndex - '/// Here ends the Save-Loop - - Cleanup: - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error. Last file processed: " + sCurrentLoadFile + " as " + sCurrentSaveFile + "." - end if - - printlog " Close all open files." - - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - - printlog " - File nr " + iCurrentLoadFileIndex + " completed." + printlog "- Export of File nr " + iCurrentLoadFileIndex + " completed." Next iCurrentLoadFileIndex '// End of the LOAD-Loop. endcase - -'--------------------------------------------------------------------------------------------------------------------- - -function fLoadTheFile(sLoadFile as string, sCurrentFilter as string) - - try - ' Load In-file - Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." - end if - - Kontext "TextImport" - if TextImport.Exists then - TextImport.Ok - end if - - Kontext "Filterauswahl" - if Filterauswahl.Exists then - Filterauswahl.Cancel - end if - - Kontext "AsciiFilterOptionen" - if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok - Kontext "SecurityWarning" - if SecurityWarning.Exists(3) then SecurityWarning.Ok - Kontext "DocumentWriter" - if DocumentWriter.Exists(3) then - Do until DocumentWriter.StatusIsProgress = false - wait 500 - Loop - else - Kontext "DocumentCalc" - if DocumentCalc.Exists(3) then - Do until DocumentCalc.StatusIsProgress = false - wait 500 - Loop - else - Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" - end if - end if - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") > 0 then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - - Kontext "AlienWarning" - if AlienWarning.Exists then AlienWarning.Ok - - catch - Warnlog "Error with file: " + sLoadFile - endcatch -end function 'fLoadTheFile - -'------------------------------------------------------------------------------------------------------------------------------------------------ - diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc index 9a7c142d0b1d..d7f96d0635f3 100755 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -451,6 +451,7 @@ testcase i103265 Call hNewDocument printlog "- Open test document" Call hFileOpen ( gTesttoolPath + "writer\optional\input\regression\issuezilla\i103265.odt" ) + Call sMakeReadOnlyDocumentEditable printlog "- Update TOC" ToolsUpdateAllIndexes @@ -483,7 +484,7 @@ testcase i103265 printlog "- Save as HTML" gApplication = "HTML" - Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html", "HTML" ) + Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html", "HTML (StarWriter)" ) Call hCloseDocument printlog "- Reload" diff --git a/testautomation/writer/optional/includes/table/w_204a_.inc b/testautomation/writer/optional/includes/table/w_204a_.inc index 4b18bb064fe2..9ab42295d521 100755 --- a/testautomation/writer/optional/includes/table/w_204a_.inc +++ b/testautomation/writer/optional/includes/table/w_204a_.inc @@ -355,19 +355,13 @@ testcase sTableMergeCell Call hNewDocument - ' set marks to find - Call wTypeKeys "NULL<return>" - Call wTypeKeys "Start<return>" - Call wTypeKeys "End<return>" - Call wTypeKeys "NULL<return><up><up>" - temp (1) = "Table1" - '/// Insert a table with 10 columns and 7 rows + printlog "Insert a table with 10 columns and 7 rows" Call TBOhTabelleEinfuegen (temp (1) ,0,1,0,1,"10",tHeight:="7") ' insert table + printlog "Point cursor out of the table" Call wTypeKeys "<MOD1 END>", 2 - Call wTypeKeys "<up><up>" - '/// Insert a table with 10 columns and 10 rows + printlog "Insert a table with 10 columns and 10 rows" temp (1) = "Table2" Call TBOhTabelleEinfuegen (temp (1) ,0,0,1,1,"10",tHeight:="10") ' insert table @@ -383,49 +377,21 @@ testcase sTableMergeCell Call wTypeKeys "<down><shift down>" ' 2 vertical (1,2) & (1,3) TableMergeCells : inc ac : dec fc Call wTypeKeys "<down><up><shift down><shift up>" ' merge again - 'Warnlog "Merge cells will crash when only one cell is selected (#i33394)" TableMergeCells - ' go to top of table, move to end & count + printlog "Go to top of table" Call wTypeKeys "<mod1 home>" - for i=1 to fc - Call wTypeKeys "<right>" - next i - Call wTypeKeys "<down>" - Call wTypeKeys "<shift end>" ' right after/outside the table -> - try - EditCopy - catch - Warnlog "Test didn't find the end of the table, stops here!" - Call hCloseDocument - goto endsub - endcatch - if (GetClipboardText <> "End") then - Warnlog "Test didn't find the end of the table, stops here! Found:" & GetClipboardtext - Call hCloseDocument - goto endsub - end if - ' undo & check where we are + printlog "Undo all cell mergers (3 times)" for i=1 to ac - EditUndo + try + EditUndo + wait 500 + catch + Warnlog "Edit / Undo disabled on Undo step: " & i + endcatch next i - - sleep (3) - temp (2) = hGetTableName() - if (temp(2) <> temp(1)) then warnlog " --- wrong table? schould be : "+temp (1)+ ", is : "+temp(2) - EditUndo ' go one step further - EditUndo ' go one step further - Call wTypeKeys "<up><shift end>" - EditCopy - temp(2) = GetClipboardText - Call wTypeKeys "<down><shift home>" - EditCopy - temp(3) = GetClipboardText - if ((temp(2) <> "Start") AND (temp(3) <> "End")) then - warnlog "there is smth. wrong with the undo stuff !!! is:"+temp(3) +" and:"+temp(2)+" should:End Start" - end if - '/// Close document + printlog "Close document" Call hCloseDocument endcase diff --git a/testautomation/writer/optional/input/hyphenation/tHyphenation.odt b/testautomation/writer/optional/input/hyphenation/tHyphenation.odt Binary files differindex 8854a645a9d7..b2b0494cd4e7 100755 --- a/testautomation/writer/optional/input/hyphenation/tHyphenation.odt +++ b/testautomation/writer/optional/input/hyphenation/tHyphenation.odt diff --git a/testautomation/writer/optional/w_hyphenation.bas b/testautomation/writer/optional/w_hyphenation.bas index e71c1ad8a978..0a4fe264f5ab 100644 --- a/testautomation/writer/optional/w_hyphenation.bas +++ b/testautomation/writer/optional/w_hyphenation.bas @@ -41,15 +41,17 @@ sub main use "writer\tools\includes\w_tools.inc" use "writer\tools\includes\w_tool4.inc" + use "writer\tools\includes\w_tools_hyphenation.inc" use "writer\optional\includes\hyphenation\w_hyphenation.inc" printlog Chr(13) + "******* Writer - Hyphenation - Test *******" Call hStatusIn ( "writer" , "w_hyphenation.bas" ) Call wEnableHyphenation(true) - Call tHyphenation_1 'Test Hyphenation using ctrl and "-" - Call tHyphenation_2 'Test Hyphenation using Tools/Hyphenation ,test like fol-lowing - Call tHyphenation_3 'Test Hyphenation using Tools/Hyphenation ,test like follow-ing + Call tHyphenation_1 + Call tHyphenation_2 + Call tHyphenation_3 + Call tHyphenation_4 Call wEnableHyphenation(false) Call hStatusOut diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index d19c4bcc3dc2..056145bdbf37 100755 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -1302,7 +1302,7 @@ testcase tMasterDocToolsHyphenation Kontext "Silbentrennung" printlog " Close upcoming 'Hyphenation' dialog" - if ( Silbentrennung.Exists() ) then + if ( Silbentrennung.Exists( 2 ) ) then Call DialogTest ( Silbentrennung ) Silbentrennung.Cancel else diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc index 62bffb9b8018..df888de1b429 100755 --- a/testautomation/writer/required/includes/w_020_.inc +++ b/testautomation/writer/required/includes/w_020_.inc @@ -417,7 +417,7 @@ testcase t_TB_Form Call sMenufunktionen("-Checkbox-") Kontext "FormControls" - if Ucase(gApplication) <> "HTML" then + if gApplication <> "HTML" then wait 500 Label.Click printlog " Insert a textbox from toolbox" diff --git a/testautomation/writer/required/w_updt.bas b/testautomation/writer/required/w_updt.bas index 77c8d5350e00..992a4cc9f194 100755 --- a/testautomation/writer/required/w_updt.bas +++ b/testautomation/writer/required/w_updt.bas @@ -61,6 +61,8 @@ sub main Printlog "******* Ressource-Test Writer Document *******" + Call wChangeDefaultView() + Call hStatusIn ( "writer", "w_updt.bas" ) Call w_001_ ' Menu File Call w_001a_ ' Menu File diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc index 19ef41a711de..4515c86811ec 100755 --- a/testautomation/writer/tools/includes/w_tool1.inc +++ b/testautomation/writer/tools/includes/w_tool1.inc @@ -343,17 +343,20 @@ sub sMenufunktionen(Fuer_Was as string) Kontext try - FormatControl - Sleep 1 + FormatControl + WaitSlot() + Kontext "ControlPropertiesDialog" - if ControlPropertiesDialog.Exists then + if ControlPropertiesDialog.Exists( 2 ) then ControlPropertiesDialog.Close + ControlPropertiesDialog.notExists( 2 ) else FormatControl Wait 500 Kontext "ControlPropertiesDialog" - if ControlPropertiesDialog.Exists then + if ControlPropertiesDialog.Exists( 2 ) then ControlPropertiesDialog.Close + ControlPropertiesDialog.notExists( 2 ) else Warnlog " - Controlfieldproperties "+ Fuer_Was +" from Menu not available!" end if diff --git a/testautomation/writer/tools/includes/w_tool2.inc b/testautomation/writer/tools/includes/w_tool2.inc index 280d18b51677..a68a5eea9ea4 100755 --- a/testautomation/writer/tools/includes/w_tool2.inc +++ b/testautomation/writer/tools/includes/w_tool2.inc @@ -409,3 +409,21 @@ function wDeleteAutotext(vAutotextName as string) as boolean next ik end function + + +sub wChangeDefaultView() + + ' #i107038: This code forces the writer to display one page only which is + ' zoomed to pagewidth, filling the entire - previously maximized - window. + ' This is required because the VCL Testtool might eventually draw objects + ' outside the document window depending on display size + + Call hNewDocument + ViewZoom + Kontext "Massstab" + Vergroesserung100.check + Singlepage.check + Massstab.Ok + Call hCloseDocument + +end sub
\ No newline at end of file diff --git a/testautomation/writer/tools/includes/w_tools_hyphenation.inc b/testautomation/writer/tools/includes/w_tools_hyphenation.inc new file mode 100644 index 000000000000..c49c07a7f3f2 --- /dev/null +++ b/testautomation/writer/tools/includes/w_tools_hyphenation.inc @@ -0,0 +1,85 @@ +'************************************************************************** +'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +'* +'* Copyright 2008 by Sun Microsystems, Inc. +'* +'* OpenOffice.org - a multi-platform office productivity suite +'* +'* $RCSfile: w_tools_hyphenation.inc,v $ +'* +'* $Revision: 1.2 $ +'* +'* last change: $Author: vg $ $Date: 2008-08-18 12:43:40 $ +'* +'* This file is part of OpenOffice.org. +'* +'* OpenOffice.org is free software: you can redistribute it and/or modify +'* it under the terms of the GNU Lesser General Public License version 3 +'* only, as published by the Free Software Foundation. +'* +'* OpenOffice.org is distributed in the hope that it will be useful, +'* but WITHOUT ANY WARRANTY; without even the implied warranty of +'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +'* GNU Lesser General Public License version 3 for more details +'* (a copy is included in the LICENSE file that accompanied this code). +'* +'* You should have received a copy of the GNU Lesser General Public License +'* version 3 along with OpenOffice.org. If not, see +'* <http://www.openoffice.org/license.html> +'* for a copy of the LGPLv3 License. +'* +'/****************************************************************** +'* ** +'* owner : helge.delfs@sun.com ** +'* ** +'* short description : Misc tools for writer hyphenation tests ** +'* ** +'\****************************************************************** + + + +function fPrepareHyphenationDocument(testWord as string) + + Dim SpaceTickCount as integer + + SpaceTickCount = 1 + Do + Call wTypeKeys "<Mod1 Home>" + Call wTypeKeys "<Down>" + Call wTypeKeys "<Mod1 Shift Right>" + try + EditCopy + catch + endcatch + if trim(GetClipboardText) <> testWord then + EditSearchAndReplace + Kontext "FindAndReplace" + SearchFor.SetText testWord + SearchNow.Click + Kontext "Active" + if Active.Exists then + if Active.GetRT = 304 then + try + active.Yes + catch + Warnlog Active.Gettext + Active.ok + endcatch + end if + end if + Kontext "FindAndReplace" + FindAndReplace.Close + Call wTypeKeys "<Mod1 Left>" + Call wTypeKeys "<Space>" + inc SpaceTickCount + if SpaceTickCount >= 30 then + fPrepareHyphenationDocument = false + exit do + end if + else + fPrepareHyphenationDocument = true + exit do + end if + Loop + +end function |