summaryrefslogtreecommitdiff
path: root/testautomation
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation')
-rwxr-xr-xtestautomation/global/required/includes/g_option.inc18
-rwxr-xr-x[-rw-r--r--]testautomation/global/sid/all.sid2
-rwxr-xr-x[-rw-r--r--]testautomation/global/sid/e_all.sid2
-rwxr-xr-xtestautomation/global/win/dial_p_s.win10
-rwxr-xr-xtestautomation/global/win/edia_d_h.win12
-rwxr-xr-xtestautomation/graphics/optional/includes/global/g_tools.inc18
-rwxr-xr-xtestautomation/graphics/optional/includes/global/id_006.inc4
-rwxr-xr-xtestautomation/graphics/required/includes/global/id_006.inc4
-rwxr-xr-xtestautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc6
-rwxr-xr-xtestautomation/writer/optional/includes/hyphenation/w_hyphenation.inc20
-rwxr-xr-xtestautomation/writer/optional/includes/regexp/search.inc4
-rwxr-xr-xtestautomation/writer/required/includes/w_007_.inc22
12 files changed, 62 insertions, 60 deletions
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index d590016bc8ba..0beb0b02a3ed 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -508,21 +508,21 @@ testcase tToolsOptionsLanguageSettings
Optionen.TypeKeys "<Down>", 6
WaitSlot() ' similar effect as a NOOP
OptionenBearbeiten.Click
- Kontext "SilbentrennungOptionen"
- Call DialogTest ( SilbentrennungOptionen )
- SilbentrennungOptionen.Cancel
+ Kontext "HyphenationOptions"
+ Call DialogTest ( HyphenationOptions )
+ HyphenationOptions.Cancel
Kontext "TabLinguistik"
Optionen.TypeKeys "<Down>"
OptionenBearbeiten.Click
- Kontext "SilbentrennungOptionen"
- Call DialogTest ( SilbentrennungOptionen )
- SilbentrennungOptionen.Cancel
+ Kontext "HyphenationOptions"
+ Call DialogTest ( HyphenationOptions )
+ HyphenationOptions.Cancel
Kontext "TabLinguistik"
Optionen.TypeKeys "<Down>"
OptionenBearbeiten.Click
- Kontext "SilbentrennungOptionen"
- Call DialogTest ( SilbentrennungOptionen )
- SilbentrennungOptionen.Cancel
+ Kontext "HyphenationOptions"
+ Call DialogTest ( HyphenationOptions )
+ HyphenationOptions.Cancel
endif
case 3,5 :
try
diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid
index 7c8f6618b059..e7a1d94c7d58 100644..100755
--- a/testautomation/global/sid/all.sid
+++ b/testautomation/global/sid/all.sid
@@ -481,7 +481,6 @@ FormatAusrichtung SID_ALIGN
' ****
' **** Alle
ExtrasRechtschreibungAutomatisch SID_AUTOSPELL_CHECK
-ExtrasSilbentrennung FN_HYPHENATE_OPT_DLG
ExtrasAutoKorrektur SID_AUTO_CORRECT_DLG
ExtrasMakro SID_BASICCHOOSER
ExtrasAnpassen SID_CONFIG
@@ -527,7 +526,6 @@ ExtrasAutoEingabe FID_AUTOCOMPLETE
' **** Draw / Impress
ExtrasThesaurusDraw SID_THESAURUS
-ExtrasSilbentrennungDraw SID_HYPHENATION
ExtrasPipette SID_BMPMASK
ExtrasDiawechsel .uno:SlideChangeWindow
ExtrasAnimation SID_ANIMATION_OBJECTS
diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid
index 82b161d7f51d..8083a6ebe727 100644..100755
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -735,6 +735,7 @@ ToolsUpdateAllIndexes FN_UPDATE_TOX
ToolsBibliographyDatabase SID_COMP_BIBLIOGRAPHY
ToolsWordCount FN_WORDCOUNT_DIALOG
TableTableProperties .uno:TableDialog
+ToolsLanguageHyphenation FN_HYPHENATE_OPT_DLG
' **** WriterWeb
ToolsPageFormatting FN_REPAGINATE
@@ -767,6 +768,7 @@ ToolsGallery .uno:Gallery
ToolsEyedropper SID_BMPMASK
ToolsMediaPlayer .uno:AVMediaPlayer
ToolsChineseTranslation .uno:ChineseConversion
+ToolsLanguageHyphenationDraw SID_HYPHENATION
' **** Math
ToolsSymbolsCatalog SID_SYMBOLS_CATALOGUE
diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win
index 30e5ae62e6e4..f165ccd0d2dc 100755
--- a/testautomation/global/win/dial_p_s.win
+++ b/testautomation/global/win/dial_p_s.win
@@ -234,16 +234,6 @@ FormatRTF sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_RTF
FormatStarWriter sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_SW
Datenbankfeldliste sw:ListBox:DLG_MAILMERGE:LB_COLUMN
-*Silbentrennung HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE
-Wort svx:Edit:RID_SVXDLG_HYPHENATE:ED_WORD
-Vor svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT
-Zurueck svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT
-Weiter svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE
-Entfernen svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE
-
-*SilbentrennungOptionen HID_LNGDLG_NUM_PREBREAK
-ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK
-
*Sonderzeichen SID_CHARMAP
Schrift cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT
SchriftListe HID_CHARMAP_CTL_SHOWSET
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index de1b69ab4429..a95bf2b755d4 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -467,3 +467,15 @@ 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
+
+*Hyphenation HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE
+Wort svx:Edit:RID_SVXDLG_HYPHENATE:ED_WORD
+Vor svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT
+Zurueck svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT
+Weiter svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE
+Entfernen svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE
+HyphenateAll svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL
+
+*HyphenationOptions HID_LNGDLG_NUM_PREBREAK
+ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK
+
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index 7602dc98a9af..fb5689429a18 100755
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -170,11 +170,11 @@ testcase tiToolsHyphenation1
printlog " - Hyphenation without any text"
Call hNewDocument '/// New impress document ///'
sleep 3
- ExtrasSilbentrennungDraw '/// Try Silbentrennung with empty document ///'
- Kontext "Silbentrennung"
- if Silbentrennung.Exists(1) = True Then
+ ToolsLanguageHyphenationDraw '/// Try with empty document ///'
+ Kontext "Hyphenation"
+ if Hyphenation.Exists(1) = True Then
Warnlog " - Dialog ist da"
- Silbentrennung.Cancel
+ Hyphenation.Cancel
else
Printlog " - Hyphenation activated"
end if
@@ -206,11 +206,11 @@ testcase tiToolsHyphenation1
endif
end select
hTypeKeys "<Home>"
- ExtrasSilbentrennungDraw '/// Try Silbentrennung ///'
- Kontext "Silbentrennung"
- if Silbentrennung.Exists =True Then
+ ToolsLanguageHyphenationDraw '/// Try ///'
+ Kontext "Hyphenation"
+ if Hyphenation.Exists =True Then
Warnlog "Dialog exists"
- Silbentrennung.Cancel
+ Hyphenation.Cancel
else
Kontext "Active"
if Active.Exists then Active.OK
@@ -281,7 +281,7 @@ testcase tiToolsHyphenation2
EditCopy
sDraw = GetClipboardText()
EditSelectAll '/// Select whole text ///'
- ExtrasSilbentrennungDraw '/// Run Hyphenation ///'
+ ToolsLanguageHyphenationDraw '/// Run Hyphenation ///'
gMouseClick 50,50
hTypeKeys "<MOD1 END><HOME><MOD1 SHIFT RIGHT>" '/// Select part of text and compare it with original text at this place ///'
sleep 3
diff --git a/testautomation/graphics/optional/includes/global/id_006.inc b/testautomation/graphics/optional/includes/global/id_006.inc
index fb774c22acb2..f3d1f44ea190 100755
--- a/testautomation/graphics/optional/includes/global/id_006.inc
+++ b/testautomation/graphics/optional/includes/global/id_006.inc
@@ -152,9 +152,9 @@ endcase
testcase tiToolsHyphenation
Call hNewDocument
- ExtrasSilbentrennungDraw
+ ToolsLanguageHyphenationDraw
WaitSlot (2000) 'sleep 2
- ExtrasSilbentrennungDraw
+ ToolsLanguageHyphenationDraw
Call hCloseDocument
endcase
diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc
index d7a3834f64b7..4c5921c5621d 100755
--- a/testautomation/graphics/required/includes/global/id_006.inc
+++ b/testautomation/graphics/required/includes/global/id_006.inc
@@ -178,10 +178,10 @@ testcase tiToolsHyphenation
'/// open application ///'
Call hNewDocument
'/// Tools->Hyphenation ///'
- ExtrasSilbentrennungDraw
+ ToolsLanguageHyphenationDraw
WaitSlot (2000) 'sleep 2
'/// Tools->Hyphenation ///'
- ExtrasSilbentrennungDraw
+ ToolsLanguageHyphenationDraw
'/// close application ///'
Call hCloseDocument
endcase
diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
index 21816865681f..ef0a96c954a5 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
@@ -195,14 +195,14 @@ testcase tToolsSpellcheck
'/// Click on 'Edit' – button
printlog " Click on 'Edit' – button"
OptionenBearbeiten.Click
- Kontext "SilbentrennungOptionen"
- Call DialogTest ( SilbentrennungOptionen )
+ Kontext "HyphenationOptions"
+ Call DialogTest ( HyphenationOptions )
'/// Decrease 'Minimal word length'
printlog " Decrease 'Minimal word length'"
ZeichenVorUmbruch.More
'/// Close dialog with 'Cancel'
printlog " Close dialog with 'Cancel'"
- SilbentrennungOptionen.Cancel
+ HyphenationOptions.Cancel
Kontext "TabLinguistik"
'/// Close dialog with 'Cancel'
printlog " Close dialog with 'Cancel'"
diff --git a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc
index 8b7296d1d5a4..d07f9983bdc9 100755
--- a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc
+++ b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc
@@ -179,9 +179,9 @@ testcase tHyphenation_3
printlog "Tools/Hyphenation"
ToolsLanguageHyphenate
- Kontext "Silbentrennung"
+ Kontext "Hyphenation"
- if Not Silbentrennung.Exists then
+ if Not Hyphenation.Exists then
Warnlog "Unable to bring up Dialog 'Hyphenation'!"
Call hCloseDocument
goto endsub
@@ -190,21 +190,21 @@ testcase tHyphenation_3
printlog "check if get 'fol=low-ing'"
if Wort.Gettext <> testWordInHyphenationDlg then
Warnlog "Expected " & testWordInHyphenationDlg & " but found " & Wort.Gettext
- Silbentrennung.Cancel
+ Hyphenation.Cancel
Call hCloseDocument
goto endsub
end if
if NOT Vor.IsEnabled then
Warnlog "the 'Vor' button is Not enabled, or something wrong!"
- Silbentrennung.Cancel
+ Hyphenation.Cancel
Call hCloseDocument
goto endsub
end if
printlog "add '-' between 'fol' and 'lowing' using left arrow key"
Vor.Click
- Silbentrennung.OK
+ Hyphenation.OK
' Messagebox 'Start hypheantion from the beginning ?
Kontext "Active"
@@ -291,9 +291,9 @@ testcase tHyphenation_4
printlog "Tools/Hyphenation"
ToolsLanguageHyphenate
- Kontext "Silbentrennung"
+ Kontext "Hyphenation"
- if Not Silbentrennung.Exists then
+ if Not Hyphenation.Exists then
Call hCloseDocument
goto endsub
end if
@@ -301,7 +301,7 @@ testcase tHyphenation_4
printlog "check if get 'fol=low-ing'"
if Wort.Gettext <> testWordInHyphenationDlg1 then
Warnlog "Expected " & testWordInHyphenationDlg1 & " but found " & Wort.Gettext
- Silbentrennung.Cancel
+ Hyphenation.Cancel
Call hCloseDocument
goto endsub
end if
@@ -309,7 +309,7 @@ testcase tHyphenation_4
printlog "click left arrow key"
if NOT Vor.IsEnabled then
Warnlog "the Vor button is Not enabled, or something wrong!"
- Silbentrennung.Cancel
+ Hyphenation.Cancel
Call hCloseDocument
goto endsub
end if
@@ -340,7 +340,7 @@ testcase tHyphenation_4
Sleep 1
printlog "close all dialogs"
- Silbentrennung.OK
+ Hyphenation.OK
' Messagebox 'Start hypheantion from the beginning ?
Kontext "Active"
diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc
index a450d6922742..a7cef4940f30 100755
--- a/testautomation/writer/optional/includes/regexp/search.inc
+++ b/testautomation/writer/optional/includes/regexp/search.inc
@@ -1190,7 +1190,7 @@ function wSelectAttributeName(aNumber as integer, AsianSupport as boolean, SetSt
Case 31
Select Case iSprache
- Case 49: aSelectIt = "Silbentrennung"
+ Case 49: aSelectIt = "Hyphenation"
Case else: Warnlog "Language not supported. No test"
exit function
end select
@@ -1469,7 +1469,7 @@ sub wCheckAttribute(aNumber as integer)
Case 28 '"Schriftstellung asiatische Schrift"
Case 29 '"Schusterjungen"
Case 30 '"Seitenvorlage"
- Case 31 '"Silbentrennung"
+ Case 31 '"Hyphenation"
Case 32 '"Skalierung"
Case 33 '"Sprache"
Case 34 '"Sprache asiatische Schrift"
diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc
index 056145bdbf37..3ca638fa16cf 100755
--- a/testautomation/writer/required/includes/w_007_.inc
+++ b/testautomation/writer/required/includes/w_007_.inc
@@ -161,9 +161,9 @@ testcase tToolsSpellcheck
if OptionenBearbeiten.IsEnabled then
OptionenBearbeiten.Click
wait 500
- Kontext "SilbentrennungOptionen"
- DialogTest ( SilbentrennungOptionen )
- SilbentrennungOptionen.Cancel
+ Kontext "HyphenationOptions"
+ DialogTest ( HyphenationOptions )
+ HyphenationOptions.Cancel
end if
next i
@@ -396,11 +396,11 @@ testcase tToolsHyphenation
end if
end if
- Kontext "Silbentrennung"
+ Kontext "Hyphenation"
printlog " Close upcoming 'Hyphenation' dialog"
- if Silbentrennung.Exists then
- Call DialogTest ( Silbentrennung )
- Silbentrennung.Cancel
+ if Hyphenation.Exists then
+ Call DialogTest ( Hyphenation )
+ Hyphenation.Cancel
else
Warnlog "Dialog 'Hyphenation' not up!"
Kontext "Active"
@@ -1300,11 +1300,11 @@ testcase tMasterDocToolsHyphenation
end if
end if
- Kontext "Silbentrennung"
+ Kontext "Hyphenation"
printlog " Close upcoming 'Hyphenation' dialog"
- if ( Silbentrennung.Exists( 2 ) ) then
- Call DialogTest ( Silbentrennung )
- Silbentrennung.Cancel
+ if ( Hyphenation.Exists( 2 ) ) then
+ Call DialogTest ( Hyphenation )
+ Hyphenation.Cancel
else
Warnlog "Dialog 'Hyphenation' not up!"
Kontext "Active"
generated by cgit (git 2.34.1) at 2025-03-09 18:35:50 +0000