diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-01-26 14:45:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-01-26 14:45:09 +0100 |
| commit | 0942468794e4621da5338dea287f52b2ad733162 (patch) | |
| tree | edd2d7adce46f7c0942265068ac76577e3692c63 | |
| parent | 6d528f43c248ac048957b656af551befd36cb306 (diff) | |
| parent | b9f4ea3763576786ed3fef9d2981943aa529bee5 (diff) | |
merge DEV300_m70
167 files changed, 12274 insertions, 5984 deletions
diff --git a/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java b/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java index befc9a84f966..e875fe3bb3aa 100644 --- a/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java +++ b/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java @@ -31,7 +31,7 @@ package ifc.view; import com.sun.star.form.XForm; -import com.sun.star.form.XFormController; +import com.sun.star.form.runtime.XFormController; import lib.MultiMethodTest; import com.sun.star.view.XFormLayerAccess; diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc index 64f42270ae2d..aef508bcf230 100755 --- a/testautomation/chart2/required/includes/ch2_format.inc +++ b/testautomation/chart2/required/includes/ch2_format.inc @@ -798,6 +798,8 @@ endcase '------------------------------------------------------------------------------- ' testcase tFormatAxisXAxis + + Dim bAsianLanguage as boolean Dim iCountTabPg as integer iCountTabPg = 0 @@ -805,7 +807,9 @@ testcase tFormatAxisXAxis if fLoadVerySimpleChartAndSaveLocal() > 0 then warnlog "Loading test document seems to have failed -> Check this out!" goto endsub - endif + endif + printlog " Enable language support for CJK (Tools-Options-Language Support)" + bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) printlog "Select chart using navigator" call fSelectFirstOLE printlog "Edit / Object / Edit" @@ -834,10 +838,10 @@ testcase tFormatAxisXAxis printlog "Goto tab page Line" Kontext iCountTabPg = Active.GetPageCount - if iCountTabPg <> 7 then - warnlog "Format::Axis::XAxis should have 7 tab pages but has " & iCountTabPg & "." + if iCountTabPg <> 8 then + warnlog "Format::Axis::XAxis should have 8 tab pages but has " & iCountTabPg & "." else - printlog "Format::Axis::XAxis has 7 tab pages." + printlog "Format::Axis::XAxis has 8 tab pages." endif Active.SetPage TabFormatChartLine printlog "Check if tab page Line exists" @@ -879,7 +883,11 @@ testcase tFormatAxisXAxis Kontext "TabChartAxisNumbers" call DialogTest ( TabChartAxisNumbers ) printlog "Close dialog with cancel" - TabChartAxisNumbers.Cancel + TabChartAxisNumbers.Cancel + printlog " Set support for CJK back to default (Tools – Options – Language Support)" + if bAsianLanguage = FALSE then + Call ActiveDeactivateAsianSupport(FALSE) + end if printlog "File / Close" Call hCloseDocument endcase @@ -887,6 +895,8 @@ endcase '------------------------------------------------------------- ' testcase tFormatAxisYAxis + + Dim bAsianLanguage as boolean Dim iCountTabPg as integer Dim iCrossingEntries as integer Dim iCategoryEntries as integer @@ -903,7 +913,9 @@ testcase tFormatAxisYAxis if fLoadVerySimpleChartAndSaveLocal() > 0 then warnlog "Loading test document seems to have failed -> Check this out!" goto endsub - endif + endif + printlog " Enable language support for CJK (Tools-Options-Language Support)" + bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) printlog "Select chart using navigator" call fSelectFirstOLE printlog "Edit / Object / Edit" @@ -931,10 +943,10 @@ testcase tFormatAxisYAxis FormatAxisYAxis Kontext iCountTabPg = Active.GetPageCount - if iCountTabPg <> 7 then - warnlog "Format::Axis::YAxis should have 7 tab pages but has " & iCountTabPg & "." + if iCountTabPg <> 8 then + warnlog "Format::Axis::YAxis should have 8 tab pages but has " & iCountTabPg & "." else - printlog "Format::Axis::YAxis has 7 tab pages." + printlog "Format::Axis::YAxis has 8 tab pages." endif printlog "Goto tab page Characters" Active.SetPage TabFont @@ -1024,7 +1036,10 @@ testcase tFormatAxisYAxis endif Kontext "TabChartAxisPositioning" printlog "Leave dialog with Cancel." - TabChartAxisPositioning.Cancel + TabChartAxisPositioning.Cancel + if bAsianLanguage = FALSE then + Call ActiveDeactivateAsianSupport(FALSE) + end if printlog "File / Close" Call hCloseDocument endcase @@ -1113,14 +1128,18 @@ endcase '------------------------------------------------------------- ' testcase tFormatAxisSecondaryXAxis - Dim iCountTabPg as integer + + Dim bAsianLanguage as boolean + Dim iCountTabPg as integer iCountTabPg = 0 printlog "Load simple chart document" if fLoadVerySimpleChartAndSaveLocal() > 0 then warnlog "Loading test document seems to have failed -> Check this out!" goto endsub - endif + endif + printlog " Enable language support for CJK (Tools-Options-Language Support)" + bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) printlog "Select chart using navigator" call fSelectFirstOLE printlog "Edit / Object / Edit" @@ -1168,10 +1187,10 @@ testcase tFormatAxisSecondaryXAxis printlog "Goto tab page Line" Kontext iCountTabPg = Active.GetPageCount - if iCountTabPg <> 7 then - warnlog "Format::Axis::XAxis should have 7 tab pages but has " & iCountTabPg & "." + if iCountTabPg <> 8 then + warnlog "Format::Axis::XAxis should have 8 tab pages but has " & iCountTabPg & "." else - printlog "Format::Axis::XAxis has 7 tab pages." + printlog "Format::Axis::XAxis has 8 tab pages." endif Active.SetPage TabFormatChartLine printlog "Check if tab page Line exists" @@ -1213,7 +1232,10 @@ testcase tFormatAxisSecondaryXAxis Kontext "TabChartAxisNumbers" call DialogTest ( TabChartAxisNumbers ) printlog "Close dialog with cancel" - TabChartAxisNumbers.Cancel + TabChartAxisNumbers.Cancel + if bAsianLanguage = FALSE then + Call ActiveDeactivateAsianSupport(FALSE) + end if printlog "File / Close" Call hCloseDocument endcase @@ -1221,14 +1243,18 @@ endcase '------------------------------------------------------------- ' testcase tFormatAxisSecondaryYAxis - Dim iCountTabPg as integer + + Dim bAsianLanguage as boolean + Dim iCountTabPg as integer iCountTabPg = 0 printlog "Load simple chart document" if fLoadVerySimpleChartAndSaveLocal() > 0 then warnlog "Loading test document seems to have failed -> Check this out!" goto endsub - endif + endif + printlog " Enable language support for CJK (Tools-Options-Language Support)" + bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) printlog "Select chart using navigator" call fSelectFirstOLE printlog "Edit / Object / Edit" @@ -1258,10 +1284,10 @@ testcase tFormatAxisSecondaryYAxis printlog "Goto tab page Line" Kontext iCountTabPg = Active.GetPageCount - if iCountTabPg <> 7 then - warnlog "Format::Axis::XAxis should have 7 tab pages but has " & iCountTabPg & "." + if iCountTabPg <> 8 then + warnlog "Format::Axis::XAxis should have 8 tab pages but has " & iCountTabPg & "." else - printlog "Format::Axis::XAxis has 7 tab pages." + printlog "Format::Axis::XAxis has 8 tab pages." endif Active.SetPage TabFormatChartLine printlog "Check if tab page Line exists" @@ -1303,7 +1329,11 @@ testcase tFormatAxisSecondaryYAxis Kontext "TabChartAxisNumbers" call DialogTest ( TabChartAxisNumbers ) printlog "Close dialog with cancel" - TabChartAxisNumbers.Cancel + TabChartAxisNumbers.Cancel + printlog " Set support for CJK back to default (Tools – Options – Language Support)" + if bAsianLanguage = FALSE then + Call ActiveDeactivateAsianSupport(FALSE) + end if printlog "File / Close" Call hCloseDocument endcase diff --git a/testautomation/chart2/tools/ch_tools_statistics.inc b/testautomation/chart2/tools/ch_tools_statistics.inc index 7666fac165e5..513e8c8b3f56 100644 --- a/testautomation/chart2/tools/ch_tools_statistics.inc +++ b/testautomation/chart2/tools/ch_tools_statistics.inc @@ -88,7 +88,7 @@ function fInvokeTrendlinesDialog() as INTEGER '/// Lookup if call was successful Kontext - active.SetPage "TabTrendLineType" + active.SetPage (TabTrendLineType) Kontext "TabTrendLineType" if TabTrendLineType.exists(2) then printlog ">> Trend lines dialog is visible now." diff --git a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc index f242426167ad..0322974437cc 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc @@ -409,6 +409,7 @@ testcase tForms '/// set encoding to Multipart printlog "set encoding to Multipart" Encoding.select 2 + sleep(1) '/// check if the SubmitMethod get enabled printlog "check if the SubmitMethod get enabled" if SubmitMethod.isEnabled then @@ -417,6 +418,7 @@ testcase tForms '/// set encoding to URL printlog "set encoding to URL" Encoding.select 1 + sleep(1) '/// check if the SubmitMethod get disabled printlog "check if the SubmitMethod get disabled" if NOT SubmitMethod.isEnabled then diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc index b7e93ba9e34c..ae090136d2ee 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc @@ -96,7 +96,8 @@ testcase tGroupBoxWithDatasource '/// set the datasource TT printlog "set the datasource TT" DataSource.setText(sDSName) - DataSource.TypeKeys "<RETURN>" , true + DataSource.TypeKeys "<RETURN>" , true + sleep(1) '/// insert password 'testtool' into login dialog printlog "insert password 'testtool' into login dialog" Kontext "LoginDialog" 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/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..7d3d212fc7de 100755 --- a/testautomation/framework/optional/f_CJK_GridLayout.bas +++ b/testautomation/framework/optional/f_CJK_GridLayout.bas @@ -43,7 +43,7 @@ sub main PrintLog "---------------------------------------------------------------------" Printlog "----- Grid Layout for CJK in Writer -----" PrintLog "---------------------------------------------------------------------" - + use "framework\optional\includes\w_grid_layout1.inc" sAsianLanguageFlag = CheckAsianLanguageSupport("Current") @@ -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,13 @@ 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 "global\tools\includes\optional\t_docfuncs.inc" - use "framework\tools\includes\CJK_tools.inc" - + use "framework\tools\includes\CJK_tools.inc" gApplication = "WRITER" Call GetUseFiles - -End sub +end sub diff --git a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc index ce8dabdfaa7d..209e5b0ed0c9 100755..100644 --- a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc +++ b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc @@ -1,7 +1,7 @@ '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 @@ -39,213 +39,220 @@ testcase tLanguageTest_1 - Dim sLanguageIDEnglishUSA ,sLanguageIDSChinese, sLanguageIDTChinese , sLanguageIDJapanese , sLanguageIDKoren as String - Dim sKeyTypeEnglishUSA ,sKeyTypeSChinese , sKeyTypeTChinese , sKeyTypeJapanese , sKeyTypeKoren as String - Dim i as Integer - - - select case iSprache - case 01 :' English (USA) - sKeyTypeEnglishUSA = "Alphanumeric" - sKeyTypeSChinese = "Character set" - sKeyTypeTChinese = "Numeric" - sKeyTypeJapanese = "Character set" - sKeyTypeKoren = "Character set" - case 49 :' German - sKeyTypeEnglishUSA = "Alphanumerisch" - sKeyTypeSChinese = "Numerisch" - sKeyTypeTChinese = "Numerisch" - sKeyTypeJapanese = "Numerisch" - sKeyTypeKoren = "Numerisch" - case 55 :' Brazilian - sKeyTypeEnglishUSA = "Alfanumérico" - sKeyTypeSChinese = "Conjunto de caracteres" - sKeyTypeTChinese = "numérico" - sKeyTypeJapanese = "Conjunto de caracteres" - sKeyTypeKoren = "Conjunto de caracteres" - case 81 :' Japanese - sKeyTypeEnglishUSA = "英数字" - sKeyTypeSChinese = "ピンイン(中国語のローマ字表記法)" - sKeyTypeTChinese = "ピンイン(中国語のローマ字表記法)" - sKeyTypeJapanese = "数字" - sKeyTypeKoren = "数字" -' case 82 : ' Korean -' sKeyTypeEnglishUSA = 1 'alphanumeric -' sKeyTypeSChinese = 1 'Character set -' sKeyTypeTChinese = 3 'Pin yin -' sKeyTypeJapanese = 2 'Character set -' sKeyTypeKoren = 3 'Character set - case 86 :' Chinese (simplified) - sKeyTypeEnglishUSA = "字母数字式" - sKeyTypeSChinese = "字符集" - sKeyTypeTChinese = "拼音" - sKeyTypeJapanese = "字符集" - sKeyTypeKoren = "字典" - case 88 :' Chinese (traditional) - sKeyTypeEnglishUSA = "字母數字式" - sKeyTypeSChinese = "字型" - sKeyTypeTChinese = "拼音" - sKeyTypeJapanese = "字型" - sKeyTypeKoren = "字典" - case else :' Fallback - PrintLog "The test does not support the language " + iSprache - Goto endsub - end select - - sLanguageIDEnglishUSA = fGetCountryName(01) - sLanguageIDSChinese = fGetCountryName(86) - sLanguageIDTChinese = fGetCountryName(88) - sLanguageIDJapanese = fGetCountryName(81) - sLanguageIDKoren = fGetCountryName(82) - - call hNewDocument - - DocumentWriter.TypeKeys "test" - DocumentWriter.TypeKeys "<Shift Home>" - Sleep 1 - - ToolsSort - Kontext "Sortieren" - - try - Sprache.Select (sLanguageIDEnglishUSA) - catch - qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" - ' try fallback to 'English (USA)' - try - Sprache.Select ("English (USA)") - catch - qaErrorLog "Can't select even tha fallback: 'English (USA)'" - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeEnglishUSA - catch - qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" - ' try fallback to 'English (USA)' - for i = 1 to Schluesseltyp1.getItemCount - printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'" - next i - endcatch - - try - Sprache.Select (sLanguageIDSChinese) - catch - qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'" - ' try fallback to 'Chinese (simplyfied)' - try - Sprache.Select ("Chinese (simplyfied)") - catch - qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'" - endcatch - endcatch - Sleep 2 - - try - Sprache.Select (sLanguageIDEnglishUSA) - catch - qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" - ' try fallback to 'English (USA)' - try - Sprache.Select ("English (USA)") - catch - qaErrorLog "Can't select even tha fallback: 'English (USA)'" - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeEnglishUSA - catch - qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" - endcatch - - try - Sprache.Select (sLanguageIDTChinese) - catch - qaErrorLog "Can't select: '" + sLanguageIDTChinese + "'" - ' try fallback to 'Chinese (traditional)' - try - Sprache.Select ("Chinese (traditional)") - catch - qaErrorLog "Can't select even tha fallback: 'Chinese (traditional)'" - for i = 1 to Sprache.getItemCount - printlog "("+i+"/"+ Sprache.getItemCount + "): '"+Sprache.getItemText(i)+"'" - next i - endcatch - endcatch - Sleep 2 - - try - Sprache.Select (sLanguageIDEnglishUSA) - catch - qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" - ' try fallback to 'English (USA)' - try - Sprache.Select ("English (USA)") - catch - qaErrorLog "Can't select even tha fallback: 'English (USA)'" - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeEnglishUSA - catch - qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" - endcatch - - try - Sprache.Select (sLanguageIDJapanese) - catch - qaErrorLog "Can't select: '" + sLanguageIDJapanese + "'" - ' try fallback to 'Japanese' - try - Sprache.Select ("Japanese") - catch - qaErrorLog "Can't select even tha fallback: 'Japanese'" - endcatch - endcatch - Sleep 2 - if Schluesseltyp1.GetSelText <> sKeyTypeJapanese then - warnlog "The default key type for Japanese should be: '" + sKeyTypeJapanese + "' but is: '" + Schluesseltyp1.GetSelText + "'" - end if - - try - Sprache.Select (sLanguageIDEnglishUSA) - catch - qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" - ' try fallback to 'English (USA)' - try - Sprache.Select ("English (USA)") - catch - qaErrorLog "Can't select even tha fallback: 'English (USA)'" - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeEnglishUSA - catch - qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" - endcatch - - try - Sprache.Select (sLanguageIDKoren) - catch - qaErrorLog "Can't select: '" + sLanguageIDKoren + "'" - ' try fallback to 'Korean (RoK)' - try - Sprache.Select ("Korean (RoK)") - catch - qaErrorLog "Can't select even tha fallback: 'Korean (RoK)'" - for i = 1 to Sprache.getItemCount - printlog "("+i+"/"+ Sprache.getItemCount + "): '"+Sprache.getItemText(i)+"'" - next i - endcatch - endcatch - Sleep 2 - if Schluesseltyp1.GetSelText <> sKeyTypeKoren then - warnlog "The default key type for Korean should be " + sKeyTypeKoren + " but get " + Schluesseltyp1.GetSelText - end if - - Sortieren.Cancel - - Call hCloseDocument + Dim sLanguageIDEnglishUSA ,sLanguageIDSChinese, sLanguageIDTChinese , sLanguageIDJapanese , sLanguageIDKoren as String + Dim sKeyTypeEnglishUSA ,sKeyTypeSChinese , sKeyTypeTChinese , sKeyTypeJapanese , sKeyTypeKoren as String + Dim i as Integer + + '/// Check if the default setting for "key type" is right for CJK when alphanumeric is chosen in English + + select case iSprache + case 01 :' English (USA) + sKeyTypeEnglishUSA = "Alphanumeric" + sKeyTypeSChinese = "Character set" + sKeyTypeTChinese = "Numeric" + sKeyTypeJapanese = "Character set" + sKeyTypeKoren = "Character set" + case 49 :' German + sKeyTypeEnglishUSA = "Alphanumerisch" + sKeyTypeSChinese = "Numerisch" + sKeyTypeTChinese = "Numerisch" + sKeyTypeJapanese = "Numerisch" + sKeyTypeKoren = "Numerisch" + case 55 :' Brazilian + sKeyTypeEnglishUSA = "Alfanumérico" + sKeyTypeSChinese = "Conjunto de caracteres" + sKeyTypeTChinese = "numérico" + sKeyTypeJapanese = "Conjunto de caracteres" + sKeyTypeKoren = "Conjunto de caracteres" + case 81 :' Japanese + sKeyTypeEnglishUSA = "英数字" + sKeyTypeSChinese = "ピンイン(中国語のローマ字表記法)" + sKeyTypeTChinese = "ピンイン(中国語のローマ字表記法)" + sKeyTypeJapanese = "数字" + sKeyTypeKoren = "数字" + ' case 82 : ' Korean + ' sKeyTypeEnglishUSA = 1 'alphanumeric + ' sKeyTypeSChinese = 1 'Character set + ' sKeyTypeTChinese = 3 'Pin yin + ' sKeyTypeJapanese = 2 'Character set + ' sKeyTypeKoren = 3 'Character set + case 86 :' Chinese (simplified) + sKeyTypeEnglishUSA = "字母数字式" + sKeyTypeSChinese = "字符集" + sKeyTypeTChinese = "拼音" + sKeyTypeJapanese = "字符集" + sKeyTypeKoren = "字典" + case 88 :' Chinese (traditional) + sKeyTypeEnglishUSA = "字母數字式" + sKeyTypeSChinese = "字型" + sKeyTypeTChinese = "拼音" + sKeyTypeJapanese = "字型" + sKeyTypeKoren = "字典" + case else :' Fallback + PrintLog "The test does not support the language " + iSprache + Goto endsub + end select + + sLanguageIDEnglishUSA = fGetCountryName(01) + sLanguageIDSChinese = fGetCountryName(86) + sLanguageIDTChinese = fGetCountryName(88) + sLanguageIDJapanese = fGetCountryName(81) + sLanguageIDKoren = fGetCountryName(82) + + call hNewDocument + + DocumentWriter.TypeKeys "test" + DocumentWriter.TypeKeys "<Shift Home>" + Sleep 1 + + '/// Open Tools/Sort + ToolsSort + Kontext "Sortieren" + + '/// Choose language: English and key type: alphanumeric + try + Sprache.Select (sLanguageIDEnglishUSA) + catch + qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" + ' try fallback to 'English (USA)' + try + Sprache.Select ("English (USA)") + catch + qaErrorLog "Can't select even tha fallback: 'English (USA)'" + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeEnglishUSA + catch + qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" + ' try fallback to 'English (USA)' + for i = 1 to Schluesseltyp1.getItemCount + printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'" + next i + endcatch + + '/// Check to simplified Chinese + try + Sprache.Select (sLanguageIDSChinese) + catch + qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'" + ' try fallback to 'Chinese (simplyfied)' + try + Sprache.Select ("Chinese (simplyfied)") + catch + qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'" + endcatch + endcatch + Sleep 2 + + try + Sprache.Select (sLanguageIDEnglishUSA) + catch + qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" + ' try fallback to 'English (USA)' + try + Sprache.Select ("English (USA)") + catch + qaErrorLog "Can't select even tha fallback: 'English (USA)'" + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeEnglishUSA + catch + qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" + endcatch + + '/// Check to traditional Chinese + try + Sprache.Select (sLanguageIDTChinese) + catch + qaErrorLog "Can't select: '" + sLanguageIDTChinese + "'" + ' try fallback to 'Chinese (traditional)' + try + Sprache.Select ("Chinese (traditional)") + catch + qaErrorLog "Can't select even tha fallback: 'Chinese (traditional)'" + for i = 1 to Sprache.getItemCount + printlog "("+i+"/"+ Sprache.getItemCount + "): '"+Sprache.getItemText(i)+"'" + next i + endcatch + endcatch + Sleep 2 + + try + Sprache.Select (sLanguageIDEnglishUSA) + catch + qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" + ' try fallback to 'English (USA)' + try + Sprache.Select ("English (USA)") + catch + qaErrorLog "Can't select even tha fallback: 'English (USA)'" + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeEnglishUSA + catch + qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" + endcatch + + '/// Check to Japanese + try + Sprache.Select (sLanguageIDJapanese) + catch + qaErrorLog "Can't select: '" + sLanguageIDJapanese + "'" + ' try fallback to 'Japanese' + try + Sprache.Select ("Japanese") + catch + qaErrorLog "Can't select even tha fallback: 'Japanese'" + endcatch + endcatch + Sleep 2 + if Schluesseltyp1.GetSelText <> sKeyTypeJapanese then + warnlog "The default key type for Japanese should be: '" + sKeyTypeJapanese + "' but is: '" + Schluesseltyp1.GetSelText + "'" + end if + + try + Sprache.Select (sLanguageIDEnglishUSA) + catch + qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" + ' try fallback to 'English (USA)' + try + Sprache.Select ("English (USA)") + catch + qaErrorLog "Can't select even tha fallback: 'English (USA)'" + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeEnglishUSA + catch + qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" + endcatch + + '/// Check to Korean + try + Sprache.Select (sLanguageIDKoren) + catch + qaErrorLog "Can't select: '" + sLanguageIDKoren + "'" + ' try fallback to 'Korean (RoK)' + try + Sprache.Select ("Korean (RoK)") + catch + qaErrorLog "Can't select even tha fallback: 'Korean (RoK)'" + for i = 1 to Sprache.getItemCount + printlog "("+i+"/"+ Sprache.getItemCount + "): '"+Sprache.getItemText(i)+"'" + next i + endcatch + endcatch + Sleep 2 + if Schluesseltyp1.GetSelText <> sKeyTypeKoren then + warnlog "The default key type for Korean should be " + sKeyTypeKoren + " but get " + Schluesseltyp1.GetSelText + end if + + Sortieren.Cancel + + Call hCloseDocument endcase @@ -253,458 +260,452 @@ endcase testcase tLanguageTest_2 - Dim sLanguageIDEnglishUSA ,sLanguageIDSChinese, sLanguageIDTChinese , sLanguageIDJapanese , sLanguageIDKoren as String - Dim sKeyTypeEnglishUSA ,sKeyTypeSChinese , sKeyTypeTChinese , sKeyTypeJapanese , sKeyTypeKoren as String - Dim i as Integer - - - select case iSprache - case 01 :' English (USA) - sKeyTypeEnglishUSA = "Numeric" - sKeyTypeSChinese = "Numeric" - sKeyTypeTChinese = "Numeric" - sKeyTypeJapanese = "Numeric" - sKeyTypeKoren = "Numeric" - case 49 :' German - sKeyTypeEnglishUSA = "Numerisch" - sKeyTypeSChinese = "Numerisch" - sKeyTypeTChinese = "Numerisch" - sKeyTypeJapanese = "Numerisch" - sKeyTypeKoren = "Numerisch" - case 55 :' Brazilian - sKeyTypeEnglishUSA = "numérico" - sKeyTypeSChinese = "numérico" - sKeyTypeTChinese = "numérico" - sKeyTypeJapanese = "numérico" - sKeyTypeKoren = "numérico" - case 81 :' Japanese - sKeyTypeEnglishUSA = "数字" - sKeyTypeSChinese = "数字" - sKeyTypeTChinese = "数字" - sKeyTypeJapanese = "数字" - sKeyTypeKoren = "数字" -' case 82 ' Korean -' sKeyTypeEnglishUSA = 2 'numeric -' sKeyTypeSChinese = 4 'numeric -' sKeyTypeTChinese = 4 'numeric -' sKeyTypeJapanese = 4 'numeric -' sKeyTypeKoren = 4 'numeric - case 86 :' Chinese (simplified) - sKeyTypeEnglishUSA = "数字" - sKeyTypeSChinese = "数字" - sKeyTypeTChinese = "数字" - sKeyTypeJapanese = "数字" - sKeyTypeKoren = "数字" - case 88 :' Chinese (traditional) - sKeyTypeEnglishUSA = "數字" - sKeyTypeSChinese = "數字" - sKeyTypeTChinese = "數字" - sKeyTypeJapanese = "數字" - sKeyTypeKoren = "數字" - case else :' Fallback - printLog "The test does not support the language " + iSprache - Goto endsub - end select - - sLanguageIDEnglishUSA = fGetCountryName(01) - sLanguageIDSChinese = fGetCountryName(86) - sLanguageIDTChinese = fGetCountryName(88) - sLanguageIDJapanese = fGetCountryName(81) - sLanguageIDKoren = fGetCountryName(82) - - call hNewDocument - - DocumentWriter.TypeKeys "123" - DocumentWriter.TypeKeys "<Shift Home>" - Sleep 1 - - ToolsSort - Kontext "Sortieren" - - try - Sprache.Select (sLanguageIDEnglishUSA) - catch - qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" - ' try fallback to 'English (USA)' - try - Sprache.Select ("English (USA)") - catch - qaErrorLog "Can't select even tha fallback: 'English (USA)'" - for i = 1 to Sprache.getItemCount - printlog "" + i + ": '" + Sprache.getItemText(i) + "'" - next i - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeEnglishUSA - catch - qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" - ' try fallback to 'English (USA)' - for i = 1 to Schluesseltyp1.getItemCount - printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'" - next i - endcatch - - try - Sprache.Select (sLanguageIDSChinese) - catch - qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'" - ' try fallback to 'Chinese (simplyfied)' - try - Sprache.Select ("Chinese (simplyfied)") - catch - qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'" - endcatch - endcatch - Sleep 2 - if Schluesseltyp1.GetSelText <> sKeyTypeSChinese then - warnlog "The default key type for Simplified Chinese should be: '" + sKeyTypeSChinese + "' but is '" + Schluesseltyp1.GetSelText + "'" - end if - - try - Sprache.Select (sLanguageIDEnglishUSA) - catch - qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" - ' try fallback to 'English (USA)' - try - Sprache.Select ("English (USA)") - catch - qaErrorLog "Can't select even tha fallback: 'English (USA)'" - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeEnglishUSA - catch - qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" - endcatch - - try - Sprache.Select (sLanguageIDTChinese) - catch - qaErrorLog "Can't select: '" + sLanguageIDTChinese + "'" - ' try fallback to 'Chinese (traditional)' - try - Sprache.Select ("Chinese (traditional)") - catch - qaErrorLog "Can't select even tha fallback: 'Chinese (traditional)'" - endcatch - endcatch - Sleep 2 - if Schluesseltyp1.GetSelText <> sKeyTypeTChinese then - warnlog "The default key type for traditional Chinese should be " + sKeyTypeTChinese + " but get " + Schluesseltyp1.GetSelText - end if - - try - Sprache.Select (sLanguageIDEnglishUSA) - catch - qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" - ' try fallback to 'English (USA)' - try - Sprache.Select ("English (USA)") - catch - qaErrorLog "Can't select even tha fallback: 'English (USA)'" - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeEnglishUSA - catch - qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" - endcatch - - try - Sprache.Select (sLanguageIDJapanese) - catch - qaErrorLog "Can't select: '" + sLanguageIDJapanese + "'" - ' try fallback to 'Japanese' - try - Sprache.Select ("Japanese") - catch - qaErrorLog "Can't select even tha fallback: 'Japanese'" - endcatch - endcatch - Sleep 2 - if Schluesseltyp1.GetSelText <> sKeyTypeJapanese then - warnlog "The default key type for Japanese should be: '" + sKeyTypeJapanese + "' but is: '" + Schluesseltyp1.GetSelText + "'" - end if - - try - Sprache.Select (sLanguageIDEnglishUSA) - catch - qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" - ' try fallback to 'English (USA)' - try - Sprache.Select ("English (USA)") - catch - qaErrorLog "Can't select even tha fallback: 'English (USA)'" - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeEnglishUSA - catch - qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" - endcatch - - try - Sprache.Select (sLanguageIDKoren) - catch - qaErrorLog "Can't select: '" + sLanguageIDKoren + "'" - ' try fallback to 'Korean (RoK)' - try - Sprache.Select ("Korean (RoK)") - catch - qaErrorLog "Can't select even tha fallback: 'Korean (RoK)'" - endcatch - endcatch - Sleep 2 - if Schluesseltyp1.GetSelText <> sKeyTypeKoren then - warnlog "The default key type for Korean should be " + sKeyTypeKoren + " but get " + Schluesseltyp1.GetSelText - end if - - Sortieren.Cancel - - Call hCloseDocument + Dim sLanguageIDEnglishUSA ,sLanguageIDSChinese, sLanguageIDTChinese , sLanguageIDJapanese , sLanguageIDKoren as String + Dim sKeyTypeEnglishUSA ,sKeyTypeSChinese , sKeyTypeTChinese , sKeyTypeJapanese , sKeyTypeKoren as String + Dim i as Integer + + '/// Check if the default setting for "key type" is right for CJK when numeric is chosen in English + + select case iSprache + case 01 :' English (USA) + sKeyTypeEnglishUSA = "Numeric" + sKeyTypeSChinese = "Numeric" + sKeyTypeTChinese = "Numeric" + sKeyTypeJapanese = "Numeric" + sKeyTypeKoren = "Numeric" + case 49 :' German + sKeyTypeEnglishUSA = "Numerisch" + sKeyTypeSChinese = "Numerisch" + sKeyTypeTChinese = "Numerisch" + sKeyTypeJapanese = "Numerisch" + sKeyTypeKoren = "Numerisch" + case 55 :' Brazilian + sKeyTypeEnglishUSA = "numérico" + sKeyTypeSChinese = "numérico" + sKeyTypeTChinese = "numérico" + sKeyTypeJapanese = "numérico" + sKeyTypeKoren = "numérico" + case 81 :' Japanese + sKeyTypeEnglishUSA = "数字" + sKeyTypeSChinese = "数字" + sKeyTypeTChinese = "数字" + sKeyTypeJapanese = "数字" + sKeyTypeKoren = "数字" + ' case 82 ' Korean + ' sKeyTypeEnglishUSA = 2 'numeric + ' sKeyTypeSChinese = 4 'numeric + ' sKeyTypeTChinese = 4 'numeric + ' sKeyTypeJapanese = 4 'numeric + ' sKeyTypeKoren = 4 'numeric + case 86 :' Chinese (simplified) + sKeyTypeEnglishUSA = "数字" + sKeyTypeSChinese = "数字" + sKeyTypeTChinese = "数字" + sKeyTypeJapanese = "数字" + sKeyTypeKoren = "数字" + case 88 :' Chinese (traditional) + sKeyTypeEnglishUSA = "數字" + sKeyTypeSChinese = "數字" + sKeyTypeTChinese = "數字" + sKeyTypeJapanese = "數字" + sKeyTypeKoren = "數字" + case else :' Fallback + printLog "The test does not support the language " + iSprache + Goto endsub + end select + + sLanguageIDEnglishUSA = fGetCountryName(01) + sLanguageIDSChinese = fGetCountryName(86) + sLanguageIDTChinese = fGetCountryName(88) + sLanguageIDJapanese = fGetCountryName(81) + sLanguageIDKoren = fGetCountryName(82) + + call hNewDocument + + DocumentWriter.TypeKeys "123" + DocumentWriter.TypeKeys "<Shift Home>" + Sleep 1 + + '/// Open Tools/Sort + ToolsSort + Kontext "Sortieren" + + '/// Choose language: English and key type: Numeric + try + Sprache.Select (sLanguageIDEnglishUSA) + catch + qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" + ' try fallback to 'English (USA)' + try + Sprache.Select ("English (USA)") + catch + qaErrorLog "Can't select even tha fallback: 'English (USA)'" + for i = 1 to Sprache.getItemCount + printlog "" + i + ": '" + Sprache.getItemText(i) + "'" + next i + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeEnglishUSA + catch + qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" + ' try fallback to 'English (USA)' + for i = 1 to Schluesseltyp1.getItemCount + printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'" + next i + endcatch + + '/// Check to simplified Chinese + try + Sprache.Select (sLanguageIDSChinese) + catch + qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'" + ' try fallback to 'Chinese (simplyfied)' + try + Sprache.Select ("Chinese (simplyfied)") + catch + qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'" + endcatch + endcatch + Sleep 2 + if Schluesseltyp1.GetSelText <> sKeyTypeSChinese then + warnlog "The default key type for Simplified Chinese should be: '" + sKeyTypeSChinese + "' but is '" + Schluesseltyp1.GetSelText + "'" + end if + + try + Sprache.Select (sLanguageIDEnglishUSA) + catch + qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" + ' try fallback to 'English (USA)' + try + Sprache.Select ("English (USA)") + catch + qaErrorLog "Can't select even tha fallback: 'English (USA)'" + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeEnglishUSA + catch + qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" + endcatch + + '/// Check to traditional Chinese + try + Sprache.Select (sLanguageIDTChinese) + catch + qaErrorLog "Can't select: '" + sLanguageIDTChinese + "'" + ' try fallback to 'Chinese (traditional)' + try + Sprache.Select ("Chinese (traditional)") + catch + qaErrorLog "Can't select even tha fallback: 'Chinese (traditional)'" + endcatch + endcatch + Sleep 2 + if Schluesseltyp1.GetSelText <> sKeyTypeTChinese then + warnlog "The default key type for traditional Chinese should be " + sKeyTypeTChinese + " but get " + Schluesseltyp1.GetSelText + end if + + try + Sprache.Select (sLanguageIDEnglishUSA) + catch + qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" + ' try fallback to 'English (USA)' + try + Sprache.Select ("English (USA)") + catch + qaErrorLog "Can't select even tha fallback: 'English (USA)'" + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeEnglishUSA + catch + qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" + endcatch + + '/// Check to Japanese + try + Sprache.Select (sLanguageIDJapanese) + catch + qaErrorLog "Can't select: '" + sLanguageIDJapanese + "'" + ' try fallback to 'Japanese' + try + Sprache.Select ("Japanese") + catch + qaErrorLog "Can't select even tha fallback: 'Japanese'" + endcatch + endcatch + Sleep 2 + if Schluesseltyp1.GetSelText <> sKeyTypeJapanese then + warnlog "The default key type for Japanese should be: '" + sKeyTypeJapanese + "' but is: '" + Schluesseltyp1.GetSelText + "'" + end if + + try + Sprache.Select (sLanguageIDEnglishUSA) + catch + qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'" + ' try fallback to 'English (USA)' + try + Sprache.Select ("English (USA)") + catch + qaErrorLog "Can't select even tha fallback: 'English (USA)'" + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeEnglishUSA + catch + qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'" + endcatch + + '/// Check to Korean + try + Sprache.Select (sLanguageIDKoren) + catch + qaErrorLog "Can't select: '" + sLanguageIDKoren + "'" + ' try fallback to 'Korean (RoK)' + try + Sprache.Select ("Korean (RoK)") + catch + qaErrorLog "Can't select even tha fallback: 'Korean (RoK)'" + endcatch + endcatch + Sleep 2 + if Schluesseltyp1.GetSelText <> sKeyTypeKoren then + warnlog "The default key type for Korean should be " + sKeyTypeKoren + " but get " + Schluesseltyp1.GetSelText + end if + + Sortieren.Cancel + + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tStrokeSort - Dim testFile as String - Dim sLanguageIDSChinese as String - Dim sKeyTypeSChinese as String - Dim aCorrectSequence() as String - - Dim i , j as Integer - - testFile = "sortTest.sxw" - aCorrectSequence = Array( "1" , "2" , "3" , "4" ,"5" ) - - j = UBound(aCorrectSequence) - - select case iSprache - case 01 : ' English (USA) - sKeyTypeSChinese = "Stroke" - case 49 : ' German - sKeyTypeSChinese = "Stroke" - case 55 : ' Brazilian - sKeyTypeSChinese = "Traço" - case 81 : ' Japanese - sKeyTypeSChinese = "総画数" - case 86 : ' Chinese (simplified) - sKeyTypeSChinese = "笔画" - case 88 : ' Chinese (simplified) - sKeyTypeSChinese = "筆畫" - case else : ' Fallback - printLog "Now, the test does not support for the language " +iSprache - Goto endsub + Dim testFile as String + Dim sLanguageIDSChinese as String + Dim sKeyTypeSChinese as String + Dim aCorrectSequence() as String + + Dim i , j as Integer + + testFile = "sortTest.sxw" + aCorrectSequence = Array( "1" , "2" , "3" , "4" ,"5" ) + + j = UBound(aCorrectSequence) + + select case iSprache + case 01 : ' English (USA) + sKeyTypeSChinese = "Stroke" + case 49 : ' German + sKeyTypeSChinese = "Stroke" + case 55 : ' Brazilian + sKeyTypeSChinese = "Traço" + case 81 : ' Japanese + sKeyTypeSChinese = "総画数" + case 86 : ' Chinese (simplified) + sKeyTypeSChinese = "笔画" + case 88 : ' Chinese (simplified) + sKeyTypeSChinese = "筆畫" + case else : ' Fallback + printLog "Now, the test does not support for the language " +iSprache + Goto endsub end select - sLanguageIDSChinese = fGetCountryName(86) - + sLanguageIDSChinese = fGetCountryName(86) + + '/// Check Stroke sort for Simplified Chinese + + Call hNewDocument + '/// Open a test file and check <i>No Grid</i> checkbox + Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile ) + sMakeReadOnlyDocumentEditable + EditSelectAll + + '/// Open <i>Tools/Sort</i> + ToolsSort + Kontext "Sortieren" + + '/// Choose language: Simplified Chinese and key type <i>Stroke</i> + try + Sprache.Select (sLanguageIDSChinese) + catch + qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'" + ' try fallback to 'Chinese (simplyfied)' + try + Sprache.Select ("Chinese (simplyfied)") + catch + qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'" + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeSChinese + catch + qaErrorLog "Can't select: '" + sKeyTypeSChinese + "'" + for i = 1 to Schluesseltyp1.getItemCount + printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'" + next i + endcatch + + Sortieren.OK + + Kontext "DocumentWriter" + DocumentWriter.TypeKeys "<MOD1 Home>" + + For i = 0 to j + DocumentWriter.TypeKeys "<End>" + DocumentWriter.TypeKeys "<Shift Left>" + + EditCopy + if GetClipboardText <> aCorrectSequence(i) then Warnlog "The Stroke sort is wrong , should be " + aCorrectSequence(i) + " ,but get " +GetClipboardText + + DocumentWriter.TypeKeys "<Down>" + next i + + Call hCloseDocument - Call hNewDocument - Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile ) - sMakeReadOnlyDocumentEditable - EditSelectAll - - ToolsSort - Kontext "Sortieren" - - try - Sprache.Select (sLanguageIDSChinese) - catch - qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'" - ' try fallback to 'Chinese (simplyfied)' - try - Sprache.Select ("Chinese (simplyfied)") - catch - qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'" - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeSChinese - catch - qaErrorLog "Can't select: '" + sKeyTypeSChinese + "'" - for i = 1 to Schluesseltyp1.getItemCount - printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'" - next i - endcatch - - Sortieren.OK - - Kontext "DocumentWriter" - DocumentWriter.TypeKeys "<MOD1 Home>" +endcase - For i = 0 to j - DocumentWriter.TypeKeys "<End>" - DocumentWriter.TypeKeys "<Shift Left>" +'------------------------------------------------------------------------- - EditCopy - if GetClipboardText <> aCorrectSequence(i) then Warnlog "The Stroke sort is wrong , should be " + aCorrectSequence(i) + " ,but get " +GetClipboardText +testcase tPinyinSort - DocumentWriter.TypeKeys "<Down>" - next i + Dim testFile as String + Dim sLanguageIDSChinese as String + Dim sKeyTypeSChinese as String + Dim aCorrectSequence() as String + + Dim i , j as Integer + + testFile = "sortTest.sxw" + aCorrectSequence = Array( "2" , "3" , "4" , "1" , "5" ) + + j = UBound(aCorrectSequence) + + select case iSprache + case 01 : ' English (USA) + sKeyTypeSChinese = "Pinyin" + case 49 : ' German + sKeyTypeSChinese = "Pinyin" + case 55 : ' Brazilian + sKeyTypeSChinese = "Pinyin" + case 81 : ' Japanese + sKeyTypeSChinese = "ピンイン(中国語のローマ字表記法)" + case 86 : ' Chinese (simplified) + sKeyTypeSChinese = "拼音" + case 88 : ' Chinese (simplified) + sKeyTypeSChinese = "拼音" + case else : ' Fallback + printLog "Now, the test does not support for the language " +iSprache + Goto endsub + end select - Call hCloseDocument + sLanguageIDSChinese = fGetCountryName(86) + + '/// Check <i>Pinyin</i> sort for Simplified Chinese + + Call hNewDocument + '/// Open a test file and check <i>No Grid</i> checkbox + Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile ) + sMakeReadOnlyDocumentEditable + EditSelectAll + + '/// Open <i>Tools/Sort</i> + ToolsSort + Kontext "Sortieren" + + '/// Choose language: Simplified Chinese and key type <i>Pin yin</i> + try + Sprache.Select (sLanguageIDSChinese) + catch + qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'" + ' try fallback to 'Chinese (simplyfied)' + try + Sprache.Select ("Chinese (simplyfied)") + catch + qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'" + endcatch + endcatch + try + Schluesseltyp1.Select sKeyTypeSChinese + catch + qaErrorLog "Can't select: '" + sKeyTypeSChinese + "'" + for i = 1 to Schluesseltyp1.getItemCount + printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'" + next i + endcatch + + Sortieren.OK + + Kontext "DocumentWriter" + DocumentWriter.TypeKeys "<MOD1 Home>" + + For i = 0 to j + DocumentWriter.TypeKeys "<End>" + DocumentWriter.TypeKeys "<Shift Left>" + + EditCopy + if GetClipboardText <> aCorrectSequence(i) then + Warnlog "The Pin yin sort is wrong, should be: '" + aCorrectSequence(i) + "' ,but is: '" +GetClipboardText + "'" + endif + + DocumentWriter.TypeKeys "<Down>" + next i + + Call hCloseDocument endcase '------------------------------------------------------------------------- -testcase tPinyinSort +testcase tSortOptionTest_1 - Dim testFile as String - Dim sLanguageIDSChinese as String - Dim sKeyTypeSChinese as String - Dim aCorrectSequence() as String - - Dim i , j as Integer - - testFile = "sortTest.sxw" - aCorrectSequence = Array( "2" , "3" , "4" , "1" , "5" ) - - j = UBound(aCorrectSequence) - - select case iSprache - case 01 : ' English (USA) - sKeyTypeSChinese = "Pinyin" - case 49 : ' German - sKeyTypeSChinese = "Pinyin" - case 55 : ' Brazilian - sKeyTypeSChinese = "Pinyin" - case 81 : ' Japanese - sKeyTypeSChinese = "ピンイン(中国語のローマ字表記法)" - case 86 : ' Chinese (simplified) - sKeyTypeSChinese = "拼音" - case 88 : ' Chinese (simplified) - sKeyTypeSChinese = "拼音" - case else : ' Fallback - printLog "Now, the test does not support for the language " +iSprache - Goto endsub - end select - - sLanguageIDSChinese = fGetCountryName(86) - - - Call hNewDocument - Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile ) - sMakeReadOnlyDocumentEditable - EditSelectAll - - ToolsSort - Kontext "Sortieren" - - try - Sprache.Select (sLanguageIDSChinese) - catch - qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'" - ' try fallback to 'Chinese (simplyfied)' - try - Sprache.Select ("Chinese (simplyfied)") - catch - qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'" - endcatch - endcatch - try - Schluesseltyp1.Select sKeyTypeSChinese - catch - qaErrorLog "Can't select: '" + sKeyTypeSChinese + "'" - for i = 1 to Schluesseltyp1.getItemCount - printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'" - next i - endcatch - - Sortieren.OK - - Kontext "DocumentWriter" - DocumentWriter.TypeKeys "<MOD1 Home>" - - For i = 0 to j - DocumentWriter.TypeKeys "<End>" - DocumentWriter.TypeKeys "<Shift Left>" - - EditCopy - if GetClipboardText <> aCorrectSequence(i) then - Warnlog "The Pin yin sort is wrong, should be: '" + aCorrectSequence(i) + "' ,but is: '" +GetClipboardText + "'" - endif - - DocumentWriter.TypeKeys "<Down>" - next i - - Call hCloseDocument + Dim i , j as Integer + Dim asList() as String + + select case iSprache + case 81 :' Japanese + if iSystemSprache <> 81 then goto NOTest + asList = Array( "Sun,Mon,Tue,Wed,Thu,Fri,Sat" , "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday" , "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec" , "January,February,March,April,May,June,July,August,September,October,November,December" , "日,月,火,水,木,金,土" , "日曜日,月曜日,火曜日,水曜日,木曜日,金曜日,土曜日" , ) + case 82 :' Korean + if iSystemSprache <> 82 then goto NOTest + asList = Array( "일,월,화,수,목,금,토" ,"일요일,월요일,화요일,수요일,목요일,금요일,토요일" ,"1,2,3,4,5,6,7,8,9,10,11,12" , "日,月,火,水,木,金,土" , "日曜日,月曜日,火曜日,水曜日,木曜日,金曜日,土曜日" , ) + case 86 :' Chinese (simplified) + if iSystemSprache <> 86 then goto NOTest + asList = Array( "日,一,二,三,四,五,六" , "星期日,星期一,星期二,星期三,星期四,星期五,星期六" , "一,二,三,四,五,六,七,八,九,十,十一,十二" , "一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月" , ) + case 88 :' Chinese (traditional) + if iSystemSprache <> 88 then goto NOTest + asList = Array( "日,一,二,三,四,五,六" , "星期日,星期一,星期二,星期三,星期四,星期五,星期六" , "一,二,三,四,五,六,七,八,九,十,十一,十二" , "一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月" , ) + case else :' Fallback + NOTest: + printLog "The test does not support for the language " +iSprache + " System language " + iSystemSprache + Goto endsub + end select -endcase + '/// Check if the entries in custom sort order is right in CJK version -'------------------------------------------------------------------------- + call hNewDocument -testcase tSortOptionTest_1 + '/// Open <i>Data/Sort</i> -> tabpage <i>option</i> + + DataSort + + Kontext + active.SetPage TabSortierenOptionen + Kontext "TabSortierenOptionen" -Dim i , j as Integer -Dim asList() as String - -select case iSprache - case 81 :' Japanese - if iSystemSprache <> 81 then goto NOTest - asList = Array( _ - "Sun,Mon,Tue,Wed,Thu,Fri,Sat" , _ - "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday" , _ - "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec" , _ - "January,February,March,April,May,June,July,August,September,October,November,December" , _ - "日,月,火,水,木,金,土" , _ - "日曜日,月曜日,火曜日,水曜日,木曜日,金曜日,土曜日" , _ - ) - case 82 :' Korean - if iSystemSprache <> 82 then goto NOTest - asList = Array( _ - "일,월,화,수,목,금,토" ,_ - "일요일,월요일,화요일,수요일,목요일,금요일,토요일" ,_ - "1,2,3,4,5,6,7,8,9,10,11,12" , _ - "日,月,火,水,木,金,土" , _ - "日曜日,月曜日,火曜日,水曜日,木曜日,金曜日,土曜日" , _ - ) - case 86 :' Chinese (simplified) - if iSystemSprache <> 86 then goto NOTest - asList = Array( _ - "日,一,二,三,四,五,六" , _ - "星期日,星期一,星期二,星期三,星期四,星期五,星期六" , _ - "一,二,三,四,五,六,七,八,九,十,十一,十二" , _ - "一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月" , _ - ) - case 88 :' Chinese (traditional) - if iSystemSprache <> 88 then goto NOTest - asList = Array( _ - "日,一,二,三,四,五,六" , _ - "星期日,星期一,星期二,星期三,星期四,星期五,星期六" , _ - "一,二,三,四,五,六,七,八,九,十,十一,十二" , _ - "一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月" , _ - ) - case else :' Fallback -NOTest: - printLog "The test does not support for the language " +iSprache + " System language " + iSystemSprache - Goto endsub -end select - - - call hNewDocument - - - DataSort - - Kontext - active.SetPage TabSortierenOptionen - Kontext "TabSortierenOptionen" - - BenutzerdefinierteSortierreihenfolge.Check + BenutzerdefinierteSortierreihenfolge.Check For i = 1 to SortierreihenfolgeListe.GetItemCount - if SortierreihenfolgeListe.GetItemText(i) <> asList(i-1) then - warnlog "Should get " +asList(i) + " but get " +SortierreihenfolgeListe.GetItemText(i) - end if - next i + if SortierreihenfolgeListe.GetItemText(i) <> asList(i-1) then + warnlog "Should get " +asList(i) + " but get " +SortierreihenfolgeListe.GetItemText(i) + end if + next i - TabSortierenOptionen.Cancel + TabSortierenOptionen.Cancel - Call hCloseDocument + Call hCloseDocument endcase diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc index 13dac6822d0b..37b905ec4e1e 100755..100644 --- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc +++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc @@ -1,7 +1,7 @@ '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 @@ -38,45 +38,69 @@ '\*********************************************************************** testcase tSwitchLocation - ToolsOptions + '/// Check if the switch "Asian Language support" exist -- tools/options/language settings/language + ToolsOptions - Call hToolsOptions("LANGUAGESETTINGS" , "LANGUAGES") + Call hToolsOptions("LANGUAGESETTINGS" , "LANGUAGES") - try - if Aktivieren.IsChecked = TRUE then - printLog "CJK language is checked" - else - printLog "CJK language isn't checked" - end if - catch - warnlog "Something wrong in checkbox 'Asian Language Support'" - endcatch + try + if Aktivieren.IsChecked = TRUE then + printLog "CJK language is checked" + else + printLog "CJK language isn't checked" + end if + catch + warnlog "Something wrong in checkbox 'Asian Language Support'" + endcatch - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK + Kontext "ExtrasOptionenDlg" + ExtrasOptionenDlg.OK endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest1 - call hNewDocument + '/// Check if checkbox "Snap to text grid" is enable or not -- Format/Paragraph tabpage "Alignment" + call hNewDocument - Call CheckAsianLanguageSupport("On") + '/// turn on "Asian Language support" , check if checkbox "Snap to text grid" is enable + Call CheckAsianLanguageSupport("On") - Kontext - FormatParagraph + Kontext + FormatParagraph Active.SetPage TabAusrichtungAbsatz Kontext "TabAusrichtungAbsatz" - try - if TextrasterFangen.IsChecked = TRUE then - printLog "snap to text grid is checked" - else - printLog "snap to text grid isn't checked" + try + if TextrasterFangen.IsChecked = TRUE then + printLog "snap to text grid is checked" + else + printLog "snap to text grid isn't checked" + end if + catch + warnlog "Something wrong in checkbox 'snap to text grid'" + endcatch + + TabAusrichtungAbsatz.Cancel + + '/// turn off "Asian Language support" , check if checkbox "Snap to text grid" isn't enable + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") + + Kontext + FormatParagraph + Active.SetPage TabAusrichtungAbsatz + Kontext "TabAusrichtungAbsatz" + + try + if TextrasterFangen.IsChecked = TRUE Or TextrasterFangen.IsChecked <> TRUE then + warnlog "Something wrong in checkbox 'snap to text grid'" + end if + catch + endcatch + + TabAusrichtungAbsatz.Cancel end if - catch - warnlog "Something wrong in checkbox 'snap to text grid'" - endcatch TabAusrichtungAbsatz.Cancel @@ -104,413 +128,441 @@ endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest2 - call hNewDocument - - Call CheckAsianLanguageSupport("On") - - Kontext - FormatParagraph - - try - Active.SetPage TabAsianTypography - Kontext "TabAsianTypography" - TabAsianTypography.Cancel - catch - Active.SetPage TabAusrichtungAbsatz - Kontext "TabAusrichtungAbsatz" - TabAusrichtungAbsatz.Cancel - warnlog "Something wring in tabpage - Asian Typography!" - endcatch - - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") + '/// Check if tabpage "Asian Typography" appear or not -- Format/Paragraph + call hNewDocument + + '/// turn on "Asian Language support" , check if tabpage "Asian Typography" appears + Call CheckAsianLanguageSupport("On") + + Kontext + FormatParagraph + + try + Active.SetPage TabAsianTypography + Kontext "TabAsianTypography" + TabAsianTypography.Cancel + catch + Active.SetPage TabAusrichtungAbsatz + Kontext "TabAusrichtungAbsatz" + TabAusrichtungAbsatz.Cancel + warnlog "Something wring in tabpage - Asian Typography!" + endcatch + + '/// turn off "Asian Language support" , check if tabpage "Asian Typography" disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") - Kontext - FormatParagraph + Kontext + FormatParagraph - try - Active.SetPage TabAsianTypography - Kontext "TabAsianTypography" - TabAsianTypography.Cancel - warnlog "tabpage - Asian Typography should NOT appear!" - catch - Active.SetPage TabAusrichtungAbsatz - Kontext "TabAusrichtungAbsatz" - TabAusrichtungAbsatz.Cancel - endcatch - end if + try + Active.SetPage TabAsianTypography + Kontext "TabAsianTypography" + TabAsianTypography.Cancel + warnlog "tabpage - Asian Typography should NOT appear!" + catch + Active.SetPage TabAusrichtungAbsatz + Kontext "TabAusrichtungAbsatz" + TabAusrichtungAbsatz.Cancel + endcatch + end if - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest3 - call hNewDocument - - Call CheckAsianLanguageSupport("On") - - Kontext - FormatCharacter - Kontext - active.SetPage TabFont - kontext "TabFont" - try - FontEast.Select 1 - catch - warnlog "Something wrong in list box Asian text font when Asian Language support is on" - endcatch - TabFont.Cancel - - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") + '/// Check if list box "Asian text font" appear or not -- Format/Character + call hNewDocument + + '/// turn on "Asian Language support" , Check if list box "Asian text font" appear + Call CheckAsianLanguageSupport("On") + + Kontext + FormatCharacter + Kontext + active.SetPage TabFont + kontext "TabFont" + try + FontEast.Select 1 + catch + warnlog "Something wrong in list box Asian text font when Asian Language support is on" + endcatch + TabFont.Cancel + + '/// turn off "Asian Language support" , Check if list box "Asian text font" disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") - Kontext - FormatCharacter - Kontext - active.SetPage TabFont - kontext "TabFont" + Kontext + FormatCharacter + Kontext + active.SetPage TabFont + kontext "TabFont" try - FontEast.Select 1 - warnlog "Something wrong in list box Asian text font when Asian Language support is off" + FontEast.Select 1 + warnlog "Something wrong in list box Asian text font when Asian Language support is off" catch endcatch - TabFont.Cancel - end if + TabFont.Cancel + end if - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest4 - call hNewDocument - - Call CheckAsianLanguageSupport("On") + '/// Check if list box "Emphasis mark" appear or not -- Format/Character + call hNewDocument + + '/// turn on "Asian Language support" , Check if list box "Emphasis mark" appear + Call CheckAsianLanguageSupport("On") + + Kontext + FormatCharacter + Kontext + active.SetPage TabFontEffects + kontext "TabFontEffects" + try + Emphasis.Select 1 + catch + warnlog "Something wrong in list box Emphasis mark when Asian Language support is on" + endcatch + TabFontEffects.Cancel + + '/// turn off "Asian Language support" , Check if list box "Emphasis mark" disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") - Kontext - FormatCharacter - Kontext - active.SetPage TabFontEffects - kontext "TabFontEffects" - try - Emphasis.Select 1 - catch - warnlog "Something wrong in list box Emphasis mark when Asian Language support is on" - endcatch - TabFontEffects.Cancel - - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") - - Kontext - FormatCharacter - Kontext - active.SetPage TabFontEffects - kontext "TabFontEffects" + Kontext + FormatCharacter + Kontext + active.SetPage TabFontEffects + kontext "TabFontEffects" try - Emphasis.Select 1 - warnlog "Something wrong in list box Emphasis mark when Asian Language support is off" + Emphasis.Select 1 + warnlog "Something wrong in list box Emphasis mark when Asian Language support is off" catch endcatch - TabFontEffects.Cancel - end if + TabFontEffects.Cancel + end if - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest5 - call hNewDocument + '/// Check if tabpage "Searching in Japanese" appear or not -- tools/options/language settings/ + call hNewDocument - Call CheckAsianLanguageSupport("On") + '/// turn on "Asian Language support" , Check if tabpage "Searching in Japanese" appear + Call CheckAsianLanguageSupport("On") - ToolsOptions - if hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE") <> TRUE then - warnlog "Something wrong in tabpage Searching in Japanese when Asian Language support is on" - end if + ToolsOptions + if hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE") <> TRUE then + warnlog "Something wrong in tabpage Searching in Japanese when Asian Language support is on" + end if - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.Cancel + Kontext "ExtrasOptionenDlg" + ExtrasOptionenDlg.Cancel - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") - ToolsOptions + '/// turn on "Asian Language support" , Check if tabpage "Searching in Japanese" disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") + ToolsOptions - if hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE" , TRUE) = FALSE then - printLog Chr(13) + "Yes, 'Searching Japanese'-page has been disabled after switching Asian Language Support 'off'." - else - warnlog "Something wrong in tabpage Searching in Japanese when Asian Language support is off" - end if + if hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE" , TRUE) = FALSE then + printLog Chr(13) & "Yes, 'Searching Japanese'-page has been disabled after switching Asian Language Support 'off'." + else + warnlog "Something wrong in tabpage Searching in Japanese when Asian Language support is off" + end if - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.Cancel - end if + Kontext "ExtrasOptionenDlg" + ExtrasOptionenDlg.Cancel + end if - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest6 - call hNewDocument + '/// Check if tabpage "Asian Layout" appear or not -- tools/options/language settings/ + call hNewDocument - Call CheckAsianLanguageSupport("On") + '/// turn on "Asian Language support" , Check if tabpage "Asian Layout" appear + Call CheckAsianLanguageSupport("On") - ToolsOptions - if hToolsOptions("LANGUAGESETTINGS","ASIANLAYOUT") <> TRUE then - warnlog "Something wrong in tabpage Asian Layout when Asian Language support is on" - end if + ToolsOptions + if hToolsOptions("LANGUAGESETTINGS","ASIANLAYOUT") <> TRUE then + warnlog "Something wrong in tabpage Asian Layout when Asian Language support is on" + end if - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.Cancel + Kontext "ExtrasOptionenDlg" + ExtrasOptionenDlg.Cancel - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") - ToolsOptions + '/// turn off "Asian Language support" , Check if tabpage "Asian Layout" disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") + ToolsOptions - if hToolsOptions("LANGUAGESETTINGS","ASIANLAYOUT", TRUE) = FALSE then - printLog Chr(13) + "Yes, 'Asian Layout'-page has been disabled after switching 'Asian Language Support' off." - else - warnlog "Something wrong in tabpage Asian Layout when Asian Language support is off" - end if + if hToolsOptions("LANGUAGESETTINGS","ASIANLAYOUT", TRUE) = FALSE then + printLog Chr(13) & "Yes, 'Asian Layout'-page has been disabled after switching 'Asian Language Support' off." + else + warnlog "Something wrong in tabpage Asian Layout when Asian Language support is off" + end if - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.Cancel - end if + Kontext "ExtrasOptionenDlg" + ExtrasOptionenDlg.Cancel + end if - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest7 - call hNewDocument + '/// Check if menu format/Ruby is active or not + call hNewDocument - Call CheckAsianLanguageSupport("On") + '/// turn on "Asian Language support" , Check if menu format/Ruby is actived + Call CheckAsianLanguageSupport("On") - try - formatRuby - Kontext "RubyDialog" - DialogClose.Click - Sleep 2 - catch - warnlog "Something wrong in menu format/Ruby when Asian Language support is on" - endcatch + try + formatRuby + Kontext "RubyDialog" + DialogClose.Click + Sleep 2 + catch + warnlog "Something wrong in menu format/Ruby when Asian Language support is on" + endcatch - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") + '/// turn off "Asian Language support" , Check if menu format/Ruby is inactived + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") - try - formatRuby - Kontext "RubyDialog" - DialogClose.Click - Sleep 2 - QAErrorlog "#i40913# Something wrong in menu format/Ruby when Asian Language support is off" - catch - endcatch - end if + try + formatRuby + Kontext "RubyDialog" + DialogClose.Click + Sleep 2 + QAErrorlog "#i40913# Something wrong in menu format/Ruby when Asian Language support is off" + catch + endcatch + end if - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest8 + '/// Check if the following submenus in format/change case is active or not + '/// - Half width + '/// - Full width + '/// - Hiragana + '/// - Katagana + + call hNewDocument + + '/// turn on "Asian Language support" , Check if submenus in format/change case is actived + Call CheckAsianLanguageSupport("On") + + try + FormatChangeCaseHalfWidth + catch + warnlog "Something wrong in submenu format/change case -> Half width when Asian Language support is on" + endcatch + + try + FormatChangeCaseFullWidth + catch + warnlog "Something wrong in submenu format/change case -> Full width when Asian Language support is on" + endcatch + + try + FormatChangeCaseHiragana + catch + warnlog "Something wrong in submenu format/change case -> Hiragana when Asian Language support is on" + endcatch + + try + FormatChangeCaseKatagana + catch + warnlog "Something wrong in submenu format/change case -> Katagana when Asian Language support is on" + endcatch + + '/// turn off "Asian Language support" , Check if submenus in format/change case is inactived + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") - call hNewDocument - - Call CheckAsianLanguageSupport("On") - - try - FormatChangeCaseHalfWidth - catch - warnlog "Something wrong in submenu format/change case -> Half width when Asian Language support is on" - endcatch - - try - FormatChangeCaseFullWidth - catch - warnlog "Something wrong in submenu format/change case -> Full width when Asian Language support is on" - endcatch - - try - FormatChangeCaseHiragana - catch - warnlog "Something wrong in submenu format/change case -> Hiragana when Asian Language support is on" - endcatch + try + FormatChangeCaseHalfWidth + QAErrorlog "#i43434# Something wrong in submenu format/change case -> Half width when Asian Language support is off" + catch + endcatch - try - FormatChangeCaseKatagana - catch - warnlog "Something wrong in submenu format/change case -> Katagana when Asian Language support is on" - endcatch + try + FormatChangeCaseFullWidth + QAErrorlog "#i43434# Something wrong in submenu format/change case -> Full width when Asian Language support is off" + catch + endcatch - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") + try + FormatChangeCaseHiragana + QAErrorlog "#i43434# Something wrong in submenu format/change case -> Hiragana when Asian Language support is off" + catch + endcatch - try - FormatChangeCaseHalfWidth - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Half width when Asian Language support is off" - catch - endcatch - - try - FormatChangeCaseFullWidth - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Full width when Asian Language support is off" - catch - endcatch - - try - FormatChangeCaseHiragana - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Hiragana when Asian Language support is off" - catch - endcatch - - try - FormatChangeCaseKatagana - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Katagana when Asian Language support is off" - catch - endcatch - end if + try + FormatChangeCaseKatagana + QAErrorlog "#i43434# Something wrong in submenu format/change case -> Katagana when Asian Language support is off" + catch + endcatch + end if - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest9 - - qaerrorlog( "#i105756# - Test case outdated, needs adjustments" ) - goto endsub - call hNewDocument - Call CheckAsianLanguageSupport("On") + '/// turn on "Asian Language support" , Check if list box text direction appear + Call CheckAsianLanguageSupport("On") - FormatPageWriter - Kontext - Active.SetPage TabSeite - Kontext "TabSeite" + FormatPageWriter + Kontext + Active.SetPage TabSeite + Kontext "TabSeite" - try - Textfluss.select 1 - catch - warnlog "Something wrong in list box text direction when Asian Language support is on" - endcatch - TabSeite.Cancel + try + Textfluss.select 1 + catch + warnlog "Something wrong in list box text direction when Asian Language support is on" + endcatch + TabSeite.Cancel - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") + '/// turn off "Asian Language support" , Check if list box text direction disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") - FormatPageWriter - Kontext - Active.SetPage TabSeite - Kontext "TabSeite" + FormatPageWriter + Kontext + Active.SetPage TabSeite + Kontext "TabSeite" - try - Textfluss.select 1 - warnlog "Something wrong in list box text direction when Asian Language support is off" - catch - endcatch - TabSeite.Cancel - end if + try + Textfluss.select 1 + warnlog "Something wrong in list box text direction when Asian Language support is off" + catch + endcatch + TabSeite.Cancel + end if - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tWriterUIChangesTest10 - call hNewDocument + '/// Check if vertical text box and callout appear or not + call hNewDocument - Call CheckAsianLanguageSupport("On") - sleep(1) - - Call hToolbarSelect("DRAWING", true) - try - VerticalText.Click - catch - warnlog "Something wrong in vertical text box when Asian Language support is on" - endcatch - try - VerticalCallout.Click - catch - warnlog "Something wrong in vertical text callout when Asian Language support is on" - endcatch - - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") - Kontext "Drawbar" - try - VerticalText.Click - warnlog "Something wrong in vertical text box when Asian Language support is off" - catch - endcatch - try - VerticalCallout.Click - warnlog "Something wrong in vertical text callout when Asian Language support is off" - catch - endcatch - end if + '/// turn on "Asian Language support" , Check if vertical text box and callout appear + Call CheckAsianLanguageSupport("On") + sleep(1) - Call hCloseDocument + Call hToolbarSelect("DRAWING", true) + try + VerticalText.Click + catch + warnlog "Something wrong in vertical text box when Asian Language support is on" + endcatch + try + VerticalCallout.Click + catch + warnlog "Something wrong in vertical text callout when Asian Language support is on" + endcatch + + '/// turn off "Asian Language support" , Check if vertical text box and callout disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") + Kontext "Drawbar" + try + VerticalText.Click + warnlog "Something wrong in vertical text box when Asian Language support is off" + catch + endcatch + try + VerticalCallout.Click + warnlog "Something wrong in vertical text callout when Asian Language support is off" + catch + endcatch + end if + + Call hCloseDocument 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 - iHopeNumber1 = 38 - iHopeNumber2 = 19 + iHopeNumber1 = 38 + iHopeNumber2 = 19 + '/// Check if the number in listbox numbering is right or not. + '/// [if the number of the listbox numbering is changed, this case should be modified according] - call hNewDocument + call hNewDocument - Call CheckAsianLanguageSupport("On") + '/// turn on "Asian Language support" , Check if the number in listbox numbering is right + Call CheckAsianLanguageSupport("On") FormatNumberingBullets - Kontext - Active.SetPage TabOptionenNumerierung - Kontext "TabOptionenNumerierung" - - iCount = Numerierung.GetItemCount - if iCount = iHopeNumber1 then + Kontext + Active.SetPage TabOptionenNumerierung + Kontext "TabOptionenNumerierung" + + iCount = Numerierung.GetItemCount + if iCount = iHopeNumber1 then Numerierung.Select 15 TabOptionenNumerierung.OK - printLog Chr(13) + "Pls. go to the printer to find if you can get a paper" - printLog Chr(13) + "which is printed like '-'.Otherwise , something wrong!" + printLog Chr(13) & "Pls. go to the printer to find if you can get a paper" + printLog Chr(13) & "which is printed like '-'.Otherwise , something wrong!" + '/// --Pls. go to the printer to find if you can get a paper which is printed like '-'. Otherwise , something is wrong! FilePrint Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then - Active.Ok - QAErrorLog "No Default-Printer!" - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.Cancel - end if + if Active.Exists( 1 ) then + if Active.GetRT = 304 then + Active.Ok + QAErrorLog "No Default-Printer!" + Kontext "Printing" + if ( Printing.exists( 1 ) ) then + Printing.cancel() + endif + end if else - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.OK - Sleep 5 - end if - else + Kontext "Printing" + if ( Printing.exists( 2 ) ) then + Printing.cancel() + Printing.notExists( 5 ) + endif + endif + else for i =1 to iCount - printlog "("+i+"/"+iCount+"): "+Numerierung.getItemText(i) + printlog "(" & i & "/" & iCount & "): " & Numerierung.getItemText(i) next i 'Referenze: TabOptionenNumerierung.Cancel @@ -524,47 +576,57 @@ testcase tWriterUIChangesTest11 active.ok endif - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") + 'print warning if no printer is available + kontext + if active.exists(5) then + qaErrorlog "print warning: '" & active.getText & "'" + active.ok + endif + + '/// turn off "Asian Language support" , Check if the number in listbox numbering is right + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") - FormatNumberingBullets + FormatNumberingBullets Kontext Active.SetPage TabOptionenNumerierung Kontext "TabOptionenNumerierung" - iCount = Numerierung.GetItemCount + iCount = Numerierung.GetItemCount if iCount <> iHopeNumber2 then - for i =1 to iCount - printlog "("+i+"/"+iCount+"): "+Numerierung.getItemText(i) - next i - 'Referenze: - qaerrorlog "the number of list box numbering is wrong when Asian Language support is off; expected: " + iHopeNumber2 + "; is: " + iCount + for i =1 to iCount + printlog "(" & i & "/" & iCount & "): " & Numerierung.getItemText(i) + next i + 'Referenze: + warnlog "the number of list box numbering is wrong when Asian Language support is off; expected: " & iHopeNumber2 & "; is: " & iCount end if - TabOptionenNumerierung.Cancel - end if + TabOptionenNumerierung.Cancel + end if - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tProlongedVowelsTest1 + '/// Check if the default setting of "Prolonged vowels (ka-/kaa) will be ACTIVATED. - call hNewDocument + call hNewDocument - Call CheckAsianLanguageSupport("On") + '/// turn on "Asian Language support" , Check if the default setting of "Prolonged vowels (ka-/kaa) is ACTIVATED. + Call CheckAsianLanguageSupport("On") - ToolsOptions - Call hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE") + ToolsOptions + Call hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE") - if ProlongedSoundmarks.IsChecked <> TRUE then - warnlog "The default setting of 'Prolonged vowels (ka-/kaa)' isn't ACTIVATED." - end if + if ProlongedSoundmarks.IsChecked <> TRUE then + warnlog "The default setting of 'Prolonged vowels (ka-/kaa)' isn't ACTIVATED." + end if - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.Cancel + Kontext "ExtrasOptionenDlg" + ExtrasOptionenDlg.Cancel - Call hCloseDocument + Call hCloseDocument endcase @@ -572,39 +634,42 @@ endcase testcase tCalcUIChangesTest_10 + '/// Check if vertical text box and callout appear or not - call hNewDocument - - Call CheckAsianLanguageSupport("On") - sleep(1) - Call hToolbarSelect("DRAWING", true) - try - VerticalText.Click - catch - warnlog "Something wrong in vertical text box when Asian Language support is on" - endcatch - try - VerticalCallout.Click - catch - warnlog "Something wrong in vertical text callout when Asian Language support is on" - endcatch + call hNewDocument - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") - Kontext "Drawbar" - try + '/// turn on "Asian Language support" , Check if vertical text box and callout appear + Call CheckAsianLanguageSupport("On") + sleep(1) + Call hToolbarSelect("DRAWING", true) + try VerticalText.Click - warnlog "Something wrong in vertical text box when Asian Language support is off" - catch - endcatch - try + catch + warnlog "Something wrong in vertical text box when Asian Language support is on" + endcatch + try VerticalCallout.Click - warnlog "Something wrong in vertical text callout when Asian Language support is off" - catch - endcatch - end if + catch + warnlog "Something wrong in vertical text callout when Asian Language support is on" + endcatch + + '/// turn off "Asian Language support" , Check if vertical text box and callout disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") + Kontext "Drawbar" + try + VerticalText.Click + warnlog "Something wrong in vertical text box when Asian Language support is off" + catch + endcatch + try + VerticalCallout.Click + warnlog "Something wrong in vertical text callout when Asian Language support is off" + catch + endcatch + end if - Call hCloseDocument + Call hCloseDocument endcase @@ -612,30 +677,33 @@ endcase testcase tImpressUIChangesTest_10 - call hNewDocument + '/// Check if vertical text box and callout and fit vertical text to frame appear or not + call hNewDocument - Call CheckAsianLanguageSupport("On") - sleep(1) - Kontext "Drawbar" - sleep(1) - try - VerticalText.Click - catch - warnlog "Something wrong in vertical text box when Asian Language support is on" - endcatch - - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") - sleep(1) - Kontext "Drawbar" - try + '/// turn on "Asian Language support" , Check if vertical text box appear + Call CheckAsianLanguageSupport("On") + sleep(1) + Kontext "Drawbar" + sleep(1) + try VerticalText.Click - warnlog "Something wrong in vertical text box when Asian Language support is off" - catch - endcatch - end if + catch + warnlog "Something wrong in vertical text box when Asian Language support is on" + endcatch + + '/// turn off "Asian Language support" , Check if vertical text box disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") + sleep(1) + Kontext "Drawbar" + try + VerticalText.Click + warnlog "Something wrong in vertical text box when Asian Language support is off" + catch + endcatch + end if - Call hCloseDocument + Call hCloseDocument endcase @@ -643,28 +711,31 @@ endcase testcase tDrawUIChangesTest_10 - call hNewDocument + '/// Check if vertical text box and callout and fit vertical text to frame appear or not + call hNewDocument - Call CheckAsianLanguageSupport("On") - Kontext "Drawbar" - sleep(1) - try - VerticalText.Click - catch - warnlog "Something wrong in vertical text box when Asian Language support is on" - endcatch - - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") - Kontext "Drawbar" - try + '/// turn on "Asian Language support" , Check if vertical text box appear + Call CheckAsianLanguageSupport("On") + Kontext "Drawbar" + sleep(1) + try VerticalText.Click - warnlog "Something wrong in vertical text box when Asian Language support is off" - catch - endcatch - end if + catch + warnlog "Something wrong in vertical text box when Asian Language support is on" + endcatch + + '/// turn off "Asian Language support" , Check if vertical text box disappear + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") + Kontext "Drawbar" + try + VerticalText.Click + warnlog "Something wrong in vertical text box when Asian Language support is off" + catch + endcatch + end if - Call hCloseDocument + Call hCloseDocument endcase diff --git a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc index c4caed718803..0df9c6c97aae 100755..100644 --- a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc +++ b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc @@ -1,7 +1,7 @@ '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 @@ -39,18 +39,23 @@ testcase tRubyDialog_1 - Dim sBaseText , sRubyText as String - Dim sBaseText1 , sRubyText1 as String + Dim sBaseText , sRubyText as String + Dim sBaseText1 , sRubyText1 as String - sBaseText = "BaseText" - sRubyText = "RubyText" + sBaseText = "BaseText" + sRubyText = "RubyText" - sBaseText1 = "BaseText1" - sRubyText1 = "RubyText1" + sBaseText1 = "BaseText1" + sRubyText1 = "RubyText1" - Call hNewDocument + '/// Check Apply and Close button in Ruby dialogue + Call hNewDocument - FormatRuby + '/// Check close button. + '/// open ruby dialogue , input base text and ruby text , then press close button + '/// 1) check if the ruby dialogue is closed + '/// 2) check if the base text and ruby text is recorded + FormatRuby Kontext "RubyDialog" Sleep 3 BasisText1.SetText sBaseText @@ -58,19 +63,23 @@ testcase tRubyDialog_1 RubyText1.SetText sRubyText Sleep 1 - DialogClose.Click - Sleep 1 + DialogClose.Click + Sleep 1 - if RubyDialog.Exists then - Warnlog "The Ruby dialogue is NOT closed !" - end if + if RubyDialog.Exists then + Warnlog "The Ruby dialogue is NOT closed !" + end if - FormatRuby + FormatRuby Kontext "RubyDialog" Sleep 3 if Len(BasisText1.GetText) <> 0 then Warnlog "The base text should not been inputed" if Len(RubyText1.SetText) <> 0 then Warnlog "The ruby text should not been inputed" + '/// Check Apply button -- Normally , we think it is RubyDialog.OK + '/// open ruby dialogue , input base text and ruby text , then press close button + '/// Press Apply button , then press close button + '/// check if the base text and ruby text is recorded BasisText1.SetText sBaseText1 Sleep 1 @@ -80,22 +89,22 @@ testcase tRubyDialog_1 RubyDialog.OK Sleep 2 - DialogClose.Click - Sleep 1 + DialogClose.Click + Sleep 1 - EditSelectAll - Sleep 1 + EditSelectAll + Sleep 1 - FormatRuby - Kontext "RubyDialog" + FormatRuby + Kontext "RubyDialog" Sleep 3 if BasisText1.GetText <> sBaseText1 then Warnlog "The base text should be "+sBaseText1 + " but get " + BasisText1.GetText if RubyText1.GetText <> sRubyText1 then Warnlog "The ruby text should be "+sRubyText1 + " but get " + RubyText1.GetText - DialogClose.Click - Sleep 1 + DialogClose.Click + Sleep 1 - Call hCloseDocument + Call hCloseDocument endcase @@ -103,61 +112,72 @@ endcase testcase tRubyDialog_2 - Dim sBaseText as String + Dim sBaseText as String - sBaseText = "test1 test2 test3 test4 test5 test6 test7 test8 test9" + sBaseText = "test1 test2 test3 test4 test5 test6 test7 test8 test9" + '/// Test scrollbar in Ruby dialog - Call hNewDocument + Call hNewDocument - FormatRuby + '/// when there is less basetext, the scrollbar should appear + FormatRuby Kontext "RubyDialog" if RubyDialog.HasScrollbar <> TRUE then warnlog "The Scrollbar should appear when less basetext!" - DialogClose.Click - Sleep 1 + DialogClose.Click + Sleep 1 - Kontext "DocumentWriter" - DocumentWriter.TypeKeys sBaseText - DocumentWriter.TypeKeys "<Shift Home>" + '/// when there is more basetext(here is >4), the scrollbar should appear + Kontext "DocumentWriter" + DocumentWriter.TypeKeys sBaseText + DocumentWriter.TypeKeys "<Shift Home>" - FormatRuby + FormatRuby Kontext "RubyDialog" if RubyDialog.HasScrollbar <> TRUE then warnlog "The Scrollbar should appear when more basetext!" - DialogClose.Click - Sleep 1 + DialogClose.Click + Sleep 1 - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tRubyDialog_3 - Dim sTestText as String - Dim sBaseText1, sBaseText2 as String + Dim sTestText as String + Dim sBaseText1, sBaseText2 as String - sTestText = "Test1 Test2" - sBaseText1 = "Test1" - sBaseText2 = "Test2" + sTestText = "Test1 Test2" + sBaseText1 = "Test1" + sBaseText2 = "Test2" + '/// The list in ruby dialogure will be updated as soon as the uses + '/// selects new or further words of his text. + '/// The update will be done once the user changes his focus + '/// back to the Ruby-Dialogue from the text - Call hNewDocument + Call hNewDocument - DocumentWriter.TypeKeys sTestText - DocumentWriter.TypeKeys "<Shift Left>" , 5 + '/// input 2 test words, and mark the second + DocumentWriter.TypeKeys sTestText + DocumentWriter.TypeKeys "<Shift Left>" , 5 - FormatRuby + '/// There should be only the second test word in basetext1 in ruby dialogue + FormatRuby Kontext "RubyDialog" Sleep 2 if BasisText1.GetText <> sBaseText2 then warnlog "The BaseText1 should be:" +sBaseText2 + " but get "+BasisText1.GetText - Kontext "DocumentWriter" - try - DocumentWriter.TypeKeys "<Shift Home>" - Sleep 2 - catch - warnlog "The ruby dialogue is MODE less dialogue , the document can be edited!" - endcatch + '/// Mark 2 test words + Kontext "DocumentWriter" + try + DocumentWriter.TypeKeys "<Shift Home>" + Sleep 2 + catch + warnlog "The ruby dialogue is MODE less dialogue , the document can be edited!" + endcatch + '/// Check if the 2 test words are all in the ruby dialogue when set forcus back to the dialogue Kontext "RubyDialog" Sleep 1 'this step is meaningless, just let the focus back to ruby dialogue @@ -167,10 +187,10 @@ testcase tRubyDialog_3 Sleep 1 if BasisText2.GetText <> sBaseText2 then warnlog "The BaseText2 should be:" +sBaseText2 + " but get "+BasisText2.GetText - DialogClose.Click - Sleep 1 + DialogClose.Click + Sleep 1 - Call hCloseDocument + Call hCloseDocument endcase @@ -178,41 +198,42 @@ endcase testcase tRubyDialog_4 - Dim sCharacterStyle as String - dim i as integer - - - select case iSprache - case 01 : sCharacterStyle = "Rubies" - case 33 : sCharacterStyle = "Rubys" - case 34 : sCharacterStyle = "Rubys" - case 39 : sCharacterStyle = "Testo Ruby" - case 46 : sCharacterStyle = "Rubytext" - case 49 : sCharacterStyle = "Rubys" - case 55 : sCharacterStyle = "Rubys" - case 81 : sCharacterStyle = "ふりがな" - case 82 : sCharacterStyle = "윗주 달기" ' not sure TBO - case 86 : sCharacterStyle = "拼音和注音符号" - case 88 : sCharacterStyle = "注音符號" - case else :' QAErrorLog "Now, the test does not support for the language " +iSprache - Goto endsub - end select - - Call hNewDocument - - FormatRuby + Dim sCharacterStyle as String + dim i as integer + + '/// Check default setting for Character Style of Ruby Text + + select case iSprache + case 01 : sCharacterStyle = "Rubies" + case 33 : sCharacterStyle = "Rubys" + case 34 : sCharacterStyle = "Rubys" + case 39 : sCharacterStyle = "Testo Ruby" + case 46 : sCharacterStyle = "Rubytext" + case 49 : sCharacterStyle = "Rubys" + case 55 : sCharacterStyle = "Rubys" + case 81 : sCharacterStyle = "ふりがな" + case 82 : sCharacterStyle = "윗주 달기" ' not sure TBO + case 86 : sCharacterStyle = "拼音和注音符号" + case 88 : sCharacterStyle = "注音符號" + case else :' QAErrorLog "Now, the test does not support for the language " +iSprache + Goto endsub + end select + + Call hNewDocument + + FormatRuby Kontext "RubyDialog" Sleep 3 - if CharacterStyle.GetSelText <> sCharacterStyle then - warnlog "Default setting for Character Style of Ruby Text isn't right, should be "+sCharacterStyle + " but get "+CharacterStyle.GetSelText - for i = 1 to CharacterStyle.getItemCount - printlog "("+i+"/"+CharacterStyle.getItemCount+"): '"+CharacterStyle.getItemText(i)+"'" - next i + if CharacterStyle.GetSelText <> sCharacterStyle then + warnlog "Default setting for Character Style of Ruby Text isn't right, should be "+sCharacterStyle + " but get "+CharacterStyle.GetSelText + for i = 1 to CharacterStyle.getItemCount + printlog "("+i+"/"+CharacterStyle.getItemCount+"): '"+CharacterStyle.getItemText(i)+"'" + next i endif DialogClose.Click - Sleep 1 + Sleep 1 - Call hCloseDocument + Call hCloseDocument endcase @@ -220,45 +241,49 @@ endcase testcase tRubyDialog_5 - Dim sCharacterStyle as String - Dim sStyleName as String - Dim i as Integer - dim iCount as integer - dim bError as boolean - dim bWileExit as boolean - - - select case iSprache - case 01 : sCharacterStyle = "Rubies" - case 33 : sCharacterStyle = "Rubys" - case 34 : sCharacterStyle = "Rubys" - case 39 : sCharacterStyle = "Testo Ruby" - case 46 : sCharacterStyle = "Rubytext" - case 49 : sCharacterStyle = "Rubys" - case 55 : sCharacterStyle = "Rubys" - case 81 : sCharacterStyle = "ふりがな" - case 82 : sCharacterStyle = "윗주 달기" ' not sure TBO was "덧말" - case 86 : sCharacterStyle = "拼音和注音符号" - case 88 : sCharacterStyle = "注音符號" - case else :' QAErrorLog "Now, the test does not support for the language " +iSprache - Goto endsub - end select - - sStyleName = "ZZZ-Test-ZZZ" - - Call hNewDocument - - FormatRuby + Dim sCharacterStyle as String + Dim sStyleName as String + Dim i as Integer + dim iCount as integer + dim bError as boolean + dim bWileExit as boolean + + '/// Check stylist + + select case iSprache + case 01 : sCharacterStyle = "Rubies" + case 33 : sCharacterStyle = "Rubys" + case 34 : sCharacterStyle = "Rubys" + case 39 : sCharacterStyle = "Testo Ruby" + case 46 : sCharacterStyle = "Rubytext" + case 49 : sCharacterStyle = "Rubys" + case 55 : sCharacterStyle = "Rubys" + case 81 : sCharacterStyle = "ふりがな" + case 82 : sCharacterStyle = "윗주 달기" ' not sure TBO was "덧말" + case 86 : sCharacterStyle = "拼音和注音符号" + case 88 : sCharacterStyle = "注音符號" + case else :' QAErrorLog "Now, the test does not support for the language " +iSprache + Goto endsub + end select + + sStyleName = "ZZZ-Test-ZZZ" + + Call hNewDocument + + '/// Open ruby dialogue + FormatRuby Kontext "RubyDialog" + '/// Click stylist button CallStylist.Click Sleep 2 Kontext "Stylist" if Stylist.NotExists then - Warnlog "No Stylist with clicking Stylist button!" + Warnlog "No Stylist with clicking Stylist button!" end if + '/// click Character Style Zeichenvorlagen.Click ' needed to update the listbox count :-( @@ -282,22 +307,24 @@ testcase tRubyDialog_5 endif if (NOT bError) then + '/// find entry ruby and add a new entry AusSelektion.OpenMenu Sleep 1 printlog "hMenuSelect 1" hMenuSelectNr(1) printlog "hMenuSelect 1 survived" Sleep 1 - + Kontext "VorlageErzeugen" Sleep 1 Vorlagenname.SetText sStyleName Sleep 1 VorlageErzeugen.OK Sleep 2 - + + '/// check if the new entry is in the Character Style list box in ruby dialogue Kontext "RubyDialog" - + ' needed to update the listbox count :-( CharacterStyle.typeKeys ("<end><up><down>") iCount = CharacterStyle.GetItemCount @@ -317,14 +344,14 @@ testcase tRubyDialog_5 CharacterStyle.select (i) bError = false endif - + if (NOT bError) then Kontext "Stylist" iCount = Vorlagenliste.getItemCount i=0 while ((i<iCount) AND (Vorlagenliste.getItemText (i+1) <> sStyleName)) inc (i) - printlog "" + (i) + ": " + Vorlagenliste.getItemText (i) + printlog "" + (i) + ": " + Vorlagenliste.getItemText (i) wEnd if (i = iCount) then warnlog "Style (Rubies) not found for deleting: '" + sStyleName + "' inside of entries: " + iCount @@ -362,7 +389,7 @@ testcase tRubyDialog_5 DialogClose.Click Sleep 1 - Call hCloseDocument + Call hCloseDocument endcase 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/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc index e0a07bb6b741..bda3b9a24d8f 100755 --- a/testautomation/framework/optional/includes/options_ooo_general.inc +++ b/testautomation/framework/optional/includes/options_ooo_general.inc @@ -1,16 +1,16 @@ '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: options_ooo_general.inc,v $ +'* $RCSfile: w_grid_layout1.inc,v $ '* -'* $Revision: 1.1 $ +'* $Revision: 1.2 $ '* -'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:15 $ +'* last change: $Author: jsk $ $Date: 2008-06-17 07:50:24 $ '* '* This file is part of OpenOffice.org. '* @@ -31,20 +31,39 @@ '* '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : thorsten.bosbach@sun.com '* -'* short description : 1. test for general group userdata ... view) +'* short description : Grid Layout for CJK test in Writer '* -'\****************************************************************************** +'\*********************************************************************** +private const SOURCE_PATH = "framework\optional\input\CJK\" -testcase tOOoGeneral +testcase tTextGridDialog_1 - dim lsSave (4) as String - dim lbSave (3) as Boolean + '/// Check if tabpage 'Text Grid' disappears when "Asian Language support" is NOT checked + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") + hNewDocument() + FormatPageWriter + try + Kontext + Active.SetPage TabGrid + Kontext "TabGrid" + TabGrid.Cancel + warnlog "Shouldn't get Tabpage: Grid Text" + catch + Kontext + Active.SetPage TabSeite + Kontext "TabSeite" + TabSeite.Cancel + endcatch + endif - hNewDocument + '/// Check if tabpage 'Text Grid' appears when "Asian Language support" is checked + Call CheckAsianLanguageSupport("On") + hNewDocument ToolsOptions hToolsOptions ( "StarOffice", "General" ) @@ -72,129 +91,499 @@ testcase tOOoGeneral if ( ExtrasOptionenDlg.notExists( 3 ) ) then printlog( "Options closed" ) endif + hCloseDocument() +endcase +'------------------------------------------------------------------------- - hCloseDocument +testcase tTextGridDialog_2 + '/// No grid is active, no changes to existing version + Dim testFile , sCorrectResult as String - printlog " - exit/restart StarOffice" - ExitRestartTheOffice + testFile = "gridtest.sxw" + sCorrectResult = "1" - printlog " - check data" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) + Call hNewDocument - if Zweistellig.GetText <> "1950" then Warnlog "Year ( 2 digits ) => changes not saved: '" + Zweistellig.GetText +"' #i29810" - if Aktivieren.IsChecked <> TRUE then Warnlog "Enable HelpAgent => changes not saved" - Zuruecksetzen.Click - if gPlatgroup = "w95" then - if StarOfficeDialogeBenutzen.IsChecked = lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!" - end if - If DruckenStatus.IsChecked = lbSave ( 3 ) then Warnlog "Printing sets 'Document modified' status => changes not saved!" + '/// open a test file , and check No Grid checkbox + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + sMakeReadOnlyDocumentEditable - printlog " - 2. change data" - Zweistellig.SetText "1800" - DruckenStatus.UnCheck + FormatPageWriter + Kontext + if active.exists(5) then + Active.SetPage TabGrid + endif + Kontext "TabGrid" + NoGrid.Check + Sleep 1 + TabGrid.OK + Sleep 1 - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - if ( ExtrasOptionenDlg.notExists( 3 ) ) then - printlog( "Options closed" ) + '/// Active navigator dialogue , set page to '2' and wait for a while + Kontext + ViewNavigator + Kontext "NavigatorWriter" + + Seitennummer.SetText "2" + Sleep 5 + hCloseNavigator + + '/// In No Grid mode, there should be only 1 page, the focus is before the first line + Kontext "DocumentWriter" + Call DocumentWriter.TypeKeys "<End>" + Sleep 1 + Call DocumentWriter.TypeKeys "<Shift Left>" + hUseAsyncSlot( "EditCopy" ) + + if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing NoGrid option!" + + Call hCloseDocument +endcase + +'------------------------------------------------------------------------- + +testcase tTextGridDialog_3 + '/// Grid (lines only): The page is set up with a defined number of lines + Dim testFile , sCorrectResult , sLinesPerPage as String + + testFile = "gridtest.sxw" + sCorrectResult = "G" + sLinesPerPage = "10" + + Call hNewDocument + + '/// open a test file and check Grid(lines onle) checkbox , + '/// + set 10 line/page + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + sMakeReadOnlyDocumentEditable + FormatPageWriter + Kontext + if active.exists(5) then + Active.SetPage TabGrid + endif + Kontext "TabGrid" + LinesGrid.Check + LinesPerPage.SetText sLinesPerPage + Sleep 1 + TabGrid.OK + Sleep 1 + + '/// Active navigator dialogue , set page to '2' and wait for a while + Kontext + ViewNavigator + Kontext "NavigatorWriter" + + Seitennummer.SetText "2" + Sleep 5 + hCloseNavigator + + Kontext "DocumentWriter" + Call DocumentWriter.TypeKeys "<End>" + Sleep 1 + Call DocumentWriter.TypeKeys "<Shift Left>" + hUseAsyncSlot( "EditCopy" ) + + if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines only) option!" + + Call hCloseDocument +endcase + +'------------------------------------------------------------------------- + +testcase tTextGridDialog_4 + '/// Grid (lines and characters): The page is set up with a defined number of lines and a defined number of characters in each line + Dim testFile , sCorrectResult as String + Dim sLinesPerPage , sCharsPerLine as String + + testFile = "gridtest.sxw" + sCorrectResult = "E" + sLinesPerPage = "10" + sCharsPerLine = "9" + + Call hNewDocument + + '/// open a test file and check Grid(lines and characters) checkbox + '/// + set 10 line/page and 9 characters/line + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + sMakeReadOnlyDocumentEditable + FormatPageWriter + Kontext + if active.exists(5) then + Active.SetPage TabGrid endif + Kontext "TabGrid" + CharsGrid.Check + LinesPerPage.SetText sLinesPerPage + CharsPerLine.SetText sCharsPerLine + Sleep 1 + TabGrid.OK + Sleep 1 + + '/// Active navigator dialogue , set page to '2' and wait for a while + Kontext + ViewNavigator + Kontext "NavigatorWriter" + + Seitennummer.SetText "2" + Sleep 5 + hCloseNavigator + + Kontext "DocumentWriter" + Call DocumentWriter.TypeKeys "<End>" + Sleep 1 + Call DocumentWriter.TypeKeys "<Shift Left>" + hUseAsyncSlot( "EditCopy" ) + + if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines and characters) option!" + Call hCloseDocument +endcase + +'------------------------------------------------------------------------- + +testcase tGridDisplay_1 + '/// Print grid: The grid lines will be printed. Inactive if "Display grid" is inactive. + Call hNewDocument + + '/// format / page / tabpage Text grid + '/// + check "display grid" and check "print grid" + FormatPageWriter + Kontext + if active.exists(5) then + Active.SetPage TabGrid + endif + Kontext "TabGrid" + CharsGrid.Check + Display.Check + Sleep 1 + PrintGrid.Check + Sleep 1 + TabGrid.OK + Sleep 1 - 'It's a little tricky to reproduce. - if gPlatgroup = "unx" then - hNewDocument() - FilePrint - Kontext "DruckenDLG" - if DruckenDLG.exists(5) then - if gPlatform <> "osx" then - Eigenschaften.click - kontext - active.setPage TabSPAPaper - Kontext "TabSPAPaper" - if TabSPAPaper.exists (5) then - TabSPAPaper.OK - sleep 5 - else - qaErrorlog "Properties of Printer didn't come up." - endif - end if - Kontext "DruckenDLG" - DruckenDLG.OK - ' check state - kontext - if active.exists(5) then - printlog "active: printing failed? '" + active.gettext + "'" - active.ok + '/// Print to printer + FilePrint + Kontext "Active" + if ( Active.Exists( 5 ) ) then + if Active.GetRT() = 304 then + Active.Ok() + QAErrorLog "No Default-Printer!" + Kontext "Printing" + if ( Printing.exists( 1 )) then + Printing.Cancel endif - try - FileSave - qaErrorlog "#i52248# Modify flag is set after printing though option is not set." - kontext "SpeichernDlg" - if SpeichernDlg.exists(5) then - SpeichernDlg.cancel - endif - catch - printlog "#i52248# doesn't come up." - endcatch - else - qaErrorLog "No printer available - resuming." - kontext - if active.exists(5) then - printlog active.getText - active.ok + endif + else + Kontext "Printing" + if ( Printing.exists( 2 )) then + Printing.OK() + Printing.notExists( 5 ) + endif + + kontext "Active" + if active.exists(5) then + qaErrorLog active.getText() + active.ok() + endif + endif + + '/// format / page / tabpage Text grid + '/// + check "display grid" and uncheck "print grid" + FormatPageWriter + Kontext + if active.exists(5) then + Active.SetPage TabGrid + endif + Kontext "TabGrid" + CharsGrid.Check + Display.Check + Sleep 1 + PrintGrid.UnCheck + Sleep 1 + TabGrid.OK + Sleep 1 + + '/// Print to printer + FilePrint + Kontext "Active" + if ( Active.Exists( 5 ) )then + if Active.GetRT() = 304 then + Active.Ok() + QAErrorLog "No Default-Printer!" + Kontext "Printing" + if ( Printing.exists( 1 )) then + Printing.Cancel() endif - endif - hCloseDocument - endif - - printlog " - check data" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) + endif + else + Kontext "Printing" + if( Printing.exists( 1 )) then + Printing.OK + Printing.notExists( 5 ) + endif + kontext + if ( active.exists( 2 ) ) then + qaErrorLog active.getText + active.ok + endif + endif - if Zweistellig.GetText <> "1800" then Warnlog "Year ( 2 digits ) => changes not saved : '" + Zweistellig.GetText +"'" - If DruckenStatus.IsChecked <> FALSE then Warnlog "Printing sets 'Document modified' status => changes not saved!" - if StyleSheet.GetSelIndex <> 3 then Warnlog "Style sheet for StarOffice Help => changes not saved!" + Call hCloseDocument +endcase - printlog " - reset to saved data" - Zweistellig.SetText lsSave ( 1 ) - Aktivieren.Check - Zuruecksetzen.Click - if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck - if gPlatgroup = "w95" then - if lbSave (2) = TRUE then StarOfficeDialogeBenutzen.Check else StarOfficeDialogeBenutzen.UnCheck - end if - If lbSave(3)= TRUE then DruckenStatus.Check else DruckenStatus.UnCheck - StyleSheet.Select lsSave(3) +'------------------------------------------------------------------------- - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - if ( ExtrasOptionenDlg.notExists( 3 ) ) then - printlog( "Options closed" ) +testcase tUserDefineLayout_1 + '/// Decrease characters per line will cause lines per page decrease accordingly + Dim sLinesPerPage , sCharsPerLine as String + Dim sExpectLinesPerPage , sExpectLinesPerPage1 as String + + sLinesPerPage = "20" + sCharsPerLine = "2" + sExpectLinesPerPage = "2" + sExpectLinesPerPage1 = "3" + + Call hNewDocument + + '/// Format/page , set lines per page to 20, and set charsets per line to 2 + '/// + wait for a moment , then check the the number of lines per page. + FormatPageWriter + Kontext + if active.exists(5) then + Active.SetPage TabGrid endif + Kontext "TabGrid" + CharsGrid.Check - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) + LinesPerPage.SetText sLinesPerPage + Sleep 2 + CharsPerLine.SetText sCharsPerLine + Sleep 2 - printlog " - check the reset data" - if Zweistellig.GetText <> lsSave ( 1 ) then Warnlog "Year ( 2 digits ) => changes not saved" - if Aktivieren.IsChecked <> lbSave (1) then Warnlog "Enable HelpAgent => changes not saved" - Aktivieren.Check - Zuruecksetzen.Click - if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck - if gPlatgroup = "w95" then - if StarOfficeDialogeBenutzen.IsChecked <> lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!" - end if - If DruckenStatus.IsChecked <> lbSave(3) then Warnlog "Printing sets 'Document modified' status => changes not saved!" - if StyleSheet.GetSelText <> lsSave (3) then Warnlog "Style sheet for StarOffice Help => changes not saved!" + 'This step is no use, just let the LinesPerPage change the number + CharsGrid.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - if ( ExtrasOptionenDlg.notExists( 3 ) ) then - printlog( "Options closed" ) + if LinesPerPage.GetText <> sExpectLinesPerPage AND LinesPerPage.GetText <> sExpectLinesPerPage1 then + Warnlog "The lines per page should be" + sExpectLinesPerPage + " OR " + sExpectLinesPerPage1 +" but get " +LinesPerPage.GetText endif + TabGrid.Cancel + + Call hCloseDocument +endcase + +'------------------------------------------------------------------------- + +testcase tFontSizeChanges_1 + '/// Change the font size to bigger enough will change the layout + Dim testFile , sCorrectResult as String + Dim sLinesPerPage , sCharsPerLine as String + dim sTemp as string + + testFile = "FontSizeChanges_1.sxw" + sCorrectResult = "1" + sLinesPerPage = "2" + sCharsPerLine = "9" + + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + sMakeReadOnlyDocumentEditable + Kontext "DocumentWriter" + Call DocumentWriter.TypeKeys "<Shift Right>" + + Kontext "FormatObjectbar" + Schriftgroesse.Select "60" + Schriftgroesse.TypeKeys "<Return>" + Sleep 1 + + Kontext "DocumentWriter" + FormatPageWriter + Kontext + if active.exists(5) then + Active.SetPage TabGrid + endif + Kontext "TabGrid" + if TabGrid.exists(5) then + sTemp = LinesPerPage.GetText + if sTemp <> sLinesPerPage then + Warnlog "The lines per page should be: '" + sLinesPerPage + "'; but get: '" + sTemp + "'" + endif + sTemp = CharsPerLine.GetText + if sTemp <> sCharsPerLine then + Warnlog "The chars per line should be: '" + sCharsPerLine + "'; but get: '" +sTemp + "'" + endif + TabGrid.Cancel + else + warnlog "TabGrid is not available." + endif + + Kontext + ViewNavigator + Kontext "NavigatorWriter" + if NavigatorWriter.exists(5) then + Seitennummer.SetText "2" + Sleep 5 + else + warnlog "Navigator not available" + endif + hCloseNavigator + + Kontext "DocumentWriter" + sleep 3 + Call DocumentWriter.TypeKeys "<Shift Right>" + + hUseAsyncSlot( "EditCopy" ) + sTemp = GetClipboardText + if sTemp <> sCorrectResult then + Warnlog "Don't get the expected result , hope to be: '" + sCorrectResult + "'; but get: '" + sTemp + "'" + endif + + Call hCloseDocument +endcase + +'------------------------------------------------------------------------- + +testcase 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. + Dim testFile , sRubyText as String + + testFile = "rubytest.sxw" + sRubyText = "Ruby Test Text ....................." + + Call hNewDocument + + '/// open a test file , and insert long ruby test text + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + sMakeReadOnlyDocumentEditable + Kontext "DocumentWriter" + Call DocumentWriter.TypeKeys "<Shift Right>" + Sleep 1 + + FormatRuby + Kontext "RubyDialog" + Sleep 3 + RubyText1.setText sRubyText + Sleep 2 + RubyDialog.OK + Sleep 2 + DialogClose.Click + Sleep 1 + + Kontext "DocumentWriter" + FormatAutoformatApply + Sleep 2 + Call DocumentWriter.TypeKeys "<End>" + Sleep 2 + Call DocumentWriter.TypeKeys "<Shift Left>" + hUseAsyncSlot( "EditCopy" ) + + if NOT(GetClipboardText = "5" OR GetClipboardText = "6") then + Warnlog "Don't get the correct result after inserting ruby text! Get " + GetClipboardText + endif + + Call hCloseDocument +endcase + +'------------------------------------------------------------------------- + +testcase 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. + Dim testFile , sCorrectPage1 , sCorrectPage2 as String + + testFile = "IndentsTest.sxw" + sCorrectPage1 = "1" + sCorrectPage2 = "2" + + Call hNewDocument + + '/// open a test file , and press TAB in second line + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + sMakeReadOnlyDocumentEditable + Kontext "DocumentWriter" + Call DocumentWriter.TypeKeys "<Down>" + Sleep 1 + Call DocumentWriter.TypeKeys "<Tab>" + Sleep 1 + Call DocumentWriter.TypeKeys "<End>" + Sleep 1 + + '/// Active navigator dialogue , check if the page number is 1 + Kontext + ViewNavigator + Kontext "NavigatorWriter" + if Seitennummer.GetText <> sCorrectPage1 then Warnlog "First test :Something wrong in indents test!" + hCloseNavigator + + '/// press TAB in second line again + Kontext "DocumentWriter" + Call DocumentWriter.TypeKeys "<Home>" + Sleep 1 + Call DocumentWriter.TypeKeys "<Tab>" + Sleep 1 + Call DocumentWriter.TypeKeys "<End>" + Sleep 1 + + '/// Active navigator dialogue , check if the page number is 2 + Kontext + ViewNavigator + Kontext "NavigatorWriter" + if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Second test :Something wrong in indents test!" + hCloseNavigator + + Call hCloseDocument +endcase + +'------------------------------------------------------------------------- + +testcase 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). + Dim testFile , sCorrectPage1 , sCorrectPage2 as String + + testFile = "objectsTest.sxw" + sCorrectPage1 = "1" + sCorrectPage2 = "2" + + Call hNewDocument + + '/// open a test file , and press TAB in second line + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + + '/// If object is anchored as Character , check if it will snap to the appropriate grid cell + fStartupNavigator( "OLEObject" , 1 ) + Sleep 1 + Auswahlliste.TypeKeys "<Return>" + Sleep 1 + hCloseNavigator + + Kontext + FormatAnchorAsCharacter + WaitSlot() + + + ViewNavigator + Kontext "NavigatorWriter" + Seitennummer.SetText sCorrectPage2 + Sleep 5 + if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!" + hCloseNavigator + + '/// If object is anchored to Character , check if it will NOT snap to the appropriate grid cell + fStartupNavigator( "OLEObject" , 1 ) + Auswahlliste.TypeKeys "<Return>" + hCloseNavigator + + Kontext + FormatAnchorToCharacter + + ViewNavigator + Kontext "NavigatorWriter" + Seitennummer.SetText sCorrectPage2 + Sleep 5 + if Seitennummer.GetText <> sCorrectPage1 then Warnlog "Something wrong when object is anchored to Character!" + hCloseNavigator + Kontext + Call hCloseDocument endcase diff --git a/testautomation/framework/optional/includes/options_so_4.inc b/testautomation/framework/optional/includes/options_so_4.inc deleted file mode 100755 index e8c5639d5f35..000000000000 --- a/testautomation/framework/optional/includes/options_so_4.inc +++ /dev/null @@ -1,707 +0,0 @@ -'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: options_so_4.inc,v $ -'* -'* $Revision: 1.1 $ -'* -'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:15 $ -'* -'* 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 : options test (General/Memory/View) -'* -'\****************************************************************************** - -testcase func_StarOfficeGeneral_1 - gApplication = "WRITER" - Dim sSave as String - Dim ClipText as String - - - printlog " - other" - printlog " - years two digits => 1899" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - sSave = Zweistellig.GetText - Zweistellig.SetText "1899" - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - gApplication = "CALC" - hNewDocument - DocumentCalc.TypeKeys "04.03.00<return>" - DocumentCalc.TypeKeys "<up>" - DocumentCalc.TypeKeys "<F2><Home><Shift End>" - Sleep (1) - EditCopy - DocumentCalc.TypeKeys "<Escape>" - - ClipText = GetClipboardText - if ClipText <> "04.03.1900" AND ClipText <> "04/03/1900" then Warnlog "Wrong date not 04.03.1900 or 04/03/1900 : => '" + ClipText + "'" - - hCloseDocument - - printlog " - years two digits => 2050" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - Zweistellig.SetText "2050" - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - gApplication = "CALC" - hNewDocument - DocumentCalc.TypeKeys "05.03.68<return>" - DocumentCalc.TypeKeys "<up>" - DocumentCalc.TypeKeys "<F2><Home><Shift End>" - Sleep (1) - EditCopy - DocumentCalc.TypeKeys "<Escape>" - - ClipText = GetClipboardText - if ClipText <> "05.03.2068" AND ClipText <> "05/03/2068" then Warnlog "Wrong date not 05.03.2068 or 05/03/2068 : => '" + ClipText + "'" - - hCloseDocument - - printlog " - reset to default" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - Zweistellig.SetText sSave - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - gApplication = "WRITER" -endcase - -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -testcase func_StarOfficeGeneral_2 - Dim bSave as Boolean - Dim sSave as String - Dim i as Integer, iTime as Integer - - gApplication = "WRITER" - - printlog "tools / options / staroffice / general -> help agent" - printlog "- check the minimum and the maximum of display duration for help agent ( 60sec and 5sec )" - printlog " activate the help agent options-dialog -> OK" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - bSave = Aktivieren.IsChecked - Aktivieren.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - printlog "- working with activated HelpAgent" - printlog " - check display duration of 10sec" - printlog " new writer-doc" - gApplication = "WRITER" - hNewDocument - - printlog " tools / options / staroffice / general -> help agent -> duration to 10 -> " - printlog " click also reset to delete the ignore-list for help-agent -> options-dialog OK" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - Zuruecksetzen.Click - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - printlog " Format/Character - Font-Tabpage => help-agent must be activated" - printlog " check if agent closed after ~10sec" - FormatCharacter - Kontext - active.SetPage TabFont - - Kontext "HelpAgent" - if HelpAgent.Exists(1) <> TRUE then - Warnlog "The help agent wasn't activated for autocorrection!" - else - for i=1 to 20 - if HelpAgent.Exists then - Sleep 1 - else - iTime = i - i=21 - end if - next i - if iTime < 9 then Warnlog "The help agent is closed faster than 9 seconds!" - if iTime > 12 then Warnlog "The help agent isn't closed after 12 seconds!" - if HelpAgent.Exists then - Warnlog "The help agent isn't closed after 20 seconds, the test close it!" - HelpAgent.Close - end if - end if - - Kontext "TabFont" - TabFont.Cancel - printlog " close options-dialog and close the writer-doc" - hCloseDocument - - printlog " - check another display duration of 40sec" - printlog " new writer-doc" - hNewDocument - printlog " tools / options / staroffice / general -> help agent -> duration to 40 -> options-dialog OK" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - Aktivieren.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - printlog " Format/Character - Font-Tabpage => help-agent must be activated" - printlog " check if agent closed after ~40sec" - FormatCharacter - Kontext - active.SetPage TabFont - - Kontext "HelpAgent" - if HelpAgent.Exists(1) <> TRUE then - Warnlog "The help agent wasn't activated for autocorrection!" - else - for i=1 to 60 - if HelpAgent.Exists then - Sleep 1 - else - iTime = i - i=61 - end if - next i - if iTime < 35 then Warnlog "The help agent is closed faster than 35 seconds!" - if iTime > 45 then Warnlog "The help agent isn't closed after 45 seconds!" - if HelpAgent.Exists then - Warnlog "The help agent isn't closed after 40 seconds, the test close it!" - HelpAgent.Close - end if - end if - Kontext "TabFont" - TabFont.Cancel - - printlog " close options-dialog and close the writer-doc" - hCloseDocument - - printlog " - check another display duration of 60sec" - printlog " new writer-doc" - hNewDocument - printlog " tools / options / staroffice / general -> help agent -> duration to 60 -> options-dialog OK" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - Aktivieren.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - printlog " Format/Character - Font-Tabpage => help-agent must be activated" - FormatCharacter - Kontext - active.SetPage TabFont - - Kontext "HelpAgent" - if HelpAgent.Exists(1) <> TRUE then - Warnlog "The help agent wasn't activated for autocorrection!" - else - for i=1 to 80 - if HelpAgent.Exists then - Sleep 1 - else - iTime = i - i=81 - end if - next i - if iTime < 55 then Warnlog "The help agent is closed faster than 55 seconds!" - if iTime > 65 then Warnlog "The help agent isn't closed after 65 seconds!" - if HelpAgent.Exists then - Warnlog "The help agent isn't closed after 60 seconds, the test close it!" - HelpAgent.Close - end if - end if - - Kontext "TabFont" - TabFont.Cancel - - printlog " close options-dialog and close the writer-doc" - hCloseDocument - - printlog " - check if the help agent isn't active, when you ignore it 3 times ( inserted in the ignore-list )" - printlog " new writer-doc" - hNewDocument - printlog " tools / options / staroffice / general -> help agent -> duration to 10 -> options-dialog OK" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - Aktivieren.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - printlog " Format/Character - Font-Tabpage => help-agent should not be activated" - FormatCharacter - Kontext - active.SetPage TabFont - - Kontext "HelpAgent" - if HelpAgent.Exists then - Warnlog "Ignore HelpAgent 3 time for the same slot does not work, HelpAgent is active!" - HelpAgent.Close - end if - Kontext "TabFont" - TabFont.Cancel - - printlog " close options-dialog and close the writer-doc" - hCloseDocument - - printlog " - check if ignore-list can be deleted" - printlog " new writer-doc" - hNewDocument - printlog " tools / options / staroffice / general -> help agent -> click on reset -> options-dialog OK" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - Aktivieren.Check - Zuruecksetzen.Click - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - printlog " Format/Character - Font-Tabpage => help-agent should not be activated" - FormatCharacter - Kontext - active.SetPage TabFont - - Kontext "HelpAgent" - if HelpAgent.Exists(2) <> TRUE then - Warnlog "Ignore-list isn't reset, the HelpAgent is not active" - else - HelpAgent.Close - end if - Kontext "TabFont" - TabFont.Cancel - - printlog " close options-dialog and close the writer-doc" - hCloseDocument - - printlog " - working with deactivated the help agent" - printlog " new writer-doc" - hNewDocument - printlog " tools / options / staroffice / general -> deactivate help agent -> options-dialog OK" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - Aktivieren.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - printlog " Format/Character - Font-Tabpage => help-agent ust be activated" - FormatCharacter - Kontext - active.SetPage TabFont - - Kontext "HelpAgent" - if HelpAgent.Exists(1) = TRUE then - Warnlog "The help agent was active!" - HelpAgent.Close - end if - Kontext "TabFont" - TabFont.Cancel - - printlog " close options-dialog and close the writer-doc" - hCloseDocument - - printlog " - reset help-agent-options" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - Aktivieren.Check - Zuruecksetzen.Click - if bSave = TRUE then Aktivieren.Check else Aktivieren.UnCheck - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) -endcase - -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -testcase func_StarOfficeGeneral_3 - Dim bStatus as Boolean - - gApplication = "WRITER" - - - printlog "StarOffice / General => 'printing sets 'document modified' status'" - printlog "save a writer-doc" - hNewDocument - Kontext "DocumentWriter" - DocumentWriter.TypeKeys "This is a file, for options test: <return> Tools / Options / StarOffice / General -> 'Printing sets 'document modified' status'" - DocumentWriter.TypeKeys "<Return><Return>This file is created by an automated test. It can be trashed after one day!<Return>Today is " + Date - hFileSaveAsKill ( gOfficePath + "user\work\opt.sxw" ) - - printlog "- open tools/option/StarOffice/general and save the state of the checkbox" - printlog "- check it" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - bStatus = DruckenStatus.IsChecked - DruckenStatus.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - printlog "- file/print and click OK at the print-dialog" - FilePrint - - Kontext "Active" - if Active.Exists() then - warnlog( "Unexpected dialog, no default printer found (#108776?)" ) - Active.OK() - else - Kontext "DruckenDlg" - DruckenDlg.OK - Sleep (5) - endif - - printlog "- file/close" - FileClose - Kontext "Active" - if Active.Exists(2) <> TRUE then - Warnlog "No warning, when this options is checked!" - else - Active.Cancel - end if - - printlog "- file/save" - FileSave - - printlog "- uncheck the checkbox" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - DruckenStatus.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - printlog "- file/print" - FilePrint - Kontext "DruckenDlg" - DruckenDlg.OK - Sleep (5) - - printlog "- file/close" - FileClose - Kontext "Active" - if Active.Exists(2) then - Warnlog "The document is modified, a messagebox came up at closing" - Active.Yes - end if - - printlog "- reset this option" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - if bStatus = TRUE then DruckenStatus.Check else DruckenStatus.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - -endcase - -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -testcase func_StarOfficeGeneral_4 - Dim bStatus as Boolean - - gApplication = "WRITER" - - - hNewDocument - printlog "StarOffice / General => 'use StarOffice dialogs'" - if gPlatgroup = "unx" then - printlog "This feature is only available on windows systems" - else - printlog "- open tools/options/staroffice/general and uncheck 'use StarOffice dialogs'" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - bStatus = StarOfficeDialogeBenutzen.IsChecked - StarOfficeDialogeBenutzen.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - printlog "- file/open and check if the file-dialog is a system-dialog" - FileOpen - if ExistsSysDialog ( FilePicker ) = FALSE then - Warnlog "The file-open-dialog is no system dialog" - Kontext "OeffnenDlg" - OeffnenDlg.Cancel - else - CloseSysDialog ( FilePicker ) - end if - - printlog Chr(13) + "check that StarOffice dialogs are used => state of the checkbox is checked" - printlog "- open tools/options/staroffice/general" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - StarOfficeDialogeBenutzen.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - printlog "- open tools/options/staroffice/general and check 'use StarOffice dialogs'" - FileOpen - Kontext "OeffnenDlg" - if OeffnenDlg.Exists (1) <> TRUE then - Warnlog "StarOffice dialogs are not used!" - if ExistsSysDialog ( FilePicker ) then CloseSysDialog ( FilePicker ) - else - OeffnenDlg.Cancel - end if - - printlog Chr(13) + "reset the state of 'use StarOffice dialogs' to default" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - if bStatus = TRUE then StarOfficeDialogeBenutzen.Check else StarOfficeDialogeBenutzen.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - end if - - hCloseDocument - -endcase - - -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -testcase func_StarOfficeMemory_1 - Dim sSave as String - Dim i, ilast as Integer - gApplication = "WRITER" - - - printlog " - save" - printlog " - undo" - printlog " - set number of steps => 1" - - hNewDocument - ToolsOptions - hToolsOptions ( "StarOffice", "Memory" ) - sSave = UndoSteps.GetText - UndoSteps.SetText "1" - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - DocumentWriter.TypeKeys "Hello " - DocumentWriter.TypeKeys "friends " - - EditUndo - try - EditUndo - Warnlog "More than 1 undo was possible!" - catch - endcatch - - printlog " - set number of steps => 15" - ToolsOptions - hToolsOptions ( "StarOffice", "Memory" ) - UndoSteps.SetText "15" - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - for i=1 to 20 - DocumentWriter.TypeKeys "Hello<return>" - next i - Sleep (2) - - for i=1 to 20 - if i<16 then - try - EditUndo - catch - iLast = i-1 - Warnlog "The 15th undo was impossible! The test can do only " + iLast + " undos! => BugID 83891" - endcatch - else - try - EditUndo - Warnlog "More than 15 undo was possible!" - catch - endcatch - end if - next i - - printlog " - set number of steps => 99" - ToolsOptions - hToolsOptions ( "StarOffice", "Memory" ) - UndoSteps.SetText "99" - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - for i=1 to 102 - DocumentWriter.TypeKeys "Hello<return>" - next i - - for i=1 to 102 - if i<100 then - try - EditUndo - catch - iLast = i-1 - Warnlog "The 99th undo was impossible! The test can do only " + iLast + " undos! => BugID 83891" - i=105 - endcatch - else - try - EditUndo - Warnlog "More than 99 undo are possible!" - catch - i=105 - endcatch - end if - next i - - hCloseDocument - - printlog " - reset the number of steps" - ToolsOptions - hToolsOptions ( "StarOffice", "Memory" ) - UndoSteps.SetText sSave - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - -endcase - -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -testcase func_StarOfficeView_1 - Dim bSave as Boolean - Dim iSave as Integer - Dim sSave as String - -hNewDocument - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - printlog " - view" - printlog " - display" - printlog " - scaling" - sSave = FontScale.GetText - FontScale.SetText "50" - FontScale.More - FontScale.Less - printlog " - " + FontScale.GetText - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call DialogTestForViewOptions - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - FontScale.SetText "150" - FontScale.More - FontScale.Less - printlog " - " + FontScale.GetText - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call DialogTestForViewOptions - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - FontScale.SetText(sSave) - FontScale.More - FontScale.Less - printlog " - " + FontScale.GetText - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - hclosedocument -endcase - -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -testcase func_StarOfficeView_2 - Dim iSave as Integer - - printlog " - view" - printlog " - mouse positioning" - - hNewDocument - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - iSave = MousePositioning.GetSelIndex - MousePositioning.Select 1 - printlog " - " + MousePositioning.GetSelText - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - DocumentWriter.MouseMove 1, 1 - - DialogTestForViewOptions - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - MousePositioning.Select 2 - printlog " - " + MousePositioning.GetSelText - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - DocumentWriter.MouseMove 1, 1 - - DialogTestForViewOptions - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - MousePositioning.Select 3 - printlog " - " + MousePositioning.GetSelText - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - DocumentWriter.MouseMove 1, 1 - - DialogTestForViewOptions - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - MousePositioning.Select iSave - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - hCloseDocument -endcase - - diff --git a/testautomation/framework/optional/includes/options_so_5.inc b/testautomation/framework/optional/includes/options_so_5.inc deleted file mode 100755 index 200e37ad47c1..000000000000 --- a/testautomation/framework/optional/includes/options_so_5.inc +++ /dev/null @@ -1,612 +0,0 @@ -'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: options_so_5.inc,v $ -'* -'* $Revision: 1.1 $ -'* -'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:15 $ -'* -'* 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 : general option test -'* -'\****************************************************************************** - - -testcase func_StarOfficeView_3 - - Dim bSave as Boolean - Dim iSave as Integer - Dim xPos, yPos as Integer - - printlog " - view" - printlog " - buttons" - - hNewDocument - - Kontext "DocumentWriter" - xPos = DocumentWriter.getSizeX - yPos = DocumentWriter.getSizeY - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - - iSave = IconScale.getSelIndex() - - printlog " - set buttonsize to 'large'" - IconScale.Select( 3 ) - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - if DocumentWriter.getSizeX = xPos AND DocumentWriter.getSizeY = yPos then - warnlog "Perhaps the buttons are not large!" - endif - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - - printlog " - set buttonsize to 'small'" - IconScale.Select( 2 ) - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - if DocumentWriter.getSizeX <> xPos OR DocumentWriter.getSizeY <> yPos then - warnlog "Perhaps the buttons are not small!" - endif - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - - printlog " - large buttons => default" - if iSave <> 1 then - IconScale.Select( iSave ) - endif - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - hCloseDocument -endcase - -'******************************************************************************* - -testcase func_StarOfficeView_4 - Dim bSave ( 10 ) as Boolean - Dim i as Integer, iCount as Integer - - printlog " - view" - printlog " - options" - - hNewDocument - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - bSave(4) = VorschauInSchriftlisten.IsChecked - bSave(6) = SchriftenHistorie.IsChecked - - printlog " - inactive menu items : => check" - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - DocumentWriter.OpenContextMenu - iCount = hMenuItemGetCount - Sleep (2) - hMenuClose - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - printlog " - inactive menu items : => uncheck" - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "DocumentWriter" - DocumentWriter.OpenContextMenu - if hMenuItemGetCount <> iCount then - Warnlog "The number of entries at the context menu on a writer doc is NOT the same at 'show inactive' is checked or not => BUG!" - end if - Sleep (2) - hMenuClose - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - printlog " - preview in fontlist : => Uncheck" - VorschauInSchriftlisten.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "textobjectbar" - if textobjectbar.exists then - for i=1 to Schriftart.GetItemCount - Schriftart.Select i - next i - else - warnlog "No Textobjectbar?" - endif - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - printlog " - preview in fontlist : => check" - VorschauInSchriftlisten.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "textobjectbar" - for i=1 to Schriftart.GetItemCount - Schriftart.Select i - next i - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - if bSave(4) = TRUE then VorschauInSchriftlisten.Check else VorschauInSchriftlisten.UnCheck - printlog " - font history : => Uncheck" - SchriftenHistorie.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "textobjectbar" - for i=1 to Schriftart.GetItemCount - Schriftart.Select i - next i - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - printlog " - font history : => check" - SchriftenHistorie.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Kontext "textobjectbar" - for i=1 to Schriftart.GetItemCount - Schriftart.Select i - next i - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - if bSave(6) = TRUE then SchriftenHistorie.Check else SchriftenHistorie.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - hCloseDocument - -endcase - -'******************************************************************************* - -testcase func_StarOfficeView_5 - - Dim bSave ( 5 ) as Boolean - Dim i as Integer - - printlog " - view" - printlog " - 3D-view" - - printlog " - use OpenGL => Uncheck" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - bSave (1) = OpenGL.IsChecked - bSave (2) = OptimierteAusgabe.IsChecked - - OpenGL.Uncheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call Make3D - - printlog " - use OpenGL => Check + optimized output => UnCheck" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - OpenGL.Check - OptimierteAusgabe.Uncheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call Make3D - - printlog " - use OpenGL => Check + optimized output => Check" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - OpenGL.Check - OptimierteAusgabe.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call Make3D - - printlog " - use dithering => uncheck" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - if bSave(2) = TRUE then OptimierteAusgabe.Check else OptimierteAusgabe.Check - if bSave(1) = TRUE then OpenGL.Check else OpenGL.UnCheck - bSave (3) = Dithering.IsChecked - Dithering.Uncheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call Make3D - - printlog " - use dithering => Check" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - Dithering.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call Make3D - - printlog " - use OpenGL => UnCheck + Dithering => UnCheck!" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - OpenGL.Uncheck - Dithering.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call Make3D - - printlog " - Object refresh after interaction => check!" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - if bSave(1) = TRUE then OpenGL.check else OpenGL.UnCheck - if bSave(3) = TRUE then Dithering.Check else Dithering.UnCheck - bSave (4) = Volldarstellung.IsChecked - Volldarstellung.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call Make3D - - printlog " - use OpenGL => UnCheck + Object refresh after interaction => check!" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - OpenGL.Uncheck - Volldarstellung.Check - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call Make3D - - printlog " - Object refresh after interaction => UnCheck!" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - if bSave(1) = TRUE then OpenGL.check else OpenGL.UnCheck - Volldarstellung.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - Call Make3D - - printlog " - reset to default" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - if bSave(4) = TRUE then Volldarstellung.check else Volldarstellung.UnCheck - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - gApplication = "WRITER" -endcase - -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -testcase func_StarOfficeView_6 - Dim bSave as Boolean - Dim sSave as String - Dim i as Integer - - if gPlatgroup <> "unx" then - printlog "No test for 'anti aliasing' fonts on windows platforms!" - goto endsub - end if - - printlog "open a new writer-document" - gApplication = "WRITER" - hNewDocument - - printlog " - view" - printlog " - anti aliasing" - - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - - bSave = FontAntiAliasing.IsChecked - FontAntiAliasing.Check - sSave = AAPixel.GetText - - printlog " change pixelsize to 5" - AAPixel.SetText "5" - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - - for i=1 to 8 - Kontext "DocumentWriter" - DocumentWriter.UseMenu - hMenuSelectNr i - Sleep (2) - hMenuClose - next i - - printlog " change pixelsize to 15" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - AAPixel.SetText "15" - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - - for i=1 to 8 - Kontext "DocumentWriter" - DocumentWriter.UseMenu - hMenuSelectNr i - Sleep (2) - hMenuClose - next i - - printlog " change pixelsize to 25" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - AAPixel.SetText "25" - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - - for i=1 to 8 - Kontext "DocumentWriter" - DocumentWriter.UseMenu - hMenuSelectNr i - Sleep (2) - hMenuClose - next i - - printlog " reset all changes to raw data" - ToolsOptions - hToolsOptions ( "StarOffice", "View" ) - AAPixel.SetText sSave - if bSave = TRUE then FontAntiAliasing.Check else FontAntiAliasing.UnCheck - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - - hCloseDocument - -endcase - -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * -testcase func_StarOfficePrint_1 - Dim bSave as Boolean, bSave2 as Boolean - Dim i as Integer - - gApplication = "DRAW" - - printlog " - printer warnings" - - printlog " - Paper size => active" - - ToolsOptions - hToolsOptions ( "StarOffice", "Print" ) - - bSave = PaperSize.IsChecked - PaperSize.Check - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - hNewDocument - FormatSlideDraw - Kontext - Active.Setpage TabSeite - Kontext "TabSeite" - Papierformat.Select 1 ' select the format A0 - TabSeite.OK - - FilePrint - Kontext "DruckenDlg" - if DruckenDlg.Exists then - DruckenDlg.OK - Sleep 5 - Kontext "WarningPrintOptions" - if WarningPrintOptions.Exists(3) then - WarningPrintOptions.Cancel - else - Warnlog "The warning-message for papersize does not turn up!" - end if - else - Kontext "Active" - if Active.Exists then Warnlog Active.GetText - Active.OK - end if - - hCloseDocument - - printlog " - Paper size => disabled" - ToolsOptions - hToolsOptions ( "StarOffice", "Print" ) - - PaperSize.uncheck - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - hNewDocument - FormatSlideDraw - Kontext - Active.Setpage TabSeite - Kontext "TabSeite" - Papierformat.Select 1 ' select the format A0 - TabSeite.OK - - FilePrint - Kontext "DruckenDlg" - if DruckenDlg.Exists then - DruckenDlg.OK - Sleep 5 - Kontext "WarningPrintOptions" - if WarningPrintOptions.Exists(3) then - WarningPrintOptions.Cancel - Printlog "The warning-message for papersize does exist => not realy a BUG" - end if - else - Kontext "Active" - if Active.Exists then Warnlog Active.GetText - Active.OK - end if - - hCloseDocument - - printlog " - Transparency => active" - ToolsOptions - hToolsOptions ( "StarOffice", "Print" ) - - bSave2 = Transparency.IsChecked - PaperSize.Uncheck - Transparency.Check - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - hNewDocument - hRechteckErstellen ( 30, 30, 60, 60 ) - - FormatArea - Kontext - Active.Setpage TabTransparenz - Kontext "TabTransparenz" - LineareTransparenz.Check - TabTransparenz.OK - - FilePrint - Kontext "DruckenDlg" - if DruckenDlg.Exists then - DruckenDlg.OK - Sleep 5 - Kontext "WarningPrintOptions" - if WarningPrintOptions.Exists(3) then - WarningPrintOptions.Cancel - else - Warnlog "The warning-message for papersize does not turn up!" - end if - else - Kontext "Active" - if Active.Exists then Warnlog Active.GetText - Active.OK - end if - - hCloseDocument - - printlog " - Transparency => disabled" - ToolsOptions - hToolsOptions ( "StarOffice", "Print" ) - - Transparency.Uncheck - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - - hNewDocument - hRechteckErstellen ( 30, 30, 60, 60 ) - - FormatArea - Kontext - Active.Setpage TabTransparenz - Kontext "TabTransparenz" - LineareTransparenz.Check - TabTransparenz.OK - - FilePrint - Kontext "DruckenDlg" - if DruckenDlg.Exists then - DruckenDlg.OK - Sleep 5 - Kontext "WarningPrintTransparency" - if WarningPrintTransparency.Exists(3) then - WarningPrintTransparency.Cancel - Warnlog "The warning-message for papersize does exist => BUG!" - end if - else - Kontext "Active" - if Active.Exists then Warnlog Active.GetText - Active.OK - end if - - for i=1 to 100 - FileClose - Sleep 2 - Kontext "Active" - if Active.Exists then - try - Active.OK - Sleep ( 5 ) - catch - Active.No - i=101 - endcatch - end if - next i - - printlog " - reset the printing options" - - ToolsOptions - hToolsOptions ( "StarOffice", "Print" ) - if bSave = TRUE then PaperSize.Check else PaperSize.Uncheck - if bSave2 = TRUE then Transparency.Check else Transparency.Uncheck - - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (2) - -endcase - diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc index 69301789294c..b467a7be3ae1 100755..100644 --- a/testautomation/framework/optional/includes/w_grid_layout1.inc +++ b/testautomation/framework/optional/includes/w_grid_layout1.inc @@ -1,7 +1,7 @@ '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 @@ -41,303 +41,335 @@ private const SOURCE_PATH = "framework\optional\input\CJK\" testcase tTextGridDialog_1 - if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then - Call CheckAsianLanguageSupport("Off") - hNewDocument() - FormatPageWriter - try - Kontext - Active.SetPage TabGrid - Kontext "TabGrid" - TabGrid.Cancel - warnlog "Shouldn't get Tabpage: Grid Text" - catch - Kontext - Active.SetPage TabSeite - Kontext "TabSeite" - TabSeite.Cancel - endcatch - end if - - Call CheckAsianLanguageSupport("On") - - sleep 5 - FormatPageWriter - Kontext - if Active.exists (10) then - try - Kontext - Active.SetPage TabGrid - Kontext "TabGrid" - TabGrid.Cancel - catch - Kontext - Active.SetPage TabSeite - Kontext "TabSeite" - TabSeite.Cancel - warnlog "Couldn't get Tabpage: Grid Text" - endcatch - else - warnlog "FormatPageWriter didn't bring up ndialog" - endif - hCloseDocument() + '/// Check if tabpage 'Text Grid' disappears when "Asian Language support" is NOT checked + if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then + Call CheckAsianLanguageSupport("Off") + hNewDocument() + FormatPageWriter + try + Kontext + Active.SetPage TabGrid + Kontext "TabGrid" + TabGrid.Cancel + warnlog "Shouldn't get Tabpage: Grid Text" + catch + Kontext + Active.SetPage TabSeite + Kontext "TabSeite" + TabSeite.Cancel + endcatch + endif + + '/// Check if tabpage 'Text Grid' appears when "Asian Language support" is checked + Call CheckAsianLanguageSupport("On") + + sleep 5 + FormatPageWriter + Kontext + if Active.exists (10) then + try + Kontext + Active.SetPage TabGrid + Kontext "TabGrid" + TabGrid.Cancel + catch + Kontext + Active.SetPage TabSeite + Kontext "TabSeite" + TabSeite.Cancel + warnlog "Couldn't get Tabpage: Grid Text" + endcatch + else + warnlog "FormatPageWriter didn't bring up ndialog" + endif + hCloseDocument() endcase '------------------------------------------------------------------------- testcase tTextGridDialog_2 - Dim testFile , sCorrectResult as String + '/// No grid is active, no changes to existing version + Dim testFile , sCorrectResult as String - testFile = "gridtest.sxw" - sCorrectResult = "1" + testFile = "gridtest.sxw" + sCorrectResult = "1" - Call hNewDocument + Call hNewDocument + + '/// open a test file , and check No Grid checkbox + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + sMakeReadOnlyDocumentEditable - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable - FormatPageWriter Kontext if active.exists(5) then Active.SetPage TabGrid endif - Kontext "TabGrid" - NoGrid.Check - Sleep 1 + Kontext "TabGrid" + NoGrid.Check + Sleep 1 TabGrid.OK Sleep 1 + '/// Active navigator dialogue , set page to '2' and wait for a while Kontext ViewNavigator - Kontext "NavigatorWriter" + Kontext "NavigatorWriter" - Seitennummer.SetText "2" - Sleep 5 - fCloseNavigator + Seitennummer.SetText "2" + Sleep 5 + hCloseNavigator + '/// In No Grid mode, there should be only 1 page, the focus is before the first line Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "<End>" Sleep 1 Call DocumentWriter.TypeKeys "<Shift Left>" - Editcopy + hUseAsyncSlot( "EditCopy" ) if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing NoGrid option!" - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tTextGridDialog_3 - Dim testFile , sCorrectResult , sLinesPerPage as String + '/// Grid (lines only): The page is set up with a defined number of lines + Dim testFile , sCorrectResult , sLinesPerPage as String - testFile = "gridtest.sxw" - sCorrectResult = "G" - sLinesPerPage = "10" + testFile = "gridtest.sxw" + sCorrectResult = "G" + sLinesPerPage = "10" - Call hNewDocument + Call hNewDocument - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable + '/// open a test file and check Grid(lines onle) checkbox , + '/// + set 10 line/page + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + sMakeReadOnlyDocumentEditable FormatPageWriter Kontext if active.exists(5) then Active.SetPage TabGrid endif - Kontext "TabGrid" - LinesGrid.Check - LinesPerPage.SetText sLinesPerPage - Sleep 1 + Kontext "TabGrid" + LinesGrid.Check + LinesPerPage.SetText sLinesPerPage + Sleep 1 TabGrid.OK Sleep 1 + '/// Active navigator dialogue , set page to '2' and wait for a while Kontext ViewNavigator - Kontext "NavigatorWriter" + Kontext "NavigatorWriter" - Seitennummer.SetText "2" - Sleep 5 - fCloseNavigator + Seitennummer.SetText "2" + Sleep 5 + hCloseNavigator Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "<End>" Sleep 1 Call DocumentWriter.TypeKeys "<Shift Left>" - Editcopy + hUseAsyncSlot( "EditCopy" ) if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines only) option!" - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tTextGridDialog_4 - Dim testFile , sCorrectResult as String - Dim sLinesPerPage , sCharsPerLine as String + '/// Grid (lines and characters): The page is set up with a defined number of lines and a defined number of characters in each line + Dim testFile , sCorrectResult as String + Dim sLinesPerPage , sCharsPerLine as String - testFile = "gridtest.sxw" - sCorrectResult = "E" - sLinesPerPage = "10" - sCharsPerLine = "9" + testFile = "gridtest.sxw" + sCorrectResult = "E" + sLinesPerPage = "10" + sCharsPerLine = "9" - Call hNewDocument + Call hNewDocument - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable + '/// open a test file and check Grid(lines and characters) checkbox + '/// + set 10 line/page and 9 characters/line + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + sMakeReadOnlyDocumentEditable FormatPageWriter Kontext if active.exists(5) then Active.SetPage TabGrid endif - Kontext "TabGrid" - CharsGrid.Check - LinesPerPage.SetText sLinesPerPage - CharsPerLine.SetText sCharsPerLine - Sleep 1 + Kontext "TabGrid" + CharsGrid.Check + LinesPerPage.SetText sLinesPerPage + CharsPerLine.SetText sCharsPerLine + Sleep 1 TabGrid.OK Sleep 1 + '/// Active navigator dialogue , set page to '2' and wait for a while Kontext ViewNavigator - Kontext "NavigatorWriter" + Kontext "NavigatorWriter" - Seitennummer.SetText "2" - Sleep 5 - fCloseNavigator + Seitennummer.SetText "2" + Sleep 5 + hCloseNavigator Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "<End>" Sleep 1 Call DocumentWriter.TypeKeys "<Shift Left>" - Editcopy + hUseAsyncSlot( "EditCopy" ) if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines and characters) option!" - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tGridDisplay_1 - Call hNewDocument + '/// Print grid: The grid lines will be printed. Inactive if "Display grid" is inactive. + Call hNewDocument + '/// format / page / tabpage Text grid + '/// + check "display grid" and check "print grid" FormatPageWriter Kontext if active.exists(5) then Active.SetPage TabGrid endif - Kontext "TabGrid" - CharsGrid.Check - Display.Check - Sleep 1 - PrintGrid.Check - Sleep 1 + Kontext "TabGrid" + CharsGrid.Check + Display.Check + Sleep 1 + PrintGrid.Check + Sleep 1 TabGrid.OK Sleep 1 + '/// Print to printer FilePrint Kontext "Active" - if Active.Exists(5) then - if Active.GetRT = 304 then - Active.Ok - QAErrorLog "No Default-Printer!" - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.Cancel - end if + if ( Active.Exists( 5 ) ) then + if Active.GetRT() = 304 then + Active.Ok() + QAErrorLog "No Default-Printer!" + Kontext "Printing" + if ( Printing.exists( 1 )) then + Printing.Cancel + endif + endif else - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.OK - Sleep 5 - kontext - if active.exists(5) then - qaErrorLog active.getText - active.ok - end if - end if + Kontext "Printing" + if ( Printing.exists( 2 )) then + printing.cancel() + Printing.notExists( 5 ) + endif + kontext "Active" + if active.exists(5) then + qaErrorLog active.getText() + active.ok() + endif + endif + + '/// format / page / tabpage Text grid + '/// + check "display grid" and uncheck "print grid" FormatPageWriter Kontext if active.exists(5) then Active.SetPage TabGrid endif - Kontext "TabGrid" - CharsGrid.Check - Display.Check - Sleep 1 - PrintGrid.UnCheck - Sleep 1 + Kontext "TabGrid" + CharsGrid.Check + Display.Check + Sleep 1 + PrintGrid.UnCheck + Sleep 1 TabGrid.OK Sleep 1 + '/// Print to printer FilePrint Kontext "Active" - if Active.Exists(5) then - if Active.GetRT = 304 then - Active.Ok - QAErrorLog "No Default-Printer!" - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.Cancel - end if + if ( Active.Exists( 5 ) )then + if Active.GetRT() = 304 then + Active.Ok() + QAErrorLog "No Default-Printer!" + Kontext "Printing" + if ( Printing.exists( 1 )) then + Printing.Cancel() + endif + endif else - Kontext "DruckenDlg" - Sleep 1 - DruckenDlg.OK - Sleep 5 - kontext - if active.exists(5) then - qaErrorLog active.getText - active.ok - end if - end if - - Call hCloseDocument + Kontext "Printing" + if( Printing.exists( 1 )) then + printing.cancel() + Printing.notExists( 5 ) + endif + kontext + if ( active.exists( 2 ) ) then + qaErrorLog active.getText + active.ok + endif + endif + + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tUserDefineLayout_1 - Dim sLinesPerPage , sCharsPerLine as String - Dim sExpectLinesPerPage , sExpectLinesPerPage1 as String + '/// Decrease characters per line will cause lines per page decrease accordingly + Dim sLinesPerPage , sCharsPerLine as String + Dim sExpectLinesPerPage , sExpectLinesPerPage1 as String - sLinesPerPage = "20" - sCharsPerLine = "2" - sExpectLinesPerPage = "2" - sExpectLinesPerPage1 = "3" + sLinesPerPage = "20" + sCharsPerLine = "2" + sExpectLinesPerPage = "2" + sExpectLinesPerPage1 = "3" - Call hNewDocument + Call hNewDocument - FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid - endif - Kontext "TabGrid" - CharsGrid.Check + '/// Format/page , set lines per page to 20, and set charsets per line to 2 + '/// + wait for a moment , then check the the number of lines per page. + 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 + '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 + Warnlog( "#i106381# - LInes per page changed" ) + printlog( "The lines per page should be" + sExpectLinesPerPage & " OR " & sExpectLinesPerPage1 & " but get " &LinesPerPage.GetText ) + endif - TabGrid.Cancel + TabGrid.Cancel - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tFontSizeChanges_1 + + '/// Change the font size to bigger enough will change the layout Dim testFile , sCorrectResult as String Dim sLinesPerPage , sCharsPerLine as String dim sTemp as string @@ -353,30 +385,30 @@ testcase tFontSizeChanges_1 Call DocumentWriter.TypeKeys "<Shift Right>" Kontext "FormatObjectbar" - Schriftgroesse.Select "60" - Schriftgroesse.TypeKeys "<Return>" - Sleep 1 + Schriftgroesse.Select "60" + Schriftgroesse.TypeKeys "<Return>" + Sleep 1 Kontext "DocumentWriter" FormatPageWriter - Kontext - if active.exists(5) then - Active.SetPage TabGrid + Kontext + if active.exists(5) then + Active.SetPage TabGrid + endif + Kontext "TabGrid" + if TabGrid.exists(5) then + sTemp = LinesPerPage.GetText + if sTemp <> sLinesPerPage then + Warnlog "The lines per page should be: '" & sLinesPerPage & "'; but get: '" & sTemp & "'" endif - Kontext "TabGrid" - if TabGrid.exists(5) then - sTemp = LinesPerPage.GetText - if sTemp <> sLinesPerPage then - Warnlog "The lines per page should be: '" + sLinesPerPage + "'; but get: '" + sTemp + "'" - endif - sTemp = CharsPerLine.GetText - if sTemp <> sCharsPerLine then - Warnlog "The chars per line should be: '" + sCharsPerLine + "'; but get: '" +sTemp + "'" - endif - TabGrid.Cancel - else - warnlog "TabGrid is not available." + sTemp = CharsPerLine.GetText + if sTemp <> sCharsPerLine then + Warnlog "The chars per line should be: '" & sCharsPerLine & "'; but get: '" &sTemp & "'" endif + TabGrid.Cancel + else + warnlog "TabGrid is not available." + endif Kontext ViewNavigator @@ -387,16 +419,16 @@ testcase tFontSizeChanges_1 else warnlog "Navigator not available" endif - fCloseNavigator + hCloseNavigator Kontext "DocumentWriter" sleep 3 Call DocumentWriter.TypeKeys "<Shift Right>" - sleep 3 - Editcopy + + hUseAsyncSlot( "EditCopy" ) sTemp = GetClipboardText - if sTemp <> sCorrectResult then - Warnlog "Don't get the expected result , hope to be: '" + sCorrectResult + "'; but get: '" + sTemp + "'" + if sTemp <> sCorrectResult then + Warnlog "Don't get the expected result , hope to be: '" & sCorrectResult & "'; but get: '" & sTemp & "'" endif Call hCloseDocument @@ -405,26 +437,28 @@ endcase '------------------------------------------------------------------------- testcase tRubyText_1 - Dim testFile , sRubyText as String + '/// If Ruby Text is applied and longer than its Base Text it will stretch over more grid cells than the base text itself. + Dim testFile , sRubyText as String - testFile = "rubytest.sxw" - sRubyText = "Ruby Test Text ....................." + testFile = "rubytest.sxw" + sRubyText = "Ruby Test Text ....................." - Call hNewDocument + Call hNewDocument - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + '/// open a test file , and insert long ruby test text + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) sMakeReadOnlyDocumentEditable - Kontext "DocumentWriter" - Call DocumentWriter.TypeKeys "<Shift Right>" - Sleep 1 + Kontext "DocumentWriter" + Call DocumentWriter.TypeKeys "<Shift Right>" + Sleep 1 FormatRuby Kontext "RubyDialog" - Sleep 3 - RubyText1.setText sRubyText - Sleep 2 - RubyDialog.OK - Sleep 2 + Sleep 3 + RubyText1.setText sRubyText + Sleep 2 + RubyDialog.OK + Sleep 2 DialogClose.Click Sleep 1 @@ -434,42 +468,46 @@ testcase tRubyText_1 Call DocumentWriter.TypeKeys "<End>" Sleep 2 Call DocumentWriter.TypeKeys "<Shift Left>" - Editcopy + hUseAsyncSlot( "EditCopy" ) if NOT(GetClipboardText = "5" OR GetClipboardText = "6") then - Warnlog "Don't get the correct result after inserting ruby text! Get " + GetClipboardText - end if + Warnlog "Don't get the correct result after inserting ruby text! Get " & GetClipboardText + endif - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tIndentsTest_1 - Dim testFile , sCorrectPage1 , sCorrectPage2 as String + '/// 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. + Dim testFile , sCorrectPage1 , sCorrectPage2 as String - testFile = "IndentsTest.sxw" - sCorrectPage1 = "1" - sCorrectPage2 = "2" + testFile = "IndentsTest.sxw" + sCorrectPage1 = "1" + sCorrectPage2 = "2" - Call hNewDocument + Call hNewDocument - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + '/// open a test file , and press TAB in second line + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) sMakeReadOnlyDocumentEditable - Kontext "DocumentWriter" - Call DocumentWriter.TypeKeys "<Down>" - Sleep 1 - Call DocumentWriter.TypeKeys "<Tab>" - Sleep 1 - Call DocumentWriter.TypeKeys "<End>" - Sleep 1 + Kontext "DocumentWriter" + Call DocumentWriter.TypeKeys "<Down>" + Sleep 1 + Call DocumentWriter.TypeKeys "<Tab>" + Sleep 1 + Call DocumentWriter.TypeKeys "<End>" + Sleep 1 + '/// Active navigator dialogue , check if the page number is 1 Kontext ViewNavigator - Kontext "NavigatorWriter" - if Seitennummer.GetText <> sCorrectPage1 then Warnlog "First test :Something wrong in indents test!" - fCloseNavigator + Kontext "NavigatorWriter" + if Seitennummer.GetText <> sCorrectPage1 then Warnlog "First test :Something wrong in indents test!" + hCloseNavigator + '/// press TAB in second line again Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "<Home>" Sleep 1 @@ -478,61 +516,67 @@ testcase tIndentsTest_1 Call DocumentWriter.TypeKeys "<End>" Sleep 1 + '/// Active navigator dialogue , check if the page number is 2 Kontext ViewNavigator - Kontext "NavigatorWriter" - if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Second test :Something wrong in indents test!" - fCloseNavigator + Kontext "NavigatorWriter" + if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Second test :Something wrong in indents test!" + hCloseNavigator - Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------- testcase tObjectsTest_1 - Dim testFile , sCorrectPage1 , sCorrectPage2 as String + '/// 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). + Dim testFile , sCorrectPage1 , sCorrectPage2 as String - testFile = "objectsTest.sxw" - sCorrectPage1 = "1" - sCorrectPage2 = "2" + testFile = "objectsTest.sxw" + sCorrectPage1 = "1" + sCorrectPage2 = "2" - Call hNewDocument + Call hNewDocument - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + '/// open a test file , and press TAB in second line + Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) + '/// If object is anchored as Character , check if it will snap to the appropriate grid cell fStartupNavigator( "OLEObject" , 1 ) Sleep 1 Auswahlliste.TypeKeys "<Return>" Sleep 1 - fCloseNavigator - Sleep 2 + hCloseNavigator Kontext FormatAnchorAsCharacter - Sleep 1 + WaitSlot() + ViewNavigator - Kontext "NavigatorWriter" - Seitennummer.SetText sCorrectPage2 - Sleep 5 - if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!" - fCloseNavigator + Kontext "NavigatorWriter" + Seitennummer.SetText sCorrectPage2 + Sleep 5 + if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!" + hCloseNavigator + '/// If object is anchored to Character , check if it will NOT snap to the appropriate grid cell fStartupNavigator( "OLEObject" , 1 ) Auswahlliste.TypeKeys "<Return>" - fCloseNavigator + hCloseNavigator 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 + Kontext "NavigatorWriter" + Seitennummer.SetText sCorrectPage2 + Sleep 5 + if Seitennummer.GetText <> sCorrectPage1 then Warnlog "Something wrong when object is anchored to Character!" + hCloseNavigator + Kontext + + Call hCloseDocument endcase 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/help_browser.inc b/testautomation/framework/required/includes/help_browser.inc index 2b4ee6270fda..86ed8f3d81ba 100755 --- a/testautomation/framework/required/includes/help_browser.inc +++ b/testautomation/framework/required/includes/help_browser.inc @@ -41,9 +41,7 @@ testcase tHelp_DialogTest printlog( "Resource test for the Help Browser" ) - Dim i as Integer dim brc as boolean - printlog "- open the help" brc = hOpenHelp() if ( not brc ) then @@ -56,6 +54,11 @@ testcase tHelp_DialogTest goto endsub endif + hSelectHelpTab( "content" ) + hSelectHelpTab( "index" ) + hSelectHelpTab( "find" ) + hSelectHelpTab( "bookmarks" ) + brc = hSelectHelpTab( "content" ) call DialogTest( ContentPage ) @@ -78,8 +81,10 @@ endcase testcase tHelp_ToolBar - Dim i as Integer + printlog( "Resource test for the help toolbar" ) + dim brc as boolean + dim iExitCounter as integer : iExitCounter = 0 brc = hOpenHelp() if ( not brc ) then @@ -104,9 +109,13 @@ testcase tHelp_ToolBar ' Backward- and Forward-button printlog "- activate 'Index'-page" brc = hSelectHelpTab( "index" ) - sleep( 2 ) + + do while( SearchIndex.getItemCount() < 100 ) + iExitCounter = iExitCounter + 1 : if ( iExitCounter = 20 ) then exit do + wait( 100 ) + loop - SearchIndex.Select 4 + SearchIndex.Select( 4 ) DisplayIndex.Click() waitslot @@ -126,37 +135,25 @@ testcase tHelp_ToolBar PrintButton.Click() kontext "active" - - if Active.Exists ( 1 ) then - - if Active.getRT() = 304 then - qaerrorlog "- Printing failed: Did you define a default printer?" - Active.OK() - - Kontext "DruckenDlg" - if ( druckenDlg.exists() ) then - printlog( "Printer dialog is still open, closing with cancel" ) - druckenDlg. cancel() - endif - - endif - + if ( Active.Exists ( 1 ) ) then + qaerrorlog( "Unexpected messagebox: " & Active.getText() ) + qaerrorlog( "Probably missing default printer on this system, fix it!" ) + Active.OK() + endif + + kontext "Printing" + if ( Printing.exists( 2 ) ) then + printlog( "Print dialog open, good." ) + Printing.cancel() else - kontext "druckendlg" - if DruckenDlg.NotExists (2) then - warnlog "No print-dialog is open. => direct printing? - bug 93788!" - else - DruckenDlg.Cancel() - endif - + warnlog( "Print dialog not open" ) endif - printlog "- Set Bookmark" - kontext "tb_help" + printlog "- Set Bookmark" SetBookmarks.Click() - kontext "addbookmark" + kontext "AddBookmark" call DialogTest ( AddBookmark ) AddBookmark.Cancel() 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/framework/tools/includes/CJK_tools.inc b/testautomation/framework/tools/includes/CJK_tools.inc index e877bbb2b3c5..7c6eec5b9896 100755 --- a/testautomation/framework/tools/includes/CJK_tools.inc +++ b/testautomation/framework/tools/includes/CJK_tools.inc @@ -37,10 +37,6 @@ '* '\*********************************************************************** - -'****************************************************************************** -' This function will check Asina Language Support on/off based on the parameter -'****************************************************************************** function CheckAsianLanguageSupport( sSupport as String ) as String ToolsOptions @@ -67,11 +63,8 @@ function CheckAsianLanguageSupport( sSupport as String ) as String end function +'******************************************************************************' - -'*************************************************************** -' Start up Navigator , and set focus to the correct position -'************************************************************** function fStartupNavigator(navigatorItem as String , subItemNum as Integer) Dim j as Integer @@ -117,28 +110,8 @@ function fStartupNavigator(navigatorItem as String , subItemNum as Integer) sleep 1 end function +'******************************************************************************' -'****************** -'Close Navigator -'****************** -function fCloseNavigator - '/// This function will close Navigator dialogure - - Kontext - Kontext "Navigator" - if ( Navigator.exists() ) then - Navigator.Close() - printlog( "Closed navigator" ) - else - printlog( "Navigator not open." ) - endif - -end function - - -'**************************************************************************** -' This routine will return the Country name based on CountryID -'***************************************************************************** function fGetCountryName( CountryID as Integer ) as String select case iSprache diff --git a/testautomation/framework/tools/includes/customize_tools.inc b/testautomation/framework/tools/includes/customize_tools.inc index 8c0cbf80f1c9..a8fd0b3dba99 100755 --- a/testautomation/framework/tools/includes/customize_tools.inc +++ b/testautomation/framework/tools/includes/customize_tools.inc @@ -114,9 +114,6 @@ function hToolsCustomizeSelectTab( cTab as string ) as boolean '///+<li>Switch to one of the four available tabpages</li> '///<ol> kontext - active.setPage - - kontext try @@ -193,8 +190,7 @@ function hToolsCustomizeClose( iMode as integer ) as boolean '///<ul> const CFN = "hToolsCustomizeClose::" - dim brc as boolean - brc = true + dim brc as boolean : brc = true kontext @@ -213,8 +209,11 @@ function hToolsCustomizeClose( iMode as integer ) as boolean end select '///</ol> + + '///+<li>Verify that the dialog has indeed been closed</li> kontext "TabCustomizeEvents" + TabCustomizeEvents.notExists( 3 ) if ( TabCustomizeEvents.exists() ) then brc = false endif diff --git a/testautomation/framework/tools/includes/fileoperations.inc b/testautomation/framework/tools/includes/fileoperations.inc index d4abf557afe8..16f57f5cce6a 100755 --- a/testautomation/framework/tools/includes/fileoperations.inc +++ b/testautomation/framework/tools/includes/fileoperations.inc @@ -872,6 +872,8 @@ function hFindFileObjectViaFileOpen( cName as string ) as integer dim iPathItems as integer dim asPathList( 100 ) as string + dim iWait as integer ' some increment variable + printlog( CFN & "Enter with option (File): " & cName ) '///+<li>If a fully qualified path has been provided we have to split it up</li> @@ -899,6 +901,21 @@ function hFindFileObjectViaFileOpen( cName as string ) as integer '///+<li>get the number of items in the filepicker</li> kontext "OeffnenDlg" + iWait = 0 + while ( DateiAuswahl.getItemCount() = 0 ) + wait( 100 ) + iWait = iWait + 1 + if ( iWait = 10 ) then + warnlog( "Filepicker is not populated within reasonable timeframe, aborting" ) + kontext "OeffnenDlg" + OeffnenDlg.Close() + hFindFileObjectViaFileOpen() = 0 + exit function + else + printlog( "Waiting for filepicker list to populate..." ) + endif + wend + iFileOpenItemCount = DateiAuswahl.getItemCount() '///+<li>Jump to the first item in the filelist and select it with SPACE</li> diff --git a/testautomation/framework/tools/includes/help_tools.inc b/testautomation/framework/tools/includes/help_tools.inc index 438c01d7ef7e..18e1691a1a43 100755 --- a/testautomation/framework/tools/includes/help_tools.inc +++ b/testautomation/framework/tools/includes/help_tools.inc @@ -199,18 +199,22 @@ function hSelectHelpTab( cTab as string ) as boolean select case cTabName case "content" : TabControl.setPage( ContentPage ) if ( SearchContent.isVisible() ) then + call DialogTest( ContentPage ) brc = true endif case "index" : TabControl.setPage( IndexPage ) if ( SearchIndex.isVisible() ) then + call DialogTest( IndexPage ) brc = true endif case "find" : TabControl.setPage( FindPage ) if ( SearchFind.isVisible() ) then + call DialogTest( FindPage ) brc = true endif case "bookmarks" : TabControl.setPage( BookmarksPage ) if ( Bookmarks.isVisible() ) then + call DialogTest( BookmarksPage ) brc = true endif case else 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/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc new file mode 100755 index 000000000000..b46a096c4364 --- /dev/null +++ b/testautomation/global/required/includes/g_printing.inc @@ -0,0 +1,524 @@ +'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: basic_delete_modules.inc,v $ +'* +'* $Revision: 1.1 $ +'* +'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:13 $ +'* +'* 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 : joerg.skottke@sun.com +'* +'* short description : Resource test for the printing dialog +'* +'\****************************************************************************** + +private const MSG1 = "Incorrect default setting: " + +'******************************************************************************* + +sub g_printing() + + call tPrintCommon() + call tPrintGeneral() + call tPrintApplication() + call tPrintLayout() + call tPrintOptions() + +end sub + +'******************************************************************************* + +testcase tPrintCommon() + + printlog( "Common print options (main dialog)" ) + + printlog( "Open new document" ) + hCreateDocument() + + printlog( "Open printing dialog" ) + FilePrint + + kontext "Printing" + if ( Printing.exists( 2 ) ) then + + call DialogTest( Printing ) + + if ( PreviewPageNumber.isEnabled() ) then + warnlog( "Page number should be disabled for empty document" ) + endif + + if ( ScrollBackward.isEnabled() ) then + warnlog( "Scroll backward button should be disabled for empty document" ) + endif + + if ( ScrollForward.isEnabled() ) then + warnlog( "Scroll forward button should be disabled for empty document" ) + endif + + kontext "Printing" + printlog( "Close print dialog") + Printing.cancel() + + else + warnlog( "Printing dialog did not open" ) + endif + + printlog( "Close document" ) + hDestroyDocument() + +endcase + +'******************************************************************************* + +testcase tPrintGeneral() + + printlog( "General printing options - General tabpage" ) + + dim iSlidesPerPage as integer + dim iExpected as integer + + printlog( "Open new document" ) + hCreateDocument() + + printlog( "Open printing dialog" ) + FilePrint + + kontext "Printing" + if ( Printing.exists( 2 ) ) then + + PrintingTabControl.setPage( TabPrintGeneral ) + + kontext "TabPrintGeneral" + call DialogTest( TabPrintGeneral ) + + printlog( "PrinterList" ) + if ( NOT PrinterList.isEnabled() ) then + warnlog( "Printer List is disabled" ) + endif + + printlog( "Number of copies/Collate" ) + if ( NumberOfCopies.getText <> "1" ) then + warnlog( "Number of copies should be 1 by default, is " & NumberOfCopies.getText() ) + endif + + if ( Collate.isEnabled() ) then + warnlog( "<Collate> should not be enabled for just one copy" ) + endif + + NumberOfCopies.setText( "2" ) + + if ( Collate.isEnabled() ) then + cb_test( Collate, true, "" ) + else + warnlog( "Collate should be enabled if number of copies <> 1" ) + endif + + NumberOfCopies.setText( "1" ) + + if ( Collate.isEnabled() ) then + warnlog( "<Collate> should not be enabled for just one copy" ) + endif + + printlog( "Properties/Details" ) + Details.click() ' open + Details.click() ' close + + if ( gPlatGroup = "unx" and lcase( gPlatform ) <> "osx" ) then + Properties.click() + kontext "TabSPAPaper" + if ( TabSPAPaper.exists( 2 ) ) then + TabSPAPaper.close() + else + warnlog( "Printer properties did not open." ) + endif + else + printlog( "Skipping printer properties on Windows and MacOS X (no SPAdmin)" ) + endif + + kontext "TabPrintGeneral" + printlog( "General settings on the Tab-Page" ) + + select case( gApplication ) + case "WRITER", "HTML", "MASTERDOCUMENT" + + lb_test( PrintNotes, 4, 1, "" ) + + if ( NOT AllPages.isChecked() ) then + warnlog( MSG1 & "<All pages> should be checked" ) + endif + + if ( Pages.isEnabled() ) then + Pages.check() + PageRange.setText( "1-5,7" ) + else + warnlog( "Pages setting disabled" ) + endif + + 'Selection.check() + 'AllPages.check() + + case "CALC" + + printlog( "Print ranges" ) + if ( NOT SelectedSheets.isChecked() ) then + warnlog( MSG1 & "<Selected sheets> should be selected" ) + endif + + AllSheets.check() + SelectedSheets.check() + SelectedCells.check() + + if ( NOT PrintAllPages.isChecked() ) then + warnlog( MSG1 & "<Thereof print all pages> should be selected" ) + endif + + PrintPages.check() + PageRange.setText( "1-5,8" ) + PrintAllPages.check() + + case "IMPRESS", "DRAW" + + printlog( "Print ranges" ) + if ( NOT AllSlides.isChecked() ) then + warnlog( MSG1 & "<All slides> should be selected" ) + endif + + Slides.check() + PageRange.setText( "1-6,9" ) + + Selection.check() + + + if ( gApplication = "IMPRESS" ) then + + printlog( "General print options/layout (IMPRESS only)" ) + + lb_test( PartsToPrint, 4, 1, "" ) + + if ( SlidesPerPage.isEnabled() ) then + warnlog( "<Slides per page> should only be enabled for Handouts" ) + endif + + if ( ArrangeSlides.isEnabled() ) then + warnlog( "<Ararange slides> should only be enabled for Handouts" ) + endif + + PartsToPrint.select( 2 ) ' Should be "Handouts" to enable further controls + + if ( NOT SlidesPerPage.isEnabled() ) then + warnlog( "<Slides per Page> should be enabled for Handouts" ) + endif + + if ( NOT ArrangeSlides.isEnabled() ) then + warnlog( "<Arrange slides> should be enabled for Handouts" ) + endif + + lb_test( SlidesPerPage, 6, 0, "" ) + lb_test( ArrangeSlides, 2, 1, "" ) + + endif + + + case "MATH" + + printlog( "Math does not have any special options on this tabpage" ) + + case default + warnlog( "Invalid gApplication: " & gApplication ) + end select + + kontext "Printing" + printlog( "Close print dialog" ) + Printing.cancel() + + else + warnlog( "Printing dialog did not open" ) + endif + + printlog( "Close document" ) + hDestroyDocument() + +endcase + +'******************************************************************************* + +testcase tPrintApplication() + + printlog( "Application specific printing options - Application tabpage" ) + + printlog( "Open new document" ) + hCreateDocument() + + printlog( "Open printing dialog" ) + FilePrint + + kontext "Printing" + if ( Printing.exists( 2 ) ) then + + PrintingTabControl.setPage( TabApplication ) + + kontext "TabApplication" + call DialogTest( TabApplication ) + + printlog( "Check defaults, modify and reset controls" ) + select case( gApplication ) + case "WRITER", "HTML", "MASTERDOCUMENT" + + cb_test( PrintPageBackground, true, "" ) + 'cb_test( PrintGraphicsAndDiagrams, true, "" ) + cb_test( PrintPicturesAndObjects, true, "" ) + cb_test( PrintTextInBlack, false, "" ) + cb_test( PrintBlankPages, true, "" ) + + if ( gApplication <> "HTML" ) then + cb_test( PrintHiddenText, false, "" ) + cb_test( PrintTextPlaceholder, false, "" ) + endif + + case "CALC" + + cb_test( IncludeEmptyPages, false, "" ) + + case "IMPRESS", "DRAW" + + cb_test( SlideName, false, "" ) + cb_test( DateAndTime, false, "" ) + if ( gApplication = "IMPRESS" ) then + cb_test( HiddenPages, false, "" ) + endif + + printlog( "Color options" ) + if ( NOT OriginalColors.isChecked() ) then + warnlog( MSG1 & "<Original colors> should be checked" ) + endif + + GrayScale.check() + BlackAndWhite.check() + + printlog( "Scaling options" ) + if ( NOT OriginalSize.isChecked() ) then + warnlog( MSG1 & "<Original size> should be checked" ) + endif + + FitToPage.check() + MultiplePages.check() + TilePaper.check() + + case "MATH" + + cb_test( TitleRow, true, "" ) + cb_test( FormulaText, true, "" ) + cb_test( Borders, true, "" ) + + if ( NOT OriginalSizeMath.isChecked() ) then + warnlog( MSG1 & "<Original size> should be selected" ) + endif + + FitToPageMath.check() + Scaling.check() + ScalingFactor.setText( "1000" ) + + case default + + warnlog( "Invalid gApplication: " & gApplication ) + + end select + + kontext "Printing" + printlog( "Close print dialog" ) + Printing.cancel() + + else + warnlog( "Printing dialog did not open" ) + endif + + printlog( "Close document" ) + hDestroyDocument() + +endcase + +'******************************************************************************* + +testcase tPrintLayout() + + printlog( "Layout printing options - Layout tabpage" ) + + printlog( "Open new document" ) + hCreateDocument() + + printlog( "Open printing dialog" ) + FilePrint + + kontext "Printing" + if ( Printing.exists( 2 ) ) then + + ' Math does not have a layout page as it does not have any layout options + if ( gApplication <> "MATH" ) then + + PrintingTabControl.setPage( TabLayout ) + + kontext "TabLayout" + call DialogTest( TabLayout ) + + printlog( "Controls common for (almost) all applications" ) + if ( gApplication <> "CALC" ) then + if ( NOT PagesPerSheet.isChecked()) then + warnlog( MSG1 & "<Pages per sheet> should be selected" ) + endif + + lb_test( NumberOfPages, 7, 1, "" ) + NumberOfPages.select( 7 ) + + if ( NumberOfColumns.getText() <> "1" ) then + warnlog( MSG1 & "<Pages> has incorrect default: " & NumberOfColumns.getText() ) + endif + + if ( NumberOfRows.getText() <> "1" ) then + warnlog( MSG1 & "<by> has incorrect default: " & NumberOfRows.getText() ) + endif + + NumberOfColumns.typeKeys( "<UP>" ) + NumberOfRows.typeKeys( "<UP>" ) + DistanceBetweenPages.typeKeys( "<UP>" ) + MarginToSheetBorder.typeKeys( "<UP>" ) + + lb_test( PaperOrientation, 3, 1, "" ) + else + if ( PagesPerSheet.isVisible() ) then + warnlog( "<Pages per Sheet> should not be visible for spreadsheet documents" ) + endif + endif + + lb_test( PrintOrder, 2, 1, "" ) + cb_test( BorderAroundPages, false, "" ) + + select case( gApplication ) + case "WRITER", "HTML", "MASTERDOCUMENT" + + 'if ( NOT PrintBrochureRTL.isEnabled() ) then + ' warnlog( "<Brochure> listbox should be enabled" ) + 'endif + + Brochure.check() + + 'lb_test( PrintBrochureRTL, 2, 1, "#i105265#" ) + + case "CALC" + + printlog( "Calc does not have any options in this section" ) + + case "IMPRESS", "DRAW" + + if ( BrochurePageSides.isEnabled() ) then + warnlog( "<Page sides> listbox should be disabled" ) + endif + Brochure.check() + lb_test( BrochurePageSides, 3, 1, "" ) + + case default + + warnlog( "Invalid gApplication: " & gApplication ) + + end select + + else ' What we do if gApplication = MATH + try + PrintingTabControl.setPage( TabLayout ) + warnlog( "Math should not have a layout page as no layout options exist" ) + catch + printlog( "Math has no layout page. Good." ) + endcatch + endif + + kontext "Printing" + printlog( "Close print dialog" ) + Printing.cancel() + + else + warnlog( "Printing dialog did not open" ) + endif + + printlog( "Close document" ) + hDestroyDocument() + +endcase + +'******************************************************************************* + +testcase tPrintOptions() + + printlog( "Extended printing options - Options tabpage" ) + + printlog( "Open new document" ) + hCreateDocument() + + printlog( "Open printing dialog" ) + FilePrint + + kontext "Printing" + if ( Printing.exists( 2 ) ) then + + PrintingTabControl.setPage( TabOptions ) + + kontext "TabOptions" + call DialogTest( TabOptions ) + + printlog( "Controls common for all applications" ) + cb_test( PrintToFile, false, "" ) + cb_test( PrintAsSingleJobs, false, "" ) + cb_test( PrintReverse, false, "" ) + + printlog( "Application specific controls" ) + select case( gApplication ) + case "WRITER", "HTML", "MASTERDOCUMENT", "IMPRESS", "DRAW" + + cb_test( PaperTrayFromPrefs, false, "" ) + + case "CALC", "MATH" + + printlog( "Calc does not have any program specific options." ) + + case default + + warnlog( "Invalid gApplication: " & gApplication ) + + end select + + kontext "Printing" + printlog( "Close print dialog" ) + Printing.cancel() + + else + warnlog( "Printing dialog did not open" ) + endif + + printlog( "Close document" ) + hDestroyDocument() + +endcase + 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/optional/t_control_objects.inc b/testautomation/global/tools/includes/optional/t_control_objects.inc index 79b28ece9214..ea49aca7bd61 100755 --- a/testautomation/global/tools/includes/optional/t_control_objects.inc +++ b/testautomation/global/tools/includes/optional/t_control_objects.inc @@ -35,93 +35,102 @@ '* '* short description : Functions to manipulate controls by accessing them as objects '* -'******************************************************************************* -'** -' #0 checkRadioButtons ' check a group of RBs where the sel. RB is given by number -' #0 checkRadioButton ' check a singe RB where the state is specified directly -' #0 checkCheckbox ' check a single checkbox -' #0 setCheckBox ' sets checkbox to status provided in reference file -' #0 checkComboBox ' compares an index to one provided in a reference-file -' #0 setComboBox ' selects an index provided by a reference file -' #0 checkListBox ' compares an index to one provided in a reference-file -' #0 setListBox ' selects an index provided by a reference file -' #0 checkListItem ' check that a listitem is correct -' #1 hSetControlValue ' Change the value of a EntryField (failsafe) -'** '\****************************************************************************** -function checkRadioButtons( _file as string , sKey as string , control1 as object , control2 as object , optional control3 as object , optional control4 as object ) as integer - - '///<h3>EXPERIMENTAL: Get/Set function for some control types</h3> - '///<i>This is a function that allows to change the state/content of a - '///+ control via a configuration file. This function is experimental - '///+ and should not be used.<br> - '///+ This function checks if the correct radiobutton of a group is selected. - '///+ at least two radiobuttons must be provided, the third and fouth are optional. - '///+ The value for sKey in the reference file must be of type integer</i><br> - - dim _sItem as string - dim _iItem as integer - - ' lowercase sKey for comparision - sKey = lcase( sKey ) - - ' get the reference value for sKey as string - _sItem = hGetFileData( _file , sKey ) +private const MSG1 = "Incorrect default setting: " + +'******************************************************************************* + +function cb_test( oControl as object, def_state as string, issueid as string ) as boolean + + ' Small helper that prints a warnlog if a checkbox does not have the correct + ' default setting (checked -> def_state = TRUE). You can supply an issue id + ' which will be printed to the log. no parameter is optional, issueid can + ' be an empty string. + + ' oControl: The checkbox itself + ' def_state: Default state (checked or unchecked) + ' issueid: Issue id as string "#i123456#" for QUASTe + + dim con_state as boolean : con_state = oControl.isChecked() + dim con_name as string : con_name = oControl.name() - ' cast it to int - _iItem = val( _sItem ) + printlog( con_name & " (Checkbox)" ) + cb_test() = true + + if ( def_state ) then - ' check which one of the up to four radiobuttons is selected. - select case _iItem - - case 1 : - if ( control1.isChecked() = true ) then - checkRadioButtons() = true - printlog( " * Radiobutton 1 selected: ok" ) - else - warnlog( "The wrong radiobutton is selected" ) + if ( NOT con_state ) then + warnlog( issueid & " " & MSG1 & con_name & " should be checked" ) + cb_test() = false endif - case 2 : - if ( control2.isChecked() = true ) then - checkRadioButtons() = true - printlog( " * Radiobutton 2 selected: ok" ) - else - warnlog( "The wrong radiobutton is selected" ) + oControl.unCheck() + oControl.check() + + else + + if ( con_state ) then + warnlog( issueid & " " & MSG1 & con_name & " should be unchecked" ) + cb_test() = false endif - case 3 : - if ( isMissing( control3 ) = false ) then - if ( control3.isChecked() = true ) then - checkRadioButtons() = true - printlog( " * Radiobutton 3 selected: ok" ) - else - warnlog( "The wrong radiobutton is selected" ) - endif - else - warnlog( "referencing to non-existing control." ) - checkRadioButtons() = false + oControl.check() + oControl.unCheck() + + endif + +end function + +'******************************************************************************* + +function lb_test( oControl as object, items as integer, preset as integer, issueid as string ) as boolean + + ' Do some basic testing on listboxes + ' - verify that the number of entries is correct + ' - verify that the default selection is correct + ' - select each item and restore default + + ' oControl: The Listbox as object + ' items: Number of items in the list + ' preset: Item which is selected by default (usually 1), skip with 0 + ' issueid: Issue id as string "#i123456#" for QUASTe + + dim con_name as string : con_name = oControl.name() + dim con_items as integer : con_items = oControl.getItemCount() + dim con_preset as integer : con_preset = oControl.getSelIndex() + dim con_iterator as integer + + printlog( con_name & " (Listbox)" ) + if ( oControl.isEnabled() ) then + lb_test() = true + + if ( con_items <> items ) then + warnlog( issueid & " Incorrect itemcount in listbox: " & con_name ) + printlog( "Expected: " & items ) + printlog( "Found...: " & con_items ) + lb_test() = false endif - case 4 : - if ( isMissing( control4 ) = false ) then - if ( control4.isChecked() = true ) then - checkRadioButtons() = true - printlog( " * Radiobutton 4 selected: ok" ) - else - warnlog( "The wrong radiobutton is selected" ) + if ( preset > 0 ) then + if ( con_preset <> preset ) then + warnlog( issueid & " Incorrect default setting (index): " & con_name ) + printlog( "Expected: " & preset ) + printlog( "Found...: " & con_preset ) + lb_test() = false endif - else - warnlog( "referencing to non-existing control." ) - checkRadioButtons() = false endif - case else - warnlog( "Maximum of four connected radiobuttons allowed." ) - checkRadioButtons() = false - end select - + for con_iterator = 1 to items + oControl.select( con_iterator ) + next con_iterator + + if ( preset > 0 ) then oControl.select( preset ) + else + printlog( "The control is disabled" & con_name ) + lb_test() = false + endif + end function '******************************************************************************* diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc index 704d10fea8ba..8a9c143f7179 100755 --- a/testautomation/global/tools/includes/optional/t_docfuncs.inc +++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc @@ -95,22 +95,19 @@ end function function hCloseNavigator() as boolean '///<h3>Function to close the navigator</h3> - '///<i>Starting point: Any document</i> - '///<ul> const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCloseNavigator::" if ( VERBOSE ) then printlog( CFN & "Enter" ) - '///+<li>close the navigator if found</li> Kontext "Navigator" if ( Navigator.Exists() ) then Navigator.Close() + Navigator.notExists( 2 ) if ( VERBOSE ) then printlog( CFN & "Closed Navigator" ) else if ( VERBOSE ) then printlog( CFN & "Navigator not present" ) endif - '///+<li>verify that the navigator is indeed closed, return true on success</li> Kontext "Navigator" if ( Navigator.exists() ) then hCloseNavigator() = false @@ -120,7 +117,6 @@ function hCloseNavigator() as boolean endif if ( VERBOSE ) then printlog( CFN & "Exit" ) - '///</ul> end function @@ -302,36 +298,16 @@ end function function hCreateDocument() as boolean - '///<h3>Create anew document, extends hNewDocument()</h3> - '///<i>Starting point: Any document</i><br> - '///<i>Note: When calling this function with gApplication "BACKGROUND" the - '///+ function will actually close one document to get to the backing window</i><br> - '///<u>Input</u>: - '///<ol> - '///+<li>Nothing, valid gApplication must be set</li> - '///</ol> - '///<u>Returns</u>: - '///<ol> - '///+<li>Errorstatus (boolean)</li> - '///<ul> - '///+<li>TRUE if a new document was created successfully</li> - '///+<li>FALSE if anything went wrong</li> - '///</ul> - '///</ol> - '///<u>Description</u>: - '///<ul> - - + '///<h3>Create anew document, extends hNewDocument() by providing a returnvalue</h3> + ' TRUE = New document created, FALSE = Failed to create a new document ' const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCreateDocument::" dim iDocCountBefore as integer dim iDocCountAfter as integer - '///+<li>Retrieve the number of open documents</li> iDocCountBefore = getDocumentCount if ( VERBOSE ) then printlog( CFN & "Number of open documents before: " & iDocCountBefore ) - '///+<li>Special treatment if gApplication = BACKGROUND (virtual gApplication)</li> if ( ucase( gApplication ) = "BACKGROUND" ) then do while( getDocumentCount > 0 ) hCloseDocument() @@ -339,13 +315,8 @@ function hCreateDocument() as boolean hCreateDocument() = true else - '///+<li>Open a new document using hNewDocument()</li> call hNewDocument() - - '///+<li>Retrieve the number of open documents</li> iDocCountAfter = getDocumentCount() - - '///+<li>Verify that there is exactly one more document than before</li> if ( iDocCountAfter = ( iDocCountBefore + 1 ) ) then hCreateDocument() = true else @@ -484,9 +455,7 @@ function hInitSingleDoc() as boolean '///<u>Description:</u> '///<ul> '///+<li>Close all documents until we are on the backing window</li> - do while ( getDocumentCount > 0 ) - call hCloseDocument() - loop + hFileCloseAll() '///+<li>Save the previous gApplication</li> cOldApplication = gApplication @@ -539,9 +508,7 @@ function hInitBackingMode() as boolean '///<u>Description:</u> '///<ul> '///+<li>Close all documents until we are on the backing window</li> - do while ( getDocumentCount > 0 ) - hCloseDocument() - loop + hFileCloseAll() '///+<li>verify that we do not have any open documents left (redundant check)</li> if ( getDocumentCount = 0 ) then 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_tools2.inc b/testautomation/global/tools/includes/required/t_tools2.inc index 731bea120afc..f5fa7bb01cf7 100755 --- a/testautomation/global/tools/includes/required/t_tools2.inc +++ b/testautomation/global/tools/includes/required/t_tools2.inc @@ -763,7 +763,7 @@ function fGetProductName as string 'Using the bootstraprc/bootstrap.ini file in ../program dir 'to get the value of 'ProductKey' - if gPlatform = lcase("osx") then + if ( lcase( gPlatform ) = "osx" ) then sfile = convertPath(gNetzOfficePath + "MacOS/bootstrap") else sfile = convertPath(gNetzOfficePath + "program/bootstrap") @@ -826,7 +826,7 @@ function FindBuildID as String ' bootstrap.ini/rc part if (gSamePC = TRUE) then ' since CWS nativefixer18 the information from bootstrap file is spread across bootstrap and version - if gPlatform = lcase("osx") then + if ( lcase( gPlatform ) = "osx" ) then sPlatformProgramPath = "MacOS" else sPlatformProgramPath = "program" 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..e7af03c506e6 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 @@ -214,8 +214,6 @@ AusDruckereinstellung sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN *DruckerZusaetzeWriter HID_OPTPRINT_PAGE Grafiken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF -Tabellen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB -Zeichnungen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW Kontrollfelder sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD Hintergrund sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND HiddenText sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT @@ -224,7 +222,6 @@ RightToLeft sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL SchwarzDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT LinkeSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP RechteSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP -Umgekehrt sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE Prospekt sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT Keine sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO NurNotizen sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY @@ -253,14 +250,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 +323,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..a95316d03619 100755..100644 --- a/testautomation/global/win/edia_p_s.win +++ b/testautomation/global/win/edia_p_s.win @@ -64,13 +64,108 @@ 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 OKButton HID_DLGDEPOT_0_CMDGOON_HISTORY CancelButton HID_DLGDEPOT_0_CMDCANCEL_HISTORY +*Printing .HelpId:vcl:PrintDialog:Dialog +PreviewWindow .HelpId:vcl:PrintDialog:Preview +PreviewPageNumber .HelpId:vcl:PrintDialog:PageEdit +ScrollBackward .HelpId:vcl:PrintDialog:BackwardBtn +ScrollForward .HelpId:vcl:PrintDialog:ForwardBtn +Print .HelpId:vcl:PrintDialog:OK +Cancel .HelpId:vcl:PrintDialog:Cancel + +PrintingTabControl .HelpId:vcl:PrintDialog:TabPages +TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage +TabApplication .HelpId:vcl:PrintDialog:TabPage:10 +TabLayout .HelpId:vcl:PrintDialog:NUpPage +TabOptions .HelpId:vcl:PrintDialog:OptPage + +*TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage +PrinterList .HelpId:vcl:PrintDialog:JobPage:PrinterList +NumberOfCopies .HelpId:vcl:PrintDialog:JobPage:Copies +Collate .HelpId:vcl:PrintDialog:JobPage:Collate +PrintNotes .HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox +AllPages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0 +AllSlides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0 +AllSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0 +Pages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1 +Slides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1 +SelectedSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1 +PrintAllPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:0 +PrintPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:1 +PageRange .HelpId:vcl:PrintDialog:PageRange:Edit +Selection .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2 +SelectedCells .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2 +Details .HelpId:vcl:PrintDialog:JobPage:DetailsBtn +Properties .HelpId:vcl:PrintDialog:JobPage:Properties +PageCount .HelpId:vcl:PrintDialog:NumPagesText +PartsToPrint .HelpId:vcl:PrintDialog:PageContentType:ListBox +SlidesPerPage .HelpId:vcl:PrintDialog:SlidesPerPage:ListBox +ArrangeSlides .HelpId:vcl:PrintDialog:SlidesPerPageOrder:ListBox + +*TabApplication .HelpId:vcl:PrintDialog:TabPage:10 +PrintPageBackground .HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox +PrintGraphicsAndDiagrams .HelpId:vcl:PrintDialog:PrintTablesGraphicsAndDiagrams:CheckBox +PrintPicturesAndObjects .HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox +PrintHiddenText .HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox +PrintTextPlaceholder .HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox +PrintFormControls .HelpId:vcl:PrintDialog:PrintControls:CheckBox +PrintTextInBlack .HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox +PrintBlankPages .HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox +IncludeEmptyPages .HelpId:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox +SlideName .HelpId:vcl:PrintDialog:IsPrintName:CheckBox +DateAndTime .HelpId:vcl:PrintDialog:IsPrintDateTime:CheckBox +HiddenPages .HelpId:vcl:PrintDialog:IsPrintHidden:CheckBox +TilePaper .HelpId:vcl:PrintDialog:PageOptions:RadioButton:3 +OriginalColors .HelpId:vcl:PrintDialog:Quality:RadioButton:0 +Grayscale .HelpId:vcl:PrintDialog:Quality:RadioButton:1 +BlackAndWhite .HelpId:vcl:PrintDialog:Quality:RadioButton:2 +MultiplePages .HelpId:vcl:PrintDialog:PageOptions:RadioButton:2 +TitleRow .HelpId:vcl:PrintDialog:TitleRow:CheckBox +FormulaText .HelpId:vcl:PrintDialog:FormulaText:CheckBox +Borders .HelpId:vcl:PrintDialog:Border:CheckBox +OriginalSize .HelpId:vcl:PrintDialog:PageOptions:RadioButton:0 +OriginalSizeMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:0 +FitToPage .HelpId:vcl:PrintDialog:PageOptions:RadioButton:1 +FitToPageMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:1 +Scaling .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:2 +ScalingFactor .HelpId:vcl:PrintDialog:PrintScale:NumericField + +*TabLayout .HelpId:vcl:PrintDialog:NUpPage +PagesPerSheet .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheet +NumberOfPages .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheetBox +NumberOfColumns .HelpId:vcl:PrintDialog:NUpPage:ColumnsBox +NumberOfRows .HelpId:vcl:PrintDialog:NUpPage:RowsBox +BorderAroundPages .HelpId:vcl:PrintDialog:NUpPage:BorderBox +Brochure .HelpId:vcl:PrintDialog:NUpPage:Brochure +DistanceBetweenPages .HelpId:vcl:PrintDialog:NUpPage:PageMarginBox +MarginToSheetBorder .HelpId:vcl:PrintDialog:NUpPage:SheetMarginBox +PaperOrientation .HelpId:vcl:PrintDialog:NUpPage:OrientationBox +PrintOrder .HelpId:vcl:PrintDialog:NUpPage:OrderBox +IncludePages .HelpId:vcl:PrintDialog:PrintLeftRightPages:ListBox +PrintBrochureRTL .HelpId:vcl:PrintDialog:PrintProspectRTL:ListBox +BrochurePageSides .HelpId:vcl:PrintDialog:PrintProspectInclude:ListBox + +*TabOptions .HelpId:vcl:PrintDialog:OptPage +PrintToFile .HelpId:vcl:PrintDialog:OptPage:ToFile +PrintAsSingleJobs .HelpId:vcl:PrintDialog:OptPage:SingleJobs +PrintReverse .HelpId:vcl:PrintDialog:OptPage:Reverse +PaperTrayFromPrefs .HelpId:vcl:PrintDialog:PrintPaperFromSetup:CheckBox + +*PurchaseStarOffice HID_LICENSING_DIALOG +TabPurchase HID_TP_PURCHASE +getSerialNumber tab:PushButton:TP_PURCHASE:PB_PURCHASE_GET +TabUnlockStarOffice HID_TP_UNLOCK +SerialNumberA tab:Edit:TP_UNLOCK:ED_UNLOCK_A +SerialNumberB tab:Edit:TP_UNLOCK:ED_UNLOCK_B +SerialNumberC tab:Edit:TP_UNLOCK:ED_UNLOCK_C +TabSummary HID_TP_SUMMARY + *QueryEditWindow HID_CTL_QRYSQLEDIT *QueryDesignTable HID_CTL_QRYDGNTAB @@ -166,10 +261,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 +343,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 +431,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 +496,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 @@ -456,6 +551,7 @@ PrintButton HID_HELP_TOOLBOXITEM_PRINT SetBookmarks HID_HELP_TOOLBOXITEM_BOOKMARKS *SaveScheme HID_OPTIONS_COLORCONFIG_SAVE_SCHEME + SchemeName HID_OPTIONS_COLORCONFIG_NAME_SCHEME *SecurityWarning HID_XMLSECDLG_MACROWARN @@ -522,7 +618,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/sys_dial.win b/testautomation/global/win/sys_dial.win index aeca03118da6..4cacc4dda5cc 100755 --- a/testautomation/global/win/sys_dial.win +++ b/testautomation/global/win/sys_dial.win @@ -1,21 +1,3 @@ -' **** general print-Dialog ( File/Print ) -' **** -*DruckenDlg svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG -Drucker svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES -Eigenschaften svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES -AusdruckInDatei svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT -Alles svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL -Seiten svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES -SeitenText svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES -Auswahl svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION -Exemplare svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES -Sortieren svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE -Zusaetze svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS -EditFaxNo svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO -AllSheets svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS -SelectedSheets svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS -SelectedCells svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS - ' **** general Printersettings-Dialog ( File/Printer settings ) ' **** *DruckerEinrichten svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win index fbcba2599a74..af6d933aefb4 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 @@ -303,24 +303,20 @@ SchwarzWeiss SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BLACKWHITE *TabDruckenHTML HID_OPTPRINT_PAGE Grafiken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF -Tabellen SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB Kontrollfelder SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD Hintergrund SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT -Umgekehrt SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE Prospekt SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT Keine SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO NurNotizen SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY Dokumentende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END Seitenende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND -EinzelneDruckauftraege sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS AusDruckereinstellung SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP +LeereSeitenDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES Fax SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX *TabDruckenWriter HID_OPTPRINT_PAGE Grafiken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF -Tabellen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB -Zeichnungen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW Kontrollfelder sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD Hintergrund sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND HiddenText sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT @@ -329,13 +325,11 @@ RightToLeft sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT LinkeSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP RechteSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP -Umgekehrt sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE Prospekt sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT Keine sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO NurNotizen sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY Dokumentende sw:RadioButton:TP_OPTPRINT_PAGE:RB_END Seitenende sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND -EinzelneDruckauftraege sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS AusDruckereinstellung sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP LeereSeitenDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES Fax sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX 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 510cef7e6da5..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 @@ -334,46 +334,35 @@ 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 @@ -396,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/graphics/optional/g_print.bas b/testautomation/graphics/optional/g_print.bas deleted file mode 100755 index 73ec23a9fef6..000000000000 --- a/testautomation/graphics/optional/g_print.bas +++ /dev/null @@ -1,64 +0,0 @@ -'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: g_print.bas,v $ -'* -'* $Revision: 1.1 $ -'* -'* last change: $Author: jsi $ $Date: 2008-06-16 10:42:37 $ -'* -'* 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 : wolfram.garten@sun.com -'* -'* short description : Graphics Function: Print -'* -'\****************************************************************** - -public glLocale (15*20) as string - -sub main - PrintLog "------------------------- g_print test -------------------------" - Call hStatusIn ( "Graphics","g_print.bas") - - use "graphics\tools\id_tools.inc" - use "graphics\optional\includes\global\g_print.inc" - - PrintLog "-------------------------" + gApplication + "-------------------" - call tFilePrint - - gApplication = "DRAW" - PrintLog "-------------------------" + gApplication + "-------------------" - call tFilePrint - - Call hStatusOut -end sub - -sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" - gApplication = "IMPRESS" - Call GetUseFiles -end sub diff --git a/testautomation/graphics/optional/includes/global/g_print.inc b/testautomation/graphics/optional/includes/global/g_print.inc deleted file mode 100755 index 21bad45dc420..000000000000 --- a/testautomation/graphics/optional/includes/global/g_print.inc +++ /dev/null @@ -1,164 +0,0 @@ -'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: g_print.inc,v $ -'* -'* $Revision: 1.1 $ -'* -'* last change: $Author: jsi $ $Date: 2008-06-16 10:42: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 : wolfram.garten@sun.com -'* -'* short description : -'* -'************************************************************************************** -' #1 tFilePrint -'\************************************************************************************* - -testcase tFilePrint - Call hNewDocument - - printlog "Inserting testtext." - hTextrahmenErstellen ("This is an automated print test with testtool for GRAPHICS ",90,90,80,10) - hTextrahmenErstellen ("Version : "+ gVersionsnummer + " / " + gLanguage,80,90,70,10) - hTextrahmenErstellen ("Date / Time : "+ Date + " / " + Time,70,90,60,10) - hTextrahmenErstellen ("Machine / User: " + gPCName + " " + gUser,60,90,50,10) - - printlog "Opening print Dialog." - FilePrint - kontext - if active.exists(2) then - active.ok - qaerrorlog "There is no printer available - please install one on your system!" - endif - sleep 2 - Kontext "DruckenDlg" - - - ' Not yet active since this feature is not build into the master: i85355 - ' printlog "Checking options for impress..." - ' if (gApplication = "IMPRESS") then - ' if PrintContent.GetSelIndex <> 1 then - ' warnlog "Not first entry selected!" - ' else - ' printlog " First entry selected." - ' endif - ' - ' if PrintContent.GetItemCount <> 4 then - ' warnlog "Entry-number of PrintContent listbox is wrong!" - ' else - ' printlog "Entry-number of PrintContent listbox is 4." - ' endif - ' - ' PrintContent.Select 2 - ' if SlidesPerPage.IsEnabled then - ' printlog "SlidesPerPage active." - ' else - ' warnlog "SlidesPerPage did not get active!" - ' endif - ' - ' VerticalOrder.Check - ' printlog "Vertical checked." - ' HorizontalOrder.Check - ' printlog "Horizontal checked again." - ' - ' else - ' printlog "This is not impress, so no further print content testing." - ' endif - - printlog "Opening Options dialog." - Zusaetze.Click - sleep 1 - Kontext "DruckerZusaetzeDraw" - - printlog "Checking brochure printing." - if Prospekt.IsChecked then - warnlog "Somebody forgot to uncheck the prospect printing!" - Standard.Check - else - printlog "Brochure printing is checked." - endif - - - Seitenname.Check - Datum.Check - Zeit.Check - AusgeblendeteSeiten.Check - SeitengroesseAnpassen.Check - AusDruckereinstellung.Check - - DruckerZusaetzeDraw.OK - Kontext "DruckenDlg" - Zusaetze.Click - sleep 2 - Kontext "DruckerZusaetzeDraw" - if NOT Seitenname.IsChecked Then - warnlog " - Page name not checked" - else - printlog "Page name checked." - endif - - if NOT Datum.IsChecked Then - warnlog " - Date not checked" - else - printlog "Date is checked." - endif - - if NOT Zeit.IsChecked Then - warnlog " - Time not checked" - else - printlog "Time is checked." - endif - - if NOT AusgeblendeteSeiten.IsChecked Then - warnlog " - Hidden pages not checked" - else - printlog "Hidden pages checked." - endif - - if NOT SeitengroesseAnpassen.IsChecked Then - warnlog " - Fit to page not checked" - else - printlog "Fit to page checked." - endif - - if NOT AusDruckereinstellung.IsChecked Then - warnlog " - Paper tray from printer settings not checked" - else - printlog "Paper tray checked." - endif - - AusDruckereinstellung.UnCheck - Standard.Check - DruckerZusaetzeDraw.OK - Kontext "DruckenDlg" - DruckenDlg.Cancel - Sleep 5 - - Call hCloseDocument -endcase - diff --git a/testautomation/graphics/optional/includes/global/id_001.inc b/testautomation/graphics/optional/includes/global/id_001.inc index a92daf05c2e2..fabc078af92b 100755 --- a/testautomation/graphics/optional/includes/global/id_001.inc +++ b/testautomation/graphics/optional/includes/global/id_001.inc @@ -41,7 +41,6 @@ ' #1 tiFileVersion (sFileIn as string) ' #1 tiFilePassword ' #1 tiFileTemplates -' #1 tiFilePrint ' #1 tmFileNewFromTemplate ' #1 tmFileOpen ' #1 tmFileClose @@ -471,30 +470,6 @@ testcase tiFileTemplates Call hCloseDocument endcase -testcase tiFilePrint - Call hNewDocument - FilePrint - WaitSlot (1000) - kontext - if active.exists(5) then - active.ok - qaerrorlog "There is no printer available - please install one on your system!" - end if - WaitSlot (2000) - Kontext "DruckenDlg" - Call DialogTest (DruckenDlg) - WaitSlot (2000) - Zusaetze.Click - - Kontext "DruckerZusaetzeDraw" - Call DialogTest (DruckerZusaetzeDraw) - DruckerZusaetzeDraw.Cancel - Kontext "DruckenDlg" - DruckenDlg.Cancel - WaitSlot (2000) - Call hCloseDocument -endcase - '----------------------------------------------------------- '******************* M A T H dito ************************* diff --git a/testautomation/graphics/optional/includes/global/id_009.inc b/testautomation/graphics/optional/includes/global/id_009.inc index bfbaf6861c36..bb005deb996c 100755 --- a/testautomation/graphics/optional/includes/global/id_009.inc +++ b/testautomation/graphics/optional/includes/global/id_009.inc @@ -165,9 +165,9 @@ testcase tmHelpContents Active.Ok end if - kontext "DruckenDLG" - if DruckenDLG.Exists then - DruckenDLG.cancel + kontext "Printing" + if Printing.Exists( 2 ) then + Printing.cancel else warnlog "the Print-Dialogue didnt appear." end if diff --git a/testautomation/graphics/required/d_updt.bas b/testautomation/graphics/required/d_updt.bas index 66ca92a6b190..3511bf199989 100755 --- a/testautomation/graphics/required/d_updt.bas +++ b/testautomation/graphics/required/d_updt.bas @@ -75,6 +75,7 @@ sub main call id_008 call id_009 call id_001 + Call g_printing Call tFileExportAsPDF Call tExportAsPDFButton @@ -88,6 +89,9 @@ 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_printing.inc" + use "global\tools\includes\optional\t_docfuncs.inc" + use "global\tools\includes\optional\t_control_objects.inc" Call GetUseFiles gApplication = "DRAW" end sub diff --git a/testautomation/graphics/required/i_updt_2.bas b/testautomation/graphics/required/i_updt_2.bas index c0da23879d21..83dfc5047db0 100755 --- a/testautomation/graphics/required/i_updt_2.bas +++ b/testautomation/graphics/required/i_updt_2.bas @@ -65,6 +65,7 @@ sub main call id_009 call id_007 call id_011 + call g_printing Call hStatusOut end sub @@ -75,6 +76,10 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\required\includes\g_001.inc" use "global\required\includes\g_009.inc" + use "global\required\includes\g_printing.inc" + use "global\tools\includes\optional\t_docfuncs.inc" + use "global\tools\includes\optional\t_control_objects.inc" + gApplication = "IMPRESS" Call GetUseFiles() end sub diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc index 995de9f2b1e1..e84afee0de56 100755 --- a/testautomation/graphics/required/includes/global/id_001.inc +++ b/testautomation/graphics/required/includes/global/id_001.inc @@ -41,7 +41,6 @@ ' #1 tiFileVersion (sFileIn as string) ' #1 tiFilePassword ' #1 tiFileTemplates -' #1 tiFilePrint ' #1 tmFileNewFromTemplate ' #1 tmFileOpen ' #1 tmFileClose @@ -537,38 +536,6 @@ endcase 'tiFileTemplates '------------------------------------------------------------------------------- -testcase tiFilePrint - Call hNewDocument -printlog " open application" -printlog " File->Print" - FilePrint - WaitSlot (1000) - kontext - if active.exists(5) then - active.ok - qaerrorlog "There is no printer available - please install one on your system!" - end if - WaitSlot (2000) - Kontext "DruckenDlg" - Call DialogTest (DruckenDlg) - printlog " click 'options'" - WaitSlot (2000) - Zusaetze.Click - - Kontext "DruckerZusaetzeDraw" - Call DialogTest (DruckerZusaetzeDraw) - DruckerZusaetzeDraw.Cancel - printlog " close options dialog with 'cancel'" - Kontext "DruckenDlg" - printlog " close print dialog with 'cancel'" - DruckenDlg.Cancel - WaitSlot (2000) -printlog " close application" - Call hCloseDocument -endcase 'tiFilePrint - -'------------------------------------------------------------------------------- - testcase tmFileNewFromTemplate Call hNewDocument FileNewFromTemplate diff --git a/testautomation/graphics/required/includes/global/id_009.inc b/testautomation/graphics/required/includes/global/id_009.inc index 959b6d5ebfd9..24e7e712363f 100755 --- a/testautomation/graphics/required/includes/global/id_009.inc +++ b/testautomation/graphics/required/includes/global/id_009.inc @@ -194,10 +194,10 @@ testcase tmHelpContents Active.Ok end if - kontext "DruckenDLG" - if DruckenDLG.Exists then + kontext "Printing" + if Printing.Exists( 2 ) then '/// In the dialog 'Print' press the button 'Cancel' ///' - DruckenDLG.cancel + Printing.cancel else warnlog "the Print-Dialogue didnt appear." end if diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index d0335997d2f4..78a71da95775 100755 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -730,7 +730,6 @@ sub id_001 call tiFileVersion printlog " File->Send not possible to test, because extrnal prg get's called!" call tiFileTemplates - call tiFilePrint ' Call tiFileNew instead i call: call tmFileNewFromTemplate call tmFileOpen diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc index 98b72b99b734..4139e688f1f5 100755 --- a/testautomation/math/optional/includes/m_101_.inc +++ b/testautomation/math/optional/includes/m_101_.inc @@ -550,20 +550,25 @@ testcase tFilePrint '/// print file ///' try Fileprint - sleep 2 kontext if active.exists(2) then active.ok qaerrorlog "There is no printer available - please install one on your system!" - sleep 2 - Kontext "DruckenDlg" - DruckenDlg.cancel + Kontext "Printing" + if ( Printing.exists( 2 ) ) then + Printing.cancel + else + warnlog( "Printing dialog did not open" ) + endif else - sleep 2 - Kontext "DruckenDlg" - DruckenDlg.Ok + Kontext "Printing" + if ( Printing.exists( 2 ) ) then + Printing.ok + else + warnlog( "Printing dialog did not open" ) + endif endif - sleep 2 + kontext if active.exists(2) then active.ok diff --git a/testautomation/math/required/includes/m_001_.inc b/testautomation/math/required/includes/m_001_.inc index fd7905ef382a..452a3bfd0106 100755 --- a/testautomation/math/required/includes/m_001_.inc +++ b/testautomation/math/required/includes/m_001_.inc @@ -61,7 +61,6 @@ sub M_001_ Call tmFileVersions Call tmExportAsPDF Call tmFileProperties - Call tmFilePrint Call tmFilePrinterSetting Call tmFilePassword end sub @@ -380,27 +379,6 @@ testcase tmFileVersions if app.Dir (Datei) <> "" then app.kill Datei endcase -testcase tmFilePrint -'/// open application ///' - Call hNewDocument - sleep 3 - '/// File->Print ///' - FilePrint - kontext - if active.exists(2) then - active.ok - qaerrorlog "There is no printer available - please install one on your system!" - endif - sleep 2 - Kontext "DruckenDlg" - Call DialogTest (DruckenDlg) - '/// cancel dialog 'Print' ///' - DruckenDlg.Cancel - sleep 2 -'/// close application ///' - Call hCloseDocument -endcase - '----------------------------------------------------------- '******************* I D dito ************************* '----------------------------------------------------------- diff --git a/testautomation/math/required/includes/m_007_.inc b/testautomation/math/required/includes/m_007_.inc index 64b5fda9fb3e..606ab22cd8f4 100755 --- a/testautomation/math/required/includes/m_007_.inc +++ b/testautomation/math/required/includes/m_007_.inc @@ -204,9 +204,9 @@ testcase tmHelpContents qaerrorlog "There is no printer available - please install one on your system!" endif sleep 2 - kontext "DruckenDLG" + kontext "Printing" '/// On the dialog 'Print' press the button 'Cancel' ///' - DruckenDLG.cancel + Printing.cancel Kontext "TB_Help" '///+ click on button 'Add to Bookmarks ...' ///' SetBookmarks.Click diff --git a/testautomation/math/required/m_updt.bas b/testautomation/math/required/m_updt.bas index 7472d02e2dfa..85d7e730518a 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" ) @@ -63,6 +64,7 @@ sub main Call m_020_ ' toolbars Call M_010_ ' Operators Call M_001_ ' File Menu + Call g_printing() Call tFileExportAsPDF Call hStatusOut @@ -76,7 +78,10 @@ sub LoadIncludeFiles use "global\required\includes\g_customize.inc" use "global\required\includes\g_001.inc" use "global\required\includes\g_009.inc" + use "global\required\includes\g_printing.inc" use "global\tools\includes\optional\t_ui_filters.inc" ' for gMathFilter in m_001_.inc + use "global\tools\includes\optional\t_docfuncs.inc" + use "global\tools\includes\optional\t_control_objects.inc" gApplication = "MATH" Call GetUseFiles end sub diff --git a/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc b/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc index 3d4ceb3138aa..fa13497cea4a 100755 --- a/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc +++ b/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc @@ -266,14 +266,16 @@ testcase tAddPrintRange Active.ok end if - Kontext "DruckenDlg" - Seiten.check - if SeitenText.GetText = "1-3" then + Kontext "Printing" + Kontext "TabPrintGeneral" + PrintPages.check + if PageRange.GetText = "1-3" then printlog "+ Pages to print as expected" else - warnlog "Expected pages to print are <1-3>, but we got: " & SeitenText.GetText + warnlog "Expected pages to print are <1-3>, but we got: " & PageRange.GetText end if - DruckenDlg.Cancel + Kontext "Printing" + Printing.Cancel sleep(2) call hCloseDocument endcase @@ -864,15 +866,15 @@ testcase tEmptyRangeMessagebox endcatch end if else - warnlog "There is no messagebox" + warnlog "There is no messagebox (#i106423#)" kontext "DocumentCalc" call hCloseDocument goto endsub end if - Kontext "DruckenDlg" - if DruckenDlg.Exists( 2 ) then - DruckenDlg.Cancel + Kontext "Printing" + if Printing.Exists( 2 ) then + Printing.Cancel end if sleep 2 @@ -916,9 +918,9 @@ testcase tEmptyRangeMessagebox goto endsub end if - kontext "DruckenDlg" - if DruckenDlg.Exists( 2 ) then - DruckenDlg.Cancel + kontext "Printing" + if Printing.Exists( 2 ) then + Printing.Cancel end if printlog "Close document" call hCloseDocument diff --git a/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc b/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc index aed510138d38..08d424470de5 100755 --- a/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc +++ b/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc @@ -232,17 +232,19 @@ dim sPagesToPrint as STRING end if end if printlog "Check if print dialog exists" - Kontext "DruckenDlg" - if DruckenDlg.Exists(2) then - Seiten.check - printlog "Check for string '1-12' in pages textbox" - sPagesToPrint = SeitenText.getText - if sPagesToPrint = "1-12" then + Kontext "Printing" + if Printing.Exists(2) then + Kontext "TabPrintGeneral" + PrintPages.check + printlog "Check for string '1-4' in pages textbox" + sPagesToPrint = PageRange.getText + if sPagesToPrint = "1-4" then printlog " OK, expected number of pages for output" else warnlog "Unexpected number of pages for print output: " & sPagesToPrint & " -> Check this out!" end if - DruckenDlg.Cancel + Kontext "Printing" + Printing.Cancel else qaErrorlog "OOPS, are you sure that a printer is configured at all?" end if diff --git a/testautomation/spreadsheet/required/c_updt1.bas b/testautomation/spreadsheet/required/c_updt1.bas index af3ea7596374..076b247a82ad 100755 --- a/testautomation/spreadsheet/required/c_updt1.bas +++ b/testautomation/spreadsheet/required/c_updt1.bas @@ -69,6 +69,10 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_locale_tools.inc" + use "global\tools\includes\optional\t_docfuncs.inc" + use "global\tools\includes\optional\t_control_objects.inc" + use "global\required\includes\g_printing.inc" + gApplication = "CALC" GetUseFiles () end sub diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc index 1220b283e2ec..02367cf9e625 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc @@ -590,7 +590,7 @@ testcase tEditImageMap Aktiv.Click '/// Click on 'Macro...'-button printlog " Click on 'Macro...'-button" - warnlog "Due to #i102720# this functionality is outcommented" + warnlog "#i102720# => crash, therefor this functionality is outcommented" ' Makro.Click ' Kontext "MakroZuweisen" ' Call DialogTest ( MakroZuweisen ) diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index a05f22ed9360..4e6dbe0f8d70 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc @@ -48,7 +48,6 @@ ' #0 tFileSaveAsDBF ' #1 tFileVersions ' #1 tFilePagePreview -' #1 tFilePrint '* '\*********************************************************************** @@ -67,7 +66,7 @@ sub c_upd_filemenu Call tFileSaveAsDBF Call tFileVersions Call tFilePagePreview - Call tFilePrint + Call g_printing() end sub @@ -596,71 +595,3 @@ testcase tFilePagePreview endcase -'----------------------------------------------------------- - -testcase tFilePrint - - '/// Open new Spreadsheet document - Printlog " Open new Spreadsheet document" - Call hNewDocument - '/// Enter some text - Printlog " Enter some text" - Kontext "DocumentCalc" - DocumentCalc.Typekeys "Test <RETURN>" - '/// Open File-Print - Printlog " Open File-Print" - FilePrint - '/// Look for warning regarding missing printer - '/// -> If configuration is missing only this MsgBox is tested - Kontext - if Active.Exists(2) then - if Active.GetRT = 304 then - Printlog Active.GetText - QAErrorLog "No printer is configured for this system" - else - Printlog Active.GetText - warnlog "There is an unexpected warning!" - end if - '/// Close messagebox with OK - Printlog " Close messagebox with OK" - Active.OK - '/// Cancel Print dialog - Printlog " Cancel Print dialog" - Kontext "DruckenDLG" - DruckenDLG.Cancel - '/// Close document - Printlog " Close document" - Call hCloseDocument - goto endsub - end if - Kontext "DruckenDLG" - '/// Check existence of print dilaog - Call DialogTest ( DruckenDLG ) - '/// Invoke the print options dialog - Printlog " Invoke the print options dialog" - Kontext "DruckenDLG" - Zusaetze.Click - Kontext "TabPrintCalcOptions" - '/// Check existence of print options dilaog - Call DialogTest ( TabPrintCalcOptions ) - '/// Cancel print options dialog - Printlog " Cancel print options dialog" - TabPrintCalcOptions.Cancel - '/// Check option 'Print to file' - Printlog " Check option 'Print to file'" - Kontext "DruckenDLG" - AusdruckInDatei.check - '/// Commit print dialog - Printlog " Commit print dialog" - DruckenDLG.OK - '/// (Save file dialog should be visible now) - Kontext "SpeichernDLG" - '/// Check existence of save dilaog - Call DialogTest ( SpeichernDLG ) - '/// Cancel save dialog - Printlog " Cancel save dialog" - SpeichernDLG.Cancel - '/// Close document - Printlog " Close document" - Call hCloseDocument -endcase 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/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc index f0444a21271b..0331c701032d 100755 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -782,15 +782,15 @@ testcase tDocInformationPrinted if Active.GetRT = 304 then Active.Ok QAErrorLog "No Default-Printer! The testcase isn't tested !" - Kontext "DruckenDlg" + Kontext "Printing" Sleep 1 - DruckenDlg.Cancel + Printing.Cancel goto NoTest end if else - Kontext "DruckenDlg" + Kontext "Printing" Sleep 1 - DruckenDlg.OK + Printing.OK kontext "active" if active.exists(5) then QaErrorLog "Error Printing..." diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc index 034bbd7c1793..ff010c0cda14 100755 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc @@ -455,39 +455,34 @@ endcase testcase tInsertGraphic_8 - Dim iFileType as Integer - Dim iFileNumber as Integer - - iFileType = 1 'filter (Format <All>) - - if gPlatGroup = "unx" then - iFileNumber = 4 '4 graphic files. (directory hidden on Unix) - else - iFileNumber = 5 '4 graphic files and 1 directory. - end if - - PrintLog "- Test preselect Filter (Format <All>)" - '/// Test preselect Filter (Format <All>) - - Call hNewDocument - - '/// Insert a Graphic , Insert/Graphics/From file - InsertGraphicsFromFile - - '/// Select filter (Format <All>) - Kontext "GrafikEinfuegenDlg" - Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") ) - Sleep 1 - Oeffnen.Click - - Dateityp.Select iFileType - Sleep 1 - - '/// Check if Filter (Format <All>) works well - if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter (Format <All>) does NOT work well" - GrafikEinfuegenDlg.Cancel - - Call hCloseDocument + Dim iFileType as Integer + Dim iFileNumber as Integer + + iFileType = 1 'filter (Format <All>) + iFileNumber = 4 + + PrintLog "- Test preselect Filter (Format <All>)" + '/// Test preselect Filter (Format <All>) + + Call hNewDocument + + '/// Insert a Graphic , Insert/Graphics/From file + InsertGraphicsFromFile + + '/// Select filter (Format <All>) + Kontext "GrafikEinfuegenDlg" + Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") ) + Sleep 1 + Oeffnen.Click + + Dateityp.Select iFileType + Sleep 1 + + '/// Check if Filter (Format <All>) works well + if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter (Format <All>) does NOT work well" + GrafikEinfuegenDlg.Cancel + + Call hCloseDocument endcase @@ -495,39 +490,34 @@ endcase testcase tInsertGraphic_9 - Dim iFileType as Integer - Dim iFileNumber as Integer - - iFileType = 2 'another filter except for (Format <All>) -- bmp - - if gPlatGroup = "unx" then - iFileNumber = 1 - else - iFileNumber = 2 'the first is the .svn-directory - end if - - PrintLog "- Test preselect Filter excepte for (Format <All>)" - '/// Test preselect Filter excepte for (Format <All>) - - Call hNewDocument - - '/// Insert a Graphic , Insert/Graphics/From file - InsertGraphicsFromFile - - '/// Select filter 'BMP' - Kontext "GrafikEinfuegenDlg" - Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") ) - Sleep 1 - Oeffnen.Click - - Dateityp.Select iFileType - Sleep 1 - - '/// Check if Filter BMP works well - if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter BMP does NOT work well" - GrafikEinfuegenDlg.Cancel - - Call hCloseDocument + Dim iFileType as Integer + Dim iFileNumber as Integer + + iFileType = 2 'another filter except for (Format <All>) -- bmp + iFileNumber = 1 + + PrintLog "- Test preselect Filter excepte for (Format <All>)" + '/// Test preselect Filter excepte for (Format <All>) + + Call hNewDocument + + '/// Insert a Graphic , Insert/Graphics/From file + InsertGraphicsFromFile + + '/// Select filter 'BMP' + Kontext "GrafikEinfuegenDlg" + Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") ) + Sleep 1 + Oeffnen.Click + + Dateityp.Select iFileType + Sleep 1 + + '/// Check if Filter BMP works well + if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter BMP does NOT work well" + GrafikEinfuegenDlg.Cancel + + 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/insertgraphic/w_insertgraphic4.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc index 0a1790c1cbcb..83c59edb4a68 100755 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc @@ -812,14 +812,14 @@ testcase tInsertGraphic_40 if Active.GetRT = 304 then Active.Ok QAErrorLog "No Default-Printer!" - Kontext "DruckenDlg" + Kontext "Printing" Sleep 1 - DruckenDlg.Cancel + Printing.Cancel end if else - Kontext "DruckenDlg" + Kontext "Printing" Sleep 1 - DruckenDlg.OK + Printing.OK Sleep 5 end if diff --git a/testautomation/writer/optional/includes/option/wh_o_1.inc b/testautomation/writer/optional/includes/option/wh_o_1.inc index 508030bdc4d7..73e129c47910 100755 --- a/testautomation/writer/optional/includes/option/wh_o_1.inc +++ b/testautomation/writer/optional/includes/option/wh_o_1.inc @@ -50,7 +50,7 @@ end sub '------------------------------------------------------------------------------ testcase tToolsOptionsHTMLContent - Dim irgendwas(17) as boolean + Dim bCheckboxStatus(17) as boolean printlog "tToolsOptionsHTMLContent datei erstellen zum laden" '/// uses "input\\writer\\optional\\options\\options1.sxw" /// @@ -63,23 +63,21 @@ testcase tToolsOptionsHTMLContent ToolsOptions Call hToolsOptions ("HTML","View") - irgendwas(1) = GrafikenUndObjekte.IsChecked - irgendwas(2) = Tabellen.IsChecked - irgendwas(3) = Zeichnungen.IsChecked - irgendwas(4) = Feldnamen.IsChecked - irgendwas(5) = Notizen.IsChecked + bCheckboxStatus(1) = GrafikenUndObjekte.IsChecked + bCheckboxStatus(3) = Zeichnungen.IsChecked + bCheckboxStatus(4) = Feldnamen.IsChecked + bCheckboxStatus(5) = Notizen.IsChecked - 'irgendwas(9) = Felder.IsChecked + 'bCheckboxStatus(9) = Felder.IsChecked printlog ("'/// - all states inverting ///") - if irgendwas(1) Then GrafikenUndObjekte.UnCheck Else GrafikenUndObjekte.Check - if irgendwas(2) Then Tabellen.UnCheck Else Tabellen.Check - if irgendwas(3) Then Zeichnungen.UnCheck Else Zeichnungen.Check - if irgendwas(4) Then Feldnamen.UnCheck Else Feldnamen.Check - if irgendwas(5) Then Notizen.UnCheck Else Notizen.Check + if bCheckboxStatus(1) Then GrafikenUndObjekte.UnCheck Else GrafikenUndObjekte.Check + if bCheckboxStatus(3) Then Zeichnungen.UnCheck Else Zeichnungen.Check + if bCheckboxStatus(4) Then Feldnamen.UnCheck Else Feldnamen.Check + if bCheckboxStatus(5) Then Notizen.UnCheck Else Notizen.Check - 'if irgendwas(9) Then Felder.UnCheck Else Felder.Check + 'if bCheckboxStatus(9) Then Felder.UnCheck Else Felder.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -92,16 +90,14 @@ testcase tToolsOptionsHTMLContent ToolsOptions Call hToolsOptions ( "HTML","View" ) - if ( irgendwas(1) = GrafikenUndObjekte.IsChecked ) Then WarnLog "GrafikenUndObjekte state changed" - if ( irgendwas(2) = Tabellen.IsChecked ) Then WarnLog "Tabellen state changed" - if ( irgendwas(3) = Zeichnungen.IsChecked ) Then WarnLog "Zeichnungen state changed" - if ( irgendwas(4) = Feldnamen.IsChecked ) Then WarnLog "Feldnamen state changed" - if ( irgendwas(5) = Notizen.IsChecked ) Then WarnLog "Notizen state changed" + if ( bCheckboxStatus(1) = GrafikenUndObjekte.IsChecked ) Then WarnLog "Grafiken state changed" + if ( bCheckboxStatus(3) = Zeichnungen.IsChecked ) Then WarnLog "Zeichnungen state changed" + if ( bCheckboxStatus(4) = Feldnamen.IsChecked ) Then WarnLog "Feldnamen state changed" + if ( bCheckboxStatus(5) = Notizen.IsChecked ) Then WarnLog "Notizen state changed" printlog ("'/// - all UnCheck -> o ///") GrafikenUndObjekte.UnCheck - Tabellen.UnCheck Zeichnungen.UnCheck Feldnamen.UnCheck Notizen.UnCheck @@ -115,15 +111,13 @@ testcase tToolsOptionsHTMLContent ToolsOptions hToolsOptions ( "HTML","View" ) - if GrafikenUndObjekte.IsChecked Then WarnLog "GrafikenUndObjekte x" - if Tabellen.IsChecked Then WarnLog "Tabellen x" + if GrafikenUndObjekte.IsChecked Then WarnLog "Grafiken x" if Zeichnungen.IsChecked Then WarnLog "Zeichnungen x" if Feldnamen.IsChecked Then WarnLog "Feldnamen x" if Notizen.IsChecked Then WarnLog "Notizen x" Printlog ("'/// - all Check -> x ///") GrafikenUndObjekte.Check - Tabellen.Check Zeichnungen.Check Feldnamen.Check Notizen.Check @@ -135,18 +129,16 @@ testcase tToolsOptionsHTMLContent ToolsOptions Call hToolsOptions ( "HTML","View" ) - if true <> GrafikenUndObjekte.IsChecked Then WarnLog "GrafikenUndObjekte o" - if True <> Tabellen.IsChecked Then WarnLog "Tabellen o" + if true <> GrafikenUndObjekte.IsChecked Then WarnLog "Grafiken o" if True <> Zeichnungen.IsChecked Then WarnLog "Zeichnungen o" if True <> Feldnamen.IsChecked Then WarnLog "Feldnamen o" if True <> Notizen.IsChecked Then WarnLog "Notizen o" printlog ("'/// - restore states ///") - if ( irgendwas(1) = TRUE ) Then GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck - if ( irgendwas(2) = TRUE ) Then Tabellen.Check Else Tabellen.UnCheck - if ( irgendwas(3) = TRUE ) Then Zeichnungen.Check Else Zeichnungen.UnCheck - if ( irgendwas(4) = TRUE ) Then Feldnamen.Check Else Feldnamen.UnCheck - if ( irgendwas(5) = TRUE ) Then Notizen.Check Else Notizen.UnCheck + if ( bCheckboxStatus(1) = TRUE ) Then GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck + if ( bCheckboxStatus(3) = TRUE ) Then Zeichnungen.Check Else Zeichnungen.UnCheck + if ( bCheckboxStatus(4) = TRUE ) Then Feldnamen.Check Else Feldnamen.UnCheck + if ( bCheckboxStatus(5) = TRUE ) Then Notizen.Check Else Notizen.UnCheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -158,7 +150,7 @@ endcase '------------------------------------------------------------------------------ testcase tToolsOptionsHTMLLayout - Dim irgendwas(11) as boolean + Dim bCheckboxStatus(11) as boolean Dim iMasseinheit(3) as integer Dim iTemp(3) as integer '///Open "writer\\optional\\input\\options\\options1.sxw /// @@ -169,15 +161,15 @@ testcase tToolsOptionsHTMLLayout ToolsOptions Call hToolsOptions ( "HTML" , "VIEW" ) '*TabLayoutHTML/ (1) - irgendwas(1) = Hilfslinien.IsChecked - irgendwas(2) = FarbigeHandles.IsChecked - irgendwas(3) = GrosseHandles.IsChecked - irgendwas(4) = HorizontaleBildlaufleiste.IsChecked - irgendwas(5) = VertikaleBildlaufleiste.IsChecked - irgendwas(10) = Lineal.IsChecked - irgendwas(6) = HorizontalesLineal.IsChecked - irgendwas(7) = VertikalesLineal.IsChecked - irgendwas(8) = WeichesScrollen.IsChecked + bCheckboxStatus(1) = Hilfslinien.IsChecked + bCheckboxStatus(2) = FarbigeHandles.IsChecked + bCheckboxStatus(3) = GrosseHandles.IsChecked + bCheckboxStatus(4) = HorizontaleBildlaufleiste.IsChecked + bCheckboxStatus(5) = VertikaleBildlaufleiste.IsChecked + bCheckboxStatus(10) = Lineal.IsChecked + bCheckboxStatus(6) = HorizontalesLineal.IsChecked + bCheckboxStatus(7) = VertikalesLineal.IsChecked + bCheckboxStatus(8) = WeichesScrollen.IsChecked iMasseinheit(2) = HorizontalesLinealMasseinheit.GetSelIndex iMasseinheit(3) = VertikalesLinealMasseinheit.GetSelIndex @@ -185,17 +177,17 @@ testcase tToolsOptionsHTMLLayout printlog ("'/// - all states inverting ///") 'this one has 2 places: ViewTextBoundaries - if irgendwas(1) Then Hilfslinien.UnCheck Else Hilfslinien.Check - if irgendwas(2) Then FarbigeHandles.UnCheck Else FarbigeHandles.Check - if irgendwas(3) Then GrosseHandles.UnCheck Else GrosseHandles.Check + if bCheckboxStatus(1) Then Hilfslinien.UnCheck Else Hilfslinien.Check + if bCheckboxStatus(2) Then FarbigeHandles.UnCheck Else FarbigeHandles.Check + if bCheckboxStatus(3) Then GrosseHandles.UnCheck Else GrosseHandles.Check 'this one has 2 places: ViewRuler - if irgendwas(4) Then HorizontaleBildlaufleiste.UnCheck Else HorizontaleBildlaufleiste.Check - if irgendwas(5) Then VertikaleBildlaufleiste.UnCheck Else VertikaleBildlaufleiste.Check - if irgendwas(10) then Lineal.UnCheck Else Lineal.Check ' has to be checked to enable Horizontal and Vertical Ruler + if bCheckboxStatus(4) Then HorizontaleBildlaufleiste.UnCheck Else HorizontaleBildlaufleiste.Check + if bCheckboxStatus(5) Then VertikaleBildlaufleiste.UnCheck Else VertikaleBildlaufleiste.Check + if bCheckboxStatus(10) then Lineal.UnCheck Else Lineal.Check ' has to be checked to enable Horizontal and Vertical Ruler if Lineal.IsChecked then - if irgendwas(6) Then HorizontalesLineal.UnCheck Else HorizontalesLineal.Check - if irgendwas(7) Then VertikalesLineal.UnCheck Else VertikalesLineal.Check + if bCheckboxStatus(6) Then HorizontalesLineal.UnCheck Else HorizontalesLineal.Check + if bCheckboxStatus(7) Then VertikalesLineal.UnCheck Else VertikalesLineal.Check if ( HorizontalesLinealMasseinheit.GetItemCount <> iMasseinheit(2) ) Then HorizontalesLinealMasseinheit.Select (HorizontalesLinealMasseinheit.GetItemCount) Else HorizontalesLinealMasseinheit.Select (1) if ( VertikalesLinealMasseinheit.GetItemCount <> iMasseinheit(3) ) Then VertikalesLinealMasseinheit.Select (VertikalesLinealMasseinheit.GetItemCount) Else VertikalesLinealMasseinheit.Select (1) iTemp(2) = HorizontalesLinealMasseinheit.GetSelIndex @@ -203,13 +195,13 @@ testcase tToolsOptionsHTMLLayout '/// if Asian Language enabled there has to be a checkbox 'Right-aligned' for 'Vertical-Ruler' /// if gAsianSup = True and VertikalesLineal.IsChecked = True then if RechtsAusgerichtet.IsVisible = True then - if irgendwas(9) Then RechtsAusgerichtet.Uncheck Else RechtsAusgerichtet.Check + if bCheckboxStatus(9) Then RechtsAusgerichtet.Uncheck Else RechtsAusgerichtet.Check else Warnlog "- Checkbox 'Right-aligned' is not visible !" end if end if end if - if irgendwas(8) Then WeichesScrollen.UnCheck Else WeichesScrollen.Check + if bCheckboxStatus(8) Then WeichesScrollen.UnCheck Else WeichesScrollen.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -222,22 +214,22 @@ testcase tToolsOptionsHTMLLayout ToolsOptions Call hToolsOptions ( "HTML" , "VIEW" ) '*TabLayoutHTML/ (1) - if ( irgendwas(1) = Hilfslinien.IsChecked ) Then WarnLog "Hilfslinien state changed" - if ( irgendwas(2) = FarbigeHandles.IsChecked ) Then WarnLog "FarbigeHandles state changed" - if ( irgendwas(3) = GrosseHandles.IsChecked ) Then WarnLog "GrosseHandles state changed" - if ( irgendwas(4) = HorizontaleBildlaufleiste.IsChecked ) Then WarnLog "HorizontaleBildlaufleiste state changed" - if ( irgendwas(5) = VertikaleBildlaufleiste.IsChecked ) Then WarnLog "VertikaleBildlaufleiste state changed" - if ( irgendwas(8) = WeichesScrollen.IsChecked ) Then WarnLog "WeichesScrollen state changed" - if ( irgendwas(10) = Lineal.IsChecked ) Then + if ( bCheckboxStatus(1) = Hilfslinien.IsChecked ) Then WarnLog "Hilfslinien state changed" + if ( bCheckboxStatus(2) = FarbigeHandles.IsChecked ) Then WarnLog "FarbigeHandles state changed" + if ( bCheckboxStatus(3) = GrosseHandles.IsChecked ) Then WarnLog "GrosseHandles state changed" + if ( bCheckboxStatus(4) = HorizontaleBildlaufleiste.IsChecked ) Then WarnLog "HorizontaleBildlaufleiste state changed" + if ( bCheckboxStatus(5) = VertikaleBildlaufleiste.IsChecked ) Then WarnLog "VertikaleBildlaufleiste state changed" + if ( bCheckboxStatus(8) = WeichesScrollen.IsChecked ) Then WarnLog "WeichesScrollen state changed" + if ( bCheckboxStatus(10) = Lineal.IsChecked ) Then WarnLog "Ruler state changed" - if ( irgendwas(6) = HorizontalesLineal.IsChecked ) Then WarnLog "HorizontalesLineal state changed" - if ( irgendwas(7) = VertikalesLineal.IsChecked ) Then WarnLog "VertikalesLineal state changed" + if ( bCheckboxStatus(6) = HorizontalesLineal.IsChecked ) Then WarnLog "HorizontalesLineal state changed" + if ( bCheckboxStatus(7) = VertikalesLineal.IsChecked ) Then WarnLog "VertikalesLineal state changed" if ( HorizontalesLinealMasseinheit.GetSelIndex <> iTemp(2) ) Then WarnLog "HorizontalesLinealMasseinheit state changed" if ( VertikalesLinealMasseinheit.GetSelIndex <> iTemp(3) ) Then WarnLog "VertikalesLinealMasseinheit state changed" if gAsianSup = True and VertikalesLineal.IsChecked = True then if RechtsAusgerichtet.IsVisible = True then - if irgendwas(9) = RechtsAusgerichtet.IsChecked then WarnLog "Right-aligned state changed" + if bCheckboxStatus(9) = RechtsAusgerichtet.IsChecked then WarnLog "Right-aligned state changed" else Warnlog "- Checkbox 'Right-aligned' is not visible !" end if @@ -381,19 +373,19 @@ testcase tToolsOptionsHTMLLayout ToolsOptions Call hToolsOptions ( "HTML" , "VIEW" ) - if ( irgendwas(1) = TRUE ) Then Hilfslinien.Check Else Hilfslinien.UnCheck - if ( irgendwas(2) = TRUE ) Then FarbigeHandles.Check Else FarbigeHandles.UnCheck - if ( irgendwas(3) = TRUE ) Then GrosseHandles.Check Else GrosseHandles.UnCheck + if ( bCheckboxStatus(1) = TRUE ) Then Hilfslinien.Check Else Hilfslinien.UnCheck + if ( bCheckboxStatus(2) = TRUE ) Then FarbigeHandles.Check Else FarbigeHandles.UnCheck + if ( bCheckboxStatus(3) = TRUE ) Then GrosseHandles.Check Else GrosseHandles.UnCheck - if ( irgendwas(4) = TRUE ) Then HorizontaleBildlaufleiste.Check Else HorizontaleBildlaufleiste.UnCheck - if ( irgendwas(5) = TRUE ) Then VertikaleBildlaufleiste.Check Else VertikaleBildlaufleiste.UnCheck + if ( bCheckboxStatus(4) = TRUE ) Then HorizontaleBildlaufleiste.Check Else HorizontaleBildlaufleiste.UnCheck + if ( bCheckboxStatus(5) = TRUE ) Then VertikaleBildlaufleiste.Check Else VertikaleBildlaufleiste.UnCheck Lineal.Check - if ( irgendwas(6) = TRUE ) Then HorizontalesLineal.Check Else HorizontalesLineal.UnCheck - if ( irgendwas(7) = TRUE ) Then VertikalesLineal.Check Else VertikalesLineal.UnCheck + if ( bCheckboxStatus(6) = TRUE ) Then HorizontalesLineal.Check Else HorizontalesLineal.UnCheck + if ( bCheckboxStatus(7) = TRUE ) Then VertikalesLineal.Check Else VertikalesLineal.UnCheck HorizontalesLinealMasseinheit.Select (iMasseinheit(2)) VertikalesLinealMasseinheit.Select (iMasseinheit(3)) - if ( irgendwas(8) = TRUE ) Then WeichesScrollen.Check Else WeichesScrollen.UnCheck + if ( bCheckboxStatus(8) = TRUE ) Then WeichesScrollen.Check Else WeichesScrollen.UnCheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -406,7 +398,7 @@ endcase '------------------------------------------------------------------------------ testcase tToolsOptionsHTMLGrid - Dim irgendwas(3) as boolean + Dim bCheckboxStatus(3) as boolean Dim sMetricField(4) as string ' MetricField Dim sTempMetricField(4) as string @@ -422,9 +414,9 @@ testcase tToolsOptionsHTMLGrid printlog ("'///TabRaster all UnCheck ! ///") - irgendwas(1) = FangrasterBenutzen.IsChecked - irgendwas(2) = RasterSichtbar.IsChecked - irgendwas(3) = AchsenSynchronisieren.IsChecked + bCheckboxStatus(1) = FangrasterBenutzen.IsChecked + bCheckboxStatus(2) = RasterSichtbar.IsChecked + bCheckboxStatus(3) = AchsenSynchronisieren.IsChecked sMetricField(1) = RasterAufloesungXAchse.GetText sMetricField(2) = RasterAufloesungYAchse.GetText @@ -433,9 +425,9 @@ testcase tToolsOptionsHTMLGrid printlog ("'/// - all states inverting ///") - if irgendwas(1) Then FangrasterBenutzen.UnCheck Else FangrasterBenutzen.Check - if irgendwas(2) Then RasterSichtbar.UnCheck Else RasterSichtbar.Check - ' if irgendwas(3) Then AchsenSynchronisieren.UnCheck Else AchsenSynchronisieren.Check + if bCheckboxStatus(1) Then FangrasterBenutzen.UnCheck Else FangrasterBenutzen.Check + if bCheckboxStatus(2) Then RasterSichtbar.UnCheck Else RasterSichtbar.Check + ' if bCheckboxStatus(3) Then AchsenSynchronisieren.UnCheck Else AchsenSynchronisieren.Check ' this CheckBox interacts with the MetricBoxes: AchsenSynchronisieren.UnCheck @@ -467,8 +459,8 @@ testcase tToolsOptionsHTMLGrid ToolsOptions Call hToolsOptions ( "HTML","Grid" ) - if (irgendwas(1) = FangrasterBenutzen.IsChecked ) Then WarnLog "FangrasterBenutzen state changed BugID: 82944 " - if (irgendwas(2) = RasterSichtbar.IsChecked ) Then WarnLog "RasterSichtbar state changed" + if (bCheckboxStatus(1) = FangrasterBenutzen.IsChecked ) Then WarnLog "FangrasterBenutzen state changed BugID: 82944 " + if (bCheckboxStatus(2) = RasterSichtbar.IsChecked ) Then WarnLog "RasterSichtbar state changed" if ( AchsenSynchronisieren.IsChecked = TRUE ) Then WarnLog "AchsenSynchronisieren state changed" if ( RasterAufloesungXAchse.GetText <> sTempMetricField(1) ) Then WarnLog "RasterAufloesungXAchse state changed" if ( RasterAufloesungYAchse.GetText <> sTempMetricField(2) ) Then WarnLog "RasterAufloesungYAchse state changed" @@ -638,9 +630,9 @@ testcase tToolsOptionsHTMLGrid ToolsOptions Call hToolsOptions ( "HTML","Grid" ) - if ( irgendwas(1) = TRUE ) Then FangrasterBenutzen.Check Else FangrasterBenutzen.UnCheck - if ( irgendwas(2) = TRUE ) Then RasterSichtbar.Check Else RasterSichtbar.UnCheck - if ( irgendwas(3) = TRUE ) Then AchsenSynchronisieren.Check Else AchsenSynchronisieren.UnCheck + if ( bCheckboxStatus(1) = TRUE ) Then FangrasterBenutzen.Check Else FangrasterBenutzen.UnCheck + if ( bCheckboxStatus(2) = TRUE ) Then RasterSichtbar.Check Else RasterSichtbar.UnCheck + if ( bCheckboxStatus(3) = TRUE ) Then AchsenSynchronisieren.Check Else AchsenSynchronisieren.UnCheck RasterAufloesungXAchse.SetText (sMetricField(1)) RasterAufloesungYAchse.SetText (sMetricField(2)) RasterUnterteilungXAchse.SetText (sMetricField(3)) diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc index ca7c0a789349..dd25cb452c08 100755 --- a/testautomation/writer/optional/includes/option/wh_o_2.inc +++ b/testautomation/writer/optional/includes/option/wh_o_2.inc @@ -48,53 +48,28 @@ end sub '------------------------------------------------------------------------------ testcase tToolsOptionsHTMLPrint - dim irgendwas(12) as boolean ' Checkbox states + dim bCheckboxStatus(12) as boolean ' Checkbox states dim iListBox(1) as integer ' ListBox dim iTempListBox(1) as integer dim bRadioBut(4) as boolean ' RadioButtons dim bTempRadioBut(4) as boolean - ' sMetricField(i) and sTempMetricField(i) - '(1) = Grafiken - '(2) = Tabellen - '(3) = Zeichnungen - '(4) = Kontrollfelder - '(5) = Hintergrund - '(6) = SchwarzDrucken - ' - '(7) = LinkeSeiten - '(8) = RechteSeiten - '(9) = Umgekehrt - '(10)= Prospekt - ' - '(11)= EinzelneDruckauftraege - '(12)= AusDruckereinstellung - - ' bRadioBut(i) and bTempRadioBut(i) / RadioButton - '(1) = Keine - '(2) = NurNotizen - '(3) = Dokumentende - '(4) = Seitenende - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\test.html" ) Call sMakeReadOnlyDocumentEditable - printlog "'///- Tools/Options/HTML: PrintHTML ///" + printlog "- Tools/Options/HTML: PrintHTML " - printlog ("'/// - save states ///") + printlog (" - save states ") ToolsOptions Call hToolsOptions ("HTML","PRINT") - irgendwas(1) = Grafiken.IsChecked - irgendwas(2) = Tabellen.IsChecked - irgendwas(4) = Kontrollfelder.IsChecked - irgendwas(5) = Hintergrund.IsChecked - irgendwas(6) = SchwarzDrucken.IsChecked + bCheckboxStatus(1) = Grafiken.IsChecked + bCheckboxStatus(2) = Kontrollfelder.IsChecked + bCheckboxStatus(3) = Hintergrund.IsChecked + bCheckboxStatus(4) = SchwarzDrucken.IsChecked - irgendwas(9) = Umgekehrt.IsChecked - irgendwas(10)= Prospekt.IsChecked + bCheckboxStatus(5)= Prospekt.IsChecked - irgendwas(11)= EinzelneDruckauftraege.IsChecked - irgendwas(12)= AusDruckereinstellung.IsChecked + bCheckboxStatus(6)= AusDruckereinstellung.IsChecked iListBox(1) = Fax.GetSelIndex @@ -103,19 +78,16 @@ testcase tToolsOptionsHTMLPrint bRadioBut(3) = Dokumentende.IsChecked bRadioBut(4) = Seitenende.IsChecked - printlog ("'/// - all states inverting ///") + printlog (" - all states inverting ") - if irgendwas(1) Then Grafiken.UnCheck Else Grafiken.Check - if irgendwas(2) Then Tabellen.UnCheck Else Tabellen.Check - if irgendwas(4) Then Kontrollfelder.UnCheck Else Kontrollfelder.Check - if irgendwas(5) Then Hintergrund.UnCheck Else Hintergrund.Check - if irgendwas(6) Then SchwarzDrucken.UnCheck Else SchwarzDrucken.Check + if bCheckboxStatus(1) Then Grafiken.UnCheck Else Grafiken.Check + if bCheckboxStatus(2) Then Kontrollfelder.UnCheck Else Kontrollfelder.Check + if bCheckboxStatus(3) Then Hintergrund.UnCheck Else Hintergrund.Check + if bCheckboxStatus(4) Then SchwarzDrucken.UnCheck Else SchwarzDrucken.Check - if irgendwas(9) Then Umgekehrt.UnCheck Else Umgekehrt.Check - if irgendwas(10) Then Prospekt.UnCheck Else Prospekt.Check + if bCheckboxStatus(5) Then Prospekt.UnCheck Else Prospekt.Check - if irgendwas(11) Then EinzelneDruckauftraege.UnCheck Else EinzelneDruckauftraege.Check - if irgendwas(12) Then AusDruckereinstellung.UnCheck Else AusDruckereinstellung.Check + if bCheckboxStatus(6) Then AusDruckereinstellung.UnCheck Else AusDruckereinstellung.Check if (Keine.IsChecked = True) Then NurNotizen.Check Else Keine.Check @@ -134,25 +106,22 @@ testcase tToolsOptionsHTMLPrint Call hFileSaveAsKill(gOfficepath + "user\work\printtest.html") Call hCloseDocument - printlog ("'/// - SO quit - start ///") + printlog (" - SO quit - start ") Call wOfficeRestart - printlog ("'/// - checking states ///") + printlog (" - checking states ") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) - if ( irgendwas(1) = Grafiken.IsChecked ) Then WarnLog "'Graphics' state changed" - if ( irgendwas(2) = Tabellen.IsChecked ) Then WarnLog "'Tables' state changed" - if ( irgendwas(4) = Kontrollfelder.IsChecked ) Then WarnLog "'Controls' state changed" - if ( irgendwas(5) = Hintergrund.IsChecked ) Then WarnLog "'Background' state changed" - if ( irgendwas(6) = SchwarzDrucken.IsChecked ) Then WarnLog "'Print black' state changed" + if ( bCheckboxStatus(1) = Grafiken.IsChecked ) Then WarnLog "#i108219#'Graphics' state changed" + if ( bCheckboxStatus(2) = Kontrollfelder.IsChecked ) Then WarnLog "'Controls' state changed" + if ( bCheckboxStatus(3) = Hintergrund.IsChecked ) Then WarnLog "'Background' state changed" + if ( bCheckboxStatus(4) = SchwarzDrucken.IsChecked ) Then WarnLog "'Print black' state changed" - if ( irgendwas(9) = Umgekehrt.IsChecked ) Then WarnLog "'Reversed' state changed" - if ( irgendwas(10)= Prospekt.IsChecked ) Then WarnLog "'Brochure' state changed" + if ( bCheckboxStatus(5)= Prospekt.IsChecked ) Then WarnLog "'Brochure' state changed" - if ( irgendwas(11)= EinzelneDruckauftraege.IsChecked ) Then WarnLog "'Create single print jobs' state changed" - if ( irgendwas(12)= AusDruckereinstellung.IsChecked ) Then WarnLog "'Paper tray from printer settings' state changed" + if ( bCheckboxStatus(6)= AusDruckereinstellung.IsChecked ) Then WarnLog "'Paper tray from printer settings' state changed" if ( bTempRadioBut(1) <> Keine.IsChecked ) Then WarnLog "'None' state changed (Bug#99202)" if ( bTempRadioBut(2) <> NurNotizen.IsChecked ) Then WarnLog "'Notes only' state changed (Bug#99202)" @@ -161,18 +130,15 @@ testcase tToolsOptionsHTMLPrint if ( Fax.GetSelIndex <> iTempListBox(1) ) Then warnlog "Fax state changed" - printlog ("'/// - all UnCheck -> o ///") + printlog (" - all UnCheck -> o ") Grafiken.UnCheck - Tabellen.UnCheck Kontrollfelder.UnCheck Hintergrund.UnCheck SchwarzDrucken.UnCheck - Umgekehrt.UnCheck Prospekt.UnCheck - EinzelneDruckauftraege.UnCheck AusDruckereinstellung.UnCheck if (NurNotizen.IsChecked = True) Then Dokumentende.Check Else NurNotizen.Check @@ -187,20 +153,17 @@ testcase tToolsOptionsHTMLPrint Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all UnChecked ///") + printlog (" - check if all UnChecked ") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) if Grafiken.IsChecked Then WarnLog "'Graphics' x" - if Tabellen.IsChecked Then WarnLog "'Tables' x" if Kontrollfelder.IsChecked Then WarnLog "'Controls' x" if Hintergrund.IsChecked Then WarnLog "'Background' x" if SchwarzDrucken.IsChecked Then WarnLog "'Print black' x" - if Umgekehrt.IsChecked Then WarnLog "'Reversed' x" if Prospekt.IsChecked Then WarnLog "'Brochure' x" - if EinzelneDruckauftraege.IsChecked Then WarnLog "'Create single print jobs' x" if AusDruckereinstellung.IsChecked Then WarnLog "'Paper tray from printer settings' x" ' Is saved with document @@ -217,18 +180,15 @@ testcase tToolsOptionsHTMLPrint if ( Fax.GetSelIndex <> 1 ) Then WarnLog "Fax is not item 1" - Printlog ("'/// - all Check -> x ///") + Printlog (" - all Check -> x ") Grafiken.Check - Tabellen.Check Kontrollfelder.Check Hintergrund.Check SchwarzDrucken.Check - Umgekehrt.Check Prospekt.Check - EinzelneDruckauftraege.Check AusDruckereinstellung.Check if (Dokumentende.IsChecked = True) Then Seitenende.Check Else Dokumentende.Check @@ -243,20 +203,17 @@ testcase tToolsOptionsHTMLPrint Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all Checked ///") + printlog (" - check if all Checked ") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) if not Grafiken.IsChecked Then WarnLog "'Graphics' o" - if not Tabellen.IsChecked Then WarnLog "'Tables' o" if not Kontrollfelder.IsChecked Then WarnLog "'Controls' o" if not Hintergrund.IsChecked Then WarnLog "'Background' o" if not SchwarzDrucken.IsChecked Then WarnLog "'Print black' o" - if not Umgekehrt.IsChecked Then WarnLog "'Reversed' o" if not Prospekt.IsChecked Then WarnLog "'Brochure' o" - if not EinzelneDruckauftraege.IsChecked Then WarnLog "'Create single print jobs' o" if not AusDruckereinstellung.IsChecked Then WarnLog "'Paper tray from printer settings' o" if ( bTempRadioBut(1) <> Keine.IsChecked ) Then WarnLog "'None' state changed" @@ -269,21 +226,18 @@ testcase tToolsOptionsHTMLPrint Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.Cancel - printlog ("'/// - restore states ///") + printlog (" - restore states ") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) - if ( irgendwas(1) = TRUE ) Then Grafiken.Check Else Grafiken.UnCheck - if ( irgendwas(2) = TRUE ) Then Tabellen.Check Else Tabellen.UnCheck - if ( irgendwas(4) = TRUE ) Then Kontrollfelder.Check Else Kontrollfelder.UnCheck - if ( irgendwas(5) = TRUE ) Then Hintergrund.Check Else Hintergrund.UnCheck - if ( irgendwas(6) = TRUE ) Then SchwarzDrucken.Check Else SchwarzDrucken.UnCheck + if ( bCheckboxStatus(1) = TRUE ) Then Grafiken.Check Else Grafiken.UnCheck + if ( bCheckboxStatus(2) = TRUE ) Then Kontrollfelder.Check Else Kontrollfelder.UnCheck + if ( bCheckboxStatus(3) = TRUE ) Then Hintergrund.Check Else Hintergrund.UnCheck + if ( bCheckboxStatus(4) = TRUE ) Then SchwarzDrucken.Check Else SchwarzDrucken.UnCheck - if ( irgendwas(9) = TRUE ) Then Umgekehrt.Check Else Umgekehrt.UnCheck - if ( irgendwas(10) = TRUE ) Then Prospekt.Check Else Prospekt.UnCheck + if ( bCheckboxStatus(5) = TRUE ) Then Prospekt.Check Else Prospekt.UnCheck - if ( irgendwas(11) = TRUE ) Then EinzelneDruckauftraege.Check Else EinzelneDruckauftraege.UnCheck - if ( irgendwas(12) = TRUE ) Then AusDruckereinstellung.Check Else AusDruckereinstellung.UnCheck + if ( bCheckboxStatus(7) = TRUE ) Then AusDruckereinstellung.Check Else AusDruckereinstellung.UnCheck try Fax.Select (iListBox(1)) @@ -332,9 +286,9 @@ testcase tToolsOptionsHTMLTable '(3) = Variabel Call hNewDocument - printlog ("'///- Tools/Options/HTML: Table ///") + printlog ("- Tools/Options/HTML: Table ") - printlog ("'/// - save states ///") + printlog (" - save states ") ToolsOptions Call hToolsOptions ("HTML","Table") @@ -349,7 +303,7 @@ testcase tToolsOptionsHTMLTable if ((bRadioBut(1) Xor bRadioBut(2) Xor bRadioBut(3)) = False) Then Warnlog (" RadioButtons have NO init state: " + bRadioBut(1) +", BugID: 83097") - printlog ("'/// - all states inverting ///") + printlog (" - all states inverting ") VerschiebenZeile.ToMax VerschiebenSpalte.ToMax @@ -373,11 +327,11 @@ testcase tToolsOptionsHTMLTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - SO quit - start ///") + printlog (" - SO quit - start ") Call wOfficeRestart - printlog ("'/// - checking states ///") + printlog (" - checking states ") ToolsOptions Call hToolsOptions ( "HTML" , "Table" ) @@ -393,7 +347,7 @@ testcase tToolsOptionsHTMLTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - all UnCheck -> o ///") + printlog (" - all UnCheck -> o ") ToolsOptions Call hToolsOptions ( "HTML" , "Table" ) @@ -405,7 +359,7 @@ testcase tToolsOptionsHTMLTable sTempMetricField(2) = VerschiebenSpalte.GetText sTempMetricField(3) = EinfuegenZeile.GetText sTempMetricField(4) = EinfuegenSpalte.GetText - printlog ("'/// More test ///'") + printlog (" More test ///'") VerschiebenZeile.More VerschiebenSpalte.More EinfuegenZeile.More @@ -428,7 +382,7 @@ testcase tToolsOptionsHTMLTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all UnChecked ///") + printlog (" - check if all UnChecked ") ToolsOptions Call hToolsOptions ( "HTML" , "Table" ) @@ -441,7 +395,7 @@ testcase tToolsOptionsHTMLTable if ( bTempRadioBut(2) <> FixProportional.IsChecked) Then WarnLog "Behaviour of rows/columns : 'Fixed, proportional' state changed" if ( bTempRadioBut(3) <> Variabel.IsChecked ) Then WarnLog "Behaviour of rows/columns : 'Variable' state changed" - Printlog ("'/// - all Check -> x ///") + Printlog (" - all Check -> x ") VerschiebenZeile.ToMax VerschiebenSpalte.ToMax @@ -451,7 +405,7 @@ testcase tToolsOptionsHTMLTable sTempMetricField(2) = VerschiebenSpalte.GetText sTempMetricField(3) = EinfuegenZeile.GetText sTempMetricField(4) = EinfuegenSpalte.GetText - printlog ("'/// Less test ///'") + printlog (" Less test ///'") VerschiebenZeile.Less VerschiebenSpalte.Less EinfuegenZeile.Less @@ -474,7 +428,7 @@ testcase tToolsOptionsHTMLTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all Checked ///") + printlog (" - check if all Checked ") ToolsOptions Call hToolsOptions ( "HTML" , "Table" ) @@ -487,7 +441,7 @@ testcase tToolsOptionsHTMLTable if ( bTempRadioBut(2) <> FixProportional.IsChecked) Then WarnLog "Behaviour of rows/columns : 'Fixed, proportional' state changed" if ( bTempRadioBut(3) <> Variabel.IsChecked ) Then WarnLog "Behaviour of rows/columns : 'Variable' state changed" - printlog ("'/// - restore states ///") + printlog (" - restore states ") VerschiebenZeile.SetText (sMetricField(1)) VerschiebenSpalte.SetText (sMetricField(2)) @@ -510,7 +464,7 @@ testcase tToolsOptionsHTMLTable1 '/// This testcase check for this bug /// Call hNewDocument - printlog ("'///- Tools/Options/Text document: Table ///") + printlog ("- Tools/Options/Text document: Table ") ToolsOptions Call hToolsOptions ("WRITER","Table") diff --git a/testautomation/writer/optional/includes/option/wr_o_1.inc b/testautomation/writer/optional/includes/option/wr_o_1.inc index e55ebbd73280..e20d47236dc5 100755 --- a/testautomation/writer/optional/includes/option/wr_o_1.inc +++ b/testautomation/writer/optional/includes/option/wr_o_1.inc @@ -441,18 +441,16 @@ testcase tToolsOptionsWriterView5 Call hToolsOptions ("WRITER","VIEW") option_value(1) = GrafikenUndObjekte.IsChecked - option_value(2) = Tabellen.IsChecked - option_value(3) = Zeichnungen.IsChecked - option_value(4) = Feldname.IsChecked - option_value(5) = Notizen.IsChecked + option_value(2) = Zeichnungen.IsChecked + option_value(3) = Feldname.IsChecked + option_value(4) = Notizen.IsChecked printlog ("'/// - all states inverting ///") if option_value(1) then GrafikenUndObjekte.UnCheck else GrafikenUndObjekte.Check - if option_value(2) then Tabellen.UnCheck else Tabellen.Check - if option_value(3) then Zeichnungen.UnCheck else Zeichnungen.Check - if option_value(4) then Feldname.UnCheck else Feldname.Check - if option_value(5) then Notizen.UnCheck else Notizen.Check + if option_value(2) then Zeichnungen.UnCheck else Zeichnungen.Check + if option_value(3) then Feldname.UnCheck else Feldname.Check + if option_value(4) then Notizen.UnCheck else Notizen.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -465,11 +463,10 @@ testcase tToolsOptionsWriterView5 ToolsOptions Call hToolsOptions ( "WRITER" , "VIEW" ) - if ( option_value(1) = GrafikenUndObjekte.IsChecked ) then WarnLog "GrafikenUndObjekte state changed" - if ( option_value(2) = Tabellen.IsChecked ) then WarnLog "Tabellen state changed" - if ( option_value(3) = Zeichnungen.IsChecked ) then WarnLog "Zeichnungen state changed" - if ( option_value(4) = Feldname.IsChecked ) then WarnLog "Feldname state changed" - if ( option_value(5) = Notizen.IsChecked ) then WarnLog "Notizen state changed" + if ( option_value(1) = GrafikenUndObjekte.IsChecked ) then WarnLog "Graphics and objects state changed" + if ( option_value(2) = Zeichnungen.IsChecked ) then WarnLog "Zeichnungen state changed" + if ( option_value(3) = Feldname.IsChecked ) then WarnLog "Feldname state changed" + if ( option_value(4) = Notizen.IsChecked ) then WarnLog "Notizen state changed" Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -499,15 +496,13 @@ testcase tToolsOptionsWriterView6 Call hToolsOptions ("WRITER","VIEW") option_value(1) = GrafikenUndObjekte.IsChecked - option_value(2) = Tabellen.IsChecked - option_value(3) = Zeichnungen.IsChecked - option_value(4) = Feldname.IsChecked - option_value(5) = Notizen.IsChecked + option_value(2) = Zeichnungen.IsChecked + option_value(3) = Feldname.IsChecked + option_value(4) = Notizen.IsChecked printlog ("'/// - all states unchecked ///") GrafikenUndObjekte.UnCheck - Tabellen.UnCheck Zeichnungen.UnCheck Feldname.UnCheck Notizen.UnCheck @@ -523,18 +518,16 @@ testcase tToolsOptionsWriterView6 ToolsOptions Call hToolsOptions ( "WRITER" , "VIEW" ) - if GrafikenUndObjekte.IsChecked then WarnLog "GrafikenUndObjekte x" - if Tabellen.IsChecked then WarnLog "Tabellen x" + if GrafikenUndObjekte.IsChecked then WarnLog "Graphics and objects x" if Zeichnungen.IsChecked then WarnLog "Zeichnungen x" if Feldname.IsChecked then WarnLog "Feldname x" if Notizen.IsChecked then WarnLog "Notizen x" printlog ("'/// - restore states ///") if ( option_value(1) = TRUE ) Then GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck - if ( option_value(2) = TRUE ) Then Tabellen.Check Else Tabellen.UnCheck - if ( option_value(3) = TRUE ) Then Zeichnungen.Check Else Zeichnungen.UnCheck - if ( option_value(4) = TRUE ) Then Feldname.Check Else Feldname.UnCheck - if ( option_value(5) = TRUE ) Then Notizen.Check Else Notizen.UnCheck + if ( option_value(2) = TRUE ) Then Zeichnungen.Check Else Zeichnungen.UnCheck + if ( option_value(3) = TRUE ) Then Feldname.Check Else Feldname.UnCheck + if ( option_value(4) = TRUE ) Then Notizen.Check Else Notizen.UnCheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -564,15 +557,13 @@ testcase tToolsOptionsWriterView7 Call hToolsOptions ("WRITER","VIEW") option_value(1) = GrafikenUndObjekte.IsChecked - option_value(2) = Tabellen.IsChecked - option_value(3) = Zeichnungen.IsChecked - option_value(4) = Feldname.IsChecked - option_value(5) = Notizen.IsChecked + option_value(2) = Zeichnungen.IsChecked + option_value(3) = Feldname.IsChecked + option_value(4) = Notizen.IsChecked printlog ("'/// - all Check -> x ///") GrafikenUndObjekte.Check - Tabellen.Check Zeichnungen.Check Feldname.Check Notizen.Check @@ -588,8 +579,7 @@ testcase tToolsOptionsWriterView7 ToolsOptions hToolsOptions ( "WRITER" , "VIEW" ) - if true <> GrafikenUndObjekte.IsChecked then WarnLog "GrafikenUndObjekte o" - if true <> Tabellen.IsChecked then WarnLog "Tabellen." + if true <> GrafikenUndObjekte.IsChecked then WarnLog "Graphics and objects o" if true <> Zeichnungen.IsChecked then WarnLog "Zeichnungen o" if true <> Feldname.IsChecked then WarnLog "Feldname o" if true <> Notizen.IsChecked then WarnLog "Notizen o" diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc index 78bff9f411ff..f677a5c39ed5 100755 --- a/testautomation/writer/optional/includes/option/wr_o_2.inc +++ b/testautomation/writer/optional/includes/option/wr_o_2.inc @@ -451,14 +451,12 @@ testcase tToolsOptionsWriterPrint1 ' sMetricField(i) and sTempMetricField(i) '(1) = Grafiken '(2) = Tabellen - '(3) = Zeichnungen '(4) = Kontrollfelder '(5) = Hintergrund '(6) = SchwarzDrucken ' '(7) = LinkeSeiten '(8) = RechteSeiten - '(9) = Umgekehrt '(10)= Prospekt ' '(11)= EinzelneDruckauftraege @@ -480,20 +478,18 @@ testcase tToolsOptionsWriterPrint1 Call hToolsOptions ("WRITER","PRINT") bCheckboxes(1) = Grafiken.IsChecked - bCheckboxes(2) = Tabellen.IsChecked - bCheckboxes(3) = Zeichnungen.IsChecked - bCheckboxes(4) = Kontrollfelder.IsChecked - bCheckboxes(5) = Hintergrund.IsChecked - bCheckboxes(6) = SchwarzDrucken.IsChecked + bCheckboxes(2) = Kontrollfelder.IsChecked + bCheckboxes(3) = Hintergrund.IsChecked + bCheckboxes(4) = SchwarzDrucken.IsChecked + bCheckboxes(5) = HiddenText.IsChecked + bCheckboxes(6) = TextPlaceholder.IsChecked bCheckboxes(7) = LinkeSeiten.IsChecked bCheckboxes(8) = RechteSeiten.IsChecked - bCheckboxes(9) = Umgekehrt.IsChecked - bCheckboxes(10)= Prospekt.IsChecked + bCheckboxes(9)= Prospekt.IsChecked - bCheckboxes(11)= EinzelneDruckauftraege.IsChecked - bCheckboxes(12)= AusDruckereinstellung.IsChecked - bCheckboxes(13)= LeereSeitenDrucken.IsChecked + bCheckboxes(10)= LeereSeitenDrucken.IsChecked + bCheckboxes(11)= AusDruckereinstellung.IsChecked iListBox(1) = Fax.GetSelText @@ -504,21 +500,19 @@ testcase tToolsOptionsWriterPrint1 printlog ("'/// - all states inverting ///") - if bCheckboxes(1) then Grafiken.UnCheck else Grafiken.Check - if bCheckboxes(2) then Tabellen.UnCheck else Tabellen.Check - if bCheckboxes(3) then Zeichnungen.UnCheck else Zeichnungen.Check - if bCheckboxes(4) then Kontrollfelder.UnCheck else Kontrollfelder.Check - if bCheckboxes(5) then Hintergrund.UnCheck else Hintergrund.Check - if bCheckboxes(6) then SchwarzDrucken.UnCheck else SchwarzDrucken.Check + if bCheckboxes(1) then Grafiken.UnCheck else Grafiken.Check + if bCheckboxes(2) then Kontrollfelder.UnCheck else Kontrollfelder.Check + if bCheckboxes(3) then Hintergrund.UnCheck else Hintergrund.Check + if bCheckboxes(4) then SchwarzDrucken.UnCheck else SchwarzDrucken.Check + if bCheckboxes(5) then HiddenText.UnCheck else HiddenText.Check + if bCheckboxes(6) then TextPlaceholder.UnCheck else TextPlaceholder.Check - if bCheckboxes(7) then LinkeSeiten.UnCheck else LinkeSeiten.Check - if bCheckboxes(8) then RechteSeiten.UnCheck else RechteSeiten.Check - if bCheckboxes(9) then Umgekehrt.UnCheck else Umgekehrt.Check - if bCheckboxes(10) then Prospekt.UnCheck else Prospekt.Check + if bCheckboxes(7) then LinkeSeiten.UnCheck else LinkeSeiten.Check + if bCheckboxes(8) then RechteSeiten.UnCheck else RechteSeiten.Check + if bCheckboxes(9) then Prospekt.UnCheck else Prospekt.Check - if bCheckboxes(11) then EinzelneDruckauftraege.UnCheck else EinzelneDruckauftraege.Check - if bCheckboxes(12) then AusDruckereinstellung.UnCheck else AusDruckereinstellung.Check - if bCheckboxes(13) then LeereSeitenDrucken.UnCheck else LeereSeitenDrucken.Check + if bCheckboxes(10) then LeereSeitenDrucken.UnCheck else LeereSeitenDrucken.Check + if bCheckboxes(11) then AusDruckereinstellung.UnCheck else AusDruckereinstellung.Check if (Keine.IsChecked = True) then NurNotizen.Check else Keine.Check @@ -574,21 +568,19 @@ testcase tToolsOptionsWriterPrint1 ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) - if ( bCheckboxes(1) = Grafiken.IsChecked ) then WarnLog "Grafiken state changed" - if ( bCheckboxes(2) = Tabellen.IsChecked ) then WarnLog "Tabellen state changed" - if ( bCheckboxes(3) = Zeichnungen.IsChecked ) then WarnLog "Zeichnungen state changed" - if ( bCheckboxes(4) = Kontrollfelder.IsChecked ) then WarnLog "Kontrollfelder state changed" - if ( bCheckboxes(5) = Hintergrund.IsChecked ) then WarnLog "Hintergrund state changed" - if ( bCheckboxes(6) = SchwarzDrucken.IsChecked ) then WarnLog "SchwarzDrucken state changed" + if ( bCheckboxes(1) = Grafiken.IsChecked ) then WarnLog "Grafiken state changed" + if ( bCheckboxes(2) = Kontrollfelder.IsChecked ) then WarnLog "Kontrollfelder state changed" + if ( bCheckboxes(3) = Hintergrund.IsChecked ) then WarnLog "Hintergrund state changed" + if ( bCheckboxes(4) = SchwarzDrucken.IsChecked ) then WarnLog "SchwarzDrucken state changed" + if ( bCheckboxes(5) = HiddenText.IsChecked ) then WarnLog "HiddenText state changed" + if ( bCheckboxes(6) = TextPlaceholder.IsChecked ) then WarnLog "TextPlaceholder state changed" if ( bCheckboxes(7) = LinkeSeiten.IsChecked ) then WarnLog "LinkeSeiten state changed" if ( bCheckboxes(8) = RechteSeiten.IsChecked ) then WarnLog "RechteSeiten state changed" - if ( bCheckboxes(9) = Umgekehrt.IsChecked ) then WarnLog "Umgekehrt state changed" - if ( bCheckboxes(10)= Prospekt.IsChecked ) then WarnLog "Prospekt state changed" + if ( bCheckboxes(9)= Prospekt.IsChecked ) then WarnLog "Prospekt state changed" - if ( bCheckboxes(11)= EinzelneDruckauftraege.IsChecked ) then WarnLog "EinzelneDruckauftraege state changed" - if ( bCheckboxes(12)= AusDruckereinstellung.IsChecked ) then WarnLog "AusDruckereinstellung state changed" - if ( bCheckboxes(13)= LeereSeitenDrucken.IsChecked ) then WarnLog "'Print automatically inserted blank pages' state changed" + if ( bCheckboxes(10)= LeereSeitenDrucken.IsChecked ) then WarnLog "'Print automatically inserted blank pages' state changed" + if ( bCheckboxes(11)= AusDruckereinstellung.IsChecked ) then WarnLog "AusDruckereinstellung state changed" if ( Fax.GetSelIndex <> iTempListBox(1) ) Then warnlog "Fax state changed" @@ -613,18 +605,17 @@ testcase tToolsOptionsWriterPrint1 printlog ("'/// - all UnCheck -> o ///") Grafiken.UnCheck - Tabellen.UnCheck - Zeichnungen.UnCheck Kontrollfelder.UnCheck Hintergrund.UnCheck SchwarzDrucken.UnCheck + HiddenText.UnCheck + TextPlaceholder.UnCheck LinkeSeiten.UnCheck RechteSeiten.UnCheck - Umgekehrt.UnCheck Prospekt.UnCheck - EinzelneDruckauftraege.UnCheck + LeereSeitenDrucken.UnCheck AusDruckereinstellung.UnCheck if (NurNotizen.IsChecked = True) then Dokumentende.Check else NurNotizen.Check @@ -644,20 +635,19 @@ testcase tToolsOptionsWriterPrint1 ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) - if Grafiken.IsChecked then WarnLog "Grafiken x" - if Tabellen.IsChecked then WarnLog "Tabellen x" - if Zeichnungen.IsChecked then WarnLog "Zeichnungen x" - if Kontrollfelder.IsChecked then WarnLog "Kontrollfelder x" - if Hintergrund.IsChecked then WarnLog "Hintergrund x" - if SchwarzDrucken.IsChecked then WarnLog "SchwarzDrucken x" + if Grafiken.IsChecked then WarnLog "Grafiken is checked" + if Kontrollfelder.IsChecked then WarnLog "Kontrollfelder is checked" + if Hintergrund.IsChecked then WarnLog "Hintergrund is checked" + if SchwarzDrucken.IsChecked then WarnLog "SchwarzDrucken is checked" + if HiddenText.IsChecked then WarnLog "HiddenText is checked" + if TextPlaceholder.IsChecked then WarnLog "TextPlaceholder is checked" - if LinkeSeiten.IsChecked then WarnLog "LinkeSeiten x" - if RechteSeiten.IsChecked then WarnLog "RechteSeiten x" - if Umgekehrt.IsChecked then WarnLog "Umgekehrt x" - if Prospekt.IsChecked then WarnLog "Prospekt x" + if LinkeSeiten.IsChecked then WarnLog "LinkeSeiten is checked" + if RechteSeiten.IsChecked then WarnLog "RechteSeiten is checked" + if Prospekt.IsChecked then WarnLog "Prospekt is checked" - if EinzelneDruckauftraege.IsChecked then WarnLog "EinzelneDruckauftraege x" - if AusDruckereinstellung.IsChecked then WarnLog "AusDruckereinstellung x" + if LeereSeitenDrucken.IsChecked then WarnLog "LeereSeitenDrucken is checked" + if AusDruckereinstellung.IsChecked then WarnLog "AusDruckereinstellung is checked" if ( bTempRadioBut(1) <> Keine.IsChecked ) then WarnLog "Keine state changed" if ( bTempRadioBut(2) <> NurNotizen.IsChecked ) then WarnLog "NurNotizen state changed" @@ -669,18 +659,17 @@ testcase tToolsOptionsWriterPrint1 Printlog ("'/// - all Check -> x ///") Grafiken.Check - Tabellen.Check - Zeichnungen.Check Kontrollfelder.Check Hintergrund.Check SchwarzDrucken.Check + HiddenText.Check + TextPlaceholder.Check LinkeSeiten.Check RechteSeiten.Check - Umgekehrt.Check Prospekt.Check - EinzelneDruckauftraege.Check + LeereSeitenDrucken.Check AusDruckereinstellung.Check if (Dokumentende.IsChecked = True) then Seitenende.Check else Dokumentende.Check @@ -700,20 +689,19 @@ testcase tToolsOptionsWriterPrint1 ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) - if not Grafiken.IsChecked then WarnLog "Grafiken o" - if not Tabellen.IsChecked then WarnLog "Tabellen o" - if not Zeichnungen.IsChecked then WarnLog "Zeichnungen o" - if not Kontrollfelder.IsChecked then WarnLog "Kontrollfelder o" - if not Hintergrund.IsChecked then WarnLog "Hintergrund o" - if not SchwarzDrucken.IsChecked then WarnLog "SchwarzDrucken o" + if not Grafiken.IsChecked then WarnLog "Grafiken is unchecked" + if not Kontrollfelder.IsChecked then WarnLog "Kontrollfelder is unchecked" + if not Hintergrund.IsChecked then WarnLog "Hintergrund is unchecked" + if not SchwarzDrucken.IsChecked then WarnLog "SchwarzDrucken is unchecked" + if not HiddenText.IsChecked then WarnLog "HiddenText is unchecked " + if not TextPlaceholder.IsChecked then WarnLog "TextPlaceholder is unchecked" - if not LinkeSeiten.IsChecked then WarnLog "LinkeSeiten o" - if not RechteSeiten.IsChecked then WarnLog "RechteSeiten o" - if not Umgekehrt.IsChecked then WarnLog "Umgekehrt o" - if not Prospekt.IsChecked then WarnLog "Prospekt o" + if not LinkeSeiten.IsChecked then WarnLog "LinkeSeiten is unchecked" + if not RechteSeiten.IsChecked then WarnLog "RechteSeiten is unchecked" + if not Prospekt.IsChecked then WarnLog "Prospekt is unchecked" - if not EinzelneDruckauftraege.IsChecked then WarnLog "EinzelneDruckauftraege o" - if not AusDruckereinstellung.IsChecked then WarnLog "AusDruckereinstellung o" + if not LeereSeitenDrucken.IsChecked then WarnLog "LeereSeitenDrucken is unchecked" + if not AusDruckereinstellung.IsChecked then WarnLog "AusDruckereinstellung is unchecked" ' This state will be saved with the document if ( bTempRadioBut(1) <> Keine.IsChecked ) then WarnLog "Keine state changed" @@ -730,21 +718,19 @@ testcase tToolsOptionsWriterPrint1 ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) - if ( bCheckboxes(1) = TRUE ) then Grafiken.Check else Grafiken.UnCheck - if ( bCheckboxes(2) = TRUE ) then Tabellen.Check else Tabellen.UnCheck - if ( bCheckboxes(3) = TRUE ) then Zeichnungen.Check else Zeichnungen.UnCheck - if ( bCheckboxes(4) = TRUE ) then Kontrollfelder.Check else Kontrollfelder.UnCheck - if ( bCheckboxes(5) = TRUE ) then Hintergrund.Check else Hintergrund.UnCheck - if ( bCheckboxes(6) = TRUE ) then SchwarzDrucken.Check else SchwarzDrucken.UnCheck - - if ( bCheckboxes(7) = TRUE ) then LinkeSeiten.Check else LinkeSeiten.UnCheck - if ( bCheckboxes(8) = TRUE ) then RechteSeiten.Check else RechteSeiten.UnCheck - if ( bCheckboxes(9) = TRUE ) then Umgekehrt.Check else Umgekehrt.UnCheck - if ( bCheckboxes(10) = TRUE ) then Prospekt.Check else Prospekt.UnCheck - - if ( bCheckboxes(11) = TRUE ) then EinzelneDruckauftraege.Check else EinzelneDruckauftraege.UnCheck - if ( bCheckboxes(12) = TRUE ) then AusDruckereinstellung.Check else AusDruckereinstellung.UnCheck - if ( bCheckboxes(13) = TRUE ) then LeereSeitenDrucken.Check else LeereSeitenDrucken.UnCheck + if ( bCheckboxes(1) = TRUE ) then Grafiken.Check else Grafiken.Uncheck + if ( bCheckboxes(2) = TRUE ) then Kontrollfelder.Check else Kontrollfelder.UnCheck + if ( bCheckboxes(3) = TRUE ) then Hintergrund.Check else Hintergrund.Uncheck + if ( bCheckboxes(4) = TRUE ) then SchwarzDrucken.Check else SchwarzDrucken.UnCheck + if ( bCheckboxes(5) = TRUE ) then HiddenText.check else HiddenText.Uncheck + if ( bCheckboxes(6) = TRUE ) then TextPlaceholder.check else TextPlaceholder.Uncheck + + if ( bCheckboxes(7) = TRUE ) then LinkeSeiten.Check else LinkeSeiten.Uncheck + if ( bCheckboxes(8) = TRUE ) then RechteSeiten.Check else RechteSeiten.Uncheck + if ( bCheckboxes(9) = TRUE ) then Prospekt.Check else Prospekt.Uncheck + + if ( bCheckboxes(10) = TRUE ) then LeereSeitenDrucken.Check else LeereSeitenDrucken.UnCheck + if ( bCheckboxes(11) = TRUE ) then AusDruckereinstellung.Check else AusDruckereinstellung.UnCheck try Fax.Select (iListBox(1)) diff --git a/testautomation/writer/optional/includes/option/wr_o_3.inc b/testautomation/writer/optional/includes/option/wr_o_3.inc index 6c5537eed48b..2a99278d5de2 100755 --- a/testautomation/writer/optional/includes/option/wr_o_3.inc +++ b/testautomation/writer/optional/includes/option/wr_o_3.inc @@ -935,9 +935,17 @@ testcase tToolsOptionsWriterCompatibility1 Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.Ok - '/// restart the office + printlog "- save document" + Call hFileSaveAsKill (gOfficePath + "user\work\tToolsOptionsWriterCompatibility1.odt") + Call hCloseDocument + + printlog "- restart the office" Call wOfficeRestart + printlog "- load previously saved document" + Call hNewDocument + Call hFileOpen (gOfficePath + "user\work\tToolsOptionsWriterCompatibility1.odt") + Printlog "check state of all checkboxes and uncheck all checkboxes" ToolsOptions Call hToolsOptions("WRITER","COMPATIBILITY") @@ -960,6 +968,8 @@ testcase tToolsOptionsWriterCompatibility1 Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.Ok + Call hCloseDocument + '/// restart the office Call wOfficeRestart WaitSlot (2) diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc index deb98f579ce1..6a3ca9dd50f3 100755 --- a/testautomation/writer/optional/includes/option/wr_o_4.inc +++ b/testautomation/writer/optional/includes/option/wr_o_4.inc @@ -78,9 +78,9 @@ testcase tToolsOptionsWriterOther '- !!! -Current Document only- ist bei office beenden zu beachten!!! Call hNewDocument - printlog ("'///- Tools/Options/Writer: General ///") + printlog ("- Tools/Options/Writer: General ") - printlog ("'/// - save states ///") + printlog (" - save states ") ToolsOptions Call hToolsOptions ("WRITER","GENERAL") @@ -94,7 +94,7 @@ testcase tToolsOptionsWriterOther iMasseinheit = Masseinheit.GetSelIndex sTabAbstand = Tabulatorenabstand.GetText - printlog ("'/// - all states inverting ///") + printlog ("- all states inverting ") if irgendwas(2) Then Feldbefehle.UnCheck Else Feldbefehle.Check if Feldbefehle.IsChecked Then if irgendwas(3) Then Diagramme.UnCheck Else Diagramme.Check @@ -124,11 +124,11 @@ testcase tToolsOptionsWriterOther Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - SO quit - start ///") + printlog ("- SO quit - start ") Call wOfficeRestart - printlog ("'/// - checking states ///") + printlog ("- checking states ") ToolsOptions Call hToolsOptions ( "WRITER" , "GENERAL" ) @@ -144,7 +144,7 @@ testcase tToolsOptionsWriterOther Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - all UnCheck -> o ///") + printlog ("- all UnCheck -> o ") ToolsOptions Call hToolsOptions ( "WRITER" , "GENERAL" ) @@ -159,7 +159,7 @@ testcase tToolsOptionsWriterOther Masseinheit.Select (1) Tabulatorenabstand.ToMin sTemp = Tabulatorenabstand.GetText - printlog ("'/// More test ///'") + printlog ("More test ///'") Tabulatorenabstand.More if ( sTemp = Tabulatorenabstand.GetText ) Then WarnLog "Tabulatorenabstand More-Button not working; stemp1: "+sTemp + " =? (2) " +Tabulatorenabstand.GetText sTemp = Tabulatorenabstand.GetText @@ -167,7 +167,7 @@ testcase tToolsOptionsWriterOther Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all UnChecked ///") + printlog ("- check if all UnChecked ") ToolsOptions Call hToolsOptions ( "WRITER" , "GENERAL" ) @@ -186,7 +186,7 @@ testcase tToolsOptionsWriterOther '--------------------------------------------------------------------------------- - printlog ("'/// check if tab stops get saved in document ///") + printlog ("- check if tab stops get saved in document ") Call hNewDocument ' set Default Tab Stop to 2,5cm @@ -240,7 +240,7 @@ testcase tToolsOptionsWriterOther Call hCloseDocument '--------------------------------------------------------------------------------- - Printlog ("'/// - all Check -> x ///") + Printlog ("- all Check -> x ") ToolsOptions Call hToolsOptions ("WRITER","GENERAL") @@ -264,7 +264,7 @@ testcase tToolsOptionsWriterOther Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all Checked ///") + printlog ("- check if all Checked ") ToolsOptions Call hToolsOptions ( "WRITER" , "GENERAL" ) @@ -280,7 +280,7 @@ testcase tToolsOptionsWriterOther if ( Masseinheit.GetSelIndex <> iTemp ) Then WarnLog "Masseinheit is not item " + iTemp + " it's: " + Masseinheit.GetSelIndex if (LiberalMeasurement (sTemp,Tabulatorenabstand.GetText) <> TRUE ) Then WarnLog "Tabulatorenabstand is not " + sTemp + " it's: " + Tabulatorenabstand.GetText - printlog ("'/// - restore states ///") + printlog ("- restore states ") ' if ( irgendwas(1) = TRUE ) Then NurFuerAktuellesDokument.Check Else NurFuerAktuellesDokument.UnCheck if ( irgendwas(2) = TRUE ) Then Feldbefehle.Check Else Feldbefehle.UnCheck @@ -327,7 +327,7 @@ sub hGetAllOptionsWriterGeneralCaption fHoleTabPage2 = ConvertPath(gOfficePath + "user\work\opt2_" + iSprache + "." + gPlatGroup) '------------------------ - Printlog "'///(1/3) Get all items before selecting smth. ///" + Printlog "(1/3) Get all items before selecting smth. " ' put them in lsHoleTabPage and write them to 'user\work\opt__...' Call hNewDocument @@ -355,7 +355,7 @@ sub hGetAllOptionsWriterGeneralCaption ' ------------------------ - Printlog "'///(2/3) Select every ListItem & exit with OK ///" + Printlog "(2/3) Select every ListItem & exit with OK " ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" @@ -381,7 +381,7 @@ sub hGetAllOptionsWriterGeneralCaption ExtrasOptionenDlg.OK '------------------------ - Printlog "'///(3/3) Get all items after selecting all ///" + Printlog "(3/3) Get all items after selecting all " ' put them in lsHoleTabPage2 and write them to 'user\work\opt2_...' ToolsOptions @@ -429,9 +429,9 @@ testcase tToolsOptionsWriterAutoCaption '/// !no more Listentries than 9, you have to update the allocation for the var's! ///' Call hNewDocument - printlog "'///- Tools/Options/Writer: AutoCaption ///" + printlog "- Tools/Options/Writer: AutoCaption " - printlog ("'/// - save states ///") + printlog ("- save states ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" @@ -463,7 +463,7 @@ testcase tToolsOptionsWriterAutoCaption next i '-- just checking the checkboxes of 'ObjectList' - printlog ("'/// - uncheck all object - checkboxes ///") + printlog ("- uncheck all object - checkboxes ") for i=1 to NumberOfObjects ObjectList.Select (i) ObjectList.UnCheck @@ -471,7 +471,7 @@ testcase tToolsOptionsWriterAutoCaption Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - verify if all unchecked and check all ///") + printlog ("- verify if all unchecked and check all ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" @@ -486,7 +486,7 @@ testcase tToolsOptionsWriterAutoCaption Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - verify all checkboxes are checked ///") + printlog ("- verify all checkboxes are checked ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" @@ -498,10 +498,11 @@ testcase tToolsOptionsWriterAutoCaption end if next i - printlog ("'/// - change states ///") + printlog ("- change states ") '/// look if properties get saved for each list item for i=1 to NumberOfObjects ObjectList.Select (i) + printlog " - " & ObjectList.GetText if ObjectList.IsChecked Then if i <= 7 then Numbering.Select i CaptionSeparator.Settext "Caption Separator " & cstr(i) @@ -520,16 +521,12 @@ testcase tToolsOptionsWriterAutoCaption ApplyBorderAndShadow.Check case 4: Category.Select 5 - Position.Select 2 case 5: Category.Select 2 - Position.Select 1 case 6: Category.Select 3 - Position.Select 2 case 7: Category.Select 4 - Position.Select 1 case 8: Category.Select 5 if Numbering.GetItemCount > 7 then @@ -537,7 +534,6 @@ testcase tToolsOptionsWriterAutoCaption else Numbering.Select 4 end if - Position.Select 2 case 9: Category.Select 2 if Numbering.GetItemCount > 7 then @@ -545,7 +541,6 @@ testcase tToolsOptionsWriterAutoCaption else Numbering.Select 5 end if - Position.Select 1 end select vCategoryTmp(i) = Category.GetSelText @@ -556,17 +551,17 @@ testcase tToolsOptionsWriterAutoCaption Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - SO quit - start ///") + printlog ("- SO quit - start") Call wOfficeRestart - printlog ("'/// - checking states ///") + printlog ("- checking states ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" for i=1 to NumberOfObjects - printlog "- checking: " & ObjectList.Gettext ObjectList.Select (i) + printlog " - " & ObjectList.GetText wait 500 if ObjectList.IsChecked Then if i <= 7 then @@ -632,31 +627,31 @@ testcase tToolsOptionsWriterAutoCaption end if case 4: - if Position.GetSelIndex <> 2 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 5: - if Position.GetSelIndex <> 1 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 6: - if Position.GetSelIndex <> 2 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 7: - if Position.GetSelIndex <> 1 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 8: @@ -674,10 +669,10 @@ testcase tToolsOptionsWriterAutoCaption end if end if - if Position.GetSelIndex <> 2 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 9: @@ -695,10 +690,10 @@ testcase tToolsOptionsWriterAutoCaption end if end if - if Position.GetSelIndex <> 1 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if end select @@ -710,7 +705,7 @@ testcase tToolsOptionsWriterAutoCaption Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - restore states ///") + printlog ("- restore states ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") @@ -765,10 +760,10 @@ testcase tToolsOptionsWriterGeneral ' State is saved with document. Thats why I use 3 docs Call hNewDocument - printlog "'///- Extras / Optionen / Sonstiges / Verkn?pfungen aktualisieren ///" + printlog "- Extras / Optionen / Sonstiges / Verkn?pfungen aktualisieren " ToolsOptions Call hToolsOptions("WRITER","GENERAL") - printlog "'///- Update links when loading -> always ///" + printlog "- Update links when loading -> always " Immer.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -796,7 +791,7 @@ testcase tToolsOptionsWriterGeneral ToolsOptions Call hToolsOptions("WRITER","GENERAL") if not Immer.IsChecked then Warnlog "Option 'always' has not been changed" - printlog "'///- Update links when loading -> On request ///" + printlog "- Update links when loading -> On request " AufNachfrage.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -820,7 +815,7 @@ testcase tToolsOptionsWriterGeneral ToolsOptions Call hToolsOptions("WRITER","GENERAL") if not AufNachfrage.IsChecked then Warnlog "Option 'On request' has been changed" - printlog "'///- Update links when loading -> Never ///" + printlog "- Update links when loading -> Never " Nie.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -873,7 +868,7 @@ endcase testcase tToolsOptionsWriterMailMerge Call hNewDocument - printlog ("'///- Tools/Options/Writer: Mail Merge ///") + printlog ("- Tools/Options/Writer: Mail Merge ") Kontext "Navigator" if Navigator.Exists then ViewNavigator ToolsOptions diff --git a/testautomation/writer/optional/includes/option/wr_o_a.inc b/testautomation/writer/optional/includes/option/wr_o_a.inc index 2f917d4961c1..ce8eea6178c3 100755 --- a/testautomation/writer/optional/includes/option/wr_o_a.inc +++ b/testautomation/writer/optional/includes/option/wr_o_a.inc @@ -59,15 +59,11 @@ testcase tToolsOptionsWriterPrint Call hToolsOptions("WRITER","PRINT") Grafiken.Check - Tabellen.Check - Zeichnungen.Check Kontrollfelder.Check Hintergrund.Check SchwarzDrucken.Check LinkeSeiten.Check RechteSeiten.Check - Umgekehrt.Check - Prospekt.UnCheck Seitenende.Check @@ -97,14 +93,11 @@ testcase tToolsOptionsWriterPrint Printlog " - uncheck everything" Grafiken.UnCheck - Tabellen.UnCheck - Zeichnungen.UnCheck Kontrollfelder.UnCheck Hintergrund.UnCheck SchwarzDrucken.UnCheck LinkeSeiten.Check ' that's so, otherwise there will be no printing RechteSeiten.Check ' that's so, otherwise there will be no printing - Umgekehrt.UnCheck Prospekt.UnCheck Keine.Check AusDruckereinstellung.UnCheck 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/w_fields.bas b/testautomation/writer/optional/w_fields.bas index 9d2240321158..3eb650c5ad0e 100644 --- a/testautomation/writer/optional/w_fields.bas +++ b/testautomation/writer/optional/w_fields.bas @@ -93,7 +93,8 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" + use "global\system\includes\gvariabl.inc" + Call GetUseFiles gApplication = "WRITER" end Sub diff --git a/testautomation/writer/optional/w_insertgraphic.bas b/testautomation/writer/optional/w_insertgraphic.bas index 84402564098a..ba2014952921 100644 --- a/testautomation/writer/optional/w_insertgraphic.bas +++ b/testautomation/writer/optional/w_insertgraphic.bas @@ -131,6 +131,7 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" + Call GetUseFiles gApplication = "WRITER" end sub diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc index cbfd5de23047..1b33d5360606 100644 --- a/testautomation/writer/required/includes/w_001a_.inc +++ b/testautomation/writer/required/includes/w_001a_.inc @@ -1,582 +1,480 @@ -'************************************************************************** -'* 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_001a_.inc,v $ -'* -'* $Revision: 1.2 $ -'* -'* last change: $Author: vg $ $Date: 2008-08-18 12:40:41 $ -'* -'* 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: Testcases for the Writer Required-test. -'* -'\*********************************************************************** - -sub w_001a_ - - printLog Chr(13) + "--------- File Menu (w_001a_.inc) ----------" - gApplication = "WRITER" - - Call tFileProperties - - Call tFileTemplatesOrganize - Call tFileTemplatesAddressbookSource - Call tFileTemplatesSave - Call tFileTemplatesEdit - - Call tFilePagePreview - Call tFilePrint - Call tFilePrinterSetup - - 'Writer Master Document - gApplication = "MASTERDOCUMENT" - Call tMasterDocFilePagePreview - gApplication = "WRITER" - -end sub - -'----------------------------------------------------------- - -testcase tFileProperties - PrintLog "- File / Properties" - - printlog " Open new document" - Call hNewDocument - - printlog " File / Properties" - FileProperties - - WaitSlot(5000) - Kontext - try - active.SetPage TabDokument - catch - Warnlog "Dialog 'FileProperties' not up! (Bug#99828)" - goto endsub - endcatch - - printlog " Switch to Tabpage 'General'" - Kontext "TabDokument" - Call DialogTest (TabDokument) - - printlog " Switch to Tabpage 'Description'" - Kontext - active.SetPage TabDokumentinfo - Kontext "TabDokumentinfo" - Call DialogTest (TabDokumentinfo) - - - QAErrorlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed." - ' printlog " Switch to Tabpage 'User defined'" - ' Kontext - ' active.SetPage TabBenutzer - ' Kontext "TabBenutzer" - ' Call DialogTest ( TabBenutzer ) - - ' Wait 500 - - ' Infofelder.Click - ' printlog " Click 'Infofields'" - ' Kontext "InfonamenBearbeiten" - ' printlog " Close upcoming dialog with 'Cancel'" - ' Call DialogTest (InfonamenBearbeiten) - ' InfonamenBearbeiten.Cancel - - printlog " Switch to Tabpage 'Internet'" - Kontext - active.SetPage TabInternet - Kontext "TabInternet" - Call DialogTest (TabInternet) - - printlog " Switch to Tabpage 'Statistics' and close dialog" - Kontext - active.SetPage TabStatistik - Kontext "TabStatistik" - Call DialogTest (TabStatistik) - TabStatistik.Close - - Sleep 1 - printlog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFileTemplatesOrganize - Dim i as integer - - PrintLog " Open new document." - Call hNewDocument - PrintLog " File / Templates / Organize" - FileTemplatesOrganize - Kontext "DVVerwalten" - For i = 1 to 50 - if DVVerwalten.Exists then - i = 51 - else - Sleep 5 - end if - next i - if Not DVVerwalten.Exists then - Warnlog "Dialog 'Template Management' not up !" - Call hCloseDocument - goto endsub - end if - wait 500 - PrintLog " Select first entry in left list of dialog 'Template Management' (should be 'My Templates')" - ListeLinks.Select 1 - ListeLinks.TypeKeys "<Home>" - Sleep 1 - Befehle.Click - wait 500 - PrintLog " Select 'Commands -> Import Template'" - Call hMenuSelectNr(3) - Wait 500 - PrintLog " Close Filedialog." - if gUseSysDlg = False then - Kontext "OeffnenDlg" - if OeffnenDlg.Exists then - OeffnenDlg.Cancel - else - Warnlog "FileOpen dialog not up!" - end if - end if - - PrintLog " Select 'Commands -> Printer Settings" - Kontext "DVVerwalten" - Sleep 1 - Befehle.Click - wait 500 - Call hMenuSelectNr(4) - - PrintLog " Cancel 'Printer-Setup' dialog" - Kontext "DruckerEinrichten" - if DruckerEinrichten.Exists then - DruckerEinrichten.Cancel - else - Warnlog "Printersettings dialog is not up!" - end if - - PrintLog " Select first entry in right list" - Kontext "DVVerwalten" - ListeRechts.Select 1 - - PrintLog " Select pushbutton 'File..'" - if WelcheDatei.IsEnabled then - WelcheDatei.Click - if gUseSysDlg = False then - PrintLog " Cancel Filedialog" - Kontext "OeffnenDlg" - OeffnenDlg.Cancel - end if - end if - - PrintLog " Select pushbutton 'Address Book'" - Kontext "DVVerwalten" - AddressBook.Click - Kontext "AddressbookSource" - PrintLog " Cancel Dialog 'Address Book-Assignment'" - if AddressbookSource.Exists then - AddressbookSource.Cancel - else - Warnlog "the Dialog ' Address Book Source' wasnt up!" - end if - - PrintLog " Close dialog" - Kontext "DVVerwalten" - DVVerwalten.Close - - PrintLog " Close active document." - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFileTemplatesAddressbookSource - - PrintLog " Open new document" - Call hNewDocument - - PrintLog " File / Templates /Address Book Source..." - UseBindings - FileTemplatesAddressbookSource - - WaitSlot(2000) - PrintLog " In 'Address Book Assignement' dialog click pushbutton 'Administrate'" - Kontext "AddressbookSource" - if AddressbookSource.Exists then - Call DialogTest (AddressbookSource) - Administrate.Click - Sleep 2 - PrintLog " Close 'Data Source Administration' with 'Cancel'" - Kontext "DatabaseProperties" - if Not DatabaseProperties.Exists then - Kontext "AddressSourceAutopilot" - if AddressSourceAutopilot.Exists then - AddressSourceAutopilot.Cancel - end if - Kontext "AddressbookSource" - AddressbookSource.Cancel - else - PrintLog " DatabaseProperties.SetPage TabConnection" - Kontext "TabConnection" - Call DialogTest ( TabConnection ) - Kontext "DatabaseProperties" - DatabaseProperties.Close - Kontext "AddressbookSource" - PrintLog " Close dialog" - AddressbookSource.Cancel - end if - end if - - printlog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFileTemplatesSave - if gApplication = "MASTERDOCUMENT" then - qaErrorLog " tFileTemplatesSave has been disabled in Masterdocument." - goto endsub - end if - printlog "- File / Templates / Save" - Call hNewDocument - printlog " Open new document" - FileTemplatesSave - printlog " File / Templates / Save" - - Kontext "DokumentVorlagen" - Call DialogTest ( DokumentVorlagen ) - printlog " On 'Templates' dialog click 'Organizer'" - - Verwalten.Click - Kontext "DVVerwalten" - DVVerwalten.Close - printlog " Close dialog 'Template Management'" - - Kontext "DokumentVorlagen" - DokumentVorlagen.Cancel - printlog " Close 'Templates' dialog" - - printlog " Close active document" - Call hCloseDocument - gApplication = "WRITER" -endcase - -'----------------------------------------------------------- - -testcase tFileTemplatesEdit - printlog "- File / Templates / Edit" - - printlog " Open new document" - Call hNewDocument - printlog " File / Templates / Edit" - FileTemplatesEdit - - if gUseSysDlg = False then - printlog " Cancel Filedialog" - Kontext "OeffnenDlg" - OeffnenDlg.Cancel - end if - - printlog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFilePagePreview - PrintLog "- File / Page Preview" - Dim gehtnicht as boolean - gehtnicht = FALSE - printlog " Open new document" - Select Case gApplication - Case "WRITER" - Call hNewDocument - - Case "MASTERDOCUMENT" - Call hNewDocument - - Case "HTML" - printlog "Not in Writer/Web!" - goto endsub - end select - - printlog " Enter some text in document" - Call wTypeKeys("Just a small change!") - printlog " File / Page Preview" - FilePageView - WaitSlot (1000) - Kontext "DocPageViewWriter" - if DocPageViewWriter.NotExists then - Warnlog "Page Preview is not coming up!" - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then - Active.No - end if - end if - else - if gehtnicht=FALSE then - Kontext "PreviewObjectbar" - if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true) - printlog " Select 'Zoom 100%' in toolbar" - try - Massstab.Select 4 - catch - Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)" - endcatch - - printlog " Click 'Print Page Preview' in toolbar" - Kontext "PreviewObjectbar" - DruckenSeitenansicht.Click - Kontext "Active" - if Active.Exists then - QAErrorlog "No default printer!" - Active.ok - Sleep 1 - Kontext "DruckenDlg" - if DruckenDlg.Exists then DruckenDlg.Cancel - else - printlog " Close 'Print' dialog with cancel" - Kontext "DruckenDlg" - DruckenDlg.Cancel - end if - - printlog " Click 'Print options page preview' in toolbar" - Kontext "PreviewObjectbar" - Skalierung.Click - printlog " Close 'Print Options' dialog with cancel" - Kontext "DruckOptionen" - Call DialogTest ( DruckOptionen ) - DruckOptionen.Cancel - - printlog " Close Page Preview with button 'Close Preview' in toolbar" - Kontext "PreviewObjectbar" - SeitenansichtSchliessen.Click - else - Warnlog "Objectbar not addressable!" - end if - end if - printlog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFilePrint - PrintLog " Open new document" - Call hNewDocument - - PrintLog " File / Print" - FilePrint - - Kontext "Active" - WaitSlot(1000) - if Active.Exists then - if Active.GetRT = 304 then - QAErrorlog "No Default Printer!" - Active.Ok - Kontext "DruckenDlg" - if DruckenDlg.Exists then DruckenDlg.Cancel - Call hCloseDocument - goto endsub - end if - end if - Kontext "DruckenDlg" - if DruckenDlg.Exists then - PrintLog " In printer dialog click 'Options'" - Zusaetze.Click - Sleep 1 - - Kontext "DruckerZusaetzeWriter" - PrintLog " Close 'Print options' with 'Cancel'" - DruckerZusaetzeWriter.Cancel - Kontext "DruckenDlg" - - if gPlatGroup = "unx" then - if NOT Eigenschaften.IsEnabled AND gPlatform = "osx" then - QAErrorlog "#i81545#-macport File -> Print|Printer Settings: Properties button disabled" - Kontext "DruckenDlg" - DruckenDlg.Cancel - Call hCloseDocument - goto endsub - end if - PrintLog " On Unix-Platforms select 'Properties" - Eigenschaften.Click - sleep (3) - Kontext "TabSPAPaper" - if NOT TabSPAPaper.Exists then - Kontext "TabSPADevice" - if NOT TabSPADevice.Exists then - Warnlog "#i88799# - Non functional options-button in Print-dialog." - else - Kontext - Active.Setpage TabSPAPaper - Kontext "TabSPAPaper" - Call DialogTest ( TabSPAPaper ) - - printlog( "ALLES WIRD GUT!" ) - Kontext - Active.Setpage TabSPADevice - Kontext "TabSPADevice" - Call DialogTest ( TabSPADevice ) - - PrintLog " Cancel Printer Properties' (only unix)" - TabSPADevice.Cancel - end if - else - Kontext - Active.Setpage TabSPAPaper - Kontext "TabSPAPaper" - Call DialogTest ( TabSPAPaper ) - - printlog( "ALLES WIRD GUT!" ) - Kontext - Active.Setpage TabSPADevice - Kontext "TabSPADevice" - Call DialogTest ( TabSPADevice ) - - PrintLog " Cancel Printer Properties' (only unix)" - TabSPADevice.Cancel - end if - end if - Kontext "DruckenDlg" - Call DialogTest ( DruckenDlg ) - PrintLog " Close 'Print' dialog" - DruckenDlg.Cancel - else - Warnlog "Print dialog is not up !" - end if - - PrintLog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFilePrinterSetup - PrintLog " Open new document" - Call hNewDocument - - PrintLog " File / Printer Settings" - FilePrintersettings - Kontext "Active" - WaitSlot(1000) - if Active.Exists then - if Active.GetRT = 304 then - QAErrorLog "No Default Printer!" - Active.Ok - Sleep 2 - Kontext "DruckerEinrichten" - if DruckerEinrichten.Exists then - Call DialogTest ( DruckerEinrichten ) - DruckerEinrichten.Cancel - end if - end if - else - Kontext "DruckerEinrichten" - Call DialogTest ( DruckerEinrichten ) - DruckerEinrichten.Cancel - PrintLog " Cancel 'Printer Setup' dialog" - end if - PrintLog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tMasterDocFilePagePreview - PrintLog "- File / Page Preview" - Dim gehtnicht as boolean - gehtnicht = FALSE - gApplication = "MASTERDOCUMENT" - printlog " Open new document" - Call hNewDocument - - printlog " Enter some text in document" - Call wTypeKeys("Just a small change!") - printlog " File / Page Preview" - FilePageView - WaitSlot (1000) - Kontext "DocPageViewWriter" - if DocPageViewWriter.NotExists then - Warnlog "Page Preview is not coming up!" - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then - Active.No - end if - end if - else - if gehtnicht=FALSE then - Kontext "PreviewObjectbar" - if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true) - printlog " Select 'Zoom 100%' in toolbar" - try - Massstab.Select 4 - catch - Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)" - endcatch - - printlog " Click 'Print Page Preview' in toolbar" - Kontext "PreviewObjectbar" - DruckenSeitenansicht.Click - Kontext "Active" - if Active.Exists then - QAErrorlog "No default printer!" - Active.ok - Sleep 1 - Kontext "DruckenDlg" - if DruckenDlg.Exists then DruckenDlg.Cancel - else - printlog " Close 'Print' dialog with cancel" - Kontext "DruckenDlg" - DruckenDlg.Cancel - end if - - printlog " Click 'Print options page preview' in toolbar" - Kontext "PreviewObjectbar" - Skalierung.Click - printlog " Close 'Print Options' dialog with cancel" - Kontext "DruckOptionen" - Call DialogTest ( DruckOptionen ) - DruckOptionen.Cancel - - printlog " Close Page Preview with button 'Close Preview' in toolbar" - Kontext "PreviewObjectbar" - SeitenansichtSchliessen.Click - else - Warnlog "Objectbar not addressable!" - end if - end if - - printlog " Close active document" - Call hCloseDocument - gApplication = "WRITER" -endcase +'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: w_001a_.inc,v $
+'*
+'* $Revision: 1.2 $
+'*
+'* last change: $Author: vg $ $Date: 2008-08-18 12:40:41 $
+'*
+'* 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: Testcases for the Writer Required-test.
+'*
+'\***********************************************************************
+
+sub w_001a_
+
+ printLog Chr(13) + "--------- File Menu (w_001a_.inc) ----------"
+ gApplication = "WRITER"
+
+ Call tFileProperties
+
+ Call tFileTemplatesOrganize
+ Call tFileTemplatesAddressbookSource
+ Call tFileTemplatesSave
+ Call tFileTemplatesEdit
+
+ Call tFilePagePreview
+ Call tPrintCommon()
+ Call tPrintGeneral()
+ Call tPrintApplication()
+ Call tPrintLayout()
+ Call tPrintOptions()
+ Call tFilePrinterSetup
+
+ 'Writer Master Document
+ gApplication = "MASTERDOCUMENT"
+ Call tMasterDocFilePagePreview
+ gApplication = "WRITER"
+
+end sub
+
+'-----------------------------------------------------------
+
+testcase tFileProperties
+ PrintLog "- File / Properties"
+
+ printlog " Open new document"
+ Call hNewDocument
+
+ printlog " File / Properties"
+ FileProperties
+
+ WaitSlot(5000)
+ Kontext
+ try
+ active.SetPage TabDokument
+ catch
+ Warnlog "Dialog 'FileProperties' not up! (Bug#99828)"
+ goto endsub
+ endcatch
+
+ printlog " Switch to Tabpage 'General'"
+ Kontext "TabDokument"
+ Call DialogTest (TabDokument)
+
+ printlog " Switch to Tabpage 'Description'"
+ Kontext
+ active.SetPage TabDokumentinfo
+ Kontext "TabDokumentinfo"
+ Call DialogTest (TabDokumentinfo)
+
+
+ QAErrorlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed."
+ ' printlog " Switch to Tabpage 'User defined'"
+ ' Kontext
+ ' active.SetPage TabBenutzer
+ ' Kontext "TabBenutzer"
+ ' Call DialogTest ( TabBenutzer )
+
+ ' Wait 500
+
+ ' Infofelder.Click
+ ' printlog " Click 'Infofields'"
+ ' Kontext "InfonamenBearbeiten"
+ ' printlog " Close upcoming dialog with 'Cancel'"
+ ' Call DialogTest (InfonamenBearbeiten)
+ ' InfonamenBearbeiten.Cancel
+
+ printlog " Switch to Tabpage 'Internet'"
+ Kontext
+ active.SetPage TabInternet
+ Kontext "TabInternet"
+ Call DialogTest (TabInternet)
+
+ printlog " Switch to Tabpage 'Statistics' and close dialog"
+ Kontext
+ active.SetPage TabStatistik
+ Kontext "TabStatistik"
+ Call DialogTest (TabStatistik)
+ TabStatistik.Close
+
+ Sleep 1
+ printlog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFileTemplatesOrganize
+ Dim i as integer
+
+ PrintLog " Open new document."
+ Call hNewDocument
+ PrintLog " File / Templates / Organize"
+ FileTemplatesOrganize
+ Kontext "DVVerwalten"
+ For i = 1 to 50
+ if DVVerwalten.Exists then
+ i = 51
+ else
+ Sleep 5
+ end if
+ next i
+ if Not DVVerwalten.Exists then
+ Warnlog "Dialog 'Template Management' not up !"
+ Call hCloseDocument
+ goto endsub
+ end if
+ wait 500
+ PrintLog " Select first entry in left list of dialog 'Template Management' (should be 'My Templates')"
+ ListeLinks.Select 1
+ ListeLinks.TypeKeys "<Home>"
+ Sleep 1
+ Befehle.Click
+ wait 500
+ PrintLog " Select 'Commands -> Import Template'"
+ Call hMenuSelectNr(3)
+ Wait 500
+ PrintLog " Close Filedialog."
+ if gUseSysDlg = False then
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists then
+ OeffnenDlg.Cancel
+ else
+ Warnlog "FileOpen dialog not up!"
+ end if
+ end if
+
+ PrintLog " Select 'Commands -> Printer Settings"
+ Kontext "DVVerwalten"
+ Sleep 1
+ Befehle.Click
+ wait 500
+ Call hMenuSelectNr(4)
+
+ PrintLog " Cancel 'Printer-Setup' dialog"
+ Kontext "DruckerEinrichten"
+ if DruckerEinrichten.Exists then
+ DruckerEinrichten.Cancel
+ else
+ Warnlog "Printersettings dialog is not up!"
+ end if
+
+ PrintLog " Select first entry in right list"
+ Kontext "DVVerwalten"
+ ListeRechts.Select 1
+
+ PrintLog " Select pushbutton 'File..'"
+ if WelcheDatei.IsEnabled then
+ WelcheDatei.Click
+ if gUseSysDlg = False then
+ PrintLog " Cancel Filedialog"
+ Kontext "OeffnenDlg"
+ OeffnenDlg.Cancel
+ end if
+ end if
+
+ PrintLog " Select pushbutton 'Address Book'"
+ Kontext "DVVerwalten"
+ AddressBook.Click
+ Kontext "AddressbookSource"
+ PrintLog " Cancel Dialog 'Address Book-Assignment'"
+ if AddressbookSource.Exists then
+ AddressbookSource.Cancel
+ else
+ Warnlog "the Dialog ' Address Book Source' wasnt up!"
+ end if
+
+ PrintLog " Close dialog"
+ Kontext "DVVerwalten"
+ DVVerwalten.Close
+
+ PrintLog " Close active document."
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFileTemplatesAddressbookSource
+
+ PrintLog " Open new document"
+ Call hNewDocument
+
+ PrintLog " File / Templates /Address Book Source..."
+ UseBindings
+ FileTemplatesAddressbookSource
+
+ WaitSlot(2000)
+ PrintLog " In 'Address Book Assignement' dialog click pushbutton 'Administrate'"
+ Kontext "AddressbookSource"
+ if AddressbookSource.Exists then
+ Call DialogTest (AddressbookSource)
+ Administrate.Click
+ Sleep 2
+ PrintLog " Close 'Data Source Administration' with 'Cancel'"
+ Kontext "DatabaseProperties"
+ if Not DatabaseProperties.Exists then
+ Kontext "AddressSourceAutopilot"
+ if AddressSourceAutopilot.Exists then
+ AddressSourceAutopilot.Cancel
+ end if
+ Kontext "AddressbookSource"
+ AddressbookSource.Cancel
+ else
+ PrintLog " DatabaseProperties.SetPage TabConnection"
+ Kontext "TabConnection"
+ Call DialogTest ( TabConnection )
+ Kontext "DatabaseProperties"
+ DatabaseProperties.Close
+ Kontext "AddressbookSource"
+ PrintLog " Close dialog"
+ AddressbookSource.Cancel
+ end if
+ end if
+
+ printlog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFileTemplatesSave
+ if gApplication = "MASTERDOCUMENT" then
+ qaErrorLog " tFileTemplatesSave has been disabled in Masterdocument."
+ goto endsub
+ end if
+ printlog "- File / Templates / Save"
+ Call hNewDocument
+ printlog " Open new document"
+ FileTemplatesSave
+ printlog " File / Templates / Save"
+
+ Kontext "DokumentVorlagen"
+ Call DialogTest ( DokumentVorlagen )
+ printlog " On 'Templates' dialog click 'Organizer'"
+
+ Verwalten.Click
+ Kontext "DVVerwalten"
+ DVVerwalten.Close
+ printlog " Close dialog 'Template Management'"
+
+ Kontext "DokumentVorlagen"
+ DokumentVorlagen.Cancel
+ printlog " Close 'Templates' dialog"
+
+ printlog " Close active document"
+ Call hCloseDocument
+ gApplication = "WRITER"
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFileTemplatesEdit
+ printlog "- File / Templates / Edit"
+
+ printlog " Open new document"
+ Call hNewDocument
+ printlog " File / Templates / Edit"
+ FileTemplatesEdit
+
+ if gUseSysDlg = False then
+ printlog " Cancel Filedialog"
+ Kontext "OeffnenDlg"
+ OeffnenDlg.Cancel
+ end if
+
+ printlog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFilePagePreview
+ PrintLog "- File / Page Preview"
+ Dim gehtnicht as boolean
+ gehtnicht = FALSE
+ printlog " Open new document"
+ Select Case gApplication
+ Case "WRITER"
+ Call hNewDocument
+
+ Case "MASTERDOCUMENT"
+ Call hNewDocument
+
+ Case "HTML"
+ printlog "Not in Writer/Web!"
+ goto endsub
+ end select
+
+ printlog " Enter some text in document"
+ Call wTypeKeys("Just a small change!")
+ printlog " File / Page Preview"
+ FilePageView
+ WaitSlot (1000)
+ Kontext "DocPageViewWriter"
+ if DocPageViewWriter.NotExists then
+ Warnlog "Page Preview is not coming up!"
+ Kontext "Active"
+ if Active.Exists then
+ if Active.GetRT = 304 then
+ Active.No
+ end if
+ end if
+ else
+ if gehtnicht=FALSE then
+ Kontext "PreviewObjectbar"
+ if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true)
+ printlog " Select 'Zoom 100%' in toolbar"
+ try
+ Massstab.Select 4
+ catch
+ Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)"
+ endcatch
+
+ printlog " Click 'Print Page Preview' in toolbar"
+ Kontext "PreviewObjectbar"
+ DruckenSeitenansicht.Click
+ Kontext "Active"
+ if Active.Exists then
+ QAErrorlog "No default printer!"
+ Active.ok
+ Sleep 1
+ Kontext "Printing"
+ if Printing.Exists then Printing.Cancel
+ else
+ printlog " Close 'Print' dialog with cancel"
+ Kontext "Printing"
+ Printing.Cancel
+ end if
+
+ printlog " Close Page Preview with button 'Close Preview' in toolbar"
+ Kontext "PreviewObjectbar"
+ SeitenansichtSchliessen.Click
+ else
+ Warnlog "Objectbar not addressable!"
+ end if
+ end if
+ printlog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFilePrinterSetup
+ PrintLog " Open new document"
+ Call hNewDocument
+
+ PrintLog " File / Printer Settings"
+ FilePrintersettings
+ Kontext "Active"
+ WaitSlot(1000)
+ if Active.Exists then
+ if Active.GetRT = 304 then
+ QAErrorLog "No Default Printer!"
+ Active.Ok
+ Sleep 2
+ Kontext "DruckerEinrichten"
+ if DruckerEinrichten.Exists then
+ Call DialogTest ( DruckerEinrichten )
+ DruckerEinrichten.Cancel
+ end if
+ end if
+ else
+ Kontext "DruckerEinrichten"
+ Call DialogTest ( DruckerEinrichten )
+ DruckerEinrichten.Cancel
+ PrintLog " Cancel 'Printer Setup' dialog"
+ end if
+ PrintLog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tMasterDocFilePagePreview
+ PrintLog "- File / Page Preview"
+ Dim gehtnicht as boolean
+ gehtnicht = FALSE
+ gApplication = "MASTERDOCUMENT"
+ printlog " Open new document"
+ Call hNewDocument
+
+ printlog " Enter some text in document"
+ Call wTypeKeys("Just a small change!")
+ printlog " File / Page Preview"
+ FilePageView
+ WaitSlot (1000)
+ Kontext "DocPageViewWriter"
+ if DocPageViewWriter.NotExists then
+ Warnlog "Page Preview is not coming up!"
+ Kontext "Active"
+ if Active.Exists then
+ if Active.GetRT = 304 then
+ Active.No
+ end if
+ end if
+ else
+ if gehtnicht=FALSE then
+ Kontext "PreviewObjectbar"
+ if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true)
+ printlog " Select 'Zoom 100%' in toolbar"
+ try
+ Massstab.Select 4
+ catch
+ Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)"
+ endcatch
+
+ printlog " Click 'Print Page Preview' in toolbar"
+ Kontext "PreviewObjectbar"
+ DruckenSeitenansicht.Click
+ Kontext "Active"
+ if Active.Exists then
+ QAErrorlog "No default printer!"
+ Active.ok
+ Sleep 1
+ Kontext "Printing"
+ if Printing.Exists then Printing.Cancel
+ else
+ printlog " Close 'Print' dialog with cancel"
+ Kontext "Printing"
+ Printing.Cancel
+ end if
+
+ printlog " Close Page Preview with button 'Close Preview' in toolbar"
+ Kontext "PreviewObjectbar"
+ SeitenansichtSchliessen.Click
+ else
+ Warnlog "Objectbar not addressable!"
+ end if
+ end if
+
+ printlog " Close active document"
+ Call hCloseDocument
+ gApplication = "WRITER"
+endcase
diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc index 0e4f8ea17f23..ce7ce264e3b1 100755 --- a/testautomation/writer/required/includes/w_005b_.inc +++ b/testautomation/writer/required/includes/w_005b_.inc @@ -892,16 +892,9 @@ testcase tFormatAlignmentArea Call hNewDocument printlog " Paste a rectangle from draw via clipboard" - if gPlatgroup = "unx" then - Call wZeichenobjektEinfuegen ( "Rechteck", 10, 30, 20, 45 ) - sleep (1) - gMouseClick ( 15, 38 ) - else - Call wZeichenobjektEinfuegen ( "Rechteck", 45, 30, 55, 45 ) - sleep (1) - Call wObjektSelektieren ( 43, 25, 60, 50 ) - endif - + Call wZeichenobjektEinfuegen ( "Rechteck", 45, 30, 55, 45 ) + sleep (1) + Call wObjektSelektieren ( 43, 25, 60, 50 ) Sleep 1 try printlog " Format / Anchor / As Character" @@ -1158,11 +1151,7 @@ testcase tFormatStyleEdit printlog " Insert a textobject from toolbar" Sleep 2 - if gPlatgroup = "unx" then - Call gMouseMove(10, 20, 30, 40) - else - Call gMouseMove(50, 20, 70, 40) - endif + Call gMouseMove(50, 20, 70, 40) hUseAsyncSlot( "FormatStyleBold" ) printlog " Format / Style / Bold" @@ -1231,11 +1220,7 @@ testcase tFormatAlignmentEdit Textobjekt.Click printlog " Insert a textbox via 'Draw functions' toolbar" - if gPlatgroup = "unx" then - Call gMouseMove(10, 20, 30, 40) - else - Call gMouseMove(50, 20, 70, 40) - endif + Call gMouseMove(50, 20, 70, 40) printlog " Insert some text in document" Call wTypeKeys ("Ein Wort") @@ -1274,11 +1259,7 @@ testcase tFormatLineSpacing Textobjekt.Click printlog " In a textbox via 'Draw Functions' toolbox" - if gPlatgroup = "unx" then - Call gMouseMove(10, 20, 30, 40) - else - Call gMouseMove(50, 20, 70, 40) - endif + Call gMouseMove(50, 20, 70, 40) Sleep 1 printlog " Format / Spacing / Single line" @@ -1319,11 +1300,7 @@ testcase tFormatParagraphEdit Textobjekt.Click printlog " In a textbox via 'Draw Functions' toolbox" - if gPlatgroup = "unx" then - Call gMouseMove(10, 20, 30, 40) - else - Call gMouseMove(50, 20, 70, 40) - endif + Call gMouseMove(50, 20, 70, 40) printlog " Format / Paragraph " hUseAsyncSlot( "FormatParagraph" ) diff --git a/testautomation/writer/required/includes/w_011_.inc b/testautomation/writer/required/includes/w_011_.inc index d08875f48541..707615b1bffd 100755 --- a/testautomation/writer/required/includes/w_011_.inc +++ b/testautomation/writer/required/includes/w_011_.inc @@ -458,7 +458,7 @@ testcase tZORest Call hNewDocument printlog "Insert a draw object ( rectangle )" Call wZeichenobjektEinfuegen ( "Rechteck", 30, 30, 50, 60 ) - Call gMouseClick ( 25, 25 ) + Call gMouseClick ( 50, 25 ) printlog "Select drawing object with shortcut 'Shift F4'" Call wTypeKeys ( "<Shift F4>" ) diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc index 05d11681efe7..df888de1b429 100755 --- a/testautomation/writer/required/includes/w_020_.inc +++ b/testautomation/writer/required/includes/w_020_.inc @@ -417,15 +417,11 @@ 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" - if gplatgroup = "unx" then - Call hMalZeichnenMitSelektion ( 10, 40, 21, 25 ) - else - Call hMalZeichnenMitSelektion ( 57, 20, 68, 25 ) - endif + Call hMalZeichnenMitSelektion ( 57, 20, 68, 25 ) printlog "+ Open Control Properties" Call sMenufunktionen("-Textbox-") end if @@ -454,11 +450,7 @@ testcase t_TB_Form Combobox.Click printlog " Insert a Combobox from toolbox" Wait 500 - if gPlatgroup = "unx" then - Call hMalZeichnenMitSelektion ( 41, 40, 52, 35 ) - else - Call hMalZeichnenMitSelektion ( 57, 30, 68, 35 ) - endif + Call hMalZeichnenMitSelektion ( 57, 30, 68, 35 ) printlog "+ Step through pages of upcoming Autopilot" Call sAutopilot_ListboxCombobox("Combo") printlog "+ Open Control Properties" diff --git a/testautomation/writer/required/w_updt.bas b/testautomation/writer/required/w_updt.bas index 77c8d5350e00..a52335d47e37 100755 --- a/testautomation/writer/required/w_updt.bas +++ b/testautomation/writer/required/w_updt.bas @@ -58,9 +58,11 @@ sub main use "writer\required\includes\w_010_1.inc" use "writer\required\includes\w_011_.inc" use "writer\required\includes\w_020_.inc" - + Printlog "******* Ressource-Test Writer Document *******" + Call wChangeDefaultView() + Call hStatusIn ( "writer", "w_updt.bas" ) Call w_001_ ' Menu File Call w_001a_ ' Menu File @@ -87,7 +89,10 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\required\includes\g_001.inc" use "global\required\includes\g_option.inc" ' global subroutines for Tools / Options + use "global\required\includes\g_printing.inc" use "global\tools\includes\optional\t_xml_filter1.inc" ' global routines for XML-functionality + use "global\tools\includes\optional\t_docfuncs.inc" + use "global\tools\includes\optional\t_control_objects.inc" gApplication = "WRITER" GetUseFiles () 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.inc b/testautomation/writer/tools/includes/w_tools.inc index 63e7e3a8ef7d..41d6b98eaeac 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -917,7 +917,6 @@ sub wOptionsUndo ( sOption$ ) WeichesScrollen.Uncheck ' Display GrafikenUndObjekte.Check - Tabellen.Check Zeichnungen.Check Feldname.Uncheck Notizen.Check @@ -981,20 +980,17 @@ sub wOptionsUndo ( sOption$ ) Call hToolsOptions("WRITER","Print") ' Contents Grafiken.Check - Tabellen.Check - Zeichnungen.Check Kontrollfelder.Check Hintergrund.Check SchwarzDrucken.Uncheck ' Pages LinkeSeiten.Check RechteSeiten.Check - Umgekehrt.Uncheck Prospekt.Uncheck ' Notes Keine.Check ' Other - EinzelneDruckauftraege.Uncheck + LeereSeitenDrucken.Check AusDruckereinstellung.Uncheck Fax.SetNoSelection end if diff --git a/testshl2/inc/testshl/additionalfunc.hxx b/testshl2/inc/testshl/additionalfunc.hxx new file mode 100644 index 000000000000..463d1ae87280 --- /dev/null +++ b/testshl2/inc/testshl/additionalfunc.hxx @@ -0,0 +1,61 @@ +#ifndef ADDITIONALFUNC_HXX +#define ADDITIONALFUNC_HXX + +#include "testshl/autoregister/registertestfunction.h" +#include "sal/types.h" + +extern "C" void SAL_CALL RegisterAdditionalFunctions(FktRegFuncPtr _pFunc); + +#define NOADDITIONAL \ +void RegisterAdditionalFunctions(FktRegFuncPtr){} + +namespace { + +enum T2_OSType { + T2_OS_WNT32 = 1, + T2_OS_UNIX, + T2_OS_OS2 +}; + +inline T2_OSType getOSType() +{ +#if defined WNT + return T2_OS_WNT32; +#elif defined OS2 + return T2_OS_OS2; +#else + return T2_OS_UNIX; +#endif +} + +} + +#define TESTSHL2_UNO_BOOTSTRAP(file) \ +void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc) \ +{ \ + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory> xMS; \ + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xComponentContext; \ + try { \ + if (strlen(#file) > 0) { \ + ::rtl::OUString iniFile(rtl::OUString::createFromAscii(#file)); \ + if (getOSType() == T2_OS_WNT32 || getOSType() == T2_OS_OS2) { \ + iniFile += ::rtl::OUString::createFromAscii(".ini"); \ + } else { \ + iniFile += ::rtl::OUString::createFromAscii("rc"); \ + } \ + xComponentContext = cppu::defaultBootstrap_InitialComponentContext(iniFile); \ + } else { \ + xComponentContext = cppu::defaultBootstrap_InitialComponentContext(); \ + } \ + xMS.set(xComponentContext->getServiceManager(), com::sun::star::uno::UNO_QUERY); \ + comphelper::setProcessServiceFactory(xMS); \ + } \ + catch (::com::sun::star::uno::Exception e ) { \ + rtl::OString aError; \ + aError = rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); \ + printf("Error at UNO bootstrap time caught: %s\nMust quit.\n", aError.getStr()); \ + exit(1); \ + } \ +} + +#endif diff --git a/testshl2/inc/testshl/autoregister/callbackstructure.h b/testshl2/inc/testshl/autoregister/callbackstructure.h new file mode 100644 index 000000000000..e71d3d960317 --- /dev/null +++ b/testshl2/inc/testshl/autoregister/callbackstructure.h @@ -0,0 +1,89 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef _callbackstructure_h +#define _callbackstructure_h + +#include <sal/types.h> +#include <cppunit/callbackfunc_fktptr.h> +#include <testshl/autoregister/registerfunc.h> +#include <testshl/autoregister/registertestfunction.h> +#include <testshl/cmdlinebits.hxx> + +// this structure will filled by the testshl tool and hand to the testdll + +struct CallbackStructure +{ + // a version number, if we want to change/expand this struct + sal_Int32 nVersion; + sal_Int64 nMagic; + + FktRegFuncPtr aRegisterFunction; + + FktPtr_CallbackDispatch aCallbackDispatch; + + //# FktPtr_TestResult_startTest aStartTest; + //# FktPtr_TestResult_addFailure aAddFailure; + //# FktPtr_TestResult_addError aAddError; + //# FktPtr_TestResult_endTest aEndTest; + //# FktPtr_TestResult_shouldStop aShouldStop; + //# + //# FktPtr_TestResult_addInfo aAddInfo; + //# FktPtr_TestResult_enterNode aEnterNode; + //# FktPtr_TestResult_leaveNode aLeaveNode; + + const char* psForward; + CmdLineBits nBits; + + // void* pJobList; + + sal_Int64 nMagic2; + + CallbackStructure() + :nVersion(1), + nMagic(SAL_CONST_INT64(0x0123456789abcdef)), + aRegisterFunction(NULL), + aCallbackDispatch(NULL), + /* aStartTest(NULL), + aAddFailure(NULL), + aAddError(NULL), + aEndTest(NULL), + aShouldStop(NULL), + aAddInfo(NULL), + aEnterNode(NULL), + aLeaveNode(NULL), */ + psForward(NULL), + nBits(0), + /* pJobList(NULL), */ + nMagic2(0) + {} +}; + +#endif diff --git a/testshl2/inc/testshl/autoregister/htestresult.h b/testshl2/inc/testshl/autoregister/htestresult.h new file mode 100644 index 000000000000..46cfbc8b6808 --- /dev/null +++ b/testshl2/inc/testshl/autoregister/htestresult.h @@ -0,0 +1,6 @@ +#ifndef _htestresult_h +#define _htestresult_h + +typedef void* hTestResult; + +#endif diff --git a/testshl2/inc/testshl/autoregister/registerfunc.h b/testshl2/inc/testshl/autoregister/registerfunc.h new file mode 100644 index 000000000000..9decdfe5c3b7 --- /dev/null +++ b/testshl2/inc/testshl/autoregister/registerfunc.h @@ -0,0 +1,50 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef _registerfunc_h +#define _registerfunc_h + +#include <sal/types.h> +#include <testshl/autoregister/htestresult.h> +#include <cppunit/callbackfunc_fktptr.h> +#include <testshl/autoregister/testfunc.h> + +struct CallbackStructure; + +// this function is used to register one function into a Container in the testshl tool. +extern "C" void SAL_CALL registerFunction(FktPtr aFunc, const char* aFuncName); + +// this function is the register function for auto registering + +extern "C" void SAL_CALL registerAllTestFunction(CallbackStructure* ); +typedef void (* FktRegAllPtr)(CallbackStructure*); + + +#endif diff --git a/testshl2/inc/testshl/autoregister/registertestfunction.h b/testshl2/inc/testshl/autoregister/registertestfunction.h new file mode 100644 index 000000000000..b87d6c335f48 --- /dev/null +++ b/testshl2/inc/testshl/autoregister/registertestfunction.h @@ -0,0 +1,54 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef _registertestfunction_h +#define _registertestfunction_h + +#include <sal/types.h> +#include <testshl/autoregister/testfunc.h> + +#ifdef __cplusplus +extern "C" { +#endif + +// function ptr, to register a function +typedef void (* FktRegFuncPtr)(FktPtr aFunc, const char* aFuncName); + +// this function is used in the testdll to register the given function +// into the testshl +extern "C" void SAL_CALL RegisterTestFunctions(FktRegFuncPtr aFunc); + +#ifdef __cplusplus +} +#endif + +#endif + + diff --git a/testshl2/inc/testshl/autoregister/testfunc.h b/testshl2/inc/testshl/autoregister/testfunc.h new file mode 100644 index 000000000000..2e23b7769485 --- /dev/null +++ b/testshl2/inc/testshl/autoregister/testfunc.h @@ -0,0 +1,47 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef _testfunc_h +#define _testfunc_h + +#include <testshl/autoregister/htestresult.h> + +#ifdef __cplusplus +extern "C" { +#endif + +// typedef for a testfunction +typedef void (* FktPtr)(hTestResult); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/testshl2/inc/testshl/autoregisterhelper.hxx b/testshl2/inc/testshl/autoregisterhelper.hxx new file mode 100644 index 000000000000..fce509a1e48f --- /dev/null +++ b/testshl2/inc/testshl/autoregisterhelper.hxx @@ -0,0 +1,65 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef AUTOREGISTER_HXX +#define AUTOREGISTER_HXX + +#include <vector> +#include <rtl/ustring.hxx> + +#include <testshl/autoregister/testfunc.h> + +#include "testshl/dynamicregister.hxx" +#include "testshl/getopt.hxx" + +typedef std::vector<FktPtr> FunctionList; + +// ----------------------------------------------------------------------------- +class JobList; +class AutomaticRegisterHelper : public DynamicLibraryHelper +{ + FunctionList m_aFunctionList; + bool m_bLoadLibraryOK; + // GetOpt & m_aOptions; // use getOptions() instead! + +public: + AutomaticRegisterHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions/* , JobList * _pJobList = NULL */ ); + + // FunctionList getFunctions(){return m_aFunctionList;} + void CallAll(hTestResult _hResult) const; + + /// @return true, if the given DLLName library could load and initialised. + bool isOkToStartTests() const {return m_bLoadLibraryOK;} + + virtual ~AutomaticRegisterHelper(); +}; + +#endif + diff --git a/testshl2/inc/testshl/checkboom.hxx b/testshl2/inc/testshl/checkboom.hxx new file mode 100644 index 000000000000..0ead958f28d8 --- /dev/null +++ b/testshl2/inc/testshl/checkboom.hxx @@ -0,0 +1,40 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef CHECKBOOM_HXX +#define CHECKBOOM_HXX + +#include <string> +#include <rtl/ustring.hxx> + +void CheckBoom(bool bCondition, std::string const& msg); +void CheckBoom(bool bCondition, rtl::OUString const& msg); + +#endif diff --git a/testshl2/inc/testshl/cmdlinebits.hxx b/testshl2/inc/testshl/cmdlinebits.hxx new file mode 100644 index 000000000000..92f0e5c1c660 --- /dev/null +++ b/testshl2/inc/testshl/cmdlinebits.hxx @@ -0,0 +1,52 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef CMDLINEBITS_HXX +#define CMDLINEBITS_HXX + +#include <sal/types.h> + +typedef sal_uInt32 CmdLineBits; +const char* getForwardString(); + +#include <stdarg.h> + +enum T_Print_Params { + T_INFO = 1, + T_VERBOSE, + T_DEBUG, + T_ERROR +}; + +// void t_print(const char*); +void t_print(const char*, ...); +void t_print(T_Print_Params, const char*, ...); + +#endif diff --git a/testshl2/inc/testshl/dynamicregister.hxx b/testshl2/inc/testshl/dynamicregister.hxx new file mode 100644 index 000000000000..dc263950b430 --- /dev/null +++ b/testshl2/inc/testshl/dynamicregister.hxx @@ -0,0 +1,67 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef DYNAMICREGISTER_HXX +#define DYNAMICREGISTER_HXX + +#include <rtl/ustring.hxx> +#include <osl/module.hxx> + +#include "testshl/getopt.hxx" +#include "testshl/nocopy.hxx" + +// ------------------------------------------------- + +class DynamicLibraryHelper : NOCOPY +{ +protected: + osl::Module* m_pModule; + rtl::OUString m_suDLLName; + GetOpt & m_aOptions; + + GetOpt& getOptions() {return m_aOptions;} + +public: + DynamicLibraryHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions); + virtual ~DynamicLibraryHelper(); + +private: + void showFilenameIfVerbose(); + void realLoadLibrary(rtl::OUString const& _sLibToLoad); + void loadLibraryFromAbsolutePath(); + void loadLibraryFromLocalPath(); + + rtl::OUString m_suAbsolutePathFile; // file:///D:/foo/bar/library.dll + rtl::OUString m_suAbsolutePath; // file:///D:/foo/bar + rtl::OUString m_suFilename; // library.dll +}; + +#endif + diff --git a/testshl2/inc/testshl/filehelper.hxx b/testshl2/inc/testshl/filehelper.hxx new file mode 100644 index 000000000000..b3a8e61d0ed5 --- /dev/null +++ b/testshl2/inc/testshl/filehelper.hxx @@ -0,0 +1,50 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef FILEHELPER_HXX +#define FILEHELPER_HXX + +#include <string> +#include <rtl/ustring.hxx> +#include <rtl/string.hxx> +#include <testshl/cmdlinebits.hxx> +#include "getopt.hxx" + +namespace FileHelper +{ + + std::string getTempPath(); + rtl::OUString convertPath( rtl::OUString const& _suSysPath ); + rtl::OUString convertPath( rtl::OString const& sysPth ); + CmdLineBits createFlags( GetOpt & _aOptions ); + +} +#endif + diff --git a/testshl2/inc/testshl/getopt.hxx b/testshl2/inc/testshl/getopt.hxx new file mode 100644 index 000000000000..fe77cd8e6755 --- /dev/null +++ b/testshl2/inc/testshl/getopt.hxx @@ -0,0 +1,335 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +/************************************************************************* +#* class GetOpt +#* +#* +#* Implementation getopt.cxx +#* +#* Description: class to reflect the commandline options. In addition +#* it provides functinality to get options from an inifile +#* ( getIniOptions()), evaluate, test and get options +#* ( hasOpt(), getOpt() ) and display an usage screen +#* formated in dependance of the given optionset, as well +#* as display a status about activ options +#* +#* +#* further descriptions: +#* +#* the constructor is called with two parameters: +#* char* argv[] and char* optionSet[], +#* the commandline and the available set of options. +#* Valid optionstrings have to start with a minus '-', otherwise it will +#* be ignored. Optionstrings consist of one or two arguments divided by a +#* comma separator, where the second (optional) argument is a short +#* description of the option, called hint. It will be automatically +#* formated and displayed in the usage screen if available. +#* The first argument of the optionstring can consist of two sections, +#* the name and the optional necessity and format. +#* The name of the option will be the starting minus followed by a string +#* like "-src". +#* One section options will be treated as flag (see '-v' option in example). +#* The second section consist of '=' or ':' which defines the necessity, +#* in combination with a character 's' for string or 'n' for numeric and +#* an optional '@' standing for 'vector of'. +#* '=' means this option needs an argument, ':' means can take an argument +#* followed by 's' is, as mentioned above, a single string paramenter, +#* followed by a 's' in combination with '@' means this argument consists +#* of one string or a vector of strings separated by commas +#* +#* an example for an optionset: +#* +#* static char* optionSet[] = { +#* "-src=s, release or version of sources", +#* "-ini=s, ini file with additional options", +#* "-db=s, path of type description database", +#* "-inPth=s, source path of component descriptions", +#* "-outPth=s, destination path for testcases", +#* "-logPth=s, destination path for logging", +#* "-mdl=s@, name(s) of module(s) to generate", +#* "-v, enable verbose screen messages", +#* "-dbg, enable debug messages", +#* "-h:s, display help or help on option", +#* "-help:s, see -h", +#* NULL +#* }; +#* +#* As seen a GetOpt class object will be created via: +#* GetOpt myOptions( argv, optionSet ); +#* +*************************************************************************/ +#ifndef __QADEV_REGSCAN_GETOPT_HXX__ +#define __QADEV_REGSCAN_GETOPT_HXX__ + +#include <osl/file.hxx> +#include <sal/types.h> +#include <rtl/strbuf.hxx> + + +#include <rtl/string.hxx> + +// #ifndef __QADEV_REGSCAN_UTIL_HXX__ +// #include "inc/util.hxx" +// #endif + + +#ifdef SOLARIS +#include <sys/time.h> +#endif + +#include <iostream> +#include <hash_map> +// #include "rsexception.hxx" + +// using namespace std; + +struct gstr { + sal_Bool operator()( const rtl::OString& oStr1, + const rtl::OString& oStr2 ) const { + return( oStr1 == oStr2 ); + } +}; + +struct ghstr +{ + sal_uInt32 operator()( const rtl::OString& str ) const { + return str.hashCode(); + } +}; + +struct frmt { + sal_uInt32 fCol; + sal_uInt32 sCol; + sal_uInt32 len; +}; + +typedef std::hash_map< rtl::OString, std::vector< rtl::OString >, ghstr, gstr > + optHashMap; + +typedef frmt sFormat; +typedef sal_uInt16 optType; + +#define OT_INVALID 0x0000 +#define OT_BOOL 0x0001 +#define OT_STRING 0x0002 +#define OT_NUMBER 0x0004 +#define OT_SINGLE 0x0010 +#define OT_MULTI 0x0020 +#define OT_OPTIONAL 0x0100 + +//: Option +class OptDsc { + + rtl::OString m_name; + rtl::OString m_hint; + rtl::OString m_legend; + optType m_type; + + /** + * analysis of optionstring and creation of option description class + * @param const rtl::OString& opt = optionstring to analyse + * @return void + */ + void createOptDsc( const rtl::OString& opt ); + + /** + * splitting of an optionstring and creation of a tokenvector + * in dependance of a charset + * + * @param const rtl::OString& opt = optionstring to split + * @param const rtl::OString& cSet = delimiter charset + * @param vector< rtl::OString >& optLine = tokenvector to fill + * + * @return void + */ + void split( const rtl::OString& opt, const rtl::OString& charSet, + std::vector< rtl::OString >& optLine ); + + /** + * private default c'tor, copy c'tor and assignment operator + * to get compiler errors on dumb effords + */ + OptDsc(); + OptDsc( OptDsc& ); + OptDsc& operator = ( OptDsc& ); + +public: + + //> c'tor + OptDsc( const rtl::OString& opt ) + : m_name(), + m_hint(), + m_legend(), + m_type( 0 ) { + + createOptDsc( opt ); + } ///< c'tor + + //> d'tor + ~OptDsc(){} + + /** + * returns the name of this option + * @return rtl::OString& + */ + inline rtl::OString& getName() { return m_name; } + /** + * returns the hint of this option + * @return rtl::OString& + */ + inline rtl::OString& getHint() { return m_hint; } + /** + * returns the legend of this option + * @return rtl::OString& + */ + inline rtl::OString& getLegend() { return m_legend; } + + /** + * returns the type of this option + * @return optType + */ + inline optType getType() { return m_type; } + + + inline sal_Bool isFlag() { + return( ( m_type &~ 0xfffe ) == OT_BOOL ) ? sal_True : sal_False; + } + inline sal_Bool isString() { + return( ( m_type &~ 0xfffd ) == OT_STRING ) ? sal_True : sal_False; + } + inline sal_Bool isNumber() { + return( ( m_type &~ 0xfffb ) == OT_NUMBER ) ? sal_True : sal_False; + } + inline sal_Bool isSingle() { + return( ( m_type &~ 0xffef ) == OT_SINGLE ) ? sal_True : sal_False; + } + inline sal_Bool isMulti() { + return( ( m_type &~ 0xffdf ) == OT_MULTI ) ? sal_True : sal_False; + } + inline sal_Bool isOptional() { + return( ( m_type &~ 0xfeff ) == OT_OPTIONAL ) ? sal_True : sal_False; + } + +}; ///:~ Option + +class Exception +{ + rtl::OString m_sAsciiMessage; +public: + Exception(); + virtual ~Exception(){} + + Exception(char const* sAsciiMessage); + Exception(rtl::OString const& sAsciiMessage); + + virtual rtl::OUString message() const; + virtual char const* what() const; +}; + +class ValueNotFoundException : public Exception +{ +public: + ValueNotFoundException(); + ValueNotFoundException(char const* sExit); +}; + +//: GetOpt +class GetOpt { + + rtl::OString m_prgname; + rtl::OString m_vardelim; + std::vector< rtl::OString > m_cmdline; + std::vector< rtl::OString > m_param; + std::vector< rtl::OString > m_varvec; + std::vector< OptDsc* > m_optionset; + optHashMap m_opthash; + + //> private methods + void initialize( char* cmdLine[], char const * optSet[] ); + void createCmdLineOptions(); + sal_uInt32 getMaxNameLength(); + sal_uInt32 getMaxLegendLength(); + const rtl::OString optDsc2Str( OptDsc* optDsc , sFormat frm ); + void tokenize( const rtl::OString& opt, const rtl::OString& charSet, + std::vector< rtl::OString >& optLine, sal_Bool strip = sal_True ); + ///< private methods + + GetOpt(); + GetOpt( GetOpt& ); + GetOpt& operator = ( GetOpt& ); + +public: + + //> c'tor + GetOpt( char* cmdLine[], char const * optSet[], rtl::OString varDelim = + rtl::OString( "$" ) ) + : m_vardelim( varDelim ) { + + initialize( cmdLine, optSet ); + createCmdLineOptions(); + } ///< c'tor + + //> d'tor + ~GetOpt(); + ///< d'tor + + //> inline methods + inline std::vector< rtl::OString >* getCmdLine() { return &m_cmdline; } + inline optHashMap* getOptions() { return ( &m_opthash ); } + inline rtl::OString& getName() { return m_prgname; } + inline rtl::OString& getFirstParam() { return *(m_param.begin()); } + inline std::vector< rtl::OString >& getParams() { return m_param; } + rtl::OString& getOpt( const rtl::OString& opt ); + void rmvOpt( rtl::OString& opt ) { + m_opthash.erase( opt ); + } + inline std::vector< rtl::OString >& getOptVec( const rtl::OString& opt ) { + return m_opthash[ opt ]; + } + ///< inline methods + + + sal_Bool exist( rtl::OString& opt ); + sal_Bool hasParam( std::vector< rtl::OString >::iterator iter ); + sal_Bool hasVars( void ); + sal_Bool evaluateOpt( std::vector< rtl::OString >::iterator iter ); + OptDsc* getOptDsc( rtl::OString& opt ); + sal_Bool hasOpt( const rtl::OString& opt ) const; + ::osl::FileBase::RC getIniOptions( rtl::OString iniPth ); + void createOpt( rtl::OString& optdsc ); + void str2Opt( rtl::OString iOpts ); + void addOpt( rtl::OString& opt, sal_Bool evaluate = sal_True ); + void replVars( void ); + void showUsage( void ); + void printStatus( void ); + +}; ///:~ GetOpt +#endif diff --git a/testshl2/inc/testshl/joblist.hxx b/testshl2/inc/testshl/joblist.hxx new file mode 100644 index 000000000000..3c2d0c603528 --- /dev/null +++ b/testshl2/inc/testshl/joblist.hxx @@ -0,0 +1,99 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef CPPUNIT_JOBLIST_HXX +#define CPPUNIT_JOBLIST_HXX + +#include <vector> +#include <string> +#include <hash_map> +#include "sal/types.h" + +// #include <testshl/nocopy.hxx> + +/* + struct eqstr + { + bool operator()( std::string const & s1, std::string const& s2 ) const + { + return ( s1 == s2 ); + } + }; +*/ + +/* + struct hashstr + { + sal_uInt32 operator()( std::string const & str ) const + { + return str.hashCode(); + } + }; +*/ +typedef std::hash_map< std::string, int > HashMap; + +// typedef std::vector<std::string> StringList; + +#define JOB_UNKNOWN 0 +#define JOB_NOT_FOUND 1 +#define JOB_PASSED 2 +#define JOB_FAILED 3 +#define JOB_ACCESS 4 + +#define JOB_EXCLUDE_LIST 0x1000 +#define JOB_ONLY_LIST 0x1001 + +typedef sal_Int16 JobType; + +class JobList /* : NOCOPY */ +{ + HashMap m_aJobList; + char** ppsJobList; + + // returns true if the given List contains unxlngi or unxsols or wntmsci... + bool isInCurrentEnvironment(std::string const& _sString); + std::string trim(std::string const& _sStringToTrim); + +public: + JobList(); + ~JobList(); + + bool readfile(std::string const& _sFilename, JobType _nJobType); + const char** getList() const {return (const char**)ppsJobList;} + + int getJobListEntry(std::string const& _sIndexName); + void setJobListEntry(std::string const& _sIndexName, int _nValue); + + int size() {return m_aJobList.size();} + HashMap const& getHashMap() {return m_aJobList;} +}; + +#endif + diff --git a/testshl2/inc/testshl/log.hxx b/testshl2/inc/testshl/log.hxx new file mode 100644 index 000000000000..b46ec876c911 --- /dev/null +++ b/testshl2/inc/testshl/log.hxx @@ -0,0 +1,116 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************* + + Source Code Control System - Header + + $Header$ + + Source Code Control System - Update + +*************************************************************************/ +#ifndef __QADEV_REGSCAN_LOG_HXX__ +#define __QADEV_REGSCAN_LOG_HXX__ + +#include <time.h> +#include <rtl/ustring.hxx> +#include <rtl/strbuf.hxx> +#include <sal/types.h> +#include <osl/thread.h> +#include <osl/file.hxx> + +//!io #include <iostream> +#include <vector> + +// using namespace std; + + +/** + * Log derives the interface of the ::osl::File class ( is-a relation ). + * Its members (has-a relation) are the (full qualified)name of the log + * and an OStringBuffer which represents the content of the logfile. + * It provides the functionality of easy-to-use open and write logs + */ +//: Log +class Log { + + ::osl::File* m_logfile; // fileobject + rtl::OUString m_logurl; // url of log + rtl::OStringBuffer m_buf; // content of log + + Log(); + +public: + + //> c'tor + /** + * constructors argument is a full qualified UNC path + * @param OUString logfile ( full qualified UNC path ) + */ + Log( const rtl::OUString& logURL ) + : m_logfile( new ::osl::File( logURL )) + , m_logurl(logURL) + {} ///< c'tor + + //> d'tor + virtual ~Log() { + m_logfile->close(); + delete( m_logfile ); + } ///< d'tor + + //> inline methods + // returns a reference to name instance + inline rtl::OUString getLogURL() { return m_logurl; } + inline rtl::OString getName() { return rtl::OUStringToOString( + m_logurl, RTL_TEXTENCODING_ASCII_US ); } + ///< inline methods + + // open logfile for overwrite (default) or append + ::osl::FileBase::RC open( sal_Bool append = sal_False ); + ::osl::FileBase::RC close() { return m_logfile->close(); } + + + // write methods without (default) or with echo on display + ::osl::FileBase::RC write( const sal_Char* buf, sal_Bool v = sal_False ); + ::osl::FileBase::RC write( const rtl::OString& buf, + sal_Bool v = sal_False ); + // ::osl::FileBase::RC write( rtl::OStringBuffer const& buf, + // sal_Bool v = sal_False ); + ::osl::FileBase::RC write( const rtl::OUString& buf, + rtl_TextEncoding enc = RTL_TEXTENCODING_ASCII_US, + sal_Bool v = sal_False ); + +}; ///:~ Log + +Log &operator <<( Log &_aLog, const sal_Char * _sValue ); +Log &operator <<( Log &_aLog, rtl::OString const& _sValue ); +Log &operator <<( Log &_aLog, rtl::OUString const& _sValue ); +// Log &operator <<( Log &_aLog, rtl::OStringBuffer const& _sValue ); + +#endif diff --git a/testshl2/inc/testshl/nocopy.hxx b/testshl2/inc/testshl/nocopy.hxx new file mode 100644 index 000000000000..660bb1892e46 --- /dev/null +++ b/testshl2/inc/testshl/nocopy.hxx @@ -0,0 +1,13 @@ +#ifndef NOCOPY_HXX +#define NOCOPY_HXX + +// prevent illegal copies +class NOCOPY +{ + NOCOPY(NOCOPY const&); + NOCOPY& operator=(NOCOPY const&); +public: + NOCOPY(){} +}; + +#endif diff --git a/testshl2/inc/testshl/result/SynchronizedObject.h b/testshl2/inc/testshl/result/SynchronizedObject.h new file mode 100644 index 000000000000..6994fdb1692e --- /dev/null +++ b/testshl2/inc/testshl/result/SynchronizedObject.h @@ -0,0 +1,82 @@ +#ifndef CPPUNIT_SYNCHRONIZEDOBJECT_H +#define CPPUNIT_SYNCHRONIZEDOBJECT_H + +#include <cppunit/Portability.h> +#include <testshl/nocopy.hxx> + +namespace CppUnit +{ + +/*! \brief Base class for synchronized object. + * + * Synchronized object are object which members are used concurrently by mutiple + * threads. + * + * This class define the class SynchronizationObject which must be subclassed + * to implement an actual lock. + * + * Each instance of this class holds a pointer on a lock object. + * + * See src/msvc6/MfcSynchronizedObject.h for an example. + */ +class CPPUNIT_API SynchronizedObject +{ +public: + /*! \brief Abstract synchronization object (mutex) + */ + class SynchronizationObject + { + public: + SynchronizationObject() {} + virtual ~SynchronizationObject() {} + + virtual void lock() {} + virtual void unlock() {} + }; + + /*! Constructs a SynchronizedObject object. + */ + SynchronizedObject( SynchronizationObject *syncObject =0 ); + + /// Destructor. + virtual ~SynchronizedObject(); + +protected: + /*! \brief Locks a synchronization object in the current scope. + */ + class ExclusiveZone : NOCOPY + { + SynchronizationObject *m_syncObject; + + public: + ExclusiveZone( SynchronizationObject *syncObject ) + : m_syncObject( syncObject ) + { + m_syncObject->lock(); + } + + ~ExclusiveZone() + { + m_syncObject->unlock (); + } + }; + + virtual void setSynchronizationObject( SynchronizationObject *syncObject ); + +protected: + SynchronizationObject *m_syncObject; + +private: + /// Prevents the use of the copy constructor. + SynchronizedObject( const SynchronizedObject © ); + + /// Prevents the use of the copy operator. + void operator =( const SynchronizedObject © ); +}; + + + +} // namespace CppUnit + + +#endif // CPPUNIT_SYNCHRONIZEDOBJECT_H diff --git a/testshl2/inc/testshl/result/TestListener.h b/testshl2/inc/testshl/result/TestListener.h new file mode 100644 index 000000000000..0814f21b7e2f --- /dev/null +++ b/testshl2/inc/testshl/result/TestListener.h @@ -0,0 +1,62 @@ +#ifndef CPPUNIT_TESTLISTENER_H // -*- C++ -*- +#define CPPUNIT_TESTLISTENER_H + +#include <cppunit/Portability.h> + + +namespace CppUnit { + +class Exception; +class Test; +class TestFailure; + + +/*! \brief Listener for test progress and result. + * \ingroup TrackingTestExecution + * + * Implementing the Observer pattern a TestListener may be registered + * to a TestResult to obtain information on the testing progress. Use + * specialized sub classes of TestListener for text output + * (TextTestProgressListener). Do not use the Listener for the test + * result output, use a subclass of Outputter instead. + * + * The test framework distinguishes between failures and errors. + * A failure is anticipated and checked for with assertions. Errors are + * unanticipated problems signified by exceptions that are not generated + * by the framework. + * + * \see TestResult + */ +class CPPUNIT_API TestListener +{ +public: + virtual ~TestListener() {} + + /// Called when just before a TestCase is run. + virtual void startTest( Test *test ) =0 ; + + /*! Called when a failure occurs while running a test. + * \see TestFailure. + * \warning \a failure is a temporary object that is destroyed after the + * method call. Use TestFailure::clone() to create a duplicate. + */ + virtual void addFailure( const TestFailure &failure ) =0; + + /// Called just after a TestCase was run (even if a failure occured). + virtual void endTest( Test *test ) =0; + + // additional info + virtual void addInfo(Test *test, const char*) =0; + + // info in which node we are + // helper functions to create tree structures + // old: virtual void enterNode( const char* ) =0; + // old: virtual void leaveNode( const char* ) =0; +}; + + +} // namespace CppUnit + +#endif // CPPUNIT_TESTLISTENER_H + + diff --git a/testshl2/inc/testshl/result/TestResult.h b/testshl2/inc/testshl/result/TestResult.h new file mode 100644 index 000000000000..22b5d2346664 --- /dev/null +++ b/testshl2/inc/testshl/result/TestResult.h @@ -0,0 +1,123 @@ +#ifndef CPPUNIT_TESTRESULT_H +#define CPPUNIT_TESTRESULT_H + +#include <cppunit/Portability.h> + +#if CPPUNIT_NEED_DLL_DECL +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z +#endif +#endif + +#include <testshl/result/SynchronizedObject.h> +#include <vector> +#include <string> +#include <deque> +//!io #include <iostream> + +#include "testshl/result/optionhelper.hxx" +#include "cppunit/TestFailure.h" + +class Outputter; +namespace CppUnit { + +class Exception; +class Test; +// class TestFailure; +class TestListener; + +#if CPPUNIT_NEED_DLL_DECL + template class CPPUNIT_API std::deque<TestListener *>; +#endif + +/*! \brief Manages TestListener. + * \ingroup TrackingTestExecution + * + * A single instance of this class is used when running the test. It is usually + * created by the test runner (TestRunner). + * + * This class shouldn't have to be inherited from. Use a TestListener + * or one of its subclasses to be informed of the ongoing tests. + * Use a Outputter to receive a test summary once it has finished + * + * TestResult supplies a template method 'setSynchronizationObject()' + * so that subclasses can provide mutual exclusion in the face of multiple + * threads. This can be useful when tests execute in one thread and + * they fill a subclass of TestResult which effects change in another + * thread. To have mutual exclusion, override setSynchronizationObject() + * and make sure that you create an instance of ExclusiveZone at the + * beginning of each method. + * + * \see Test, TestListener, TestResultCollector, Outputter. + */ +class CPPUNIT_API TestResult : protected SynchronizedObject +{ +protected: + OptionHelper m_aOptionHelper; + +public: + TestResult( GetOpt & _aOptions, SynchronizationObject *syncObject = 0 ); + virtual ~TestResult(); + + virtual void addListener( TestListener *listener ); + virtual void removeListener( TestListener *listener ); + + virtual void reset(); + virtual void stop(); + + virtual bool shouldStop() const; + + virtual void startTest( Test *test ); + virtual void addError( Test *test, Exception *e, ErrorType::num eType=ErrorType::ET_ERROR); + virtual void addFailure( Test *test, Exception *e ); + virtual void endTest( Test *test ); + + // LLA: additionals + virtual void addInfo(Test *test, const char *sInfo); + + virtual void enterNode(const char* Node); + virtual void leaveNode(const char* Node); + virtual std::string getNodeName(); + + // if true, execution is allowed. + virtual bool isAllowedToExecute(std::string const & sName); + bool isOnlyShowJobs() {return m_aOptionHelper.isOnlyShowJobs();} + bool isOptionWhereAmI(); + + virtual void print(Outputter &); + void setExitValue(int _nValue) {m_nExitValue = _nValue;} + int getExitValue() {return m_nExitValue;} + +protected: + void addFailure( const TestFailure &failure ); + +protected: + typedef std::deque<TestListener *> TestListeners; + TestListeners m_listeners; + bool m_stop; + + // this vector is used to expand the test name with a current node name + std::vector<std::string> m_aCurrentNodeNames; + + //# std::vector<std::string> m_aNodes; + +private: + TestResult( const TestResult &other ); + TestResult &operator =( const TestResult &other ); + int m_nExitValue; +}; + + +} // namespace CppUnit + + +#if CPPUNIT_NEED_DLL_DECL +#ifdef _MSC_VER +#pragma warning( pop ) +#endif +#endif + +#endif // CPPUNIT_TESTRESULT_H + + diff --git a/testshl2/inc/testshl/result/TestResultCollector.h b/testshl2/inc/testshl/result/TestResultCollector.h new file mode 100644 index 000000000000..ddbe517f8935 --- /dev/null +++ b/testshl2/inc/testshl/result/TestResultCollector.h @@ -0,0 +1,165 @@ +#ifndef CPPUNIT_TESTRESULTCOLLECTOR_H +#define CPPUNIT_TESTRESULTCOLLECTOR_H + +#include <cppunit/Portability.h> + +#if CPPUNIT_NEED_DLL_DECL +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z +#endif +#endif + +#include <testshl/result/TestResult.h> +#include <testshl/result/TestSucessListener.h> +#include <deque> +#include <vector> + +namespace CppUnit +{ + + +#if CPPUNIT_NEED_DLL_DECL + template class CPPUNIT_API std::deque<TestFailure *>; + template class CPPUNIT_API std::deque<Test *>; +#endif + + +/*! \brief Collects test result. + * \ingroup WritingTestResult + * \ingroup BrowsingCollectedTestResult + * + * A TestResultCollector is a TestListener which collects the results of executing + * a test case. It is an instance of the Collecting Parameter pattern. + * + * The test framework distinguishes between failures and errors. + * A failure is anticipated and checked for with assertions. Errors are + * unanticipated problems signified by exceptions that are not generated + * by the framework. + * \see TestListener, TestFailure. + */ + +class OneStringContainer +{ + std::string m_sName; +protected: + OneStringContainer() {} +public: + OneStringContainer(std::string const& _sName) + :m_sName(_sName){} + std::string getString() const {return m_sName;} + virtual ~OneStringContainer(){} +}; + +// ----------------------------------------------------------------------------- +class TestEnvelope : public OneStringContainer +{ + Test* m_pTest; +public: + TestEnvelope():m_pTest(NULL){} + + TestEnvelope(Test* _pTest, std::string const& _sName) + : OneStringContainer(_sName), + m_pTest(_pTest) + {} + + Test* getTest() {return m_pTest;} + virtual ~TestEnvelope(){} + +}; + +// ----------------------------------------------------------------------------- +class TestInfo : public TestEnvelope +{ +public: + TestInfo(Test* _pTest, std::string const& _sName) + :TestEnvelope(_pTest, _sName) + {} +}; + +// ----------------------------------------------------------------------------- +class TestFailureEnvelope : public OneStringContainer +{ + TestFailure* m_pTestFailure; +public: + TestFailureEnvelope():m_pTestFailure(NULL){} + + TestFailureEnvelope(TestFailure* _pTestFailure, std::string const& _sName) + :OneStringContainer(_sName), + m_pTestFailure(_pTestFailure) + {} + + TestFailure* getTestFailure() {return m_pTestFailure;} + virtual ~TestFailureEnvelope(){} + +}; +// ----------------------------------------------------------------------------- + +class CPPUNIT_API TestResultCollector : public TestSucessListener +{ + TestResult* m_pResult; +public: + typedef std::deque<TestFailureEnvelope *> TestFailures; + typedef std::deque<TestEnvelope *> Tests; + typedef std::vector<TestInfo *> TestInfos; + + + /*! Constructs a TestResultCollector object. + */ + TestResultCollector( TestResult *_pResult, SynchronizationObject *syncObject = 0 ); + + /// Destructor. + virtual ~TestResultCollector(); + + void startTest( Test *test ); + void endTest( Test *test ); + + void addFailure( const TestFailure &failure ); + + virtual void reset(); + + virtual int runTests() const; + virtual int testErrors() const; + virtual int testFailures() const; + virtual int testFailuresTotal() const; + + virtual const TestFailures& failures() const; + virtual const Tests &tests() const; + virtual std::string getInfo(Test*); + + virtual void addInfo(Test *test, const char *sInfo); + + // virtual void enterNode(const char* Node); + // virtual void leaveNode(const char* Node); + +protected: + Tests m_tests; + TestFailures m_failures; + TestInfos m_aInfos; + + int m_testErrors; + + // this vector is used to expand the test name with a current node name + // std::vector<std::string> m_aCurrentNodeNames; + // std::string getNodeName(); +private: + /// Prevents the use of the copy constructor. + TestResultCollector( const TestResultCollector © ); + + /// Prevents the use of the copy operator. + void operator =( const TestResultCollector © ); +}; + + + +} // namespace CppUnit + + +#if CPPUNIT_NEED_DLL_DECL +#ifdef _MSC_VER +#pragma warning( pop ) +#endif +#endif + + +#endif // CPPUNIT_TESTRESULTCOLLECTOR_H diff --git a/testshl2/inc/testshl/result/TestSucessListener.h b/testshl2/inc/testshl/result/TestSucessListener.h new file mode 100644 index 000000000000..3eb53b9fc13f --- /dev/null +++ b/testshl2/inc/testshl/result/TestSucessListener.h @@ -0,0 +1,40 @@ +#ifndef CPPUNIT_TESTSUCESSLISTENER_H +#define CPPUNIT_TESTSUCESSLISTENER_H + +#include <testshl/result/SynchronizedObject.h> +#include <testshl/result/TestListener.h> + + +namespace CppUnit +{ + +/*! \brief TestListener that checks if any test case failed. + * \ingroup TrackingTestExecution + */ +class CPPUNIT_API TestSucessListener : public TestListener, + public SynchronizedObject +{ +public: + /*! Constructs a TestSucessListener object. + */ + TestSucessListener( SynchronizationObject *syncObject = 0 ); + + /// Destructor. + virtual ~TestSucessListener(); + + virtual void reset(); + + void addFailure( const TestFailure &failure ); + + /// Returns whether the entire test was successful or not. + virtual bool wasSuccessful() const; + +private: + bool m_sucess; +}; + + +} // namespace CppUnit + + +#endif // CPPUNIT_TESTSUCESSLISTENER_H diff --git a/testshl2/inc/testshl/result/TextTestResult.h b/testshl2/inc/testshl/result/TextTestResult.h new file mode 100644 index 000000000000..e2ba0ffba427 --- /dev/null +++ b/testshl2/inc/testshl/result/TextTestResult.h @@ -0,0 +1,62 @@ +#ifndef CPPUNIT_TEXTTESTRESULT_H +#define CPPUNIT_TEXTTESTRESULT_H + +#include <testshl/result/TestResult.h> +#include <testshl/result/TestResultCollector.h> +#include <ostream> + +class GetOpt; +namespace CppUnit { + +class SourceLine; +class Exception; +class Test; + +/*! \brief Holds printable test result (DEPRECATED). + * \ingroup TrackingTestExecution + * + * deprecated Use class TextTestProgressListener and TextOutputter instead. + */ +class CPPUNIT_API TextTestResult : public TestResult +/* public TestResultCollector*/ +{ + TestResultCollector m_aResulter; +public: + TextTestResult(GetOpt& _aOptions); + + virtual void addFailure( const TestFailure &failure ); + virtual void startTest( Test *test ); + virtual void endTest( Test *test ); + + virtual void print( std::ostream &stream ); +protected: + + virtual void printFailures( std::ostream &stream ); + virtual void printHeader( std::ostream &stream ); + + virtual void printFailure( TestFailure *failure, + int failureNumber, + std::ostream &stream ); + virtual void printFailureListMark( int failureNumber, + std::ostream &stream ); + virtual void printFailureTestName( TestFailure *failure, + std::ostream &stream ); + virtual void printFailureType( TestFailure *failure, + std::ostream &stream ); + virtual void printFailureLocation( SourceLine sourceLine, + std::ostream &stream ); + virtual void printFailureDetail( Exception *thrownException, + std::ostream &stream ); + virtual void printFailureWarning( std::ostream &stream ); + virtual void printStatistics( std::ostream &stream ); +}; + +/** insertion operator for easy output */ +std::ostream &operator <<( std::ostream &stream, + TextTestResult &result ); + +} // namespace CppUnit + +#endif // CPPUNIT_TEXTTESTRESULT_H + + diff --git a/testshl2/inc/testshl/result/callbackfunc.h b/testshl2/inc/testshl/result/callbackfunc.h new file mode 100644 index 000000000000..606bf7179163 --- /dev/null +++ b/testshl2/inc/testshl/result/callbackfunc.h @@ -0,0 +1,25 @@ +#ifndef _callbackfunc_h +#define _callbackfunc_h + +#ifdef __cplusplus +extern "C" { +#endif + + // this is the entry point from the DLL back to the executable. + long CallbackDispatch(int x, ...); + +//# void TestResult_startTest(hTestResult _pResult, hTest _pTest); +//# void TestResult_addFailure( hTestResult _pResult, hTest _pTest, hException _pException ); +//# void TestResult_addError( hTestResult _pResult, hTest _pTest, hException _pException ); +//# void TestResult_endTest( hTestResult _pResult, hTest _pTest ); +//# bool TestResult_shouldStop(hTestResult _pResult); +//# void TestResult_addInfo( hTestResult _pResult, hTest _pTest, const char* _sInfo ); +//# +//# void TestResult_enterNode( hTestResult _pResult, const char* _sInfo ); +//# void TestResult_leaveNode( hTestResult _pResult, const char* _sInfo ); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/testshl2/inc/testshl/result/emacsTestResult.hxx b/testshl2/inc/testshl/result/emacsTestResult.hxx new file mode 100644 index 000000000000..7198ad7ce852 --- /dev/null +++ b/testshl2/inc/testshl/result/emacsTestResult.hxx @@ -0,0 +1,82 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef cppunit_emacstestresult_h +#define cppunit_emacstestresult_h + +#include <testshl/result/TestResult.h> +#include <testshl/result/TestResultCollector.h> +#include <ostream> +#include "testshl/getopt.hxx" + +class Outputter; +namespace CppUnit { + +class SourceLine; +class Exception; +class Test; + +/*! \brief Holds printable test result (DEPRECATED). + * \ingroup TrackingTestExecution + * + * deprecated Use class TextTestProgressListener and TextOutputter instead. + */ + class CPPUNIT_API emacsTestResult : public TestResult + +/* ,public TestResultCollector*/ + { + GetOpt & m_aOptions; + // OptionHelper m_aOptionHelper; + TestResultCollector m_aResulter; + + public: + emacsTestResult(GetOpt & _aOptions); + + // virtual void addFailure( const TestFailure &failure ); + // virtual void startTest( Test *test ); + // virtual void endTest( Test *test ); + + virtual void print( Outputter &stream ); + + protected: + virtual void printHeader( Outputter &stream ); + // virtual void printTestLine( Outputter &stream, Test* pTest, std::string const& _sNodeName, std::string const& _sInfo); + virtual void printFailureLine( Outputter &stream, TestFailure* pFailure, std::string const& _sNodeName ); + }; + +/** insertion operator for easy output */ +// std::ostream &operator <<( std::ostream &stream, +// emacsTestResult &result ); + +} // namespace CppUnit + +#endif // CPPUNIT_testshlTESTRESULT_H + + diff --git a/testshl2/inc/testshl/result/log.hxx b/testshl2/inc/testshl/result/log.hxx new file mode 100644 index 000000000000..fe5816a7cb17 --- /dev/null +++ b/testshl2/inc/testshl/result/log.hxx @@ -0,0 +1,106 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ +#ifndef __QADEV_REGSCAN_LOG_HXX__ +#define __QADEV_REGSCAN_LOG_HXX__ + +#include <time.h> +#include <rtl/ustring.hxx> +#include <rtl/strbuf.hxx> +#include <sal/types.h> +#include <osl/thread.h> +#include <osl/file.hxx> + +#include <testshl/nocopy.hxx> + +//!io #include <iostream> +#include <vector> + +// using namespace std; + + +/** + * Log derives the interface of the ::osl::File class ( is-a relation ). + * Its members (has-a relation) are the (full qualified)name of the log + * and an OStringBuffer which represents the content of the logfile. + * It provides the functionality of easy-to-use open and write logs + */ +//: Log +class Log : NOCOPY { + + ::osl::File* m_logfile; // fileobject + rtl::OUString m_logurl; // url of log + rtl::OStringBuffer m_buf; // content of log + + Log(); + +public: + + //> c'tor + /** + * constructors argument is a full qualified UNC path + * @param OUString logfile ( full qualified UNC path ) + */ + Log( const rtl::OUString& logURL ) + : m_logfile( new ::osl::File( logURL )) + , m_logurl(logURL) + {} ///< c'tor + + //> d'tor + virtual ~Log() + { + m_logfile->close(); + delete( m_logfile ); + } ///< d'tor + + //> inline methods + // returns a reference to name instance + inline rtl::OUString getLogURL() { return m_logurl; } + inline rtl::OString getName() { return rtl::OUStringToOString( + m_logurl, RTL_TEXTENCODING_ASCII_US ); } + ///< inline methods + + // open logfile for overwrite (default) or append + ::osl::FileBase::RC open( sal_Bool append = sal_False ); + ::osl::FileBase::RC close() { return m_logfile->close(); } + + + // write methods without (default) or with echo on display + ::osl::FileBase::RC write( const sal_Char* buf, sal_Bool v = sal_False ); + ::osl::FileBase::RC write( const rtl::OString& buf, + sal_Bool v = sal_False ); + //! ::osl::FileBase::RC write( rtl::OStringBuffer& buf, + //! sal_Bool v = sal_False ); + ::osl::FileBase::RC write( const rtl::OUString& buf, + rtl_TextEncoding enc = RTL_TEXTENCODING_ASCII_US, + sal_Bool v = sal_False ); + +}; ///:~ Log + +#endif diff --git a/testshl2/inc/testshl/result/optionhelper.hxx b/testshl2/inc/testshl/result/optionhelper.hxx new file mode 100644 index 000000000000..a3ae28cc4c81 --- /dev/null +++ b/testshl2/inc/testshl/result/optionhelper.hxx @@ -0,0 +1,98 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef optionhelper_hxx +#define optionhelper_hxx + +#include <string> + +#include <sal/types.h> + +#include "testshl/nocopy.hxx" +#include "testshl/getopt.hxx" +#include "testshl/joblist.hxx" + +// ----------------------------------------------------------------------------- + +typedef std::vector<rtl::OString> OStringList; + +//!? Better: OptionHelper +class OptionHelper : NOCOPY +{ + GetOpt & m_aOption; + JobList m_aJobOnlyList; + JobList m_aJobExcludeList; + OStringList m_aJobFilter; + + std::string m_sProjectId; + std::string m_sBuildId; + + std::string getProjectId() const; + std::string getBuildId() const; + std::string createDateTag(std::string const& _sProjectId, std::string const& _sBuildId); + + void handleJobs(); +public: + OptionHelper(GetOpt & _aOption) + :m_aOption(_aOption) + { + if (m_aOption.hasOpt("-projectid")) + m_sProjectId = m_aOption.getOpt("-projectid"); + + if (m_aOption.hasOpt("-buildid")) + m_sBuildId = m_aOption.getOpt("-buildid"); + + handleJobs(); + } + + static std::string integerToAscii(sal_Int32 nValue); + static std::string twoDigits(std::string const& _sValue); + + std::string createDateTag(); + bool showErrors(); + bool showTests(); + + JobList getJobOnlyList() {return m_aJobOnlyList;} + JobList getJobExcludeList() {return m_aJobExcludeList;} + + bool isAllowedToExecute(std::string const& _sNode, std::string const& _sName); + + bool isOnlyShowJobs() {return m_aOption.hasOpt("-onlyshowjobs") == sal_True ? true : false;} + GetOpt& getOptions() {return m_aOption;} + bool isVerbose() {return m_aOption.hasOpt("-verbose") == sal_True ? true : false;} + bool isOptionWhereAmI() {return m_aOption.hasOpt("-whereami") == sal_True ? true : false;} +}; + +// ----------------------------------------------------------------------------- + + +#endif + + diff --git a/testshl2/inc/testshl/result/outputter.hxx b/testshl2/inc/testshl/result/outputter.hxx new file mode 100644 index 000000000000..9ae49620201e --- /dev/null +++ b/testshl2/inc/testshl/result/outputter.hxx @@ -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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// + +#ifndef outputter_hxx +#define outputter_hxx + +#include <string> +#include <ostream> +#include <memory> +#include "testshl/log.hxx" +#include <sal/types.h> +#include "testshl/nocopy.hxx" + +// #include <fstream> + +class Outputter : NOCOPY +{ + std::auto_ptr<Log> m_pLog; + std::ostream* m_pStream; + + void writeToAll(const sal_Char* _pStr); +public: + class endl + { + char c; + public: + endl():c('\0'){} + }; +public: + Outputter(Log * _pLog ) + :m_pLog(_pLog), + m_pStream(NULL) {} + + Outputter(std::ostream& _aStream) + :m_pLog(NULL), + m_pStream(&_aStream) {} + + ~Outputter(); + + void write(const sal_Char*); + void write(std::string const&); + void write(sal_Int32); + // void write(double); +}; + +Outputter& operator <<( Outputter &stream, const sal_Char* ); +Outputter& operator <<( Outputter &stream, std::string const& ); +Outputter& operator <<( Outputter &stream, sal_Int32 ); +// Outputter& operator <<( Outputter &stream, double ); + +Outputter& operator <<( Outputter &stream, Outputter::endl const&); + +// Outputter& operator <<( Outputter &stream, const char* ); + +#endif + diff --git a/testshl2/inc/testshl/result/testshlTestResult.h b/testshl2/inc/testshl/result/testshlTestResult.h new file mode 100644 index 000000000000..22a50a9a841e --- /dev/null +++ b/testshl2/inc/testshl/result/testshlTestResult.h @@ -0,0 +1,72 @@ +#ifndef cppunit_testshltestresult_h +#define cppunit_testshltestresult_h + +#include <map> +#include <testshl/result/TestResult.h> +#include <testshl/result/TestResultCollector.h> +#include <ostream> +#include "testshl/getopt.hxx" + +class Outputter; + +namespace CppUnit { + +class SourceLine; +class Exception; +class Test; + +struct ltstr +{ + bool operator()(const CppUnit::Test* p1, const CppUnit::Test* p2) const + { + return p1 < p2; + } +}; +typedef std::map<CppUnit::Test*, bool, ltstr> TestPtrList; + + +/*! \brief Holds printable test result (DEPRECATED). + * \ingroup TrackingTestExecution + * + * deprecated Use class TextTestProgressListener and TextOutputter instead. + */ + class CPPUNIT_API testshlTestResult : public TestResult + +/* ,public TestResultCollector*/ + { + GetOpt & m_aOptions; + // OptionHelper m_aOptionHelper; + TestResultCollector m_aResulter; + + public: + testshlTestResult(GetOpt & _aOptions); + virtual ~testshlTestResult(); + + // virtual void addFailure( const TestFailure &failure ); + // virtual void startTest( Test *test ); + // virtual void endTest( Test *test ); + + virtual void print( Outputter &stream ); + + protected: + virtual void printHeader( Outputter &stream ); + + void printLines(Outputter &stream, HashMap & _aJobList); + void printFailedTests(Outputter &stream, TestPtrList &aFailedTests); + void printTestLines(Outputter &stream, TestPtrList &aFailedTests); + void printUnknownLines(Outputter &stream, HashMap & _aJobList); + + virtual void printTestLine( Outputter &stream, Test* pTest, std::string const& _sNodeName, std::string const& _sInfo); + virtual void printFailureLine( Outputter &stream, TestFailure* pFailure, std::string const& _sNodeName ); + virtual void printUnknownLine( Outputter &stream, std::string const& _sTestName); + }; + +/** insertion operator for easy output */ + Outputter &operator <<( Outputter &stream, + testshlTestResult &result ); + +} // namespace CppUnit + +#endif // CPPUNIT_testshlTESTRESULT_H + + diff --git a/testshl2/inc/testshl/signaltest.h b/testshl2/inc/testshl/signaltest.h new file mode 100644 index 000000000000..7c501bd846c1 --- /dev/null +++ b/testshl2/inc/testshl/signaltest.h @@ -0,0 +1,65 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef SIGNALTEST_H +#define SIGNALTEST_H + +#include <string> +#include "cppunit/Test.h" +#include <testshl/autoregister/htestresult.h> + +namespace CppUnit +{ + +class CPPUNIT_API SignalTest : public Test +{ +public: + + SignalTest( std::string const& Name ); + + ~SignalTest(); + + virtual void run(hTestResult pResult); + virtual int countTestCases() const; + std::string getName() const; + std::string toString() const; + +private: + SignalTest( const SignalTest &other ); + SignalTest &operator=( const SignalTest &other ); + +private: + const std::string m_sName; +}; + +} // namespace CppUnit + + +#endif diff --git a/testshl2/inc/testshl/simpleheader.hxx b/testshl2/inc/testshl/simpleheader.hxx new file mode 100644 index 000000000000..5b378acafd02 --- /dev/null +++ b/testshl2/inc/testshl/simpleheader.hxx @@ -0,0 +1,46 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef CPPUNIT_SIMPLEHEADER_HXX +#define CPPUNIT_SIMPLEHEADER_HXX + +// This file contains only the cppunit header files, for simplification. + +#include <cppunit/TestFixture.h> +#include <cppunit/TestCaller.h> +#include <cppunit/TestSuite.h> +#include <cppunit/TestAssert.h> +#include <testshl/autoregister/registertestfunction.h> +#include <cppunit/extensions/HelperMacros.h> +#include <testshl/additionalfunc.hxx> +#include <testshl/cmdlinebits.hxx> +#include <testshl/checkboom.hxx> + +#endif diff --git a/testshl2/inc/testshl/stringhelper.hxx b/testshl2/inc/testshl/stringhelper.hxx new file mode 100644 index 000000000000..60809e3d3551 --- /dev/null +++ b/testshl2/inc/testshl/stringhelper.hxx @@ -0,0 +1,42 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef STRINGHELPER_HXX +#define STRINGHELPER_HXX + +#include <rtl/ustring.hxx> +#include <rtl/string.hxx> + +inline void operator <<= (rtl::OString& _rAsciiString, const rtl::OUString& _rUnicodeString) +{ + _rAsciiString = rtl::OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US); +} + +#endif diff --git a/testshl2/inc/testshl/taghelper.hxx b/testshl2/inc/testshl/taghelper.hxx new file mode 100644 index 000000000000..0275d0885893 --- /dev/null +++ b/testshl2/inc/testshl/taghelper.hxx @@ -0,0 +1,91 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef TAGHELPER_HXX +#define TAGHELPER_HXX + +#include <map> +#include <sal/types.h> +#include <testshl/nocopy.hxx> +#include <cppunit/tagvalues.hxx> + +/* Tags are a general mechanism of extensible data arrays for parameter + * specification and property inquiry. In practice, tags are used in arrays, + * or chain of arrays. + * + */ + +typedef sal_IntPtr TagData; + +//# struct TagItem +//# { +//# Tag ti_Tag; /* identifies the type of data */ +//# TagData ti_Data; /* type-specific data */ +//# }; + +/* constants for Tag.ti_Tag, control tag values */ +#define TAG_DONE (Tag(0L)) /* terminates array of TagItems. ti_Data unused */ +#define TAG_END (Tag(0L)) /* synonym for TAG_DONE */ +#define TAG_IGNORE (Tag(1L)) /* ignore this item, not end of array */ +#define TAG_MORE (Tag(2L)) /* ti_Data is pointer to another array of TagItems + * note that this tag terminates the current array + */ +#define TAG_SKIP (Tag(3L)) /* skip this and the next ti_Data items */ + +/* differentiates user tags from control tags */ +#define TAG_USER (Tag(1L<<31)) + +// ----------------------------------------------------------------------------- +class TagHelper /* : NOCOPY */ +{ + typedef std::map<Tag, TagData> TagItems; + TagItems m_aTagItems; + +public: + TagHelper(){} + void insert(Tag _nTag, TagData _nData) + { + m_aTagItems[_nTag] = _nData; + } + // const TagItems& get() const { return m_aTagItems; } + + TagData GetTagData(Tag _aTagValue, TagData _aDefaultValue = 0 /* NULL */) const + { + TagItems::const_iterator it = m_aTagItems.find(_aTagValue); + if (it != m_aTagItems.end()) + return (*it).second; + else + return _aDefaultValue; + } +}; + +#endif + + diff --git a/testshl2/inc/testshl/tresstatewrapper.h b/testshl2/inc/testshl/tresstatewrapper.h new file mode 100644 index 000000000000..5730a2126718 --- /dev/null +++ b/testshl2/inc/testshl/tresstatewrapper.h @@ -0,0 +1,66 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef TESTSTATEWRAPPER_H +#define TESTSTATEWRAPPER_H + +#ifdef _RTL_TRES_H_ +#error "This is old code, please remove the include of rtl/tres.h" +#endif + +#include <sal/types.h> +#include "testshl/autoregister/registertestfunction.h" + +#ifdef __cplusplus +extern "C" { +#endif + +// typedef void* hTestResult; +typedef hTestResult rtlTestResult; + +// ----------------------------------------------------------------------------- +void c_rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName); +void c_rtl_tres_state_end(hTestResult _aResult, const sal_Char* _pName); + +// ----------------------------------------------------------------------------- +// the old test state function, which here convert all values for using with the +// new testshl tool + +sal_Bool SAL_CALL c_rtl_tres_state( + hTestResult pResult, + sal_Bool bSuccess, + char const * pTestMsg, + char const * pFuncName); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/testshl2/inc/testshl/tresstatewrapper.hxx b/testshl2/inc/testshl/tresstatewrapper.hxx new file mode 100644 index 000000000000..c840c1606140 --- /dev/null +++ b/testshl2/inc/testshl/tresstatewrapper.hxx @@ -0,0 +1,60 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef teststatewrapper_hxx +#define teststatewrapper_hxx + +#include <testshl/nocopy.hxx> +#include <sal/types.h> + +#include <testshl/simpleheader.hxx> +#include <cppunit/callbackfunc_fktptr.h> + +// This is a hack, because it's possible that the testshl directory doesn't exist. +#ifdef LOAD_TRESSTATEWRAPPER_LOCAL +#include "tresstatewrapper.h" +#else +#include <testshl/tresstatewrapper.h> +#endif + +// ----------------------------------------------------------------------------- +// helper class to mark the start off old test code +// the name is need in the test result generator +class rtl_tres_state_start : NOCOPY +{ + const sal_Char* m_pName; + hTestResult m_aResult; +public: + rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName); + ~rtl_tres_state_start(); +}; + +#endif + diff --git a/testshl2/inc/testshl/versionhelper.hxx b/testshl2/inc/testshl/versionhelper.hxx new file mode 100644 index 000000000000..bfba729397ba --- /dev/null +++ b/testshl2/inc/testshl/versionhelper.hxx @@ -0,0 +1,87 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef AUTOREGISTER_HXX +#define AUTOREGISTER_HXX + +#include <stdio.h> +#include <vector> +#include <ostream> +#include <iostream> + +#include <rtl/ustring.hxx> +#include <rtl/string.hxx> + +#include "dynamicregister.hxx" + +// ----------------------------------------------------------------------------- +// ---------------------------------- Version ---------------------------------- +// ----------------------------------------------------------------------------- +// extern "C" const struct VersionInfo *GetVersionInfo(); + +// this is a Hack, but at the moment, no change to handle this behaviour better. +struct VersionInfo +{ + const char* pTime; + const char* pDate; + const char* pUpd; + const char* pMinor; + const char* pBuild; + const char* pInpath; +}; +typedef const struct VersionInfo* (*FktGetVersionInfoPtr)(); + +// ----------------------------------------------------------------------------- +class VersionHelper : public DynamicLibraryHelper +{ + const VersionInfo *m_pInfo; + +public: + VersionHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions); +// void print(std::ostream& _aStream); + void printall(FILE*); + + rtl::OString getTime() const; + rtl::OString getDate() const; + rtl::OString getUpd() const; + rtl::OString getMinor() const; + rtl::OString getBuild() const; + rtl::OString getInpath() const; + + bool isOk() const; +}; + +/** insertion operator for easy output */ +// std::ostream &operator <<( std::ostream &stream, +// VersionHelper &version ); + + +#endif + diff --git a/testshl2/inc/testshl/winstuff.hxx b/testshl2/inc/testshl/winstuff.hxx new file mode 100644 index 000000000000..d50a0aa6ce42 --- /dev/null +++ b/testshl2/inc/testshl/winstuff.hxx @@ -0,0 +1,44 @@ +/************************************************************************* + * + * 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$ + * + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef WINSTUFF_HXX +#define WINSTUFF_HXX + +#include <sal/types.h> + +// Isolated into own compilation unit, to avoid interference with +// windows headers +void WinDebugBreak(); +void WinSleep( sal_uInt32 sec ); +sal_uInt32 WinGetCurrentProcessId(); +void WinTerminateApp( sal_uInt32 dwPID, sal_uInt32 dwTimeout ); + +#endif diff --git a/testshl2/prj/build.lst b/testshl2/prj/build.lst index d7a5c76cc435..7bbdfa8c1646 100644 --- a/testshl2/prj/build.lst +++ b/testshl2/prj/build.lst @@ -1,6 +1,9 @@ -t2 testshl2 : cppunit NULL +t2 testshl2 : cppunit sal NULL t2 testshl2 usr1 - all t2_mkout NULL -t2 testshl2\inc nmake - all t2_inc NULL -t2 testshl2\source nmake - all t2_src t2_inc NULL +t2 testshl2\inc nmake - all t2_inc NULL +t2 testshl2\source\cppunit\win32 nmake - all t2_src_cppunit_win32 t2_inc NULL +t2 testshl2\source\cppunit nmake - all t2_src_cppunit t2_src_cppunit_win32 t2_inc NULL +t2 testshl2\source\cppunit\result nmake - all t2_src_cppunit_result t2_inc NULL +t2 testshl2\source nmake - all t2_src t2_src_cppunit_result t2_src_cppunit t2_inc NULL t2 testshl2\util nmake - all t2_util t2_src NULL diff --git a/testshl2/prj/d.lst b/testshl2/prj/d.lst index f97cec8747d6..67cc1ad8e9e7 100644 --- a/testshl2/prj/d.lst +++ b/testshl2/prj/d.lst @@ -1,23 +1,29 @@ -..\%__SRC%\bin\testshl2.exe %_DEST%\bin%_EXT%\testshl2.exe -..\%__SRC%\bin\testshl2_timeout.exe %_DEST%\bin%_EXT%\testshl2_timeout.exe -..\%__SRC%\bin\testshl2 %_DEST%\bin%_EXT%\testshl2 -..\%__SRC%\bin\testshl2_timeout %_DEST%\bin%_EXT%\testshl2_timeout -..\%__SRC%\bin\versioninfo.exe %_DEST%\bin%_EXT%\versioninfo.exe -..\%__SRC%\bin\versioninfo %_DEST%\bin%_EXT%\versioninfo +../%__SRC%/bin/testshl2.exe %_DEST%/bin%_EXT%/testshl2.exe +../%__SRC%/bin/testshl2_timeout.exe %_DEST%/bin%_EXT%/testshl2_timeout.exe +../%__SRC%/bin/testshl2 %_DEST%/bin%_EXT%/testshl2 +../%__SRC%/bin/testshl2_timeout %_DEST%/bin%_EXT%/testshl2_timeout +../%__SRC%/bin/versioninfo.exe %_DEST%/bin%_EXT%/versioninfo.exe +../%__SRC%/bin/versioninfo %_DEST%/bin%_EXT%/versioninfo -..\source\codegen\codegen.pl %_DEST%\bin%_EXT%\codegen_testshl2.pl +../source/codegen/codegen.pl %_DEST%/bin%_EXT%/codegen_testshl2.pl -mkdir: %_DEST%\inc%_EXT%\testshl -..\inc\*.hxx %_DEST%\inc%_EXT%\testshl\*.hxx -..\inc\*.h %_DEST%\inc%_EXT%\testshl\*.h +mkdir: %_DEST%/inc%_EXT%/testshl +mkdir: %_DEST%/inc%_EXT%/testshl/autoregister +mkdir: %_DEST%/inc%_EXT%/testshl/result +../inc/testshl/*.hxx %_DEST%/inc%_EXT%/testshl/*.hxx +../inc/testshl/*.h %_DEST%/inc%_EXT%/testshl/*.h +../inc/testshl/result/*.hxx %_DEST%/inc%_EXT%/testshl/result/*.hxx +../inc/testshl/result/*.h %_DEST%/inc%_EXT%/testshl/result/*.h +../inc/testshl/autoregister/*.h %_DEST%/inc%_EXT%/testshl/autoregister/*.h -..\%__SRC%\lib\cppunit.lib %_DEST%\lib%_EXT%\cppunit.lib -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a +../%__SRC%/lib/testshl2.lib %_DEST%/lib%_EXT%/testshl2.lib +../%__SRC%/lib/*.a %_DEST%/lib%_EXT%/*.a +../%__SRC%/lib/c5t_*.lib %_DEST%/lib%_EXT%/c5t_*.lib # The follows is a testshl2 selftest library, which must be delivered for tests. # But per default this library doesn't exists. # For more information see workben/selftest -..\%__SRC%\bin\delivertest.dll %_DEST%\bin%_EXT%\testshl2_deliver_test.dll -..\%__SRC%\lib\libdelivertest.so %_DEST%\lib%_EXT%\libtestshl2_deliver_test.so -..\%__SRC%\lib\libdelivertest.dylib %_DEST%\lib%_EXT%\libtestshl2_deliver_test.dylib +../%__SRC%/bin/delivertest.dll %_DEST%/bin%_EXT%/testshl2_deliver_test.dll +../%__SRC%/lib/libdelivertest.so %_DEST%/lib%_EXT%/libtestshl2_deliver_test.so +../%__SRC%/lib/libdelivertest.dylib %_DEST%/lib%_EXT%/libtestshl2_deliver_test.dylib diff --git a/testshl2/source/autoregisterhelper.cxx b/testshl2/source/autoregisterhelper.cxx index ff36ecac6db6..55dd1103861e 100644 --- a/testshl2/source/autoregisterhelper.cxx +++ b/testshl2/source/autoregisterhelper.cxx @@ -38,10 +38,10 @@ #include <rtl/ustring.hxx> -#include <cppunit/autoregister/registerfunc.h> -#include <cppunit/autoregister/callbackstructure.h> -#include <cppunit/result/callbackfunc.h> -#include <cppunit/autoregister/testfunc.h> +#include <testshl/autoregister/registerfunc.h> +#include <testshl/autoregister/callbackstructure.h> +#include <testshl/result/callbackfunc.h> +#include <testshl/autoregister/testfunc.h> #include "testshl/filehelper.hxx" FunctionList m_Functions; diff --git a/testshl2/source/codegen/codegen.pl b/testshl2/source/codegen/codegen.pl index 6e2120798fac..ab7a68397aeb 100644 --- a/testshl2/source/codegen/codegen.pl +++ b/testshl2/source/codegen/codegen.pl @@ -63,7 +63,7 @@ sub generateNewPackage(*$) open(CPPFILE, ">$sFilename") || die "can't create source file"; print CPPFILE "// autogenerated file with codegen.pl\n"; print CPPFILE "\n"; - print CPPFILE "#include <cppunit/simpleheader.hxx>\n"; + print CPPFILE "#include <testshl/simpleheader.hxx>\n"; print CPPFILE "\n"; print CPPFILE "namespace $sPackageName\n"; print CPPFILE "{\n"; diff --git a/testshl2/source/cppunit/cmdlinebits.cxx b/testshl2/source/cppunit/cmdlinebits.cxx new file mode 100644 index 000000000000..9a9bf6789330 --- /dev/null +++ b/testshl2/source/cppunit/cmdlinebits.cxx @@ -0,0 +1,144 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#ifdef WNT +# define UNDER_WINDOWS_DEBUGGING +# include "testshl/winstuff.hxx" +#endif /* WNT */ + +#include <stdio.h> +#include <testshl/cmdlinebits.hxx> +#include "testshl/checkboom.hxx" + +#include <testshl/autoregister/callbackstructure.h> +#include <osl/diagnose.h> +#include <rtl/tres.h> +#include <testshl/stringhelper.hxx> + +extern CallbackStructure aGlobalStructure; + +sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag ); + +// sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag ) +// { +// return( ( _nBits & _nFlag ) == _nFlag ); +// } + +void CheckBoom(bool bCondition, std::string const& msg) +{ + (void) msg; // avoid warning + if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_BOOM ) ) + { + /* force an assertion on false state */ + if ( !bCondition ) { +#ifdef UNDER_WINDOWS_DEBUGGING + WinDebugBreak(); +#else + OSL_ENSURE( false, msg.c_str() ); +#endif + } + } +} + +void CheckBoom(bool bCondition, rtl::OUString const& msg) +{ + if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_BOOM ) ) + { + /* force an assertion on false state */ + rtl::OString sMessage; + sMessage <<= msg; + if ( !bCondition ) { +#ifdef UNDER_WINDOWS_DEBUGGING + WinDebugBreak(); +#else + OSL_ENSURE( false, sMessage.getStr() ); +#endif + } + } +} + +const char* getForwardString() +{ + return aGlobalStructure.psForward; +} + +// ----------------------------------------------------------------------------- +// ----------------------------- own printf method ----------------------------- +// ----------------------------------------------------------------------------- + +// bool isVerbose() +// { +// if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_VERBOSE ) ) +// { +// return true; +// } +// return false; +// } +// +// bool isQuiet() +// { +// if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_QUIET ) ) +// { +// return true; +// } +// return false; +// } +// +// void impl_t_print(const char* _pFormatStr, va_list &args) +// { +// if (! isQuiet()) +// { +// printf("# "); +// vprintf(_pFormatStr, args); +// } +// } +// +// void t_print(const char* _pFormatStr, ...) +// { +// va_list args; +// va_start( args, _pFormatStr ); +// impl_t_print(_pFormatStr, args); +// va_end( args ); +// } +// +// void t_print(T_Print_Params _eType, const char* _pFormatStr, ...) +// { +// if (_eType == T_VERBOSE && isVerbose()) +// { +// // if T_VERBOSE and we should be verbose, print info +// va_list args; +// va_start( args, _pFormatStr ); +// impl_t_print(_pFormatStr, args); +// va_end( args ); +// } +// } diff --git a/testshl2/source/cppunit/joblist.cxx b/testshl2/source/cppunit/joblist.cxx new file mode 100644 index 000000000000..52b36342c206 --- /dev/null +++ b/testshl2/source/cppunit/joblist.cxx @@ -0,0 +1,224 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <stdlib.h> +#include <stdio.h> +#include <fstream> +#include <rtl/string.hxx> +#include "testshl/joblist.hxx" + +#define C_SEPARATOR_LIST " \t,;:#" +JobList::JobList() + :ppsJobList(NULL) +{} + +// ----------------------------------------------------------------------------- +bool JobList::isInCurrentEnvironment(std::string const& _sString) +{ + int nSpace = 0; + std::string sSearchString = _sString; + bool bEnd = false; + // run through the hole given string, + std::string sEnv; + + do { + nSpace = sSearchString.find_first_of(C_SEPARATOR_LIST); + if (nSpace < 0) + { + sEnv = sSearchString; + bEnd = true; + } + else + { + sEnv = sSearchString.substr(0, nSpace); + sSearchString = sSearchString.substr(nSpace + 1); + } + if (sEnv.length() > 0) + { + // cout << sEnv << endl; +#ifdef LINUX + int nLinux = sEnv.find("unxlng"); + if (nLinux >= 0) + { + // found unxlng + return true; + } +#endif +#ifdef SOLARIS + int nSolaris = sEnv.find("unxsol"); + if (nSolaris >= 0) + { + // found unxsol + return true; + } +#endif +#ifdef WNT + int nWindows = sEnv.find("wnt"); + if (nWindows >= 0) + { + // found wnt + return true; + } +#endif + } + } while ( !bEnd ); + return false; +} + +std::string JobList::trim(std::string const& _sStringToTrim) +{ + rtl::OString sStr(_sStringToTrim.c_str()); + sStr = sStr.trim(); + return std::string(sStr.getStr()); +} + +// ----------------------------------------------------------------------------- +bool JobList::readfile(std::string const& _sFilename, JobType _nJobType) +{ + // StringList aJobList; + m_aJobList.clear(); + + std::ifstream in(_sFilename.c_str(), std::ios::in); + + if (!in) + { + // fprintf(stderr, "warning: Can't open job file: %s\n", _sFilename.c_str()); + return false; + } + else + { + if (_nJobType == JOB_EXCLUDE_LIST) + { + fprintf(stderr, "warning: There exist a job exclusion list file: %s\n", _sFilename.c_str()); + } + + // std::cout << "Check for signal" << std::endl; + std::string sLine; + while (std::getline(in, sLine)) + { + if (sLine.size() > 0) + { + char ch = sLine[0]; + if (ch != '#' && + isspace(ch) == 0) + { + sLine = trim(sLine); + + // m_aJobList.push_back( sLine ); + int nSpace = sLine.find_first_of(C_SEPARATOR_LIST); + if (nSpace < 0) + { + m_aJobList[sLine] = JOB_UNKNOWN; + } + else + { + // found a separator + std::string sTest = sLine.substr(0, nSpace); + std::string sRest = sLine.substr(nSpace + 1); + if (isInCurrentEnvironment(sRest)) + { + m_aJobList[sTest] = JOB_UNKNOWN; + } + } + } + } + } + + // inclusion list +/* + int nSize = m_aJobList.size(); + + ppsJobList = (char**) malloc((nSize + 1) * sizeof(char*)); + + int nIdx = 0; + StringList::const_iterator aItEnd = m_aJobList.end(); + for(StringList::const_iterator it = m_aJobList.begin(); + it != aItEnd; ++it) + { + std::string sValue = *it; + char* psTestFkt = (char*) malloc(sValue.size() + 1); + strcpy(psTestFkt, sValue.c_str()); + ppsJobList[nIdx] = psTestFkt; + ++nIdx; + } + + ppsJobList[nIdx] = NULL; +*/ + } + return true; +} + +// ----------------------------------------------------------------------------- +int JobList::getJobListEntry(std::string const& _sIndexName) +{ + if (m_aJobList.find(_sIndexName) != m_aJobList.end()) + { + return m_aJobList[_sIndexName]; + } + return JOB_NOT_FOUND; +} + +// ----------------------------------------------------------------------------- +void JobList::setJobListEntry(std::string const& _sIndexName, int _nValue) +{ + // if (m_aJobList.find(_sIndexName) == m_aJobList.end()) + // { + m_aJobList[_sIndexName] = _nValue; + // } + // else + // { + // fprintf(stderr, "error: test function '%s' already exist.\n", _sIndexName); + // } +} + +// ----------------------------------------------------------------------------- +JobList::~JobList() +{ + int nIdx = 0; + if (ppsJobList) + { + while(ppsJobList[nIdx] != NULL) + { + free(ppsJobList[nIdx]); + ++nIdx; + } + free(ppsJobList); + } +} +// ----------------------------------------------------------------------------- +/* + bool JobList::checkFilter(JobList m_aJobFilter, std::string const& _sNodeName, std::string const& _sName) + { + std::string sFilter = m_aJobFilter.m_aJobList.begin(); + } +*/ diff --git a/testshl2/source/cppunit/makefile.mk b/testshl2/source/cppunit/makefile.mk new file mode 100644 index 000000000000..6a6d913f6140 --- /dev/null +++ b/testshl2/source/cppunit/makefile.mk @@ -0,0 +1,103 @@ +#************************************************************************* +# +# 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$ +# +# $Revision$ +# +# 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. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=testshl2 +TARGET=testshl2 +LIBTARGET=NO +ENABLE_EXCEPTIONS=TRUE +# ENABLE_RTTI=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +# CXXFILES = \ +# querytemplate.cxx \ +# stringhelper.cxx + +# ENVCFLAGSCXX+=-DCPPUNIT_BUILD_DLL + +CPPUNIT_TESTSHL_SLOFILES = \ + $(SLO)$/joblist.obj \ + $(SLO)$/t_print.obj \ + $(SLO)$/signaltest.obj + +CPPUNIT_STATIC_SOLFILES = \ + $(SLO)$/cmdlinebits.obj \ + $(SLO)$/tresregister.obj \ + $(SLO)$/tresstatewrapper.obj \ + $(SLO)$/registertestfunction.obj + + +SLOFILES = \ + $(CPPUNIT_TESTSHL_SLOFILES) \ + $(CPPUNIT_STATIC_SOLFILES) +#------------------------------------------------------------------------------- +# This is statically cppunit library +LIB1TARGET= $(LB)$/$(TARGET).lib +LIB1OBJFILES= \ + $(SLOFILES) + +.IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a +.ENDIF +LIB1FILES=$(LB)$/c5t_winstuff.lib +.ENDIF + +.IF "$(GUI)" == "UNX" +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a +.ENDIF + +#------------------------------------------------------------------------------- +TARGET2=c5t_no_regallfkt +LIB2TARGET= $(LB)$/$(TARGET2).lib +LIB2OBJFILES= \ + $(CPPUNIT_TESTSHL_SLOFILES) + +.IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a +.ENDIF +.ENDIF + +.IF "$(GUI)" == "UNX" +LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk + diff --git a/testshl2/source/cppunit/registertestfunction.cxx b/testshl2/source/cppunit/registertestfunction.cxx new file mode 100644 index 000000000000..99e3fec38493 --- /dev/null +++ b/testshl2/source/cppunit/registertestfunction.cxx @@ -0,0 +1,60 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <stdlib.h> +#include <testshl/simpleheader.hxx> +#include <testshl/additionalfunc.hxx> + +extern "C" void SAL_CALL testAllRegisteredFunctions(hTestResult _pResult) +{ + CppUnit::TestFactoryRegistry::testRegistries(_pResult); + // CppUnit::Test* tp = CppUnit::TestFactoryRegistry::getRegistry("rtl_OUString").makeTest(); + // tp->run(pResult); +} + +// ----------------------------------------------------------------------------- +// ---------------------------- RegisterTestFunctions ---------------------------- +// ----------------------------------------------------------------------------- + +extern "C" void SAL_CALL RegisterTestFunctions(FktRegFuncPtr _pFunc) +{ + if (_pFunc) + { + (_pFunc)(&testAllRegisteredFunctions, ""); + } + else + { + // error, FktRegFuncPtr not given + } + RegisterAdditionalFunctions(_pFunc); +} diff --git a/testshl2/source/cppunit/result/SynchronizedObject.cpp b/testshl2/source/cppunit/result/SynchronizedObject.cpp new file mode 100644 index 000000000000..73de43b8c543 --- /dev/null +++ b/testshl2/source/cppunit/result/SynchronizedObject.cpp @@ -0,0 +1,38 @@ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <cppunit/SynchronizedObject.h> + + +namespace CppUnit +{ + + + + +SynchronizedObject::SynchronizedObject( SynchronizationObject *syncObject ) + : m_syncObject( syncObject == 0 ? new SynchronizationObject() : + syncObject ) +{ +} + + +SynchronizedObject::~SynchronizedObject() +{ + delete m_syncObject; +} + + +/** Accept a new synchronization object for protection of this instance + * TestResult assumes ownership of the object + */ +void +SynchronizedObject::setSynchronizationObject( SynchronizationObject *syncObject ) +{ + delete m_syncObject; + m_syncObject = syncObject; +} + + +} // namespace CppUnit + diff --git a/testshl2/source/cppunit/result/TestResult.cpp b/testshl2/source/cppunit/result/TestResult.cpp new file mode 100644 index 000000000000..5fa5e444e540 --- /dev/null +++ b/testshl2/source/cppunit/result/TestResult.cpp @@ -0,0 +1,264 @@ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <cppunit/TestFailure.h> +#include <testshl/result/TestListener.h> +#include "testshl/getopt.hxx" +#include <testshl/result/TestResult.h> +#include <algorithm> +#include "testshl/result/outputter.hxx" +#include <cppunit/Test.h> +#include <testshl/cmdlinebits.hxx> + +namespace CppUnit { + +/// Construct a TestResult +TestResult::TestResult( GetOpt &_pOptions, SynchronizationObject *syncObject ) + : SynchronizedObject( syncObject ), + m_aOptionHelper(_pOptions), + m_nExitValue(0) +{ + reset(); +} + + +/// Destroys a test result +TestResult::~TestResult() +{ +} + + +/** Resets the result for a new run. + * + * Clear the previous run result. + */ +void +TestResult::reset() +{ + ExclusiveZone zone( m_syncObject ); + m_stop = false; +} + + +/** Adds an error to the list of errors. + * The passed in exception + * caused the error + */ +void +TestResult::addError( Test *test, + Exception *e, ErrorType::num _eType ) +{ + TestFailure aTestFailure( test, e, _eType ); + addFailure( aTestFailure ); +} + + +/** Adds a failure to the list of failures. The passed in exception + * caused the failure. + */ +void +TestResult::addFailure( Test *test, Exception *e ) +{ + TestFailure aTestFailure( test, e, ErrorType::ET_FAILURE ); + addFailure( aTestFailure ); +} + + +/** Called to add a failure to the list of failures. + */ +void +TestResult::addFailure( const TestFailure &failure ) +{ + ExclusiveZone zone( m_syncObject ); + + // LLA: + // this set the global returnvalue, due to the fact, there occurs a failure, we have to return a non zero value + // at the moment this seams to be a good place. + setExitValue(1); + + for ( TestListeners::iterator it = m_listeners.begin(); + it != m_listeners.end(); + ++it ) + { + TestListener *pListener = *it; + pListener->addFailure( failure ); + } +} + + +/// Informs the result that a test will be started. +void +TestResult::startTest( Test *test ) +{ + ExclusiveZone zone( m_syncObject ); + if (m_aOptionHelper.isVerbose()) + { + std::string aStr; + if (test) + { + aStr = getNodeName(); + aStr += "."; + aStr += test->getName(); + } + // fprintf(stderr, "Start test: %s\n", aStr.c_str()); + t_print( T_VERBOSE, "Start test: %s\n", aStr.c_str()); + } + + for ( TestListeners::iterator it = m_listeners.begin(); + it != m_listeners.end(); + ++it ) + { + TestListener *pListener = *it; + pListener->startTest( test ); + } +} + + +/// Informs the result that a test was completed. +void +TestResult::endTest( Test *test ) +{ + ExclusiveZone zone( m_syncObject ); + for ( TestListeners::iterator it = m_listeners.begin(); + it != m_listeners.end(); + ++it ) + { + TestListener *pListener = *it; + pListener->endTest( test ); + } +} + + +/// Returns whether testing should be stopped +bool +TestResult::shouldStop() const +{ + ExclusiveZone zone( m_syncObject ); + return m_stop; +} + + +/// Stop testing +void +TestResult::stop() +{ + ExclusiveZone zone( m_syncObject ); + m_stop = true; +} + + +void +TestResult::addListener( TestListener *listener ) +{ + ExclusiveZone zone( m_syncObject ); + m_listeners.push_back( listener ); +} + + +void +TestResult::removeListener ( TestListener *listener ) +{ + ExclusiveZone zone( m_syncObject ); +#if defined(_MSC_VER) && (_MSC_VER >=1400) + m_listeners.erase( remove( m_listeners.begin(), +#else + m_listeners.erase( std::remove( m_listeners.begin(), +#endif + m_listeners.end(), + listener ), + m_listeners.end()); +} + +void +TestResult::addInfo(Test *test, const char* _aStr) +{ + ExclusiveZone zone( m_syncObject ); + for ( TestListeners::iterator it = m_listeners.begin(); + it != m_listeners.end(); + ++it ) + { + TestListener *pListener = *it; + pListener->addInfo( test, _aStr ); + } +} + +// old: void +// old: TestResult::enterNode(const char* _aStr) +// old: { +// old: ExclusiveZone zone( m_syncObject ); +// old: for ( TestListeners::iterator it = m_listeners.begin(); +// old: it != m_listeners.end(); +// old: ++it ) +// old: { +// old: TestListener *pListener = *it; +// old: pListener->enterNode( _aStr ); +// old: } +// old: } +// old: +// old: void +// old: TestResult::leaveNode(const char* _aStr) +// old: { +// old: ExclusiveZone zone( m_syncObject ); +// old: +// old: for ( TestListeners::iterator it = m_listeners.begin(); +// old: it != m_listeners.end(); +// old: ++it ) +// old: { +// old: TestListener *pListener = *it; +// old: pListener->leaveNode( _aStr ); +// old: } +// old: } + +void TestResult::enterNode(const char* _sNode) +{ + ExclusiveZone zone( m_syncObject ); + m_aCurrentNodeNames.push_back(std::string(_sNode)); +} + +void TestResult::leaveNode(const char* /*_sNode*/) +{ + ExclusiveZone zone( m_syncObject ); + std::string sBack = m_aCurrentNodeNames.back(); + m_aCurrentNodeNames.pop_back(); + + // due to a -Wall warning, comment out. + // if (sBack != std::string(_sNode)) + // { + // volatile int dummy = 0; + // // problem?! + // } +} + +std::string TestResult::getNodeName() +{ + std::string sName; + for (std::vector<std::string>::const_iterator it = m_aCurrentNodeNames.begin(); + it != m_aCurrentNodeNames.end(); + ++it) + { + if (sName.size() != 0) + { + sName += "."; + } + sName += *it; + } + return sName; +} + +// ----------------------------------------------------------------------------- +bool TestResult::isAllowedToExecute(std::string const& _sName) +{ + return m_aOptionHelper.isAllowedToExecute(getNodeName(), _sName); +} +// ----------------------------------------------------------------------------- +bool TestResult::isOptionWhereAmI() +{ + return m_aOptionHelper.isOptionWhereAmI(); +} + +// ----------------------------------------------------------------------------- +void TestResult::print(Outputter&) +{ +} + +} // namespace CppUnit diff --git a/testshl2/source/cppunit/result/TestResultCollector.cpp b/testshl2/source/cppunit/result/TestResultCollector.cpp new file mode 100644 index 000000000000..e3913219b541 --- /dev/null +++ b/testshl2/source/cppunit/result/TestResultCollector.cpp @@ -0,0 +1,150 @@ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <cppunit/TestFailure.h> +#include <testshl/result/TestResultCollector.h> + + +namespace CppUnit +{ + + +TestResultCollector::TestResultCollector( TestResult* _pResult, SynchronizationObject *syncObject ) + : TestSucessListener( syncObject ), + m_pResult(_pResult), + m_testErrors(0) +{ + reset(); +} + + +TestResultCollector::~TestResultCollector() +{ + TestFailures::iterator itFailure = m_failures.begin(); + while ( itFailure != m_failures.end() ) + { + TestFailureEnvelope *pEnvelope = *itFailure++; + TestFailure *pFailure = pEnvelope->getTestFailure(); + delete pFailure; + } +} + + +void +TestResultCollector::reset() +{ + TestSucessListener::reset(); + + ExclusiveZone zone( m_syncObject ); + m_testErrors = 0; + m_tests.clear(); + m_failures.clear(); +} + + +void +TestResultCollector::startTest( Test *test ) +{ + ExclusiveZone zone (m_syncObject); + + m_tests.push_back( new TestEnvelope(test, m_pResult->getNodeName()) ); +} + +void +TestResultCollector::endTest( Test * ) +{ + // ExclusiveZone zone (m_syncObject); + // Nothing! +} + + +void +TestResultCollector::addFailure( const TestFailure &failure ) +{ + TestSucessListener::addFailure( failure ); + + ExclusiveZone zone( m_syncObject ); + if ( failure.isError() ) + ++m_testErrors; + m_failures.push_back( new TestFailureEnvelope(failure.clone(), m_pResult->getNodeName()) ); +} + + +/// Gets the number of run tests. +int +TestResultCollector::runTests() const +{ + ExclusiveZone zone( m_syncObject ); + return m_tests.size(); +} + + +/// Gets the number of detected errors (uncaught exception). +int +TestResultCollector::testErrors() const +{ + ExclusiveZone zone( m_syncObject ); + return m_testErrors; +} + + +/// Gets the number of detected failures (failed assertion). +int +TestResultCollector::testFailures() const +{ + ExclusiveZone zone( m_syncObject ); + return m_failures.size() - m_testErrors; +} + + +/// Gets the total number of detected failures. +int +TestResultCollector::testFailuresTotal() const +{ + ExclusiveZone zone( m_syncObject ); + return m_failures.size(); +} + + +/// Returns a the list failures (random access collection). +const TestResultCollector::TestFailures & +TestResultCollector::failures() const +{ + ExclusiveZone zone( m_syncObject ); + return m_failures; +} + + +const TestResultCollector::Tests & +TestResultCollector::tests() const +{ + ExclusiveZone zone( m_syncObject ); + return m_tests; +} + +void TestResultCollector::addInfo(Test *_pTest, const char* _sInfo) +{ + ExclusiveZone zone( m_syncObject ); + m_aInfos.push_back(new TestInfo(_pTest, _sInfo)); +} + +std::string TestResultCollector::getInfo(Test *_pTest) +{ + for (TestInfos::const_iterator it = m_aInfos.begin(); + it != m_aInfos.end(); + ++it) + { + TestInfo *pInfo = *it; + Test *pTest = pInfo->getTest(); + if (pTest == _pTest) + { + std::string sInfo = pInfo->getString(); + return sInfo; + } + } + return std::string(); +} + + +} // namespace CppUnit + diff --git a/testshl2/source/cppunit/result/TestSucessListener.cpp b/testshl2/source/cppunit/result/TestSucessListener.cpp new file mode 100644 index 000000000000..d8f8268f09aa --- /dev/null +++ b/testshl2/source/cppunit/result/TestSucessListener.cpp @@ -0,0 +1,50 @@ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + + +#include <testshl/result/TestSucessListener.h> + + + +namespace CppUnit +{ + + +TestSucessListener::TestSucessListener( SynchronizationObject *syncObject ) + : SynchronizedObject( syncObject ) + , m_sucess( true ) +{ +} + + +TestSucessListener::~TestSucessListener() +{ +} + + +void +TestSucessListener::reset() +{ + ExclusiveZone zone( m_syncObject ); + m_sucess = true; +} + + +void +TestSucessListener::addFailure( const TestFailure & ) +{ + ExclusiveZone zone( m_syncObject ); + m_sucess = false; +} + + +bool +TestSucessListener::wasSuccessful() const +{ + ExclusiveZone zone( m_syncObject ); + return m_sucess; +} + + +} // namespace CppUnit + diff --git a/testshl2/source/cppunit/result/TextTestResult.cpp b/testshl2/source/cppunit/result/TextTestResult.cpp new file mode 100644 index 000000000000..2ad271ded7de --- /dev/null +++ b/testshl2/source/cppunit/result/TextTestResult.cpp @@ -0,0 +1,194 @@ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <cppunit/Exception.h> +#include <cppunit/NotEqualException.h> +#include <cppunit/Test.h> +#include <cppunit/TestFailure.h> +#include <testshl/result/TextTestResult.h> +// #include <TextTestResult.h> +//!io #include <iostream> + +namespace CppUnit { + + +TextTestResult::TextTestResult(GetOpt& _aOptions) + :TestResult(_aOptions), + m_aResulter(this) +{ + addListener( &m_aResulter ); +} + + +void +TextTestResult::addFailure( const TestFailure &failure ) +{ + TestResult::addFailure( failure ); + // std::cerr << ( failure.isError() ? "E" : "F" ); + if (failure.isError()) + fprintf(stderr, "E"); + else + fprintf(stderr, "F"); +} + + +void +TextTestResult::startTest( Test *test ) +{ + TestResult::startTest (test); + // std::cerr << "."; + fprintf(stderr, "."); +} + +void TextTestResult::endTest( Test *test ) +{ + TestResult::endTest (test); +} + + +void +TextTestResult::printFailures( std::ostream &stream ) +{ + TestResultCollector::TestFailures::const_iterator itFailure = m_aResulter.failures().begin(); + int failureNumber = 1; + while ( itFailure != m_aResulter.failures().end() ) + { + stream << std::endl; + TestFailure *pFailure= (*itFailure++)->getTestFailure(); + printFailure( pFailure, failureNumber++, stream ); + } +} + + +void +TextTestResult::printFailure( TestFailure *failure, + int failureNumber, + std::ostream &stream ) +{ + printFailureListMark( failureNumber, stream ); + stream << ' '; + printFailureTestName( failure, stream ); + stream << ' '; + printFailureType( failure, stream ); + stream << ' '; + printFailureLocation( failure->sourceLine(), stream ); + stream << std::endl; + printFailureDetail( failure->thrownException(), stream ); + stream << std::endl; +} + + +void +TextTestResult::printFailureListMark( int failureNumber, + std::ostream &stream ) +{ + stream << failureNumber << ")"; +} + + +void +TextTestResult::printFailureTestName( TestFailure *failure, + std::ostream &stream ) +{ + Test* pTest = failure->failedTest(); + stream << "test: " << pTest->getName(); +} + + +void +TextTestResult::printFailureType( TestFailure *failure, + std::ostream &stream ) +{ + stream << "(" + << (failure->isError() ? "E" : "F") + << ")"; +} + + +void +TextTestResult::printFailureLocation( SourceLine sourceLine, + std::ostream &stream ) +{ + if ( !sourceLine.isValid() ) + return; + + stream << "line: " << sourceLine.lineNumber() + << ' ' << sourceLine.fileName(); +} + + +void +TextTestResult::printFailureDetail( Exception *thrownException, + std::ostream &stream ) +{ + if ( thrownException->isInstanceOf( NotEqualException::type() ) ) + { + NotEqualException *e = (NotEqualException*)thrownException; + stream << "expected: " << e->expectedValue() << std::endl + << "but was: " << e->actualValue(); + if ( !e->additionalMessage().empty() ) + { + stream << std::endl; + stream << "additional message:" << std::endl + << e->additionalMessage(); + } + } + else + { + stream << " \"" << thrownException->what() << "\""; + } +} + + +void +TextTestResult::print( std::ostream& stream ) +{ + printHeader( stream ); + stream << std::endl; + printFailures( stream ); +} + + +void +TextTestResult::printHeader( std::ostream &stream ) +{ + if (m_aResulter.wasSuccessful ()) + stream << std::endl << "OK (" << m_aResulter.runTests () << " tests)" + << std::endl; + else + { + stream << std::endl; + printFailureWarning( stream ); + printStatistics( stream ); + } +} + + +void +TextTestResult::printFailureWarning( std::ostream &stream ) +{ + stream << "!!!FAILURES!!!" << std::endl; +} + + +void +TextTestResult::printStatistics( std::ostream &stream ) +{ + stream << "Test Results:" << std::endl; + + stream << "Run: " << m_aResulter.runTests() + << " Failures: " << m_aResulter.testFailures() + << " Errors: " << m_aResulter.testErrors() + << std::endl; +} + + +std::ostream & +operator <<( std::ostream &stream, + TextTestResult &result ) +{ + result.print (stream); return stream; +} + + +} // namespace CppUnit diff --git a/testshl2/source/cppunit/result/emacsTestResult.cxx b/testshl2/source/cppunit/result/emacsTestResult.cxx new file mode 100644 index 000000000000..cad9c08d4558 --- /dev/null +++ b/testshl2/source/cppunit/result/emacsTestResult.cxx @@ -0,0 +1,193 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <stdlib.h> + +#include <map> +#include <cppunit/Exception.h> +#include <cppunit/NotEqualException.h> +#include <cppunit/Test.h> +#include <cppunit/TestFailure.h> +#include <testshl/result/emacsTestResult.hxx> +// #include <TextTestResult.h> +//!io #include <iostream> +#include <string> + +#include <rtl/string.hxx> +#include "testshl/result/outputter.hxx" + +namespace CppUnit { + + emacsTestResult::emacsTestResult(GetOpt & _aOptions) + :TestResult(_aOptions), + m_aOptions(_aOptions), + m_aResulter(this) + { + addListener( &m_aResulter ); + } + + //# struct ltstr + //# { + //# bool operator()(const CppUnit::Test* p1, const CppUnit::Test* p2) const + //# { + //# return p1 < p2; + //# } + //# }; + //# typedef std::map<CppUnit::Test*, bool, ltstr> TestPtrList; + + void + emacsTestResult::print( Outputter& stream ) + { + printHeader( stream ); + // stream << std::endl; + // printFailures( stream ); + + // TestPtrList aFailedTests; + + for (TestResultCollector::TestFailures::const_iterator it2 = m_aResulter.failures().begin(); + it2 != m_aResulter.failures().end(); + ++it2) + { + TestFailureEnvelope *pEnvelop = *it2; + TestFailure *pFailure = pEnvelop->getTestFailure(); + std::string sNodeName = pEnvelop->getString(); + + // aFailedTests[ pFailure->failedTest() ] = true; + + printFailureLine(stream, pFailure, sNodeName); + } + + // only errors are from interest here + //# for (TestResultCollector::Tests::const_iterator it = m_aResulter.tests().begin(); + //# it != m_aResulter.tests().end(); + //# ++it) + //# { + //# TestEnvelope *pEnvelop = *it; + //# Test* pTest = pEnvelop->getTest(); + //# std::string sNodeName = pEnvelop->getString(); + //# + //# if (aFailedTests.find(pTest) == aFailedTests.end()) + //# { + //# std::string sInfo = m_aResulter.getInfo(pTest); + //# printTestLine(stream, pTest, sNodeName, sInfo); + //# } + //# } + stream << "Test #PASSED#" << Outputter::endl(); + } + + + void + emacsTestResult::printHeader( Outputter &stream ) + { + std::string sDate(m_aOptionHelper.createDateTag()); + stream << sDate << Outputter::endl(); + } + + void + emacsTestResult::printFailureLine( Outputter &stream, TestFailure *_pFailure, std::string const& _sNodeName) + { + std::string aName; + aName += _sNodeName; + aName += "."; + aName += _pFailure->failedTestName(); + + SourceLine aLine = _pFailure->sourceLine(); + sal_Int32 nLine = -1; + std::string sFilename; + if (aLine.isValid()) + { + nLine = aLine.lineNumber(); + sFilename = aLine.fileName(); + } + + Exception *pExp = _pFailure->thrownException(); + std::string sWhat; + if (pExp) + { + sWhat = pExp->what(); + } + + stream << sFilename; + stream << ":"; + stream << nLine; + stream << ":"; + + stream << aName; + stream << ";#FAILED#"; + // ErrorType::num eErr = _pFailure->getErrorType(); + //# if (isErr) + //# stream << "FAILED#;"; + //# else + //# stream << "ERROR#;"; + + stream << sWhat; + stream << Outputter::endl(); + } + + //# void + //# emacsTestResult::printTestLine( Outputter &stream, Test* _pTest, std::string const& _sNodeName, std::string const& _sInfo) + //# { + //# std::string aName; + //# aName += _sNodeName; + //# aName += "."; + //# aName += _pTest->getName(); + //# + //# stream << aName; + //# stream << ";"; + //# stream << _sInfo << "#"; + //# stream << "OK#"; + //# stream << std::endl; + //# } + + +//# void +//# emacsTestResult::printStatistics( Outputter &stream ) +//# { +//# stream << "Test Results:" << std::endl; +//# +//# stream << "Run: " << runTests() +//# << " Failures: " << testFailures() +//# << " Errors: " << testErrors() +//# << std::endl; +//# } + + + Outputter & + operator <<( Outputter &stream, + emacsTestResult &result ) + { + result.print (stream); return stream; + } + + +} // namespace CppUnit diff --git a/testshl2/source/cppunit/result/log.cxx b/testshl2/source/cppunit/result/log.cxx new file mode 100644 index 000000000000..985c7cfef413 --- /dev/null +++ b/testshl2/source/cppunit/result/log.cxx @@ -0,0 +1,125 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include "testshl/log.hxx" + +// #include <hash_map> +// #include <list> +// #include <set> + +using namespace std; + +::osl::FileBase::RC Log::open( sal_Bool append ) { + + ::osl::FileBase::RC ret; + + if ( ! append ) { + ret = ::osl::File::remove( m_logurl ); + } + + if( m_logfile->open( OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) { + ret = m_logfile->open( OpenFlag_Write | OpenFlag_Create ); + } + else { + ret = m_logfile->setPos( Pos_End, 0 ); + } + return ret; +} + +::osl::FileBase::RC Log::write( const sal_Char* buf, sal_Bool v ) { + sal_uInt64 uBytes=0; + sal_uInt32 len = 0; + const sal_Char* ptr = buf; + + if( ptr ) { + while( *ptr++ ) len++; + } + + if ( v ) { + // cout << buf << flush; + printf("%s", buf); + } + return m_logfile->write( buf, len , uBytes ); +} + +::osl::FileBase::RC Log::write( const rtl::OString& buf, sal_Bool v ) { + sal_uInt64 uBytes=0; + if ( v ) { + // cout << buf.getStr() << flush; + printf("%s", buf.getStr()); + } + return m_logfile->write( buf.getStr(), buf.getLength(), uBytes ); +} +/* +// LLA: due to a problem with sal/OUStingBuffer getLength() which isn't const, this +// is so not compilable. +::osl::FileBase::RC Log::write( rtl::OStringBuffer const& buf, sal_Bool v ) { + sal_uInt64 uBytes=0; + if ( v ) { + cout << buf.getStr() << flush; + } + return m_logfile->write( buf.getStr(), buf.getLength(), uBytes ); +} +*/ +::osl::FileBase::RC Log::write( const rtl::OUString& buf, + rtl_TextEncoding tenc, sal_Bool v ) { + sal_uInt64 uBytes=0; + if ( ! tenc ) { + tenc = RTL_TEXTENCODING_ASCII_US; + } + rtl::OStringBuffer osbuf( + rtl::OUStringToOString( buf, tenc ).getStr() ); + + if ( v ) { + // cout << osbuf.getStr() << flush; + printf("%s", osbuf.getStr()); + } + return m_logfile->write( osbuf.getStr(), osbuf.getLength(), uBytes ); +} + +Log &operator <<( Log &_aLog, const sal_Char * _sValue ) +{ + _aLog.write(_sValue); return _aLog; +} +Log &operator <<( Log &_aLog, rtl::OString const& _sValue ) +{ + _aLog.write(_sValue); return _aLog; +} +Log &operator <<( Log &_aLog, rtl::OUString const& _sValue ) +{ + _aLog.write(_sValue); return _aLog; +} +//! Log &operator <<( Log &_aLog, rtl::OStringBuffer const& _sValue ) +//! { +//! _aLog.write(_sValue); return _aLog; +//! } diff --git a/testshl2/source/cppunit/result/makefile.mk b/testshl2/source/cppunit/result/makefile.mk new file mode 100644 index 000000000000..25ef193a2c88 --- /dev/null +++ b/testshl2/source/cppunit/result/makefile.mk @@ -0,0 +1,83 @@ +#************************************************************************* +# +# 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$ +# +# $Revision$ +# +# 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. +# +#************************************************************************* + +PRJ=..$/..$/.. + +PRJNAME=testshl2 +TARGET=c5t_testresult +LIBTARGET=NO +ENABLE_EXCEPTIONS=TRUE +# ENABLE_RTTI=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +# CXXFILES = \ +# querytemplate.cxx \ +# stringhelper.cxx + +# ENVCFLAGSCXX+=-DCPPUNIT_BUILD_DLL +SLOFILES = \ + $(SLO)$/SynchronizedObject.obj \ + $(SLO)$/TestResult.obj \ + $(SLO)$/TestResultCollector.obj \ + $(SLO)$/TestSucessListener.obj \ + $(SLO)$/emacsTestResult.obj \ + $(SLO)$/log.obj \ + $(SLO)$/optionhelper.obj \ + $(SLO)$/outputter.obj \ + $(SLO)$/signal.obj \ + $(SLO)$/testshlTestResult.obj \ + $(SLO)$/treswrapper.obj + +# currently unused +# $(SLO)$/TextTestResult.obj + +LIB1TARGET= $(LB)$/$(TARGET).lib +LIB1OBJFILES= $(SLOFILES) + +.IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a +.ENDIF +.ENDIF + +.IF "$(GUI)" == "UNX" +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk + diff --git a/testshl2/source/cppunit/result/optionhelper.cxx b/testshl2/source/cppunit/result/optionhelper.cxx new file mode 100644 index 000000000000..bb7c89b24081 --- /dev/null +++ b/testshl2/source/cppunit/result/optionhelper.cxx @@ -0,0 +1,317 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include "testshl/result/optionhelper.hxx" +// #include <sstream> +// #include <string> +#include <osl/time.h> +#include "testshl/cmdlinebits.hxx" + +// ----------------------------------------------------------------------------- + +namespace +{ + void split( const rtl::OString& opt, + const rtl::OString& _sSeparator, + OStringList& optLine ) + { + optLine.clear(); + // const sal_Int32 cSetLen = cSet.getLength(); + sal_Int32 index = 0; + sal_Int32 oldIndex = 0; + + // sal_Int32 i; + // sal_Int32 j = 0; + while ( opt.getLength() > 0) + { + // for ( i = 0; i < cSetLen; i++ ) + // { + index = opt.indexOf( _sSeparator, oldIndex); + if( index != -1 ) + { + optLine.push_back( opt.copy( oldIndex, index - oldIndex ) ); + oldIndex = index + _sSeparator.getLength(); + } + // } + else // if (index == -1) + { + optLine.push_back( opt.copy( oldIndex ) ); + break; + } + } + } ///< split + + bool match(OStringList const& _aFilter, OStringList const& _aName) + { + OStringList::const_iterator aFilterIter = _aFilter.begin(); + OStringList::const_iterator aValueIter = _aName.begin(); + + bool bMatch = false; + + while (aFilterIter != _aFilter.end() && aValueIter != _aName.end()) + { + rtl::OString sFilter = *aFilterIter; + rtl::OString sName = *aValueIter; + + if (sFilter == sName) + { + bMatch = true; + ++aFilterIter; + ++aValueIter; + } + else if (sFilter == "*") + { + bMatch = true; + break; + } + else + { + // Filter does not match + bMatch = false; + break; + } + } + return bMatch; + } +} + +/* static */ +std::string OptionHelper::integerToAscii(sal_Int32 nValue) +{ + sal_Char cBuf[30]; + sal_Char *pBuf = cBuf; + sprintf(pBuf, "%d", static_cast<int>(nValue)); +//# std::ostringstream sBuf; +//# sBuf << nValue; +// rtl::OString sStr; +// sStr = rtl::OString::valueOf(nValue); + return std::string(pBuf); +} + +/* static */ +// if a given String is less then 2 char, add a "0" in front. +std::string OptionHelper::twoDigits(std::string const& _sValue) +{ + std::string sBack; + if (_sValue.length() == 0) + { + sBack = "00"; + } + else if (_sValue.length() == 1) + { + sBack = "0"; + sBack += _sValue; + } + else + { + sBack = _sValue; + } + return sBack; +} + + +std::string OptionHelper::createDateTag(std::string const& _sProjectId, std::string const& _sBuildId) +{ + TimeValue tmv_system; + TimeValue tmv_local; + oslDateTime dt; + osl_getSystemTime( &tmv_system ); + osl_getLocalTimeFromSystemTime(&tmv_system, &tmv_local); + osl_getDateTimeFromTimeValue( &tmv_local, &dt ); + + sal_Int32 nYear = dt.Year; + sal_Int32 nMonth = dt.Month; + sal_Int32 nDay = dt.Day; + + std::string sDate; + sDate = "# Current Time: "; + sDate += std::string(twoDigits(integerToAscii(dt.Hours))); + sDate += ":"; + sDate += std::string(twoDigits(integerToAscii(dt.Minutes))); + sDate += ":"; + sDate += std::string(twoDigits(integerToAscii(dt.Seconds))); + sDate += "\n"; + + sDate += "["; + + // sDate += rtl::OString::valueOf(nYear); + sDate.append(integerToAscii(nYear)); + sDate += "."; + if (nMonth < 10) + sDate += "0"; + // sDate += rtl::OString::valueOf(nMonth); + sDate.append(integerToAscii(nMonth)); + sDate += "."; + if (nDay < 10) + sDate += "0"; + // sDate += rtl::OString::valueOf(nDay); + sDate += std::string(integerToAscii(nDay)); + sDate += "/"; + sDate += _sProjectId; + sDate += "/"; + sDate += _sBuildId; + sDate += "]"; + + return sDate; +} + +//# rtl::OString createDateTag() +//# { +//# TimeValue tmv; +//# oslDateTime dt; +//# osl_getSystemTime( &tmv ); +//# osl_getDateTimeFromTimeValue( &tmv, &dt ); +//# +//# sal_Int32 nYear = dt.Year; +//# sal_Int32 nMonth = dt.Month; +//# sal_Int32 nDay = dt.Day; +//# +//# rtl::OString sDate("["); +//# sDate += rtl::OString::valueOf(nYear); +//# sDate += "."; +//# if (nMonth < 10) +//# sDate += "0"; +//# sDate += rtl::OString::valueOf(nMonth); +//# sDate += "."; +//# if (nDay < 10) +//# sDate += "0"; +//# sDate += rtl::OString::valueOf(nDay); +//# sDate += "//]"; +//# +//# return sDate; +//# } + +std::string OptionHelper::createDateTag() +{ + return createDateTag(m_sProjectId, m_sBuildId); +} + +bool OptionHelper::showErrors() +{ + bool bRetValue = true; // default, show all + if (m_aOption.hasOpt("-noerrors")) + { + bRetValue = false; + } + return bRetValue; +} + +bool OptionHelper::showTests() +{ + bool bRetValue = true; // default, show all + if (m_aOption.hasOpt("-onlyerrors")) + { + bRetValue = false; + } + return bRetValue; +} + +// Check which parameter is given for handle the jobs. +// If no parameter is given, all jobs (tests) will run through +void OptionHelper::handleJobs() +{ + // load job file, the file contains the functions which we only want to test. + if (m_aOption.hasOpt("-jobexclude")) + { + rtl::OString sJobFile = m_aOption.getOpt("-jobexclude"); + m_aJobExcludeList.readfile(sJobFile.getStr(), JOB_EXCLUDE_LIST); + } + + if (m_aOption.hasOpt("-jobonly")) + { + rtl::OString sJobFile = m_aOption.getOpt("-jobonly"); + m_aJobOnlyList.readfile(sJobFile.getStr(), JOB_ONLY_LIST); + } + + // + if (m_aOption.hasOpt("-jobfilter")) + { + rtl::OString sJobFilter = m_aOption.getOpt("-jobfilter"); + split(sJobFilter, ".", m_aJobFilter); + } +} + +// ----------------------------------------------------------------------------- +// Here will be decide, if a job/test will execute or not. +// therefore exist some lists, in which stay all jobs (positive list) or a list (negative list) which jobs should not execute +// or if only specific jobs should execute by a given filter + +bool OptionHelper::isAllowedToExecute(std::string const& _sNodeName, std::string const& _sName) +{ + std::string sJobName = _sNodeName + "." + _sName; + // t_print(T_VERBOSE, "Jobname %s\n", sJobName.c_str()); + if (isOnlyShowJobs()) // true, if parameter -onlyshowjob + { + m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS); + return false; + } + + if (m_aJobOnlyList.size()) // >0 if parameter -jobonly + { + if (m_aJobOnlyList.getJobListEntry(sJobName) != JOB_NOT_FOUND) + { + // job entry found, mark as accessed + m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS); + return true; + } + return false; + } + else if (m_aJobFilter.size() > 0) // >0 if parameter -jobfilter + { + OStringList aSplitName; + split(sJobName.c_str(), ".", aSplitName); + if (! match(m_aJobFilter, aSplitName)) + { + t_print(T_VERBOSE, "job: '%s' filtered by [-jobfilter]\n", sJobName.c_str()); + return false; + } + } + else if (m_aJobExcludeList.size() > 0) // >0 if parameter -jobexclude + { + if (m_aJobExcludeList.getJobListEntry(sJobName) != JOB_NOT_FOUND) + { + // job entry found, this job should not executed, so return false + t_print(T_VERBOSE, "job: '%s' filtered by [-jobexclude]\n", sJobName.c_str()); + return false; + } + // m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS); + return true; + } + else + { + //! not handled yet + } + + return true; +} + diff --git a/testshl2/source/cppunit/result/outputter.cxx b/testshl2/source/cppunit/result/outputter.cxx new file mode 100644 index 000000000000..a0fceddda604 --- /dev/null +++ b/testshl2/source/cppunit/result/outputter.cxx @@ -0,0 +1,106 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +// +#include <string> +#include <sal/types.h> +#include "testshl/result/outputter.hxx" + +// ----------------------------------------------------------------------------- + +Outputter::~Outputter() +{ + // delete m_pLog; +} + +void Outputter::writeToAll(const sal_Char* _sCharStr) +{ + // std::cout << _sCharStr; + if (m_pStream) + { + *m_pStream << _sCharStr; + } + if (m_pLog.get()) + { + m_pLog->write(_sCharStr); + } +} + +void Outputter::write(const sal_Char* _sCharStr) +{ + writeToAll(_sCharStr); +} + +void Outputter::write(std::string const& _sStr) +{ + writeToAll(_sStr.c_str()); +} + +void Outputter::write(sal_Int32 _nValue) +{ + sal_Char cBuf[20]; + sal_Char* pBuf = cBuf; + sprintf(pBuf, "%d", SAL_STATIC_CAST(int, _nValue)); + writeToAll(pBuf); +} + +// ----------------------------------------------------------------------------- + +Outputter& operator <<( Outputter &_aStreamWrapper, const sal_Char* _sValue) +{ + _aStreamWrapper.write(_sValue); + return _aStreamWrapper; +} + +Outputter& operator <<( Outputter &_aStreamWrapper, std::string const& _sValue) +{ + _aStreamWrapper.write(_sValue); + return _aStreamWrapper; +} + +Outputter& operator <<( Outputter &_aStreamWrapper, sal_Int32 _nValue) +{ + _aStreamWrapper.write(_nValue); + return _aStreamWrapper; +} + +//# Outputter& operator <<( Outputter &_aStreamWrapper, double ) +//# { +//# return _aStreamWrapper; +//# } + +Outputter& operator <<( Outputter &_aStreamWrapper, Outputter::endl const&) +{ + _aStreamWrapper.write("\n"); + return _aStreamWrapper; +} diff --git a/testshl2/source/cppunit/result/signal.cxx b/testshl2/source/cppunit/result/signal.cxx new file mode 100644 index 000000000000..cf5ce08368bc --- /dev/null +++ b/testshl2/source/cppunit/result/signal.cxx @@ -0,0 +1,999 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#if (defined UNX) || (defined OS2) +#include <signal.h> +#include <errno.h> +#endif + +#include <fstream> +#include <vector> +#include <hash_map> + +#include <rtl/tres.h> +#include <rtl/string.hxx> + +#include "testshl/autoregisterhelper.hxx" +#include "testshl/getopt.hxx" +#include "signal.hxx" +#include <cppunit/tagvalues.hxx> +#include <testshl/taghelper.hxx> +#include <unistd.h> +#include "testshl/filehelper.hxx" +#include <testshl/result/TestResult.h> +#include "testshl/signaltest.h" +#include "cppunit/Exception.h" + +#ifdef WNT +#include "testshl/winstuff.hxx" +#endif + +// typedef std::vector<std::string> StringList; +// StringList sCurrentNodeName; +CppUnit::TestResult *pTestResult = NULL; +std::string sSignalFile; + +typedef std::hash_map< std::string, int > HashMap; +HashMap m_aSignalHash; +bool bSignalsCached = false; +bool bDoNotTouchSignalFile = false; + +// ----------------------------------------------------------------------------- + +// return 'true' if signalfile doesn't exist. +// else 'false' +bool existsSignalFile(std::string const& _sSignalFilename) +{ + FILE* pFile = fopen(_sSignalFilename.c_str(), "r"); + if (!pFile) + { + return false; + } + fprintf(stderr, "'%s' exists.\n", _sSignalFilename.c_str()); + fclose(pFile); + return true; +} + +// ----------------------------------------------------------------------------- +void createEmptySignalFile(std::string const& _sSignalFilename) +{ + FILE* pFile = fopen(_sSignalFilename.c_str(), "w"); + if (!pFile) + { + fprintf(stderr, "error: Could not create signal helper file %s for signal info.\n", _sSignalFilename.c_str()); + } + else + { + fprintf(pFile, "# This is an auto generated helper file for signal handling.\n"); + fprintf(pFile, "# An entry start by '#' is a comment.\n"); + fprintf(pFile, "# All other are test functions which have abort, before this line is removed.\n"); + fprintf(pFile, "# So you have to check this functions by hand.\n"); + + fclose(pFile); + } +} + +// ----------------------------------------------------------------------------- +/** get Current PID. +*/ +inline ::rtl::OUString getCurrentPID( ) +{ + //~ Get current PID and turn it into OUString; + sal_uInt32 nPID = 0; +#ifdef WNT + nPID = WinGetCurrentProcessId(); +#else + nPID = getpid(); +#endif + return ( ::rtl::OUString::valueOf( static_cast<long>(nPID ) ) ); +} +// ----------------------------------------------------------------------------- +static std::string integerToAscii(sal_uInt32 nValue) +{ + sal_Char cBuf[30]; + sal_Char *pBuf = cBuf; + sprintf(pBuf, "%d", static_cast<unsigned int>(nValue)); + return std::string(pBuf); +} +void my_sleep(int sec); + +// ----------------------------------------------------------------------------- +void setSignalFilename(GetOpt & opt) +{ + if (opt.hasOpt("-dntsf") || opt.hasOpt("-donottouchsignalfile")) + { + // special feature, for debugging, so the signal file will not manipulate. + // but create, if no one exist. + bDoNotTouchSignalFile = true; + } + + if (opt.hasOpt("-sf") || opt.hasOpt("-signalfile")) + { + if (opt.hasOpt("-sf")) + { + sSignalFile = opt.getOpt("-sf"); + } + else if (opt.hasOpt("-signalfile")) + { + sSignalFile = opt.getOpt("-signalfile"); + } + } + else + { + std::string sPath; + // std::string sPath(FileHelper::getTempPath()); + std::string sFilename("signalfile"); + std::string sFilenameExt(".txt"); + bool bCanQuitLoop = true; + do + { + +// #ifdef WNT +// sPath += "\\"; +// #endif +// #ifdef UNX +// sPath += "/"; +// #endif + sPath = sFilename; + // BUG: i72675 + // add "_12345" where 12345 is the current process ID + + TimeValue aTimeValue; + osl_getSystemTime(&aTimeValue); + + sPath += "_"; + sPath += integerToAscii(aTimeValue.Seconds); + // rtl::OUString suPID = getCurrentPID(); + // rtl::OString sPID = rtl::OUStringToOString(suPID, RTL_TEXTENCODING_ASCII_US); + // sPath += sPID.getStr(); + sPath += sFilenameExt; + bCanQuitLoop = true; + if (existsSignalFile(sPath)) + { + // there is already a signal file, wait a second, choose an other one. + my_sleep(1); + bCanQuitLoop = false; + } + } + while (!(bCanQuitLoop)); + + sSignalFile = sPath; + fprintf(stderr, "Use default signal file name '%s'\n", sSignalFile.c_str()); + } + + if (opt.hasOpt("-dnrmsf")) + { + fprintf(stderr, "'Don't remove signal file' (-dnrmsf) is set.\n"); + } + else + { + if (bDoNotTouchSignalFile == true) + { + fprintf(stderr, "warning: 'Don't touch signal file' parameter (-dntsf) is set, will not remove existing signal file.\n"); + } + else + { + // remove signalfile + createEmptySignalFile(sSignalFile); + } + } +} + +// ----------------------------------------------------------------------------- +bool doNotTouchSignalFile() { return bDoNotTouchSignalFile; } + +// ----------------------------------------------------------------------------- +std::string buildTestFunctionName(std::string const& _sName) +{ + std::string sName; + if (pTestResult) + { + sName = pTestResult->getNodeName(); + sName += "."; + } + +/* + for (StringList::const_iterator it = sCurrentNodeName.begin(); + it != sCurrentNodeName.end(); + ++it) + { + sName += *it; + sName += "."; + } +*/ + sName += _sName; + + return sName; +} +// ----------------------------------------------------------------------------- +// old: void executionPushName(std::string const& _sName) +// old: { +// old: sCurrentNodeName.push_back(_sName); +// old: } +// old: void executionPopName() +// old: { +// old: sCurrentNodeName.pop_back(); +// old: } +// old: + +// ----------------------------------------------------------------------------- +// ------------------------------ Signal Handling ------------------------------ +// ----------------------------------------------------------------------------- + +// std::string sLastTestFunctionName; + +std::string getSignalName(sal_Int32 nSignalNo); +// ----------------------------------------------------------------------------- + +std::string getSignalFilename() +{ + return sSignalFile; +} + +// ----------------------------------------------------------------------------- +// void storeNoSignal(std::string const& _sTestName) +// { + // sLastTestFunctionName = buildTestFunctionName(_sTestName); + // std::ofstream out(getSignalFilename().c_str(), std::ios::out); + // out << NO_SIGNAL << std::endl; // no signal! +// } + +void markSignalAsAlreadyDone(sal_Int32 _nSignalNo) +{ + // std::ofstream out(getSignalFilename().c_str(), std::ios::out | std::ios::app); + FILE *out = fopen(getSignalFilename().c_str(), "a"); + if (out != NULL) + { +//# out << "# the previous test function creates signal: " +//# << getSignalName(_nSignalNo) +//# << " (" +//# << _nSignalNo +//# << ")" << std::endl; +//# // out << sLastTestFunctionName << std::endl; // SIGNAL! + + fprintf(out, "# the previous test function creates signal: %s(%d)\n", getSignalName(_nSignalNo).c_str(), SAL_STATIC_CAST(int, _nSignalNo)); + // fprintf(out, "%s\n", sLastTestFunctionName ); + fclose(out); + } + else + { + fprintf(stderr, "error: Can't write signal info to file %s \n", getSignalFilename().c_str()); + } +} + +// ----------------------------------------------------------------------------- + +Signal hasSignaled(std::string const& _sTestName) +{ + // BACK: true: signal + // false: nothing + + if (bSignalsCached == true) + { + + if (m_aSignalHash.find(buildTestFunctionName(_sTestName)) != m_aSignalHash.end()) + { + return HAS_SIGNAL; + } + return NO_SIGNAL; + } + + std::ifstream in(getSignalFilename().c_str(), std::ios::in); + + // std::cout << "Check for signal" << std::endl; + std::string sLine, sLastLine; + while (std::getline(in, sLine)) + { + // std::cout << sTest << std::endl; + char ch = sLine[0]; + if (isspace(ch) == 0 && + sLine.size() > 0) + { + if (ch == '#') + { + if (sLastLine.size() > 0) + { + rtl::OString aStrLine(sLine.c_str()); + sal_Int32 nIdx = aStrLine.indexOf("(") + 1; + sal_Int32 nIdx2 = aStrLine.indexOf(")"); + sal_Int32 nSignalNo = 0; + if (nIdx > 0 && nIdx2 > 0) + { + rtl::OString sSignalNo = aStrLine.copy(nIdx, nIdx2 - nIdx); + nSignalNo = sSignalNo.toInt32(); + m_aSignalHash[sLastLine] = nSignalNo; + } + sLastLine.clear(); + } + } + else + { + // if (sTest == buildTestFunctionName(_sTestName)) + m_aSignalHash[sLine] = 1; + sLastLine = sLine; + // return HAS_SIGNAL; + } + } + } + + bSignalsCached = true; + return hasSignaled(_sTestName); + // return NO_SIGNAL; +} + +#ifdef UNX + +// ----------------------------------------------------------------------------- + +void release_signal_Handling(); + +//# void signalFunction(int value) +//# { +//# std::cout << "Signal caught: (" << value << "), please restart." << std::endl; +//# markSignalAsAlreadyDone(); +//# +//# release_signal_Handling(); +//# std::cout.flush(); +//# abort(); +//# } + +// ----------------------------------------------------------------------------- +extern "C" void SignalHandlerFunction(int _nSignalNo, siginfo_t *, void*) +{ + // std::cout << "Signal caught: " << getSignalName(_nSignalNo) << " (" << _nSignalNo << "), please restart." << std::endl; + fprintf(stderr, "Signal caught %s(%d)\n", getSignalName(_nSignalNo).c_str(), _nSignalNo); + markSignalAsAlreadyDone(_nSignalNo); + + release_signal_Handling(); + // std::cout.flush(); + abort(); +} + +// ----------------------------------------------------------------------------- +// This is a copy of the osl/signal.c code +#define ACT_IGNORE 1 +#define ACT_ABORT 2 +#define ACT_EXIT 3 +#define ACT_SYSTEM 4 +#define ACT_HIDE 5 + +extern "C" { +static struct SignalAction +{ + int Signal; + int Action; + void (*Handler)(int); +} Signals[] = +{ + { SIGHUP, ACT_IGNORE, NULL }, /* hangup */ + { SIGINT, ACT_EXIT, NULL }, /* interrupt (rubout) */ + { SIGQUIT, ACT_ABORT, NULL }, /* quit (ASCII FS) */ + { SIGILL, ACT_SYSTEM, NULL }, /* illegal instruction (not reset when caught) */ +/* changed from ACT_ABOUT to ACT_SYSTEM to try and get collector to run*/ + { SIGTRAP, ACT_ABORT, NULL }, /* trace trap (not reset when caught) */ +#if ( SIGIOT != SIGABRT ) + { SIGIOT, ACT_ABORT, NULL }, /* IOT instruction */ +#endif +// { SIGABRT, ACT_ABORT, NULL }, /* used by abort, replace SIGIOT in the future */ +#ifdef SIGEMT + { SIGEMT, ACT_SYSTEM, NULL }, /* EMT instruction */ +/* changed from ACT_ABORT to ACT_SYSTEM to remove handler*/ +/* SIGEMT may also be used by the profiler - so it is probably not a good + plan to have the new handler use this signal*/ +#endif + { SIGFPE, ACT_ABORT, NULL }, /* floating point exception */ + { SIGKILL, ACT_SYSTEM, NULL }, /* kill (cannot be caught or ignored) */ + { SIGBUS, ACT_ABORT, NULL }, /* bus error */ + { SIGSEGV, ACT_ABORT, NULL }, /* segmentation violation */ +#ifdef SIGSYS + { SIGSYS, ACT_ABORT, NULL }, /* bad argument to system call */ +#endif + { SIGPIPE, ACT_HIDE, NULL }, /* write on a pipe with no one to read it */ + { SIGALRM, ACT_EXIT, NULL }, /* alarm clock */ + { SIGTERM, ACT_EXIT, NULL }, /* software termination signal from kill */ + { SIGUSR1, ACT_SYSTEM, NULL }, /* user defined signal 1 */ + { SIGUSR2, ACT_SYSTEM, NULL }, /* user defined signal 2 */ + { SIGCHLD, ACT_SYSTEM, NULL }, /* child status change */ +#ifdef SIGPWR + { SIGPWR, ACT_IGNORE, NULL }, /* power-fail restart */ +#endif + { SIGWINCH, ACT_IGNORE, NULL }, /* window size change */ + { SIGURG, ACT_EXIT, NULL }, /* urgent socket condition */ +#ifdef SIGPOLL + { SIGPOLL, ACT_EXIT, NULL }, /* pollable event occured */ +#endif + { SIGSTOP, ACT_SYSTEM, NULL }, /* stop (cannot be caught or ignored) */ + { SIGTSTP, ACT_SYSTEM, NULL }, /* user stop requested from tty */ + { SIGCONT, ACT_SYSTEM, NULL }, /* stopped process has been continued */ + { SIGTTIN, ACT_SYSTEM, NULL }, /* background tty read attempted */ + { SIGTTOU, ACT_SYSTEM, NULL }, /* background tty write attempted */ + { SIGVTALRM, ACT_EXIT, NULL }, /* virtual timer expired */ + { SIGPROF, ACT_SYSTEM, NULL }, /* profiling timer expired */ +/*Change from ACT_EXIT to ACT_SYSTEM for SIGPROF is so that profiling signals do + not get taken by the new handler - the new handler does not pass on context + information which causes 'collect' to crash. This is a way of avoiding + what looks like a bug in the new handler*/ + { SIGXCPU, ACT_ABORT, NULL }, /* exceeded cpu limit */ + { SIGXFSZ, ACT_ABORT, NULL } /* exceeded file size limit */ +}; +} + +const int NoSignals = sizeof(Signals) / sizeof(struct SignalAction); + +#endif /* UNX */ + +// ----------------------------------------------------------------------------- +void init_signal_Handling(CppUnit::TestResult *_pResult) +{ + pTestResult = _pResult; +#ifdef UNX + +// signal(SIGSEGV, signalFunction); + // signal(SIGSEGV, signalFunction); + // signal(SIGFPE, signalFunction); + +// signal(1, signalFunction); + // struct sigaction action, oldaction; + // action.sa_sigaction = signalFunction2; + // action.sa_flags = SA_ONESHOT /* | SA_SIGINFO */; + + struct sigaction act; + struct sigaction oact; + + // act.sa_handler = SignalHandlerFunction; + act.sa_flags = SA_RESTART; + // act.sa_flags = SA_ONESHOT /* | SA_SIGINFO */; + act.sa_sigaction = SignalHandlerFunction; + + sigfillset(&(act.sa_mask)); + + /* Initialize the rest of the signals */ + for (int i = 0; i < NoSignals; i++) + { + if (Signals[i].Action != ACT_SYSTEM) + { + if (Signals[i].Action == ACT_HIDE) + { + struct sigaction ign; + + ign.sa_handler = SIG_IGN; + ign.sa_flags = 0; + sigemptyset(&ign.sa_mask); + + if (sigaction(Signals[i].Signal, &ign, &oact) == 0) + Signals[i].Handler = oact.sa_handler; + else + Signals[i].Handler = SIG_DFL; + } + else + if (sigaction(Signals[i].Signal, &act, &oact) == 0) + Signals[i].Handler = oact.sa_handler; + else + Signals[i].Handler = SIG_DFL; + } + } +#endif + + // ------------ signal helper file must exist ----------------- + FILE* pFile = fopen(getSignalFilename().c_str(), "r"); + if (!pFile) + { + createEmptySignalFile( getSignalFilename() ); + } + else + { + fclose(pFile); + } +} + +// ----------------------------------------------------------------------------- +void release_signal_Handling() +{ + // frees all signals +#ifdef UNX + int i; + struct sigaction act; + + act.sa_flags = 0; + sigemptyset(&(act.sa_mask)); + + /* Initialize the rest of the signals */ + for (i = NoSignals - 1; i >= 0; i--) + { + if (Signals[i].Action != ACT_SYSTEM) + { + act.sa_handler = Signals[i].Handler; + + sigaction(Signals[i].Signal, &act, NULL); + } + } +#endif +} + +// ----------------------------------------------------------------------------- +Signal signalCheck(CppUnit::TestResult* _pResult, std::string const& _sTestName) +{ + // BACK: HAS_SIGNAL: the test has already done and signaled + if (hasSignaled(_sTestName) == HAS_SIGNAL) + { + // std::cout << "The Test '" << buildTestFunctionName(_sTestName) << "' is marked as signaled." << std::endl; + std::string sTestFunctionName = buildTestFunctionName(_sTestName); + fprintf(stderr, "The Test '%s' is marked as signaled.\n", sTestFunctionName.c_str()); + if (_pResult) + { + CppUnit::SignalTest *pTest = new CppUnit::SignalTest(_sTestName); + + std::string sErrorText = "Function is marked as signaled: "; + sal_Int32 nSignalNo = m_aSignalHash[sTestFunctionName]; + sErrorText += getSignalName(nSignalNo); + sErrorText += " ("; + sErrorText += OptionHelper::integerToAscii(nSignalNo); + sErrorText += ")"; + + _pResult->addError(pTest, new CppUnit::SignalException(sErrorText), ErrorType::ET_SIGNAL); + } + return HAS_SIGNAL; + } + + // storeNoSignal(_sTestName); + return NO_SIGNAL; +} + +// ----------------------------------------------------------------------------- +bool copyFile(std::string const& _sFrom, std::string const& _sTo) +{ + bool bRetValue = false; + const int MAXBUFSIZE = 1024; + char buff[MAXBUFSIZE]; + FILE *in = fopen(_sFrom.c_str(), "r"); + if (in == NULL) + { + fprintf(stderr, "error: Can't open file %s for read to copy.\n", _sFrom.c_str()); + bRetValue = false; + } + else + { + FILE *out = fopen(_sTo.c_str(), "w"); + if (out == NULL) + { + fclose(in); + fprintf(stderr, "error: Can't open file %s for write to copy.\n", _sTo.c_str()); + bRetValue = false; + } + else + { + int nRealGot = 0; + while(!feof(in)) + { + nRealGot = fread(buff, sizeof(char), MAXBUFSIZE, in); + if (nRealGot > 0) + { + fwrite(buff, sizeof(char), nRealGot, out); + } + } + bRetValue = true; + fclose(out); + fclose(in); + } + } + return bRetValue; +} + +// ----------------------------------------------------------------------------- +void signalStartTest(std::string const& _sName) +{ + if (doNotTouchSignalFile()) return; + + // fprintf(stderr, "### signalStartTest!\n"); + // due to the fact, that functions are vicious, we write the name first. + // if it isn't vivious, than we removed it. + std::string sNewName = getSignalFilename(); + sNewName += ".bak"; + if (copyFile(getSignalFilename(), sNewName)) + { + // std::ofstream out(getSignalFilename().c_str(), std::ios::out | std::ios::app); + FILE *out = fopen(getSignalFilename().c_str(), "a"); + if (out != NULL) + { + // out << buildTestFunctionName(_sName) << std::endl; + fprintf(out, "%s\n", buildTestFunctionName(_sName).c_str()); + fclose(out); + } + else + { + fprintf(stderr, "error: Can't open file %s for append.\n", getSignalFilename().c_str()); + } + } + else + { + fprintf(stderr, "error: Can't copy signal helper from file %s to file %s, %d\n", getSignalFilename().c_str(), sNewName.c_str(), errno); + } +} + +// ----------------------------------------------------------------------------- +void signalEndTest() +{ + if (doNotTouchSignalFile()) return; + + // fprintf(stderr, "### signalEndTest!\n"); + if (0 != remove(getSignalFilename().c_str())) + { + fprintf(stderr, "error: Can't delete file %s\n", getSignalFilename().c_str()); + } + else + { + std::string sNewName = getSignalFilename(); + sNewName += ".bak"; + if (0 != rename(sNewName.c_str(), getSignalFilename().c_str())) + { + fprintf(stderr, "error: Can't rename file %s to file %s errno: %d\n", sNewName.c_str(), getSignalFilename().c_str(), errno); + } + } +} + +// ----------------------------------------------------------------------------- +void removeSignalFile(GetOpt & opt) +{ + // fprintf(stderr, "### remove signal file: '%s'\n", sSignalFile.c_str()); + if (opt.hasOpt("-dnrmsf")) + { + return; + } + if (bDoNotTouchSignalFile == true) + { + return; + } + remove(getSignalFilename().c_str()); +} + +// ----------------------------------------------------------------------------- + +sal_Int32 SignalHandlerA( TagHelper const& _aTagItems ) +{ + sal_Int32 nRetValue = 0; + TagData nTagType = _aTagItems.GetTagData(TAG_TYPE, 0); +// LLA: unused +// hTestResult hResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */ ); +// CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult; + + try + { + switch(nTagType) + { + // old: case SIGNAL_PUSH_NAME: + // old: { + // old: const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME); + // old: if (sName != NULL) + // old: signalPushName(sName); + // old: break; + // old: } + // old: + // old: case SIGNAL_POP_NAME: + // old: signalPopName(); + // old: break; + + // old: case SIGNAL_CHECK: + // old: { + // old: const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME); + // old: if (sName != NULL) + // old: { + // old: nRetValue = signalCheck(sName); + // old: } + // old: break; + // old: } + + // old: case INIT_SIGNAL_HANDLING: + // old: init_signal_Handling(); + // old: break; + // old: + // old: case RELEASE_SIGNAL_HANDLING: + // old: release_signal_Handling(); + // old: break; + + case SIGNAL_START_TEST: + { + // fprintf(stderr, "### SIGNAL_START_TEST!\n"); + const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME); + if (sName != NULL) + { + signalStartTest(sName); + } + break; + } + + case SIGNAL_END_TEST: + { + // fprintf(stderr, "### SIGNAL_END_TEST!\n"); + const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME); + if (sName != NULL) + { + signalEndTest(); + } + break; + } + + default: + fprintf(stderr, "error: SignalHandlerA: Can't handle the tag type %d\n", SAL_STATIC_CAST(int, nTagType)); + fflush(stderr); + // throw std::exception(/*std::string("Unknown TYPE_TAG Exception.")*/); + } + } + catch (std::exception &e) + { + fprintf(stderr, "error: SignalHandlerA: Exception caught: %s\n", e.what()); + fflush(stderr); + // throw e; + } + + return nRetValue; +} +// ----------------------------------------------------------------------------- +// This a little bit more abstract code, could be easier to modify or expand. + +sal_Int32 CheckExecution(CppUnit::TestResult* _pResult, std::string const& _sName) +{ + // more checks in the corresponding job lists + if (_pResult) + { + if (! _pResult->isAllowedToExecute(_sName)) + { + return DO_NOT_EXECUTE; + } + } + + // Check if the given test should be executed. + if (signalCheck(_pResult, _sName) == HAS_SIGNAL) + { + return DO_NOT_EXECUTE; + } + + return GO_EXECUTE; +} + +// ----------------------------------------------------------------------------- +sal_Int32 ExecutionA( TagHelper const& _aTagItems ) +{ + sal_Int32 nRetValue = 0; + TagData nTagType = _aTagItems.GetTagData(TAG_TYPE, 0); + hTestResult hResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */ ); + CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult; + + try + { + switch(nTagType) + { + case EXECUTION_CHECK: + { + const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME); + if (sName) + { + nRetValue = CheckExecution(pResult, sName); + if (nRetValue == GO_EXECUTE) + { + if (pResult && pResult->isOptionWhereAmI()) + { + printf("# This is: %s\n", buildTestFunctionName(sName).c_str()); + } + } + } + + break; + } + + // old: case EXECUTION_PUSH_NAME: + // old: { + // old: const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME); + // old: if (sName != NULL) + // old: executionPushName(sName); + // old: break; + // old: } + // old: + // old: case EXECUTION_POP_NAME: + // old: executionPopName(); + // old: break; + + case INIT_TEST: + init_signal_Handling(pResult); + break; + + case RELEASE_TEST: + release_signal_Handling(); + break; + + default: + fprintf(stderr, "ExceptionA: Can't handle the tag type %d\n", SAL_STATIC_CAST(int, nTagType)); + break; + } + } + catch (std::exception &e) + { + fprintf(stderr, "ExecutionA: exception caught: %s\n", e.what()); + fflush(stderr); + // throw e; + } + return nRetValue; +} + +// ----------------------------------------------------------------------------- +std::string getSignalName(sal_Int32 nSignalNo) +{ + std::string sValue; +#ifdef UNX + switch(nSignalNo) + { + case SIGHUP: + sValue = "SIGHUP"; + break; + + case SIGINT: + sValue = "SIGINT"; + break; + + case SIGQUIT: + sValue = "SIGQUIT"; + break; + + case SIGILL: + sValue = "SIGILL"; + break; + + case SIGTRAP: + sValue = "SIGTRAP"; + break; + +#if ( SIGIOT != SIGABRT ) + case SIGIOT: + sValue = "SIGIOT"; + break; +#endif +// case SIGABRT: +#ifdef SIGEMT + case SIGEMT: + sValue = "SIGEMT"; + break; +#endif + case SIGFPE: + sValue = "SIGFPE"; + break; + + case SIGKILL: + sValue = "SIGKILL"; + break; + + case SIGBUS: + sValue = "SIGBUS"; + break; + + case SIGSEGV: + sValue = "SIGSEGV"; + break; + +#ifdef SIGSYS + case SIGSYS: + sValue = "SIGSYS"; + break; +#endif + case SIGPIPE: + sValue = "SIGPIPE"; + break; + + case SIGALRM: + sValue = "SIGALRM"; + break; + + case SIGTERM: + sValue = "SIGTERM"; + break; + + case SIGUSR1: + sValue = "SIGUSR1"; + break; + + case SIGUSR2: + sValue = "SIGUSR2"; + break; + + case SIGCHLD: + sValue = "SIGCHLD"; + break; + +#ifdef SIGPWR + case SIGPWR: + sValue = "SIGPWR"; + break; +#endif + case SIGWINCH: + sValue = "SIGWINCH"; + break; + + case SIGURG: + sValue = "SIGURG"; + break; + +#ifdef SIGPOLL + case SIGPOLL: + sValue = "SIGPOLL"; + break; +#endif + case SIGSTOP: + sValue = "SIGSTOP"; + break; + + case SIGTSTP: + sValue = "SIGTSTP"; + break; + + case SIGCONT: + sValue = "SIGCONT"; + break; + + case SIGTTIN: + sValue = "SIGTTIN"; + break; + + case SIGTTOU: + sValue = "SIGTTOU"; + break; + + case SIGVTALRM: + sValue = "SIGVTALRM"; + break; + + case SIGPROF: + sValue = "SIGPROF"; + break; + + case SIGXCPU: + sValue = "SIGXCPU"; + break; + + case SIGXFSZ: + sValue = "SIGXFSZ"; + break; + + default: + sValue = "Unhandled Signal."; + } +#else + (void) nSignalNo; // unused +#endif + return sValue; +} + +// The following sets variables for GNU EMACS +// Local Variables: +// tab-width:4 +// End: diff --git a/testshl2/source/cppunit/result/signal.hxx b/testshl2/source/cppunit/result/signal.hxx new file mode 100644 index 000000000000..d95569f8bf8b --- /dev/null +++ b/testshl2/source/cppunit/result/signal.hxx @@ -0,0 +1,42 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +#ifndef SIGNAL_HXX +#define SIGNAL_HXX + +#include <sal/types.h> + +#define HAS_SIGNAL 1 +#define NO_SIGNAL 0 + +typedef sal_Int32 Signal; + +#endif + diff --git a/testshl2/source/cppunit/result/testshlTestResult.cxx b/testshl2/source/cppunit/result/testshlTestResult.cxx new file mode 100644 index 000000000000..fdba53136f2b --- /dev/null +++ b/testshl2/source/cppunit/result/testshlTestResult.cxx @@ -0,0 +1,428 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <stdlib.h> + +#include <map> +#include <cppunit/Exception.h> +#include <cppunit/NotEqualException.h> +#include <cppunit/Test.h> +#include <cppunit/TestFailure.h> +#include <testshl/result/testshlTestResult.h> +// #include <TextTestResult.h> +//!io #include <iostream> +#include <string> + +#include <rtl/string.hxx> +#include "testshl/result/outputter.hxx" + +namespace CppUnit { + + testshlTestResult::testshlTestResult(GetOpt & _aOptions) + :TestResult(_aOptions), + m_aOptions(_aOptions), + // m_aOptionHelper(_aOptions), + m_aResulter(this) + { + addListener( &m_aResulter ); + } + + testshlTestResult::~testshlTestResult() + { + } + +//# void +//# testshlTestResult::addFailure( const TestFailure &failure ) +//# { +//# // TestResultCollector::addFailure( failure ); +//# // std::cerr << ( failure.isError() ? "E" : "F" ); +//# m_aResulter.addFailure(failure); +//# } +//# +//# +//# void +//# testshlTestResult::startTest( Test *test ) +//# { +//# // TestResultCollector::startTest (test); +//# m_aResulter.startTest(test); +//# // std::cerr << "."; +//# } +//# +//# void testshlTestResult::endTest( Test *test ) +//# { +//# } + +// ----------------------------------------------------------------------------- + +//# void +//# testshlTestResult::printFailures( Outputter &stream ) +//# { +//# TestFailures::const_iterator itFailure = failures().begin(); +//# int failureNumber = 1; +//# while ( itFailure != failures().end() ) +//# { +//# stream << std::endl; +//# printFailure( *itFailure++, failureNumber++, stream ); +//# } +//# } +//# +//# +//# void +//# testshlTestResult::printFailure( TestFailure *failure, +//# int failureNumber, +//# std::ostream &stream ) +//# { +//# printFailureListMark( failureNumber, stream ); +//# stream << ' '; +//# printFailureTestName( failure, stream ); +//# stream << ' '; +//# printFailureType( failure, stream ); +//# stream << ' '; +//# printFailureLocation( failure->sourceLine(), stream ); +//# stream << std::endl; +//# printFailureDetail( failure->thrownException(), stream ); +//# stream << std::endl; +//# } +//# +//# +//# void +//# testshlTestResult::printFailureListMark( int failureNumber, +//# std::ostream &stream ) +//# { +//# stream << failureNumber << ")"; +//# } +//# +//# +//# void +//# testshlTestResult::printFailureTestName( TestFailure *failure, +//# std::ostream &stream ) +//# { +//# Test* pTest = failure->failedTest(); +//# stream << "test: " << pTest->getName(); +//# } +//# +//# +//# void +//# testshlTestResult::printFailureType( TestFailure *failure, +//# std::ostream &stream ) +//# { +//# stream << "(" +//# << (failure->isError() ? "E" : "F") +//# << ")"; +//# } +//# +//# +//# void +//# testshlTestResult::printFailureLocation( SourceLine sourceLine, +//# std::ostream &stream ) +//# { +//# if ( !sourceLine.isValid() ) +//# return; +//# +//# stream << "line: " << sourceLine.lineNumber() +//# << ' ' << sourceLine.fileName(); +//# } +//# +//# +//# void +//# testshlTestResult::printFailureDetail( Exception *thrownException, +//# std::ostream &stream ) +//# { +//# if ( thrownException->isInstanceOf( NotEqualException::type() ) ) +//# { +//# NotEqualException *e = (NotEqualException*)thrownException; +//# stream << "expected: " << e->expectedValue() << std::endl +//# << "but was: " << e->actualValue(); +//# if ( !e->additionalMessage().empty() ) +//# { +//# stream << std::endl; +//# stream << "additional message:" << std::endl +//# << e->additionalMessage(); +//# } +//# } +//# else +//# { +//# stream << " \"" << thrownException->what() << "\""; +//# } +//# } + + +// LLA: output format: +// Header +// # -- BEGIN +// Error lines +// No error lines +// unknown lines +// # -- END +// Text 'Test #PASSED#' or 'Errors only' + +void +testshlTestResult::print( Outputter& stream ) +{ + printHeader( stream ); + // stream << std::endl; + // printFailures( stream ); + + bool bPassed = false; + if (isOnlyShowJobs()) + { + JobList jl(m_aOptionHelper.getJobOnlyList()); + HashMap aJobList = jl.getHashMap(); + printLines(stream, aJobList); + } + else + { + stream << "# -- BEGIN:" << Outputter::endl(); + + TestPtrList aFailedTests; + + // List of failures + printFailedTests(stream, aFailedTests); + + if (! m_aOptionHelper.getOptions().hasOpt("-onlyerrors")) + { + // List of well done tests + printTestLines(stream, aFailedTests); + + // List of unknown Tests + JobList jl(m_aOptionHelper.getJobOnlyList()); + HashMap aJobList = jl.getHashMap(); + printUnknownLines(stream, aJobList); + + bPassed = true; + } + stream << "# -- END:" << Outputter::endl(); + + if (bPassed) + { + stream << "Test #PASSED#" << Outputter::endl(); + } + + if (m_aOptionHelper.getOptions().hasOpt("-onlyerrors")) + { + stream << "Errors only." << Outputter::endl(); + } + } +} + +// ----------------------------------------------------------------------------- +void +testshlTestResult::printLines(Outputter &stream, HashMap & _aJobList) +{ + int nCount = _aJobList.size(); + if (nCount != 0) + { + for (HashMap::const_iterator it = _aJobList.begin(); + it != _aJobList.end(); + ++it) + { + std::string aKey = (*it).first; + if (_aJobList[aKey] == JOB_ACCESS) + { + stream << aKey; + stream << Outputter::endl(); + } + } + } +} + +void +testshlTestResult::printFailedTests(Outputter &stream, TestPtrList &aFailedTests) +{ + for (TestResultCollector::TestFailures::const_iterator it2 = m_aResulter.failures().begin(); + it2 != m_aResulter.failures().end(); + ++it2) + { + TestFailureEnvelope *pEnvelop = *it2; + TestFailure *pFailure = pEnvelop->getTestFailure(); + std::string sNodeName = pEnvelop->getString(); + + aFailedTests[ pFailure->failedTest() ] = true; + + printFailureLine(stream, pFailure, sNodeName); + } +} + +void +testshlTestResult::printTestLines(Outputter &stream, TestPtrList &aFailedTests) +{ + for (TestResultCollector::Tests::const_iterator it = m_aResulter.tests().begin(); + it != m_aResulter.tests().end(); + ++it) + { + TestEnvelope *pEnvelop = *it; + Test* pTest = pEnvelop->getTest(); + std::string sNodeName = pEnvelop->getString(); + + if (aFailedTests.find(pTest) == aFailedTests.end()) + { + std::string sInfo = m_aResulter.getInfo(pTest); + printTestLine(stream, pTest, sNodeName, sInfo); + } + } +} + +void +testshlTestResult::printUnknownLines(Outputter &stream, HashMap & _aJobList) +{ + int nCount = _aJobList.size(); + if (nCount != 0) + { + for (HashMap::const_iterator it = _aJobList.begin(); + it != _aJobList.end(); + ++it) + { + std::string aKey = (*it).first; + if (_aJobList[aKey] == JOB_UNKNOWN) + { + printUnknownLine(stream, aKey); + } + } + } +} + +void +testshlTestResult::printHeader( Outputter &stream ) +{ + std::string sDate(m_aOptionHelper.createDateTag()); + if (isOnlyShowJobs()) + { + stream << "# This is an automatically generated job file." << Outputter::endl(); + stream << "# "; + } + else + { + stream << sDate << Outputter::endl(); + } +} + +void +testshlTestResult::printFailureLine( Outputter &stream, TestFailure *_pFailure, std::string const& _sNodeName) +{ + std::string aName; + aName += _sNodeName; + aName += "."; + aName += _pFailure->failedTestName(); + + SourceLine aLine = _pFailure->sourceLine(); + sal_Int32 nLine = -1; + std::string sFilename; + if (aLine.isValid()) + { + nLine = aLine.lineNumber(); + sFilename = aLine.fileName(); + } + + Exception *pExp = _pFailure->thrownException(); + std::string sWhat; + if (pExp) + { + sWhat = pExp->what(); + } + + ErrorType::num eErr = _pFailure->getErrorType(); + + stream << aName; + stream << ";"; + + if (eErr == ErrorType::ET_FAILURE) + stream << "FAILED"; + + else if (eErr == ErrorType::ET_ERROR) + stream << "ERROR"; + + else if (eErr == ErrorType::ET_SIGNAL) + stream << "SIGNAL"; + + else + stream << "UNKNOWN"; + + stream << "#FAILED#"; + + stream << sWhat; + stream << Outputter::endl(); +} + +void +testshlTestResult::printTestLine( Outputter &stream, Test* _pTest, std::string const& _sNodeName, std::string const& _sInfo) +{ + std::string aName; + aName += _sNodeName; + aName += "."; + aName += _pTest->getName(); + + stream << aName; + stream << ";"; + stream << _sInfo << "#"; + if (_sInfo == "PASSED") + { + stream << "OK#"; + } + else + { + stream << "FAILED#"; + } + stream << Outputter::endl(); +} + +void +testshlTestResult::printUnknownLine( Outputter &stream, std::string const& _sTestName) +{ + stream << _sTestName; + stream << ";"; + stream << "UNKNOWN#"; + stream << "FAILED#"; + stream << Outputter::endl(); +} + +//# void +//# testshlTestResult::printStatistics( Outputter &stream ) +//# { +//# stream << "Test Results:" << std::endl; +//# +//# stream << "Run: " << runTests() +//# << " Failures: " << testFailures() +//# << " Errors: " << testErrors() +//# << std::endl; +//# } + + +Outputter & +operator <<( Outputter &stream, + testshlTestResult &result ) +{ + result.print (stream); return stream; +} + + +} // namespace CppUnit diff --git a/testshl2/source/cppunit/result/treswrapper.cxx b/testshl2/source/cppunit/result/treswrapper.cxx new file mode 100644 index 000000000000..56e891fa026f --- /dev/null +++ b/testshl2/source/cppunit/result/treswrapper.cxx @@ -0,0 +1,262 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <cstdarg> +#include <stdlib.h> +#include <stdio.h> + +#include <sal/types.h> +#include <cppunit/Test.h> +#include "testshl/autoregister/htestresult.h" +#include "cppunit/callbackfunc_fktptr.h" +#include "testshl/result/callbackfunc.h" +#include "testshl/result/TestResult.h" +#include <testshl/taghelper.hxx> + +#include <cppunit/tagvalues.hxx> + +namespace +{ + void TestResult_startTest(hTestResult _pResult, hTest _pTest) + { + CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult; + CppUnit::Test* pTest = (CppUnit::Test*)_pTest; + + std::string sName = pTest->getName(); + CallbackDispatch(0 /* NULL */, TAG_TYPE, SIGNAL_START_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE); + + pResult->startTest(pTest); + } + + void TestResult_endTest( hTestResult _pResult, hTest _pTest ) + { + CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult; + CppUnit::Test* pTest = (CppUnit::Test*)_pTest; + pResult->endTest(pTest); + + std::string sName = pTest->getName(); + CallbackDispatch(0 /* NULL */, TAG_TYPE, SIGNAL_END_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE); + } + +// ----------------------------------------------------------------------------- + + void TestResult_addFailure( hTestResult _pResult, hTest _pTest, hException _pException ) + { + CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult; + CppUnit::Test* pTest = (CppUnit::Test*)_pTest; + CppUnit::Exception* pException = (CppUnit::Exception*)_pException; + pResult->addFailure(pTest, pException); + } + + void TestResult_addError( hTestResult _pResult, hTest _pTest, hException _pException ) + { + CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult; + CppUnit::Test* pTest = (CppUnit::Test*)_pTest; + CppUnit::Exception* pException = (CppUnit::Exception*)_pException; + pResult->addError(pTest, pException); + } + + sal_Int32 TestResult_shouldStop(hTestResult _pResult) + { + CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult; + return pResult->shouldStop() == true ? 1 : 0; + } + +// ----------------------------------------------------------------------------- + void TestResult_addInfo( hTestResult _pResult, hTest _pTest, const char* _sInfo ) + { + CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult; + CppUnit::Test* pTest = (CppUnit::Test*)_pTest; + // CppUnit::Exception* pException = (CppUnit::Exception*)_pException; + pResult->addInfo(pTest, _sInfo); + } +// ----------------------------------------------------------------------------- + void TestResult_enterNode( hTestResult _pResult, const char* _sNode ) + { + // signalPushName(getName()); + // CallbackDispatch(NULL, TAG_TYPE, EXECUTION_PUSH_NAME, TAG_RESULT_PTR, _pResult, TAG_NODENAME, _sNode, TAG_DONE); + + CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult; + // CppUnit::Test* pTest = (CppUnit::Test*)_pTest; + // CppUnit::Exception* pException = (CppUnit::Exception*)_pException; + pResult->enterNode(_sNode); + } + void TestResult_leaveNode( hTestResult _pResult, const char* _sNode ) + { + CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult; + // CppUnit::Test* pTest = (CppUnit::Test*)_pTest; + // CppUnit::Exception* pException = (CppUnit::Exception*)_pException; + pResult->leaveNode(_sNode); + + // CallbackDispatch(NULL, TAG_TYPE, EXECUTION_POP_NAME, TAG_RESULT_PTR, _pResult, TAG_DONE); + } + +// ----------------------------------------------------------------------------- + sal_Int32 TestResult_StarterA(TagHelper const& _aTagItems) + { + sal_Int32 nRetValue = 0; + TagData nTagType = _aTagItems.GetTagData(TAG_TYPE, 0); + hTestResult pResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */); + CppUnit::Test* pTest = (CppUnit::Test*) _aTagItems.GetTagData(TAG_TEST_PTR, 0 /* NULL */); + + try + { + switch(nTagType) + { + case RESULT_START: + TestResult_startTest(pResult, pTest); + break; + + case RESULT_END: + TestResult_endTest(pResult, pTest); + break; + + case RESULT_ADD_FAILURE: + { + hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0); + TestResult_addFailure(pResult, pTest, pException); + break; + } + + case RESULT_ADD_ERROR: + { + hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0); + TestResult_addError(pResult, pTest, pException); + break; + } + + case RESULT_ADD_INFO: + { + const char* pInfo = (const char* ) _aTagItems.GetTagData(TAG_INFO, 0); + TestResult_addInfo(pResult, pTest, pInfo); + break; + } + + case RESULT_ENTER_NODE: + { + const char* pNode = (const char* )_aTagItems.GetTagData(TAG_NODENAME, 0); + TestResult_enterNode(pResult, pNode); + break; + } + + case RESULT_LEAVE_NODE: + { + const char* pNode = (const char* ) _aTagItems.GetTagData(TAG_NODENAME, 0); + TestResult_leaveNode(pResult, pNode); + break; + } + + case RESULT_SHOULD_STOP: + nRetValue = TestResult_shouldStop(pResult); + break; + + default: + fprintf(stderr, "TestResult_StarterA: Can't handle the tag type %8x\n", SAL_STATIC_CAST(int, nTagType)); + fflush(stderr); + // throw std::exception(/*std::string("Unknown TYPE_TAG Exception.")*/); + } + } + catch (std::exception &e) + { + fprintf(stderr, "TestResult_StarterA: Exception caught: %s\n", e.what()); + // throw e; + } + + return nRetValue; + } +} // namespace anonymous + +// --------------------------------- Prototypes --------------------------------- + +sal_Int32 SignalHandlerA( TagHelper const& _aTagItems ); +sal_Int32 ExecutionA( TagHelper const& _aTagItems ); + +// ----------------------------------------------------------------------------- +long CallbackDispatch(int x, ...) +{ + (void) x; // avoid warning + + // The idea behind TagItems are from the Amiga OS. + // Due to the fact that the following code does not find my ok + // I decide to wrote a simple helper + // + // struct TagItem *tags = (struct TagItem *)&x + 1; + + TagHelper aTagItems; + + // the following code could also be in a #define, so other functions could + // use this, but at the moment this function a the only one. + + // FILL_TAGS(aTagItems, x); + std::va_list args; + va_start( args, x ); + Tag nTag; + do + { + nTag = va_arg(args, Tag); + if (nTag != TAG_DONE) + { + TagData nValue = va_arg(args, TagData); + // printf("Tag: %8x Value:%8x\n", nTag, nValue); + aTagItems.insert(nTag, nValue); + } + } while (nTag != TAG_DONE); + + va_end ( args ); + + // FILL_TAGS:END + + // printf(".\n"); + + long nRetValue = 0; + Tag nPreTag = aTagItems.GetTagData(TAG_TYPE); + if ( (nPreTag & TAG_RESULT) == TAG_RESULT) + { + nRetValue = TestResult_StarterA( aTagItems ); + } + else if ((nPreTag & TAG_SIGNAL) == TAG_SIGNAL) + { + nRetValue = SignalHandlerA(aTagItems); + } + else if (( nPreTag & TAG_EXECUTION) == TAG_EXECUTION) + { + nRetValue = ExecutionA(aTagItems); + } + else + { + fprintf(stderr, "CallbackDispatch: First tag is unknown %8x\n", SAL_STATIC_CAST(int, nPreTag)); + // unknown TAG_TYPE + } + return nRetValue; +} + diff --git a/testshl2/source/cppunit/signaltest.cxx b/testshl2/source/cppunit/signaltest.cxx new file mode 100644 index 000000000000..78bc447f06e4 --- /dev/null +++ b/testshl2/source/cppunit/signaltest.cxx @@ -0,0 +1,92 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <typeinfo> + +#include "testshl/signaltest.h" + +namespace CppUnit +{ + +/** Constructs a test case for a suite. + * This TestCase is intended for use by the TestCaller and should not + * be used by a test case for which run() is called. + **/ +SignalTest::SignalTest(std::string const& _sName) + : m_sName( _sName ) +{ +} + + +/// Destructs a test case +SignalTest::~SignalTest() +{ +} + + +/// Returns a count of all the tests executed +int +SignalTest::countTestCases() const +{ + return 1; +} + +/// We never need to start this +void SignalTest::run(hTestResult) {} + + +/// Returns the name of the test case +std::string +SignalTest::getName() const +{ + return m_sName; +} + + +/// Returns the name of the test case instance +std::string +SignalTest::toString() const +{ + std::string className; + +#if CPPUNIT_USE_TYPEINFO_NAME + const std::type_info& thisClass = typeid( *this ); + className = thisClass.name(); +#else + className = "SignalTest"; +#endif + + return className + "." + getName(); +} + +} // namespace CppUnit diff --git a/testshl2/source/cppunit/t_print.cxx b/testshl2/source/cppunit/t_print.cxx new file mode 100644 index 000000000000..602a77998da3 --- /dev/null +++ b/testshl2/source/cppunit/t_print.cxx @@ -0,0 +1,98 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <stdio.h> +#include <testshl/cmdlinebits.hxx> +#include <rtl/tres.h> +#include <osl/mutex.hxx> + +extern CmdLineBits st_nBits; + +sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag ) +{ + return( ( _nBits & _nFlag ) == _nFlag ); +} + +// ----------------------------------------------------------------------------- +// ----------------------------- own printf method ----------------------------- +// ----------------------------------------------------------------------------- + +bool isVerbose() +{ + if ( isBit( st_nBits, rtl_tres_Flag_VERBOSE ) ) + { + return true; + } + return false; +} + +bool isQuiet() +{ + if ( isBit( st_nBits, rtl_tres_Flag_QUIET ) ) + { + return true; + } + return false; +} + +// ::osl::Mutex m_aTPrintMutex; + +void impl_t_print(const char* _pFormatStr, va_list &args) +{ + if (! isQuiet()) + { + // ::osl::MutexGuard g(m_aTPrintMutex); + printf("# "); + vprintf(_pFormatStr, args); + } +} + +void t_print(const char* _pFormatStr, ...) +{ + va_list args; + va_start( args, _pFormatStr ); + impl_t_print(_pFormatStr, args); + va_end( args ); +} + +void t_print(T_Print_Params _eType, const char* _pFormatStr, ...) +{ + if (_eType == T_VERBOSE && isVerbose()) + { + // if T_VERBOSE and we should be verbose, print info + va_list args; + va_start( args, _pFormatStr ); + impl_t_print(_pFormatStr, args); + va_end( args ); + } +} diff --git a/testshl2/source/cppunit/tresregister.cxx b/testshl2/source/cppunit/tresregister.cxx new file mode 100644 index 000000000000..96491345416b --- /dev/null +++ b/testshl2/source/cppunit/tresregister.cxx @@ -0,0 +1,69 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#include <stdio.h> +#include <sal/types.h> +#include <testshl/autoregister/registerfunc.h> +#include <testshl/autoregister/callbackstructure.h> +#include <testshl/cmdlinebits.hxx> + +//! is this global CallbackStructure need? +CallbackStructure aGlobalStructure; +CmdLineBits st_nBits; + +FktPtr_CallbackDispatch pCallbackFunc = NULL; + +// This function is called from the TestShl tool. +extern "C" void SAL_CALL registerAllTestFunction(CallbackStructure* _pCallback) +{ + aGlobalStructure = *_pCallback; + + st_nBits = aGlobalStructure.nBits; + + pCallbackFunc = _pCallback->aCallbackDispatch; + FktRegFuncPtr pFunc = _pCallback->aRegisterFunction; + if (pFunc) + { + RegisterTestFunctions(pFunc); + } + else + { + // error, should be echoed + fprintf(stderr, "error: Callback Structure doesn't contain a test function ptr.\n"); + } + + // all is done, copy the magic value + // this is only a simple internal invariant check, + // if the called registerAllTestFunctions Function do, what we want. + _pCallback->nMagic2 = _pCallback->nMagic; +} diff --git a/testshl2/source/cppunit/tresstatewrapper.cxx b/testshl2/source/cppunit/tresstatewrapper.cxx new file mode 100644 index 000000000000..bdfe23ac574e --- /dev/null +++ b/testshl2/source/cppunit/tresstatewrapper.cxx @@ -0,0 +1,169 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +// this functions build the wrapper, to handle old function calls to rtl_tres_state +// IMPORTANT: Due to the fact that rtl_tres_state is in the sal.lib +// you have to rename rtl_tres_state to c_rtl_tres_state +// +// return c_rtl_tres_state +// ( +// hRtlTestResult, +// pData->length == 0 && +// ! *pData->buffer, +// "New OString containing no characters", +// "ctor_001" +// ) + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include "cppunit/Test.h" +#include "testshl/autoregister/htestresult.h" +#include "cppunit/callbackfunc_fktptr.h" +#include "cppunit/TestAssert.h" +#include "testshl/checkboom.hxx" + +#define LOAD_TRESSTATEWRAPPER_LOCAL +#include "testshl/tresstatewrapper.hxx" +#undef LOAD_TRESSTATEWRAPPER_LOCAL + +#include "cppunit/tagvalues.hxx" +#include "cppunit/externcallbackfunc.hxx" + +// ----------------------------------------------------------------------------- +// Wrapper class for the CppUnit::Test, because the new TestResult +// expect a CppUnit::Test interface + +class WrappedTest : public CppUnit::Test +{ + std::string m_sName; +public: + WrappedTest(std::string const& _sName) + :m_sName(_sName){} + + virtual ~WrappedTest () {} + virtual void run (hTestResult /*pResult*/){} + virtual int countTestCases () const {return 1;} + virtual std::string getName () const {return m_sName;} + virtual std::string toString () const {return "WrappedTest";} +}; + +// ----------------------------------------------------------------------------- +rtl_tres_state_start::rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName) + :m_pName(_pName), + m_aResult(_aResult) +{ + // (pTestResult_EnterNode)(m_aResult, m_pName); + (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE); +} +rtl_tres_state_start::~rtl_tres_state_start() +{ + // (pTestResult_LeaveNode)(m_aResult, m_pName); + (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_LEAVE_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE); +} + +// --------------------------------- C-Wrapper --------------------------------- +typedef std::vector<rtl_tres_state_start*> rtl_tres_states; +rtl_tres_states m_StateStack; + +extern "C" void c_rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName) +{ + rtl_tres_state_start* pState = new rtl_tres_state_start(_aResult, _pName); + m_StateStack.push_back(pState); +} + +extern "C" void c_rtl_tres_state_end(hTestResult, const sal_Char*) +{ + rtl_tres_state_start* pState = m_StateStack.back(); + + delete pState; + m_StateStack.pop_back(); +} +// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- + +// ----------------------------------------------------------------------------- +// ------------------------- Wrapper for rtl_tres_state ------------------------- +// ----------------------------------------------------------------------------- + +sal_Bool SAL_CALL c_rtl_tres_state( + hTestResult pResult, + sal_Bool bSuccess, + char const * pTestMsg, + char const * pFuncName) +{ + CppUnit::Test* pTest = new WrappedTest(pFuncName); + + sal_Int32 nValue = (pCallbackFunc)(0 /* NULL */, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, pResult, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE); + if (nValue == DO_NOT_EXECUTE) + { + return false; + } + + // This code is copied from CppUnit::TestCase and less adapted, to work with the + // old test code. + // (pTestResult_StartTest)(pResult, pTest); + (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE); + + try + { + CPPUNIT_ASSERT_MESSAGE( pTestMsg, bSuccess ? true : false ); + // (pTestResult_AddInfo)(pResult, pTest, "#PASSED#"); + (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_INFO, "PASSED", TAG_DONE); + } + catch ( CppUnit::Exception &e ) + { + CppUnit::Exception *copy = e.clone(); + // (pTestResult_AddFailure)( pResult, pTest, copy ); + (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE ); + } + catch ( std::exception &e ) + { + //(pTestResult_AddError)( pResult, pTest, new CppUnit::Exception( e.what() ) ); + (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( e.what() ), TAG_DONE ); + } + catch (...) + { + CppUnit::Exception *e = new CppUnit::Exception( "caught unknown exception" ); + // (pTestResult_AddError)( pResult, pTest, e ); + (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE ); + } + + + // (pTestResult_EndTest)( pResult, pTest ); + (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE ); + + return bSuccess; +} + diff --git a/testshl2/source/cppunit/win32/makefile.mk b/testshl2/source/cppunit/win32/makefile.mk new file mode 100644 index 000000000000..9c9882d87113 --- /dev/null +++ b/testshl2/source/cppunit/win32/makefile.mk @@ -0,0 +1,64 @@ +#************************************************************************* +# +# 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$ +# +# $Revision$ +# +# 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. +# +#************************************************************************* +PRJ=..$/..$/.. + +PRJNAME=testshl2 +TARGET=c5t_winstuff +LIBTARGET=NO +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- +.INCLUDE : settings.mk + +# ------------------------------------------------------------------ + +SLOFILES = \ + $(SLO)$/winstuff.obj + +#------------------------------------------------------------------------------- +# This is a static lib +LIB1TARGET= $(LB)$/$(TARGET).lib +LIB1OBJFILES= \ + $(SLOFILES) + +.IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a +.ENDIF +.ENDIF + +.IF "$(GUI)" == "UNX" +LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk diff --git a/testshl2/source/cppunit/win32/winstuff.cxx b/testshl2/source/cppunit/win32/winstuff.cxx new file mode 100644 index 000000000000..41fc4157171b --- /dev/null +++ b/testshl2/source/cppunit/win32/winstuff.cxx @@ -0,0 +1,143 @@ +/************************************************************************* + * + * 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$ + * $Revision$ + * + * 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. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_testshl2.hxx" + +#ifdef WIN32 +#include "testshl/winstuff.hxx" + +#if defined _MSC_VER +#pragma warning(push, 1) +#endif +#include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif +#include <MAPIWin.h> + +void WinDebugBreak() +{ + // forward to WinAPI. Note that the whole story is simply to + // disentangle OOo headers from Windows headers (which are largely + // incompatible, due to name clashes and macro mess-ups) + DebugBreak(); +} + +void WinSleep( sal_uInt32 sec ) +{ + Sleep(sec * 1000); +} + +sal_uInt32 WinGetCurrentProcessId() +{ + return GetCurrentProcessId(); +} + +#define TA_FAILED 0 +#define TA_SUCCESS_CLEAN 1 +#define TA_SUCCESS_KILL 2 +#define TA_SUCCESS_16 3 + + // Declare Callback Enum Functions. +bool CALLBACK TerminateAppEnum( HWND hwnd, LPARAM lParam ); + +/*---------------------------------------------------------------- + DWORD WINAPI TerminateApp( DWORD dwPID, DWORD dwTimeout ) + + Purpose: + Shut down a 32-Bit Process (or 16-bit process under Windows 95) + + Parameters: + dwPID + Process ID of the process to shut down. + + dwTimeout + Wait time in milliseconds before shutting down the process. + + Return Value: + TA_FAILED - If the shutdown failed. + TA_SUCCESS_CLEAN - If the process was shutdown using WM_CLOSE. + TA_SUCCESS_KILL - if the process was shut down with + TerminateProcess(). + NOTE: See header for these defines. + ----------------------------------------------------------------*/ +void WinTerminateApp( sal_uInt32 dwPID, sal_uInt32 dwTimeout ) +{ + HANDLE hProc; + DWORD dwRet; + + // If we can't open the process with PROCESS_TERMINATE rights, + // then we give up immediately. + hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, false, + dwPID); + + if(hProc == NULL) + return; + + // TerminateAppEnum() posts WM_CLOSE to all windows whose PID + // matches your process's. + EnumWindows((WNDENUMPROC)TerminateAppEnum, (LPARAM) dwPID); + + // Wait on the handle. If it signals, great. If it times out, + // then you kill it. + if (WaitForSingleObject(hProc, dwTimeout) != WAIT_OBJECT_0) + dwRet= (TerminateProcess(hProc,0) ? TA_SUCCESS_KILL : TA_FAILED); + else + dwRet = TA_SUCCESS_CLEAN; + + CloseHandle(hProc); +} + +bool CALLBACK TerminateAppEnum( HWND hwnd, LPARAM lParam ) +{ + DWORD dwID; + + GetWindowThreadProcessId(hwnd, &dwID); + + if(dwID == (DWORD)lParam) + { + PostMessage(hwnd, WM_CLOSE, 0, 0); + } + + return true; +} +#else + +// this file is only need within Windows. +// due to the fact that empty files don't create libraries +// we store one function in it. +int WinStuffDummy_this_function_will_never_need() +{ + return 42; // we need some code +} + +#endif /* WIN32 */ + diff --git a/testshl2/source/makefile.mk b/testshl2/source/makefile.mk index f411f7d7948f..ab0d9685e667 100644 --- a/testshl2/source/makefile.mk +++ b/testshl2/source/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # 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 @@ -47,15 +47,15 @@ ENABLE_EXCEPTIONS=TRUE COMMON_OBJFILES=\ $(OBJ)$/getopt.obj \ $(OBJ)$/filehelper.obj \ - $(OBJ)$/dynamicregister.obj + $(OBJ)$/dynamicregister.obj TESTSHL_OBJFILES=\ $(OBJ)$/autoregisterhelper.obj \ - $(OBJ)$/testshl.obj + $(OBJ)$/testshl.obj VERSIONINFO_OBJFILES=\ $(OBJ)$/versionhelper.obj \ - $(OBJ)$/versioner.obj + $(OBJ)$/versioner.obj BMSMA_OBJFILES=\ $(OBJ)$/bmsma.obj @@ -70,35 +70,34 @@ APP1RPATH=NONE APP1STDLIBS=$(SALLIB) -# the c5t*.lib files are out of the cppunit module -# APP1DEPN= \ -# $(SOLARLIBDIR)$/c5t_no_regallfkt.lib \ -# $(SOLARLIBDIR)$/c5t_testresult.lib - .IF "$(GUI)" == "WNT" .IF "$(COM)" == "GCC" APP1STDLIBS+= \ - $(SOLARLIBDIR)$/libc5t_testresult$(DLLPOSTFIX).a \ - $(SOLARLIBDIR)$/libc5t_no_regallfkt$(DLLPOSTFIX).a \ - $(SOLARLIBDIR)$/libc5t_winstuff$(DLLPOSTFIX).a + $(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a \ + $(LB)$/libc5t_testresult$(DLLPOSTFIX).a \ + $(LB)$/libc5t_no_regallfkt$(DLLPOSTFIX).a \ + $(LB)$/libc5t_winstuff$(DLLPOSTFIX).a .ELSE APP1LIBS= \ - $(SOLARLIBDIR)$/c5t_no_regallfkt.lib \ - $(SOLARLIBDIR)$/c5t_testresult.lib -APP1LIBS += $(SOLARLIBDIR)$/c5t_winstuff.lib + $(SOLARLIBDIR)$/cppunit.lib \ + $(LB)$/c5t_testresult.lib \ + $(LB)$/c5t_no_regallfkt.lib \ + $(LB)$/c5t_winstuff.lib .ENDIF .ENDIF .IF "$(GUI)" == "OS2" APP1LIBS= \ - $(SOLARLIBDIR)$/c5t_no_regallfkt.lib \ - $(SOLARLIBDIR)$/c5t_testresult.lib + $(SOLARLIBDIR)$/cppunit.lib \ + $(LB)$/c5t_no_regallfkt.lib \ + $(LB)$/c5t_testresult.lib .ENDIF .IF "$(GUI)" == "UNX" APP1STDLIBS+= \ - $(SOLARLIBDIR)$/libc5t_testresult$(DLLPOSTFIX).a \ - $(SOLARLIBDIR)$/libc5t_no_regallfkt$(DLLPOSTFIX).a + $(LB)$/libc5t_testresult$(DLLPOSTFIX).a \ + $(LB)$/libc5t_no_regallfkt$(DLLPOSTFIX).a \ + $(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a .ENDIF # @@ -108,24 +107,24 @@ APP2OBJS= $(COMMON_OBJFILES) $(VERSIONINFO_OBJFILES) APP2STDLIBS=$(SALLIB) -APP2DEPN= -APP2LIBS= +APP2DEPN= +APP2LIBS= # ------------------------------------------------------------------ APP3TARGET= $(TARGET)_timeout -APP3OBJS= $(OBJ)$/getopt.obj $(OBJ)$/filehelper.obj $(OBJ)$/terminate.obj +APP3OBJS= $(OBJ)$/getopt.obj $(OBJ)$/filehelper.obj $(OBJ)$/terminate.obj APP3STDLIBS=$(SALLIB) -APP3DEPN= -APP3LIBS= +APP3DEPN= +APP3LIBS= .IF "$(GUI)" == "WNT" .IF "$(COM)" == "GCC" APP3STDLIBS+= \ - $(SOLARLIBDIR)$/libc5t_winstuff$(DLLPOSTFIX).a + $(LB)$/libc5t_winstuff$(DLLPOSTFIX).a .ELSE -APP3LIBS += $(SOLARLIBDIR)$/c5t_winstuff.lib +APP3LIBS += $(LB)$/c5t_winstuff.lib .ENDIF .ENDIF diff --git a/testshl2/source/testshl.cxx b/testshl2/source/testshl.cxx index bf44b3c4572f..eaeb1f9e5fbe 100644 --- a/testshl2/source/testshl.cxx +++ b/testshl2/source/testshl.cxx @@ -55,15 +55,15 @@ #include "testshl/log.hxx" #include "testshl/filehelper.hxx" #include "testshl/getopt.hxx" -#include "cppunit/result/outputter.hxx" -#include "cppunit/joblist.hxx" +#include "testshl/result/outputter.hxx" +#include "testshl/joblist.hxx" // #include <osl/time.h> using namespace std; -#include "cppunit/result/testshlTestResult.h" -#include "cppunit/result/emacsTestResult.hxx" +#include "testshl/result/testshlTestResult.h" +#include "testshl/result/emacsTestResult.hxx" // Prototype for signal handling void setSignalFilename(GetOpt & opt); diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java index 3a3c60b8146d..57582203fe2d 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponent.java +++ b/testtools/com/sun/star/comp/bridge/TestComponent.java @@ -495,6 +495,10 @@ public class TestComponent { return i_Struct; } + public int testPPCAlignment( long l1, long l2, int i1, long l3, int i2 ) throws com.sun.star.uno.RuntimeException { + return i2; + } + // Attributes public boolean getBool() throws com.sun.star.uno.RuntimeException { return _bool; diff --git a/testtools/qa/cli/makefile.mk b/testtools/qa/cli/makefile.mk index 181c28791e60..89e389de3104 100644 --- a/testtools/qa/cli/makefile.mk +++ b/testtools/qa/cli/makefile.mk @@ -38,7 +38,7 @@ PACKAGE = clitest #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = CLITest.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/testtools/qa/cliversioning/makefile.mk b/testtools/qa/cliversioning/makefile.mk index 70f535c341e1..1c0506786c42 100644 --- a/testtools/qa/cliversioning/makefile.mk +++ b/testtools/qa/cliversioning/makefile.mk @@ -41,7 +41,7 @@ PACKAGE = cliversion #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = VersionTestCase.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 45edf5f53392..cf286c30d16f 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -535,24 +535,28 @@ static sal_Bool performTest( bRet = check( equals( aData, aRet ) && equals( aData, aRet2 ) , "struct comparison test") && bRet; { - SmallStruct aIn(1, 2); - SmallStruct aOut = xLBT->echoSmallStruct(aIn); - bRet = check( memcmp(&aIn, &aOut, sizeof(SmallStruct)) == 0, "small struct test" ) && bRet; + SmallStruct aIn(1, 2); + SmallStruct aOut = xLBT->echoSmallStruct(aIn); + bRet = check( memcmp(&aIn, &aOut, sizeof(SmallStruct)) == 0, "small struct test" ) && bRet; } { - MediumStruct aIn(1, 2, 3, 4); - MediumStruct aOut = xLBT->echoMediumStruct(aIn); - bRet = check( memcmp(&aIn, &aOut, sizeof(MediumStruct)) == 0, "medium struct test" ) && bRet; + MediumStruct aIn(1, 2, 3, 4); + MediumStruct aOut = xLBT->echoMediumStruct(aIn); + bRet = check( memcmp(&aIn, &aOut, sizeof(MediumStruct)) == 0, "medium struct test" ) && bRet; } { - BigStruct aIn(1, 2, 3, 4, 5, 6, 7, 8); - BigStruct aOut = xLBT->echoBigStruct(aIn); - bRet = check( memcmp(&aIn, &aOut, sizeof(BigStruct)) == 0, "big struct test" ) && bRet; + BigStruct aIn(1, 2, 3, 4, 5, 6, 7, 8); + BigStruct aOut = xLBT->echoBigStruct(aIn); + bRet = check( memcmp(&aIn, &aOut, sizeof(BigStruct)) == 0, "big struct test" ) && bRet; } { - AllFloats aIn(1.1f, 2.2f, 3.3f, 4.4f); - AllFloats aOut = xLBT->echoAllFloats(aIn); - bRet = check( memcmp(&aIn, &aOut, sizeof(AllFloats)) == 0, "all floats struct test" ) && bRet; + AllFloats aIn(1.1f, 2.2f, 3.3f, 4.4f); + AllFloats aOut = xLBT->echoAllFloats(aIn); + bRet = check( memcmp(&aIn, &aOut, sizeof(AllFloats)) == 0, "all floats struct test" ) && bRet; + } + { + sal_Int32 i2 = xLBT->testPPCAlignment( 0, 0, 0, 0, 0xbeaf ); + bRet = check( i2 == 0xbeaf, "ppc-style alignment test" ) && bRet; } // Test extended attributes that raise exceptions: diff --git a/testtools/source/bridgetest/cli/cli_cs_testobj.cs b/testtools/source/bridgetest/cli/cli_cs_testobj.cs index 2f1c9dde78f6..0801eb95274f 100644 --- a/testtools/source/bridgetest/cli/cli_cs_testobj.cs +++ b/testtools/source/bridgetest/cli/cli_cs_testobj.cs @@ -247,6 +247,11 @@ public class BridgeTestObject : WeakBase, XRecursiveCall, XBridgeTest2 return arg; } + public int testPPCAlignment( long l1, long l2, int i1, long l3, int i2 ) + { + return i2; + } + // Attributes public bool Bool { diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 9a8a6508a069..f05bb8e1db2f 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -225,6 +225,8 @@ public: { return rStruct; } virtual AllFloats SAL_CALL echoAllFloats(const AllFloats& rStruct) throw(com::sun::star::uno::RuntimeException) { return rStruct; } + virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64, sal_Int32, sal_Int64, sal_Int32 i2 ) throw(com::sun::star::uno::RuntimeException) + { return i2; } virtual sal_Bool SAL_CALL getBool() throw(com::sun::star::uno::RuntimeException) { return _aData.Bool; } diff --git a/testtools/source/bridgetest/idl/bridgetest.idl b/testtools/source/bridgetest/idl/bridgetest.idl index 206956755ee1..be54e4e9d07e 100644 --- a/testtools/source/bridgetest/idl/bridgetest.idl +++ b/testtools/source/bridgetest/idl/bridgetest.idl @@ -269,6 +269,11 @@ interface XBridgeTestBase : com::sun::star::uno::XInterface */ AllFloats echoAllFloats( [in] AllFloats aStruct ); + /** + * register return test 4 (i107182) + */ + long testPPCAlignment( [in] hyper l1, [in] hyper l2, [in] long i1, [in] hyper l3, [in] long i2 ); + [attribute] boolean Bool; [attribute] byte Byte; [attribute] char Char; |