dba34a: pulled DEV300.m88

testautomation/global/win/dial_a_c.win

@@ -261,16 +261,6 @@ AnimationenZulassen sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED
 DiawechselAufHintergrund SD:CHECKBOX:DLG_START_PRESENTATION:CBX_CHANGE_PAGE
 PraesentationImmerImVordergrund sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP
 
-*BMPOptionen svtools:ModalDialog:DLG_EXPORT_PIX
-Farbaufloesung svtools:ListBox:DLG_EXPORT_PIX:LB_COLORS
-RLEKodierung svtools:CheckBox:DLG_EXPORT_PIX:CBX_RLE
-Original svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX
-Aufloesung svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX
-DPI svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX
-Groesse svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX
-Breite svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX
-Hoehe svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX
-
 *Browser SID_BROWSER
 
 *ChineseTranslation svx:CB_USE_VARIANTS:DLG_CHINESETRANSLATION

testautomation/global/win/dial_d_h.win

@@ -270,22 +270,6 @@ Titel SW:EDIT:DLG_FLD_INPUT:ED_LABEL
 EingabeText sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT
 Weiter SW:PUSHBUTTON:DLG_FLD_INPUT:PB_NEXT
 
-*EMFOptionen svtools:ModalDialog:DLG_EXPORT_VEC
-Original svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC
-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 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
 
@@ -403,14 +387,6 @@ Loeschen HID_FLDVAR_DELETE
 *Filterauswahl HID_DLG_FILTER_SELECT
 Filter uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS
 
-*FilterDlg svtools:ModalDialog:DLG_EXPORT_PIX
-Original svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX
-Aufloesung svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX
-Groesse svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX
-AufloesungDPI svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX
-Breite svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX
-Hoehe svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX
-
 *Fontwork SID_FONTWORK
 KreisAuswahl HID_FONTWORK_CTL_FORMS
 Aus HID_FONTWORK_TBI_STYLE_OFF
@@ -479,10 +455,6 @@ Aktualisieren HID_TEMPLDLG_UPDATEBYEXAMPLE
 Vorlagenliste HID_TEMPLATE_FMT
 Gruppenliste HID_TEMPLATE_FILTER
 
-*GifOptionen filter:ModalDialog:DLG_EXPORT_GIF
-Interlace filter:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED
-TransparentSpeichern filter:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT
-
 *GridControlDialogStarter ACTIVE
 ShowGridcontrol sym:showGridcontrol
 

testautomation/global/win/dial_i_o.win

@@ -105,11 +105,6 @@ Vorschau sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW
 
 +Interaktion TabInteraktion
 
-*JPEGOptionen svtools:ModalDialog:DLG_EXPORT_JPG
-Qualitaet svtools:NumericField:DLG_EXPORT_JPG:NUM_FLD_QUALITY
-Graustufen svtools:RadioButton:DLG_EXPORT_JPG:RB_GRAY
-Echtfarben svtools:RadioButton:DLG_EXPORT_JPG:RB_RGB
-
 *Kommentar HID_REDLINING_DLG
 KommentarText HID_REDLINING_EDIT
 Zurueck HID_REDLINING_PREV
@@ -259,12 +254,6 @@ 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 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
 Module HID_CLB_EDIT_MODULES_MODULES

testautomation/global/win/dial_p_s.win

@@ -19,25 +19,11 @@ SchutzAufheben HID_CHG_PROTECT
 PasswortEingabe sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER
 PasswortBestaetigen sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM
 
-*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 filter:ModalDialog:DLG_EXPORT_EPGM
-Binaer filter:RadioButton:DLG_EXPORT_EPGM:RB_RAW
-Ascii filter:RadioButton:DLG_EXPORT_EPGM:RB_ASCII
-
-*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
 Farbfeld HID_BMPMASK_CTL_PIPETTE
@@ -79,14 +65,6 @@ 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
-Interlaced svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED
-
-*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
 AngemeldeteDatenquelle sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_DATABASE
@@ -374,12 +352,6 @@ Persistent sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS
 
 +Stylist Gestalter
 
-*SVMOptionen svtools:ModalDialog:DLG_EXPORT_VEC
-Original svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC
-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
-
 *SymboleMath starmath:ModalDialog:RID_SYMBOLDIALOG
 Symbolset starmath:ListBox:RID_SYMBOLDIALOG:1
 Bearbeiten starmath:PushButton:RID_SYMBOLDIALOG:1

testautomation/global/win/dial_t_z.win

@@ -261,12 +261,6 @@ Neu sw:PushButton:DLG_BIB_BASE:PB_NEW
 Loeschen sw:PushButton:DLG_BIB_BASE:PB_DELETE
 Umbenennen sw:PushButton:DLG_BIB_BASE:PB_RENAME
 
-*WMFOptionen svtools:ModalDialog:DLG_EXPORT_VEC
-Original svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC
-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
-
 *Zahlenformat HID_NUMBERFORMAT
 Kategorie cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
 KategorieFormat HID_NUMBERFORMAT_LB_FORMAT

testautomation/global/win/edia_a_c.win

@@ -330,6 +330,16 @@ Custom3 HID_BIB_CUSTOM3_POS
 Custom4 HID_BIB_CUSTOM4_POS
 Custom5 HID_BIB_CUSTOM5_POS
 
+*BMPOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+Colordepth svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH
+Compression svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING
+
+
 *Breakpoints basctl:ModalDialog:RID_BASICIDE_BREAKPOINTDLG
 BreakpointsList basctl:ComboBox:RID_BASICIDE_BREAKPOINTDLG:RID_CB_BRKPOINTS
 NewButton basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_NEW

testautomation/global/win/edia_d_h.win

@@ -97,6 +97,24 @@ Modify starmath:PushButton:RID_SYMDEFINEDIALOG:2
 Delete starmath:PushButton:RID_SYMDEFINEDIALOG:3
 Symbols HID_SMA_CONTROL_FONTCHAR_VIEW
 
+*EMFOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+
+*EPSOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Preview svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF
+Epsi svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI
+Color svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1
+Greyscale svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2
+Level1 svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1
+Level2 svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2
+LZWEncoding svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW
+NoneCompression svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE
+
 *ExecuteSQLCommand dbaccess:ModalDialog:DLG_DIRECTSQL
 CommandToExecute dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL
 ExecuteBtn dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE
@@ -439,6 +457,15 @@ View HID_GALLERY_WINDOW
 *GalleryNewTitle HID_GALLERY_TITLE
 Title HID_GALLERY_TITLE_EDIT
 
+*GIFOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+Interlaced svtools:CheckBox:DLG_EXPORT:CB_INTERLACED
+Transparency svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY
+
 *HelpAgent HID_HELPAGENT_WINDOW
 
 *HangulHanjaConversion HID_DIALOG_HANGULHANJA

testautomation/global/win/edia_i_o.win

@@ -152,6 +152,15 @@ FielsInvolved HID_RELDLG_KEYFIELDS
 LeftFieldCell HID_RELATIONDIALOG_LEFTFIELDCELL
 RightFieldCell HID_RELATIONDIALOG_RIGHTFIELDCELL
 
+*JPGOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+Colordepth svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH
+Quality svtools:NumericField:DLG_EXPORT:NF_COMPRESSION
+
 *LabelFieldSelection extensions:ModalDialog:RID_DLG_SELECTLABELCONTROL
 
 *LicenseAgreementDialog HID_LICENSEDIALOG
@@ -226,6 +235,11 @@ PhoneBusiness HID_MM_HEADER_11
 Email HID_MM_HEADER_12
 Gender HID_MM_HEADER_13
 
+*METOptions   svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+
 *Mplayer HID_AVMEDIA_PLAYERWINDOW
 Mopen HID_AVMEDIA_TOOLBOXITEM_OPEN
 mInsert HID_AVMEDIA_TOOLBOXITEM_INSERT

testautomation/global/win/edia_p_s.win

@@ -25,6 +25,20 @@ OldPassword svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD
 NewPassword svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD
 Confirm svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD
 
+*PBMOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+QualityBinary svtools:RadioButton:DLG_EXPORT:RB_BINARY
+QualityText svtools:RadioButton:DLG_EXPORT:RB_TEXT
+
+*PCTOptions  svtools:ModalDialog:DLG_EXPORT
+ Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+ Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+ Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+
 *PDFOptions HID_FILTER_PDF_OPTIONS
 RangeAll filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL
 RangePages filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE
@@ -63,6 +77,34 @@ HideMenubar filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVMENUBAR
 HideToolbar filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR
 HideWindowControls filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL
 
+*PGMOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+QualityBinary svtools:RadioButton:DLG_EXPORT:RB_BINARY
+QualityText svtools:RadioButton:DLG_EXPORT:RB_TEXT
+
+*PNGOptions  svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+Compression svtools:NumericField:DLG_EXPORT:NF_COMPRESSION
+Interlaced svtools:CheckBox:DLG_EXPORT:CB_INTERLACED
+
+
+*PPMOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+QualityBinary svtools:RadioButton:DLG_EXPORT:RB_BINARY
+QualityText svtools:RadioButton:DLG_EXPORT:RB_TEXT
+
 *Posterize SID_GRFFILTER_POSTER
 PosterColors cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER
 
@@ -625,3 +667,7 @@ 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
 
+*SVMOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
\ No newline at end of file

testautomation/global/win/edia_t_z.win

@@ -236,6 +236,11 @@ NextBtn HID_FIRSTSTART_NEXT
 OKBtn HID_FIRSTSTART_FINISH
 CancelBtn HID_FIRSTSTART_CANCEL
 
+*WMFOptions svtools:ModalDialog:DLG_EXPORT
+Exportwidth svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight svtools:MetricField:DLG_EXPORT:MF_SIZEY
+
 *XFormAddInstance HID_XFORMS_ADDINSTANCE_DLG
 InstanceName svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME
 InstanceURL SID_OPENURL

testautomation/graphics/required/includes/global/id_opt_2.inc

@@ -64,39 +64,6 @@ testcase tToolsOptionsMeasurementUnit (sApplication as string)
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
 
-        FileExport
-        Kontext "ExportierenDlg"
-        Dateiname.SetText "adagio"
-        Dateityp.Select "BMP - Windows Bitmap (.bmp)"
-        if AutomatischeDateinamenserweiterung.Exists then
-            AutomatischeDateinamenserweiterung.Check
-        else
-            warnlog( "Automatic Filename Extension checkbox is mising" )
-        endif
-        Speichern.Click
-        kontext "AlienWarning"
-        if AlienWarning.exists(5) then
-            warnlog "#i41983# Alien Warning on export not allowed"
-            AlienWarning.OK
-        endif
-        Kontext "Messagebox"
-        if Messagebox.Exists(2) then
-           Messagebox.Yes
-        endif
-        Sleep 3
-        Kontext "BMPOptionen"
-            Groesse.Check
-                sUnitDialog = getMeasUnit(Breite.getText)   ' (2)
-                if (getMeasUnit(Hoehe.getText) <> sUnitDialog) then
-                    warnlog " Measurement Unit is different for Width:'" + sUnitDialog + "' and Hight:'" + getMeasUnit(Hoehe.getText) + "'"
-                else
-                    printlog "Measurement Unit is same for Width:'" + sUnitDialog + "' and Hight:'" + getMeasUnit(Hoehe.getText) + "'"
-                endif
-                if (sUnitOptions <> sUnitDialog) then
-                    printlog "#109705# Measurement Unit is different for Options:'" + sUnitOptions + "' and BMP Dialog:'" + sUnitDialog + "' (1) <> (2)"
-                endif
-        BMPOptionen.Cancel
-
         Format3D_Effects
         Kontext "Drei_D_Effekte"
         Geometrie.Click

testautomation/graphics/required/includes/impress/im_003_.inc

@@ -217,9 +217,14 @@ testcase tiViewToolbar_1
 
     printlog "open application "
     Call hNewDocument
-    
+
     printlog "use the empty layout"
-    call sSelectEmptyLayout
+    Call sSelectEmptyLayout
+
+    printlog "delete default content"
+    hUseAsyncSlot( "EditSelectAll" )
+    Kontext "DocumentImpress"
+    DocumentImpress.typeKeys("<DELETE>",true)
 
     printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp "
     hUseAsyncSlot( "InsertGraphicsFromFile" )

testautomation/graphics/tools/id_tools.inc

@@ -104,10 +104,10 @@ function LiberalMeasurement ( sShould$, sActual$) as Boolean
             printlog "took units from http://gsl.openoffice.org/source/browse/gsl/vcl/source/src/units.src"
             select case GetMeasUnit(sShould$)
             case "mm", "ミリ", "公厘" : iTolerance = 2.0             '01, 81,     88
-            case "cm","センチ","厘米","公分"  : iTolerance = 0.5       '01, 81, 86, 88
+            case "cm","セン?","厘米","公分"  : iTolerance = 0.5       '01, 81, 86, 88
             case chr$(34) : iTolerance = 2.5
             case "pi","ピクセル" : iTolerance = 2.5                 '01, 81
-            case "pt",  "ポイント" : iTolerance = 2.5                '01, 81
+            case "pt",  "?イント" : iTolerance = 2.5                '01, 81
             case "" : iTolerance = 1.5 ' cm is presubposition in old functions
             case else
                 iTolerance = 2.5
@@ -268,43 +268,49 @@ function fMakeDocumentWritable() as boolean
 end function
 
 '-------------------------------------------------------------------------------
-
 function fGetSizeXY (sX as string, sY as string, bGet as boolean) as Boolean
-   dim sTx as string
-   dim sTy as string
-   dim bReturn as boolean
-
-   bReturn = True
-   try
-      ContextPositionAndSize
-   catch
-      warnlog "couldn't call 'ContextPositionAndSize' no object selected ?"
-   endcatch
-   kontext
-   active.SetPage TabPositionAndSize
-   kontext "TabPositionAndSize"
-   if TabPositionAndSize.exists (5) then
-      sTx = Width.GetText
-      sTy = Height.GetText
-      TabPositionAndSize.OK
-   else
-      warnlog "Couldn't switch tab page :-( "
-   endif
-   if bGet then  ' Get the Values only
-      sY = sTy
-      sX = sTx
-   else          ' Get the Values and COMPARE them
-      if (LiberalMeasurement (sX,sTx) <> TRUE) then
-         warnlog "width is different :-( should: '"+sX+"' is: '"+sTx+"'" + "eventually a result of i35519"
-         bReturn = False
-      endif
-      if (LiberalMeasurement (sY,sTy) <> TRUE) then
-         warnlog "hight is different :-( should: '"+sY+"' is: '"+sTy+"'" + "eventually a result of i35519"
-         bReturn = False
-      endif
-      bGet = bReturn
-   endif
+    dim sTx as string
+    dim sTy as string
+    dim bReturn as boolean
+
+    bReturn = True
+    try
+        printlog "Trying to open Position and size Dialog.."
+        ContextPositionAndSize
+    catch
+        warnlog "couldn't call 'ContextPositionAndSize' no object selected ?"
+    endcatch
+    kontext
+    active.SetPage TabPositionAndSize
+    kontext "TabPositionAndSize"
+    printlog "Getting some sizes from Position and Size dialog."
+    if TabPositionAndSize.exists (5) then
+        sTx = Width.GetText
+        printlog "Width, sTx=" & sTx
+        sTy = Height.GetText
+        printlog "Height, sTy=" & sTy
+        TabPositionAndSize.OK
+    else
+        warnlog "Couldn't switch tab page :-( "
+    endif
+    if bGet then  ' Get the Values only
+        sY = sTy
+        printlog "sY=" & sY
+        sX = sTx
+        printlog "sX=" & sX
+    else          ' Get the Values and COMPARE them
+        if (LiberalMeasurement (sX,sTx) <> TRUE) then
+            warnlog "width is different :-( XXXXXXXXXXXXX should: '"+sX+"' is: '"+sTx+"'" + "eventually a result of i35519"
+            bReturn = False
+        endif
+        if (LiberalMeasurement (sY,sTy) <> TRUE) then
+            warnlog "hight is different :-( xxxxxxxxxxxx should: '"+sY+"' is: '"+sTy+"'" + "eventually a result of i35519"
+            bReturn = False
+        endif
+        bGet = bReturn
+    endif
 end function
+
 '-------------------------------------------------------------------------
 
 function hCallExport ( cFileName as String , sFilter as String, optional bSelection as boolean ) as Boolean