CWS-TOOLING: integrate CWS svxsplit

9 files changed, 45 insertions, 59 deletions

diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index d590016bc8ba..dcd623dbca04 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -614,11 +614,6 @@ testcase tToolsOptionsInternet
         gefunden = FALSE
         Kontext "OptionenDlg"
         Optionsliste.TypeKeys "<Down>"
-        Kontext "ProxyWarnung"
-        if ProxyWarnung.Exists(1) then
-            NichtMehrAnzeigen.Check
-            ProxyWarnung.OK
-        endif
 
         select case i
         case 1 :
diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid
index c22ff6975c02..1e3da63fd1ec 100644..100755
--- a/testautomation/global/sid/bars.sid
+++ b/testautomation/global/sid/bars.sid
@@ -133,7 +133,6 @@ OL_Objekt_SW_Hintergrundfarbe SID_BACKGROUND_COLOR
 OL_Objekt_SW_GanzNachVorn SID_FRAME_TO_TOP
 OL_Objekt_SW_GanzNachHinten SID_FRAME_TO_BOTTOM
 OL_Objekt_SW_Verankerungwechseln FN_TOOL_ANKER
-OL_Objekt_SW_GrafikBearbeiten SID_SIM_START
 OL_Objekt_SW_HorizontalSpiegeln FN_FLIP_HORZ_GRAFIC
 OL_Objekt_SW_VertikalSpiegeln FN_FLIP_VERT_GRAFIC
 OL_Objekt_SW_PositionUndGroesse SID_ATTR_TRANSFORM
diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc
index 6ba837d79f84..8d79cbda42cf 100755
--- a/testautomation/global/tools/includes/required/t_option.inc
+++ b/testautomation/global/tools/includes/required/t_option.inc
@@ -279,11 +279,6 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
                 Kontext "ExtrasOptionenDlg"
                 select case Tabpagename
                 case "PROXY"
-                    Kontext "ProxyWarnung"
-                    if ProxyWarnung.Exists then
-                        NichtMehrAnzeigen.Check
-                        ProxyWarnung.OK
-                    end if
                     Kontext "TabProxyServer"
                     if TabProxyServer.exists(2) then bCorPage = TRUE
                 case "SEARCH"
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 993ce8347d90..75c23a86f2cd 100755
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -591,7 +591,6 @@ EigenschaftenControls SID_SHOW_BROWSER
 EigenschaftenObjekt .uno:FrameDialog
 GanzNachHinten .uno:SendToBack
 GanzNachVorn .uno:BringToFront
-GrafikBearbeiten SID_SIM_START
 Hintergrundfarbe .uno:BackgroundColor
 Hintergrundmuster SID_BACKGROUND_PATTERN
 HorizontalSpiegeln FN_FLIP_HORZ_GRAFIC
@@ -671,7 +670,6 @@ Flaechenstil SID_ATTR_FILL_STYLE
 Gamma .uno:GrafGamma
 GanzNachHinten SID_FRAME_TO_BOTTOM
 GanzNachVorn SID_FRAME_TO_TOP
-GrafikBearbeiten SID_SIM_START
 GrafikEigenschaften FN_FORMAT_GRAFIC_DLG
 Grafikmodus .uno:GrafMode
 Gruenanteil .uno:GrafGreen
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index e7af03c506e6..48724c5eaa27 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -286,15 +286,15 @@ Groesse svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC
 Breite svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC
 Hoehe svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC
 
-*EPSOptionen goodies:ModalDialog:DLG_EXPORT_EPS
-VorschauTif goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF
-InterchangeEPSI goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI
-Level1 goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1
-Level2 goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2
-Farbe goodies:RadioButton:DLG_EXPORT_EPS:RB_COLOR
-Graustufen goodies:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE
-LZWKodierung goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW
-Keine goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE
+*EPSOptionen filter:ModalDialog:DLG_EXPORT_EPS
+VorschauTif filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF
+InterchangeEPSI filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI
+Level1 filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1
+Level2 filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2
+Farbe filter:RadioButton:DLG_EXPORT_EPS:RB_COLOR
+Graustufen filter:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE
+LZWKodierung filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW
+Keine filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE
 
 *EtikettenSynchronisieren HID_SYNC_BTN
 Synchronisieren SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC
@@ -489,9 +489,9 @@ Aktualisieren HID_TEMPLDLG_UPDATEBYEXAMPLE
 Vorlagenliste HID_TEMPLATE_FMT
 Gruppenliste HID_TEMPLATE_FILTER
 
-*GifOptionen goodies:ModalDialog:DLG_EXPORT_GIF
-Interlace goodies:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED
-TransparentSpeichern goodies:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT
+*GifOptionen filter:ModalDialog:DLG_EXPORT_GIF
+Interlace filter:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED
+TransparentSpeichern filter:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT
 
 *GroupingDlg HID_SC_DPDATEGROUP
 AutoStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART
diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win
index 629da180900d..aa965b42f51d 100755
--- a/testautomation/global/win/dial_i_o.win
+++ b/testautomation/global/win/dial_i_o.win
@@ -259,11 +259,11 @@ Vorgaben1 sc:ImageButton:RID_SCDLG_TABOP:RB_FORMULARANGE
 Vorgaben2 sc:ImageButton:RID_SCDLG_TABOP:RB_ROWCELL
 Vorgaben3 sc:ImageButton:RID_SCDLG_TABOP:RB_COLCELL
 
-*MetOptionen GOODIES:MODALDIALOG:DLG_EXPORT_EMET
-Original GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL
-Groesse GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE
-Breite GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX
-Hoehe GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY
+*MetOptionen FILTER:MODALDIALOG:DLG_EXPORT_EMET
+Original FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL
+Groesse FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE
+Breite FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX
+Hoehe FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY
 
 *ModuleBearbeiten HID_EDIT_MODULES
 Sprache cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE
diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win
index 30e5ae62e6e4..6f76fe17b2bd 100755
--- a/testautomation/global/win/dial_p_s.win
+++ b/testautomation/global/win/dial_p_s.win
@@ -15,24 +15,24 @@ SchutzAufheben HID_CHG_PROTECT
 PasswortEingabe sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER
 PasswortBestaetigen sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM
 
-*PBMOptionen goodies:ModalDialog:DLG_EXPORT_EPBM
-Binaer goodies:RadioButton:DLG_EXPORT_EPBM:RB_RAW
-Ascii goodies:RadioButton:DLG_EXPORT_EPBM:RB_ASCII
+*PBMOptionen filter:ModalDialog:DLG_EXPORT_EPBM
+Binaer filter:RadioButton:DLG_EXPORT_EPBM:RB_RAW
+Ascii filter:RadioButton:DLG_EXPORT_EPBM:RB_ASCII
 
 *PfadeAuswaehlen HID_MULTIPATH
 Pfade HID_OPTIONS_MULTIPATH_LIST
 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
-Ascii goodies:RadioButton:DLG_EXPORT_EPGM:RB_ASCII
+*PGMOptionen filter:ModalDialog:DLG_EXPORT_EPGM
+Binaer filter:RadioButton:DLG_EXPORT_EPGM:RB_RAW
+Ascii filter:RadioButton:DLG_EXPORT_EPGM:RB_ASCII
 
-*PICTOPtionen goodies:ModalDialog:DLG_EXPORT_EPCT
-Original goodies:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL
-Groesse goodies:RadioButton:DLG_EXPORT_EPCT:RB_SIZE
-Breite goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX
-Hoehe goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY
+*PICTOPtionen filter:ModalDialog:DLG_EXPORT_EPCT
+Original filter:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL
+Groesse filter:RadioButton:DLG_EXPORT_EPCT:RB_SIZE
+Breite filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX
+Hoehe filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY
 
 *Pipette SID_BMPMASK svx:DockingWindow:RID_SVXDLG_BMPMASK
 PipetteKnopf HID_BMPMASK_TBI_PIPETTE
@@ -79,12 +79,9 @@ Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS
 Kompression svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION
 Interlaced svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED
 
-*PPMOptionen goodies:ModalDialog:DLG_EXPORT_EPPM
-Binaer goodies:RadioButton:DLG_EXPORT_EPPM:RB_RAW
-Ascii goodies:RadioButton:DLG_EXPORT_EPPM:RB_ASCII
-
-*ProxyWarnung cui:ModalDialog:RID_OFADLG_OPTIONS_TREE_HINT
-NichtMehrAnzeigen cui:CheckBox:RID_OFADLG_OPTIONS_TREE_HINT:CB_DISABLE
+*PPMOptionen filter:ModalDialog:DLG_EXPORT_EPPM
+Binaer filter:RadioButton:DLG_EXPORT_EPPM:RB_RAW
+Ascii filter:RadioButton:DLG_EXPORT_EPPM:RB_ASCII
 
 *QuelleAuswaehlen HID_DATAPILOT_TYPE
 AktuelleSelektion sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_SELECTION
@@ -235,11 +232,11 @@ 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
+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
@@ -345,7 +342,7 @@ 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 svx:ListBox:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE
+Auswahl cui:ListBox:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE
 
 *StandardFilter SID_FILTER
 FeldName1 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1
diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win
index 5c52f92c1de4..e660fdaeaf96 100755
--- a/testautomation/global/win/dial_t_z.win
+++ b/testautomation/global/win/dial_t_z.win
@@ -142,12 +142,12 @@ Textmarken sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK
 Loeschen sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE
 
 *Thesaurus SID_THESAURUS
-Wort svx:ListBox:RID_SVXDLG_THESAURUS:LB_WORD
-Ersetzen svx:Edit:RID_SVXDLG_THESAURUS:ED_REPL
-Bedeutung svx:ListBox:RID_SVXDLG_THESAURUS:LB_MEAN
-Synonym svx:ListBox:RID_SVXDLG_THESAURUS:LB_SYNON
-Nachschlagen svx:PushButton:RID_SVXDLG_THESAURUS:BTN_LOOKUP
-Sprache svx:PushButton:RID_SVXDLG_THESAURUS:BTN_LANGUAGE
+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
diff --git a/testautomation/global/win/etab_p_s.win b/testautomation/global/win/etab_p_s.win
index 49a253bdb128..46f4a46b2f63 100755
--- a/testautomation/global/win/etab_p_s.win
+++ b/testautomation/global/win/etab_p_s.win
@@ -65,6 +65,8 @@ PrintOnly sc:CheckBox:RID_SCPAGE_PRINT:BTN_SELECTEDSHEETS
 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
+HttpsProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY
+HttpsPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_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