cws tl79: merge with DEV300_m83

10 files changed, 206 insertions, 48 deletions

diff --git a/testautomation/global/input/officeinfo.txt b/testautomation/global/input/officeinfo.txt
index 92b4e492740d..430e4141e3dd 100644
--- a/testautomation/global/input/officeinfo.txt
+++ b/testautomation/global/input/officeinfo.txt
@@ -1,7 +1,5 @@
 [Current program versions]
-StarOffice=9
-StarSuite=9
-OpenOffice.org=3.1
-BrOffice.org=3.1
-Oracle Open Office=3.2
+OpenOffice.org=3.3
+BrOffice.org=3.3
+Oracle Open Office=3.3
 
diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc
new file mode 100644
index 000000000000..38af3edd28aa
--- /dev/null
+++ b/testautomation/global/required/includes/g_findbar.inc
@@ -0,0 +1,159 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' 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 : Update test for the findbar
+'*
+'\***********************************************************************
+
+testcase tUpdtFindBar()
+
+    ' This test is incomplete. It needs to be integrated into all update tests
+    ' and it needs to be added to the toolbar management functions
+
+    printlog( "Update test for the findbar" )
+
+    const TEST_STRING = "VCL Testtool"
+
+    select case( gApplication )
+    case "IMPRESS", "DRAW", "DATABASE"
+        kontext "FindBar"
+        if ( FindBar.exists() ) then
+            warnlog( "The FindBar should not be visible by default" )
+        endif
+    end select
+
+    hNewDocument()
+
+    kontext "FindBar"
+    if ( FindBar.exists() ) then
+
+        printlog( "FindBar has " & FindBar.getItemCount() & " items" )
+
+        printlog( "Insert text into search field" )
+        FindText.setText( TEST_STRING )
+
+        printlog( "Click <Find next> (down arrow)" )
+        DownSearch.click()
+
+        kontext "Active"
+        if ( Active.exists( 1 ) ) then
+            printlog( "Expected message: " & Active.getText()
+            call DialogTest( Active )
+
+            kontext "Active"
+            Active.ok()
+        else
+            warnlog( "Messagebox missing <No matches found>" )
+        endif
+
+        printlog( "Click <Find last> (up arrow)" )
+        kontext "FindBar"
+        UpSearch.click()
+
+        kontext "Active"
+        if ( Active.exists( 1 ) ) then
+            printlog( "Expected message: " & Active.getText()
+            call DialogTest( Active )
+
+            kontext "Active"
+            Active.ok()
+        else
+            warnlog( "Messagebox missing <No matches found>" )
+        endif
+
+        warnlog( "#i111984 - exclude <SearchDialog> button from testing" )
+        goto skip_SearchDialog
+
+            printlog( "Search dialog button may not be visible by default" )
+            kontext "FindBar"
+            if ( SearchDialog.exists() ) then
+                if ( SearchDialog.isVisible() ) then
+                    SearchDialog.click()
+                    warnlog( "Button <Search Dialog> is visible, it should be hidden by default" )
+                else
+                    printlog( "Button <Search Dialog> is hidden, good" )
+                endif
+            else
+                warnlog( "<Search Dialog> button should not be visible" )
+            endif
+
+            printlog( "Add <Search Dialog> button to toolbar" )
+            hToggleSearchDialog()
+
+            kontext "FindBar"
+            SearchDialog.click()
+
+            kontext "FindAndReplace"
+            if ( FindAndReplace.exists( 1 ) ) then
+                call DialogTest( FindAndReplace )
+
+                kontext "FindAndReplace"
+                if ( SearchFor.getSelText() = TEST_STRING ) then
+                    printlog( "Test string has been inserted into <SearchFor> Listbox. Good." )
+                else
+                    warnlog( "Search string should have been copied from findbar to search dialog" )
+                endif
+                FindAndReplace.close()
+            else
+                warnlog( "Dialog <Search And Replace> is missing" )
+            endif
+
+            printlog( "Remove <Search Dialog> button from toolbar" )
+            hToggleSearchDialog()
+            
+        skip_SearchDialog:
+
+    else
+        warnlog( "FindBar is not visible" )
+    endif
+
+    hCloseDocument()
+
+endcase
+
+'*******************************************************************************
+
+function hToggleSearchDialog()
+
+    printlog( "Make button <Search Dialog> visible via context menu" )
+
+    const MENU_VISIBLE_BUTTONS = 1
+    const MENU_SEARCH_AND_REPLACE = 4
+
+    kontext "FindBar"
+    FindBar.openContextMenu()
+    wait( 1000 )
+
+    hMenuSelectNr( MENU_VISIBLE_BUTTONS )
+    wait( 1000 )
+
+    hMenuSelectNr( MENU_SEARCH_AND_REPLACE )
+    wait( 1000 )
+
+end function
\ No newline at end of file
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 60f4e977337d..b14ceca82c9f 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -487,21 +487,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 8639bfa0f0b6..5ee1c157235f 100755..100644
--- a/testautomation/global/sid/all.sid
+++ b/testautomation/global/sid/all.sid
@@ -479,14 +479,12 @@ FormatAusrichtung SID_ALIGN
 ' ****
 ' **** Alle
 ExtrasRechtschreibungAutomatisch SID_AUTOSPELL_CHECK
-ExtrasSilbentrennung FN_HYPHENATE_OPT_DLG
 ExtrasAutoKorrektur SID_AUTO_CORRECT_DLG
 ExtrasMakro SID_BASICCHOOSER
 ExtrasAnpassen SID_CONFIG
 ExtrasOptionen SID_OPTIONS_TREEDIALOG
 
 ' **** Writer
-ExtrasThesaurusWriter FN_THESAURUS_DLG
 ExtrasKapitelnumerierung FN_NUMBERING_OUTLINE_DLG
 ExtrasZeilennumerierung FN_LINE_NUMBERING_DLG
 ExtrasSeitennummer FN_CHANGE_PAGENUM
@@ -505,7 +503,6 @@ ExtrasAktualisierenSeitenformatierung FN_REPAGINATE
 ExtrasSeitenformatierung FN_REPAGINATE
 
 ' **** Calc
-ExtrasThesaurusCalc SID_THESAURUS
 ExtrasDetektivAlleSpurenEntfernen SID_DETECTIVE_DEL_ALL
 ExtrasDetektivFuellModus SID_DETECTIVE_FILLMODE
 ExtrasDetektivSpurZumFehler SID_DETECTIVE_ADD_ERR
@@ -525,7 +522,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 de68cf13f79d..b9fa2d9c81e8 100755..100644
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -256,7 +256,7 @@ ViewSnapLinesFront SID_HELPLINES_FRONT
 ViewStatusBarVisible .uno:StatusBarVisible
 ViewShowImeStatusWindow .uno:ShowImeStatusWindow
 ViewShowRuler .uno:ShowRuler
-ViewTaskPane .uno:RightPane
+ViewTaskPane .uno:TaskPane
 ViewTaskSlide .uno:LeftPaneImpress
 ViewTitle SID_TITLE_MASTERPAGE
 ViewToolbarsOptionbar .uno:AvailableToolbars?Toolbar:string=optionsbar
@@ -414,6 +414,9 @@ FormatStylesLoad SID_TEMPLATE_LOAD
 FormatStylist SID_STYLE_DESIGNER
 FormatControl SID_FM_CTL_PROPERTIES
 FormatForm SID_FM_PROPERTIES
+FormatChangeCaseToSentence .uno:ChangeCaseToSentenceCase
+FormatChangeCaseCapitalizeEveryWord .uno:ChangeCaseToTitleCase
+FormatChangeCaseToggleCase .uno:ChangeCaseToToggleCase
 FormatChangeCaseUpper .uno:ChangeCaseToUpper
 FormatChangeCaseLower .uno:ChangeCaseToLower
 FormatChangeCaseHalfWidth .uno:ChangeCaseToHalfWidth
@@ -734,13 +737,13 @@ ToolsUpdateAllIndexes FN_UPDATE_TOX
 ToolsBibliographyDatabase SID_COMP_BIBLIOGRAPHY
 ToolsWordCount FN_WORDCOUNT_DIALOG
 TableTableProperties .uno:TableDialog
+ToolsLanguageHyphenation FN_HYPHENATE_OPT_DLG
 
 ' **** WriterWeb
 ToolsPageFormatting FN_REPAGINATE
 
 ' **** Calc
 ToolsSpellcheckAutoCheckCalc SID_AUTOSPELL_CHECK
-ToolsLanguageThesaurusCalc .uno:Thesaurus
 ToolsLanguageHyphenateCalc .uno:Hyphenate
 ToolsDetectiveRemoveAllTraces SID_DETECTIVE_DEL_ALL
 ToolsDetectiveFillMode SID_DETECTIVE_FILLMODE
@@ -766,6 +769,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/bars.win b/testautomation/global/win/bars.win
index dd65f825893d..525be7d897ca 100755
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -356,6 +356,13 @@ ExtrusionLightingFloater .uno:ExtrusionLightingFloater
 ExtrusionSurfaceFloater .uno:ExtrusionSurfaceFloater
 Extrusion3DColor .uno:Extrusion3DColor
 '-------------------------------------------------------------------------
+*FindBar   .HelpId:findbar
+'-------------------------------------------------------------------------
+FindText .uno:FindText
+DownSearch .uno:DownSearch
+UpSearch .uno:UpSearch
+SearchDialog   .uno:SearchDialog
+'-------------------------------------------------------------------------
 *Flowchart .HelpId:flowchartshapes
 '-------------------------------------------------------------------------
 Process .uno:FlowChartShapes.flowchart-process
diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win
index 6f76fe17b2bd..accef3714a3b 100755
--- a/testautomation/global/win/dial_p_s.win
+++ b/testautomation/global/win/dial_p_s.win
@@ -231,16 +231,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 cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD
-Vor cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT
-Zurueck cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT
-Weiter cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE
-Entfernen cui: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
@@ -341,9 +331,6 @@ Zusaetze sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE
 FilterkriterienMin sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA
 FilterergebnisMin sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA
 
-*SpracheAuswaehlen HID_THES_LANGUAGE
-Auswahl cui:ListBox:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE
-
 *StandardFilter SID_FILTER
 FeldName1 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1
 Feldname2 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2
diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win
index c37ad2512873..1f317fd412da 100755
--- a/testautomation/global/win/dial_t_z.win
+++ b/testautomation/global/win/dial_t_z.win
@@ -125,14 +125,6 @@ Umrandung   sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_BORDER
 Textmarken sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK
 Loeschen sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE
 
-*Thesaurus SID_THESAURUS
-Wort cui:ListBox:RID_SVXDLG_THESAURUS:LB_WORD
-Ersetzen cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL
-Bedeutung cui:ListBox:RID_SVXDLG_THESAURUS:LB_MEAN
-Synonym cui:ListBox:RID_SVXDLG_THESAURUS:LB_SYNON
-Nachschlagen cui:PushButton:RID_SVXDLG_THESAURUS:BTN_LOOKUP
-Sprache cui:PushButton:RID_SVXDLG_THESAURUS:BTN_LANGUAGE
-
 *Ueberblenden SID_POLYGON_MORPHING
 Attributierung sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES
 GleicheOrientierung sd:CheckBox:DLG_MORPH:CBX_ORIENTATION
@@ -170,10 +162,6 @@ Vorschau sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW
 *UndoRedoBox HID_SVXTBX_UNDO_REDO_CTRL
 UndoRedoList svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL
 
-*UrlOeffnen sfx2:ModalDialog:RID_URLOPEN
-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 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
 Linie2 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index 1dfc1699386d..11c76c491ae4 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -485,8 +485,20 @@ 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 cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD
+Vor cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT
+Zurueck cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT
+Weiter cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE
+Entfernen cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE
+HyphenateAll cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL   
+
+*HyphenationOptions HID_LNGDLG_NUM_PREBREAK
+ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK
+
 *HTMLImportOptions sc:ModalDialog:RID_SCDLG_TEXT_IMPORT_OPTIONS
 Automatic   sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_AUTOMATIC
 Custom   sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_CUSTOM
 CustomLanguage sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG
 DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE
+
diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win
index a53038e79394..670a872ac657 100755
--- a/testautomation/global/win/edia_t_z.win
+++ b/testautomation/global/win/edia_t_z.win
@@ -2,7 +2,7 @@
 TableWindow HID_CTL_TABLEEDIT
 Fieldname HID_TABDESIGN_NAMECELL
 FieldType HID_TABDESIGN_TYPECELL
-Description HID_TABDESIGN_COMMENTCELL
+Description HID_TABDESIGN_HELPTEXT
 
 *TablesFilter HID_DSADMIN_TABLE_SUBSCRIPTION
 Tables HID_DSADMIN_TABLE_SELECTOR
@@ -40,8 +40,8 @@ FinishBtn HID_DLGTABLE_CMDFINISH
 CancelBtn HID_DLGTABLE_CMDCANCEL
 
 ' not nice solved, but can't do better right now; complains -> TBO
-*Tasks sd:DockingWindow:FLT_RIGHT_PANE_DOCKING_WINDOW
-View HID_SD_TASK_PANE_VIEW_MENU
+*Tasks sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW
+View HID_TASKPANE_VIEW_MENU
 '? HID_SD_WIN_DOCUMENT
 ' Master Pages
 UsedInThisPresentationPreview HID_SD_TASK_PANE_PREVIEW_CURRENT
@@ -128,6 +128,13 @@ RecentFile HID_XML_FILTER_TEST_IMPORT_RECENT
 FixedRecentFile HID_XML_FILTER_TEST_IMPORT_RECENT_FILE
 CloseBtn HID_XML_FILTER_TEST_CLOSE
 
+*Thesaurus SID_THESAURUS
+CurrentWord cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD
+RecallCurrentWord cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT
+Alternatives HID_CT_THES_ALTERNATIVES
+ReplaceWith cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL
+Language cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE
+
 *TextImport SC:MODALDIALOG:RID_SCDLG_ASCII
 CharacterSet SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET
 Language sc:ListBox:RID_SCDLG_ASCII:LB_CUSTOMLANG