summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2010-09-17 15:22:21 +0200
committerHans-Joachim Lankenau <hjs@openoffice.org>2010-09-17 15:22:21 +0200
commitfbbe60b3c7abf363c9de533ba94199f4cd50c277 (patch)
treed9cc510d8cab1ca563f106212d8e301fc2e811ad
parent311f9a7d22aeeabc35df34d300ec5873a2779c60 (diff)
parentce884ce321e5e679afff9e0a926dafe4617e8b0c (diff)
CWS-TOOLING: integrate CWS impress186ooo/DEV300_m88
-rwxr-xr-xtestautomation/global/win/dial_a_c.win10
-rwxr-xr-xtestautomation/global/win/dial_d_h.win28
-rwxr-xr-xtestautomation/global/win/dial_i_o.win11
-rwxr-xr-xtestautomation/global/win/dial_p_s.win28
-rwxr-xr-xtestautomation/global/win/dial_t_z.win6
-rwxr-xr-xtestautomation/global/win/edia_a_c.win10
-rwxr-xr-xtestautomation/global/win/edia_d_h.win27
-rwxr-xr-xtestautomation/global/win/edia_i_o.win14
-rwxr-xr-x[-rw-r--r--]testautomation/global/win/edia_p_s.win46
-rwxr-xr-xtestautomation/global/win/edia_t_z.win5
-rw-r--r--testautomation/graphics/optional/includes/global/export_graphic.inc197
-rw-r--r--testautomation/graphics/optional/includes/global/export_graphic_2.inc652
-rw-r--r--testautomation/graphics/required/includes/global/id_opt_2.inc33
-rw-r--r--testautomation/graphics/tools/id_tools.inc80
14 files changed, 494 insertions, 653 deletions
diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win
index dfb4686ad..18f695c91 100755
--- a/testautomation/global/win/dial_a_c.win
+++ b/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
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index ab6183ad7..af40d36b2 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/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
diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win
index aa965b42f..9b100efec 100755
--- a/testautomation/global/win/dial_i_o.win
+++ b/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
diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win
index 84d1978a3..3aebf3710 100755
--- a/testautomation/global/win/dial_p_s.win
+++ b/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
diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win
index 1f317fd41..4cec83ed5 100755
--- a/testautomation/global/win/dial_t_z.win
+++ b/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
diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win
index a062d5db9..717bf83ed 100755
--- a/testautomation/global/win/edia_a_c.win
+++ b/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
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index 19ba11ec6..6b4f2f41c 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/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
diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win
index c2353a085..61cea83b3 100755
--- a/testautomation/global/win/edia_i_o.win
+++ b/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
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index a97b3b3ed..dfba150f0 100644..100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/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
diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win
index 4e3e0cd2a..79297769c 100755
--- a/testautomation/global/win/edia_t_z.win
+++ b/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
diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc
index fd2cf45f9..f4c34ec36 100644
--- a/testautomation/graphics/optional/includes/global/export_graphic.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic.inc
@@ -43,34 +43,24 @@ testcase tEPS
hFileOpen( gTesttoolPath + "graphics\required\input\graphicexport." + ExtensionString )
if ( hCallExport ( OutputGrafikTBO , sFilter ) ) then
- Kontext "EPSOptionen"
- if ( EPSOptionen.Exists( 2 ) ) then
+ Kontext "EPSOptions"
+ if ( EPSOptions.Exists( 2 ) ) then
printlog "check if all properties have the right count, and depend on each other"
- ' they do not affect annything, i can check (TBO)
- ' VorschauTIF.Check
- ' InterchangeEPSI.Check
+
Level1.Check
- if Farbe.IsEnabled then warnlog " :-("
- if Graustufen.IsEnabled then warnlog " :-("
- if LZWKodierung.IsEnabled then warnlog " :-("
- if Keine.IsEnabled then warnlog " :-("
- ' if (TextEinstellungen.IsEnabled <> TRUE) then warnlog " :-("
+ if Color.IsEnabled then warnlog " :-("
+ if Greyscale.IsEnabled then warnlog " :-("
+ if LZWEncoding.IsEnabled then warnlog " :-("
+ if NoneCompression.IsEnabled then warnlog " :-("
+
Level2.Check
- if (Farbe.IsEnabled <> TRUE) then warnlog " :-("
- if (Graustufen.IsEnabled <> TRUE) then warnlog " :-("
- if (LZWKodierung.IsEnabled <> TRUE) then warnlog " :-("
- if (Keine.IsEnabled <> TRUE) then warnlog " :-("
- ' if (TextEinstellungen.IsEnabled <> TRUE) then warnlog " :-("
- printlog "'Color Resolution' listbox contains eight items"
- ' x = TextEinstellungen.GetItemCount
- ' if x <> 2 then warnlog "'TextEinstellungen' Count is wrong; should:2, is:" + x
- ' for i = 1 to x
- ' TextEinstellungen.Select i
- ' sleep 1
- ' Printlog " - " + i + ": '" +TextEinstellungen.GetSelText + "'"
- ' next i
+ if (Color.IsEnabled <> TRUE) then warnlog " :-("
+ if (Greyscale.IsEnabled <> TRUE) then warnlog " :-("
+ if (LZWEncoding.IsEnabled <> TRUE) then warnlog " :-("
+ if (NoneCompression.IsEnabled <> TRUE) then warnlog " :-("
+
printlog "leave dialog with cancel -> there has to be no file created!"
- hCloseDialog( EPSOptionen, "cancel" )
+ hCloseDialog( EPSOptions, "cancel" )
if ( FileExists( OutputGrafikTBO+sExt ) ) then ' inspired by bug #99932 Graphic is exported though cancel is pressed
warnlog "Dialog was canceled, but file got saved, too :-( - i35177"
@@ -89,10 +79,9 @@ testcase tEPS
printlog( "Save the file" )
if ( hCallExport( OutputGrafikTBO, sFilter ) ) then
- Kontext "EPSOptionen"
- if ( EPSOptionen.Exists( 2 ) ) then
- printlog "TextEinstellungen.select 2"
- hCloseDialog( EPSOptionen, "ok" )
+ Kontext "EPSOptions"
+ if ( EPSOptions.Exists( 2 ) ) then
+ hCloseDialog( EPSOptions, "ok" )
else
warnlog( "No export options dialog was displayed" )
endif
@@ -127,24 +116,13 @@ testcase tPCT
printlog "open the document"
sDocument = convertpath( gTesttoolPath + "graphics\required\input\graphicexport." + ExtensionString )
hFileOpen( sDocument )
-
+ printlog "----------1st: Trying export and canceling it."
if ( hCallExport( OutputGrafikTBO , sFilter ) ) then
-
- Kontext "PICTOptionen"
+ Kontext "PCTOptions"
printlog( "Export options dialog" )
- if ( PICTOptionen.Exists( 2 ) ) then
-
- printlog "check if all properties have the right count, and depend on each other"
- Original.Check
- if Breite.IsEnabled then warnlog " :-("
- if Hoehe.IsEnabled then warnlog " :-("
- Groesse.Check
- Breite.More
- Hoehe.Less
-
+ if PCTOptions.Exists(2) then
printlog "leave dialog with cancel -> there has to be no file created!"
- hCloseDialog( PICTOptionen, "cancel" )
-
+ hCloseDialog( PCTOptions, "cancel" )
if ( FileExists( OutputGrafikTBO + sExt ) ) then
warnlog( "#i35177# - dialog <PictOptions> canceled, still the file was saved" )
endif
@@ -157,33 +135,25 @@ testcase tPCT
Warnlog " '" + sFilter + "' has a problem"
Active.OK
end if
-
end if
- printlog " now save it realy and load the file afterwards"
+ printlog "----------2nd: now save it really and load the file afterwards"
if ( hCallExport( OutputGrafikTBO, sFilter ) ) then
- Kontext "PICTOptionen"
+ Kontext "PCTOptions"
printlog( "Export options dialog" )
- if ( PICTOptionen.Exists( 2 ) ) then
- Groesse.Check
- Breite.Less
- Hoehe.More
- hCloseDialog( PICTOptionen, "ok" )
+ if ( PCTOptions.Exists( 2 ) ) then
+ hCloseDialog( PCTOptions, "ok" )
else
warnlog( "No export options dialog was displayed" )
endif
-
sOutputFile = OutputGrafikTBO+sExt
-
if ( hWaitForOutputFile( sOutputFile ) ) then
-
- printlog( "Close file and re-insert graphics into new document" )
+ printlog "Close file and re-insert graphics into new document"
hInsertGraphicsToNewFile( sOutputFile ) ' local helper function, see bottom of this file
else
warnlog( "File was not saved: " & sOutputFile )
endif
-
endif
hFileReOpen( sDocument )
@@ -197,16 +167,16 @@ testcase tPCT
endif
endif
+ printlog "----------3rd: exporting part of the picture and inserting into new file."
hTypeKeys ("<escape><tab>")
fGetSizeXY sx1, sY, TRUE
if ( hCallExport( OutputGrafikTBO + "1", sFilter, TRUE ) ) then
- Kontext "PICTOptionen"
+ Kontext "PCTOptions"
printlog( "Export options dialog" )
- if ( PICTOptionen.Exists( 2 ) ) then
- Original.Check
- hCloseDialog( PICTOptionen, "ok" )
+ if ( PCTOptions.Exists( 2 ) ) then
+ hCloseDialog( PCTOptions, "ok" )
else
warnlog( "No export options dialog was displayed" )
endif
@@ -226,22 +196,29 @@ testcase tPCT
endif
hFileReOpen( "" )
+ printlog "----------4th: exporting rectangle and reload file."
hRechteckErstellen ( 10, 10, 30, 40 )
if ( hCallExport( OutputGrafikTBO + "2" , sFilter, TRUE ) ) then
- Kontext "PICTOptionen"
+ Kontext "PCTOptions"
printlog( "Export options dialog" )
- if ( PICTOptionen.Exists( 2 ) ) then
- Groesse.Check
- Breite.SetText "9"
- Hoehe.SetText "9"
- Groesse.Check
-
- printlog "Check 'Size' one more time to make the change go through"
- sx1 = Breite.GetText
- sY = Hoehe.GetText
- hCloseDialog( PICTOptionen, "ok" )
+ if ( PCTOptions.Exists( 2 ) ) then
+ Exportwidth.SetText "9"
+ if Exportmeasurement.GetSelText = "inches" then
+ sx1 = (Exportwidth.GetText)+ """"
+ printlog "sx1= " & sx1
+ else
+ sx1 = (Exportwidth.GetText)+ "cm"
+ endif
+
+ if Exportmeasurement.GetSelText = "inches" then
+ sY = (Exportheight.GetText)+ """"
+ printlog "sY= " & sY
+ else
+ sY = (Exportheight.GetText)+ "cm"
+ endif
+ hCloseDialog( PCTOptions, "ok" )
else
warnlog( "No export options dialog was displayed" )
endif
@@ -262,34 +239,6 @@ testcase tPCT
if ( not bTemp ) then warnlog "Selected original size NOT OK :-("
endif
- if ( hCallExport( OutputGrafikTBO + "3", sFilter, TRUE ) ) then
-
- Kontext "PICTOptionen"
- printlog( "Export options dialog" )
- if ( PICTOptionen.Exists( 2 ) ) then
- Groesse.Check
- sX2 = Breite.GetText
- if (LiberalMeasurement(sx1, sX2)) <> TRUE then
- if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
- Printlog "Width was ok. Expected: " + sx1 + "' was: '" + sX2 + "'"
- else
- warnLog "Width is different expected: '" + sx1 + "' is: '" + sX2 + "'"
- endif
- endif
- sY2 = Hoehe.GetText
- if (LiberalMeasurement(sY, sY2)) <> TRUE then
- if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
- Printlog "Height was ok. Expected: " + sY + "' was: '" + sY2 + "'"
- else
- warnLog "Height is different expected: '" + sY + "' is: '" + sY2 + "'"
- endif
- endif
- hCloseDialog( PICTOptionen, "cancel" )
- else
- warnlog( "No export options dialog was displayed" )
- endif
- endif
-
call hCloseDocument
endcase 'tPCT
@@ -305,15 +254,17 @@ testcase tPBM
printlog "Save it"
if ( hCallExport (OutputGrafikTBO , sFilter ) ) then
- Kontext "PBMOptionen"
- if ( PBMOptionen.Exists( 2 ) ) then
- Ascii.Check
- hCloseDialog( PBMOptionen, "ok" )
+ Kontext "PBMOptions"
+ if ( PBMOptions.Exists( 2 ) ) then
+ QualityBinary.Check
+ QualityText.Check
+ hCloseDialog( PBMOptions, "ok" )
else
warnlog( "No export options dialog was displayed" )
endif
printlog( "Close file and re-insert graphics into new document" )
+ sleep (1)
hInsertGraphicsToNewFile( OutputGrafikTBO + sExt ) ' local helper function, see bottom of this file
endif
@@ -333,10 +284,11 @@ testcase tPGM
printlog "Save it"
if ( hCallExport (OutputGrafikTBO , sFilter ) ) then
- Kontext "PGMOptionen"
- if ( PGMOptionen.Exists( 2 ) ) then
- Ascii.Check
- hCloseDialog( PGMOptionen, "ok" )
+ Kontext "PGMOptions"
+ if ( PGMOptions.Exists( 2 ) ) then
+ QualityBinary.Check
+ QualityText.Check
+ hCloseDialog( PGMOptions, "ok" )
else
warnlog( "No export options dialog was displayed" )
endif
@@ -361,10 +313,11 @@ testcase tPPM
printlog "Save it"
if ( hCallExport (OutputGrafikTBO , sFilter ) ) then
- Kontext "PPMOptionen"
- if ( PPMOptionen.Exists( 2 ) ) then
- Ascii.Check
- hCloseDialog( PPMOptionen, "ok" )
+ Kontext "PPMOptions"
+ if ( PPMOptions.Exists( 2 ) ) then
+ QualityBinary.Check
+ QualityText.Check
+ hCloseDialog( PPMOptions, "ok" )
else
warnlog( "No export options dialog was displayed" )
endif
@@ -452,16 +405,17 @@ testcase tGIF
printlog "save it"
if ( hCallExport( OutputGrafikTBO, sFilter ) ) then
- Kontext "GIFOptionen"
- if GIFOptionen.Exists (2) then
- Interlace.Uncheck
- TransparentSpeichern.UnCheck
- hCloseDialog( GIFOptionen, "ok" )
+ Kontext "GIFOptions"
+ if GIFOptions.Exists (2) then
+ Interlaced.Uncheck
+ Transparency.UnCheck
+ hCloseDialog( GIFOptions, "ok" )
else
warnlog( "No export options dialog was displayed" )
endif
printlog( "Close file and re-insert graphics into new document" )
+ sleep (1)
hInsertGraphicsToNewFile( OutputGrafikTBO + sExt ) ' local helper function, see bottom of this file
endif
@@ -481,11 +435,10 @@ testcase tJPEG
printlog " save it "
if ( hCallExport( OutputGrafikTBO , sFilter ) ) then
- Kontext "JpegOptionen"
- if ( JpegOptionen.Exists( 2 ) ) then
- Echtfarben.Check
- Qualitaet.ToMin
- hCloseDialog( JpegOptionen, "ok" )
+ Kontext "JPGOptions"
+ if ( JPGOptions.Exists( 2 ) ) then
+ Quality.ToMin
+ hCloseDialog( JPGOptions, "ok" )
else
warnlog( "No export options dialog was displayed" )
endif
@@ -502,7 +455,7 @@ endcase 'tJPEG
'*******************************************************************************
function hInsertGraphicsToNewFile( sOutputFile as string )
-
+ sleep (1)
if ( FileExists( sOutputFile ) ) then
hFileReOpen( "" )
Call hGrafikEinfuegen( sOutputFile )
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index 5e0a2f3ec..3beefb13d 100644
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -44,13 +44,13 @@ testcase tPNG
hFileOpen( gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString )
if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
- Kontext "PNGOptionen"
- if PNGOptionen.Exists (2) then
- Kompression.ToMax
+ Kontext "PNGOptions"
+ if PNGOptions.Exists (2) then
+ Compression.ToMax
Interlaced.UnCheck
- PNGOptionen.OK
+ PNGOptions.OK
iWaitIndex = 0
- do while PNGOptionen.Exists AND iWaitIndex < 30
+ do while PNGOptions.Exists AND iWaitIndex < 30
sleep (1)
iWaitIndex = iWaitIndex + 1
loop
@@ -87,25 +87,19 @@ testcase tSVM
sFilter = "SVM - StarView Metafile (.svm)"
sExt = ".svm"
-
+ printlog "opening test file"
sDocument = ConvertPath ( gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString)
hFileOpen sDocument
+ printlog "Trying export and canceling it.."
if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Original.Check
- if Breite.IsEnabled then
- warnlog " :-("
- endif
- if Hoehe.IsEnabled then
- warnlog " :-("
- endif
- Groesse.Check
- Breite.More
- Hoehe.Less
- SVMOptionen.Cancel
+ Kontext "SVMOptions"
+ if SVMOptions.Exists (2) then
+ Exportwidth.More
+ Exportheight.Less
+ SVMOptions.Cancel
sleep 5
+ printlog "Checking if directory is still empty.."
if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
Printlog "ok :-)"
else
@@ -122,13 +116,14 @@ testcase tSVM
Active.OK
end if
end if
+
+ printlog "Doing real SVM export."
if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Groesse.Check
- Breite.Less
- Hoehe.More
- SVMOptionen.OK
+ Kontext "SVMOptions"
+ if SVMOptions.Exists (2) then
+ Exportwidth.Less
+ Exportheight.More
+ SVMOptions.OK
sleep 5
endif
if ( dir(OutputGrafikTBO+sExt) <> "") then
@@ -136,56 +131,77 @@ testcase tSVM
else
warnlog "File didn't get saved :-("
endif
- hCloseDocument ()
- sleep 5
- hNewDocument()
- sleep 5
- Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
endif
+ printlog "Closing TestDoc."
hCloseDocument ()
+ sleep 5
+ printlog "Opening new doc and inserting exported file."
+ hNewDocument()
+ sleep 5
+ Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
+ printlog "Closing doc with inserted file."
+ hCloseDocument ()
+
+ printlog "Loading testdoc."
hFileOpen (sDocument)
sleep (10)
-
+ printlog "Making doc editable."
call fMakeDocumentWritable
-
+ printlog "Selecting part of doc."
hTypeKeys ("<escape><tab>")
+ printlog "getting size of part. "
fGetSizeXY sx1, sY, TRUE
+ printlog "exporting part of doc."
if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Original.Check
- SVMOptionen.OK
- sleep 5
- endif
+ Kontext "SVMOptions"
+ SVMOptions.OK
+ sleep 5
if ( dir(OutputGrafikTBO & "1" & sExt) <> "") then
Printlog "Ok :-) Saved as: '" & OutputGrafikTBO & "1" & sExt & "'"
else
warnlog "File didn't get saved :-("
endif
+ printlog "Closing testdoc."
hCloseDocument ()
sleep 5
+ printlog "Opening new doc."
hNewDocument()
sleep 5
+ printlog "Inserting exported part of Testdoc."
Call hGrafikEinfuegen ( OutputGrafikTBO & "1" & sExt )
bTemp = FALSE
+ printlog "checking size of inserted file."
fGetSizeXY sx1, sY, bTemp
if (bTemp = FALSE) then
warnlog "Selected original size NOT OK :-("
endif
endif
+ printlog "closing doc."
hCloseDocument ()
+
+ printlog "opening new doc."
hNewDocument()
+ printlog "inserting Rectangle."
hRechteckErstellen ( 10, 10, 30, 40 )
+ printlog "Exporting Rectangle"
if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Groesse.Check
- Breite.SetText "9"
- Hoehe.SetText "9"
- Groesse.Check 'Check to make settings go throught
- sx1 = Breite.GetText
- sY = Hoehe.GetText
- SVMOptionen.OK
+ Kontext "SVMOptions"
+ if SVMOptions.Exists (2) then
+ Exportwidth.SetText "9"
+ if Exportmeasurement.GetSelText = "inches" then
+ sx1 = (Exportwidth.GetText)+ """"
+ printlog "sx1= " & sx1
+ else
+ sx1 = (Exportwidth.GetText)+ "cm"
+ endif
+
+ if Exportmeasurement.GetSelText = "inches" then
+ sY = (Exportheight.GetText)+ """"
+ printlog "sY= " & sY
+ else
+ sY = (Exportwidth.GetText)+ "cm"
+ endif
+ SVMOptions.OK
sleep 5
endif
if ( dir(OutputGrafikTBO & "2" & sExt) <> "") then
@@ -193,8 +209,10 @@ testcase tSVM
else
warnlog "File didn't get saved :-("
endif
+ printlog "Closing doc."
hCloseDocument ()
sleep 5
+ printlog "Opening exported rectangle."
hFileOpen (OutputGrafikTBO & "2" & sExt)
kontext "Filterauswahl"
if Filterauswahl.exists then
@@ -204,6 +222,7 @@ testcase tSVM
endif
kontext "DocumentDraw"
DocumentDraw.TypeKeys ("<escape><tab>")
+ printlog "Selecting and checking size.."
ContextOriginalSize
bTemp = FALSE
fGetSizeXY sx1, sY, bTemp
@@ -211,31 +230,8 @@ testcase tSVM
warnlog "Selected original size NOT OK :-("
endif
endif
- if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Groesse.Check
- sX2 = Breite.GetText
- if (LiberalMeasurement(sx1, sX2)) <> TRUE then
- if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
- Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'"
- else
- warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'"
- endif
- endif
- sY2 = Hoehe.GetText
- if (LiberalMeasurement(sY, sY2)) <> TRUE then
- if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
- Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'"
- else
- warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'"
- endif
- endif
- SVMOptionen.Cancel
- sleep 5
- endif
- endif
+ printlog "Closing doc."
call hCloseDocument
endcase 'tSVM
@@ -657,7 +653,7 @@ endcase 'tSVG
'-------------------------------------------------------------------------------
testcase tBMP
-qaerrorlog
+
dim x as integer
dim i as integer
dim bTemp as boolean
@@ -668,50 +664,24 @@ qaerrorlog
dim sY2 as string
dim sDocument as string
- '/// open the document
+ printlog "open the Test-document"
sDocument = ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString)
hFileOpen sDocument
- if hCallExport (OutputGrafikTBO , "BMP - Windows Bitmap (.bmp)" ) = TRUE then
- Kontext "BMPOptionen"
- if BMPOptionen.Exists (2) then
- '/// check if all properties have the right count, and depend on each other ///'
- '/// 'Color Resolution' listbox contains eight items ///'
- x = Farbaufloesung.GetItemCount
- if x <> 8 then warnlog "Color Resolution Count is wrong; should be:8, is:" + x
+ printlog "Trying to export and canceling.."
+ if hCallExport (OutputGrafikTBO , "BMP - Windows Bitmap (.bmp)" ) = TRUE then
+ Kontext "BMPOptions"
+ if BMPOptions.Exists (2) then
+ x = Colordepth.GetItemCount
+ if x <> 7 then warnlog "Color Resolution Count is wrong; should be:7, is:" + x
for i = 1 to x
- Farbaufloesung.Select i
+ Colordepth.Select i
sleep 1
- Printlog " - " + i + ": '" +Farbaufloesung.GetSelText + "'"
- '/// checkbox RLE coding has to be enabled only for '4 and 8 bit' color palettes ///'
- if ((i > 3) AND (i < 8)) then
- if RLEKodierung.IsEnabled <> TRUE then warnlog "'RLE coding' is not checkable :-("
- else
- if RLEKodierung.IsEnabled <> FALSE then warnlog "'RLE coding' is checkable :-("
- endif
+ Printlog " - " + i + ": '" +Colordepth.GetSelText + "'"
next i
- '/// if Mode 'original' is selected, DPI///'
- Original.Check
- if DPI.IsEnabled then warnlog " :-("
- if Breite.IsEnabled then warnlog " :-("
- if Hoehe.IsEnabled then warnlog " :-("
- Aufloesung.Check
- x = DPI.GetItemCount
- '/// 'DPI' listbox contains eight items ///'
- if x <> 4 then warnlog "'DPI' Count is wrong; should be:4, is:" + x
- for i = 1 to x
- DPI.Select i
- Printlog " - " + i + ": '" +DPI.GetSelText + "'"
- next i
- if Breite.IsEnabled then warnlog " :-("
- if Hoehe.IsEnabled then warnlog " :-("
- Groesse.Check
- if DPI.IsEnabled then warnlog " :-("
- Breite.More
- Hoehe.Less
Sleep 1
- '/// leave dialog with cancel -> there has to be no file created! ///'
- BMPOptionen.Cancel
+ printlog "Leave dialog with cancel -> there has to be no file created!"
+ BMPOptions.Cancel
sleep 5
if ( dir(OutputGrafikTBO+".bmp") = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
Printlog "ok :-)"
@@ -729,15 +699,14 @@ qaerrorlog
Active.OK
end if
end if
- Printlog "'/// now save it realy and load the file afterwards ///'"
+
+ Printlog " now save it really and load the file afterwards"
if hCallExport (OutputGrafikTBO , "BMP - Windows Bitmap (.bmp)" ) = TRUE then
- Kontext "BMPOptionen"
- if BMPOptionen.Exists (2) then
- Farbaufloesung.Select 7
- RLEKodierung.Check
- Aufloesung.Check
- DPI.Select 3
- BMPOptionen.OK
+ Kontext "BMPOptions"
+ if BMPOptions.Exists (2) then
+ Colordepth.Select 7
+ Compression.Check
+ BMPOptions.OK
sleep 5
endif
if ( dir(OutputGrafikTBO+".bmp") <> "") then
@@ -745,14 +714,18 @@ qaerrorlog
else
warnlog "File didn't get saved :-("
endif
+ printlog "Closing doc."
hCloseDocument ()
sleep 5
+ printlog "Opening new doc."
hNewDocument()
sleep 5
+ printlog "Inserting exported file."
Call hGrafikEinfuegen ( OutputGrafikTBO+".bmp" )
endif
+ printlog "Closing doc again."
hCloseDocument ()
- Printlog "'/// now save a SELECTION in ORIGINAL SIZE and load the file afterwards ///'"
+ Printlog "Now save a SELECTION in and load the file afterwards"
hFileOpen (sDocument)
kontext "Filterauswahl"
@@ -762,51 +735,58 @@ qaerrorlog
goto endsub
endif
- ' check if the document is writable
+ printlog "check if the document is writable"
call fMakeDocumentWritable
hTypeKeys ("<escape><tab>")
fGetSizeXY sx1, sy, TRUE
- if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
- Kontext "BMPOptionen"
- if BMPOptionen.Exists (2) then
- Original.Check
- BMPOptionen.OK
- sleep 5
- endif
- if ( dir(OutputGrafikTBO + "1"+".bmp") <> "") then
- Printlog "Ok :-) Saved as: '" + OutputGrafikTBO + "1"+".bmp" + "'"
- else
- warnlog "File didn't get saved :-("
- endif
- hCloseDocument ()
- sleep 5
- hNewDocument()
- sleep 5
- Call hGrafikEinfuegen ( OutputGrafikTBO + "1"+".bmp" )
- bTemp = FALSE
- fGetSizeXY sx1, sY, bTemp
- if (bTemp = FALSE) then
- warnlog "Selected original size NOT OK :-("
+ if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
+ Kontext "BMPOptions"
+ if BMPOptions.Exists (2) then
+ BMPOptions.OK
+ sleep 5
+ endif
+ if ( dir(OutputGrafikTBO + "1"+".bmp") <> "") then
+ Printlog "Ok :-) Saved as: '" + OutputGrafikTBO + "1"+".bmp" + "'"
+ else
+ warnlog "File didn't get saved :-("
+ endif
+ hCloseDocument ()
+ sleep 5
+ hNewDocument()
+ sleep 5
+ Call hGrafikEinfuegen ( OutputGrafikTBO + "1"+".bmp" )
+ bTemp = FALSE
+ fGetSizeXY sx1, sY, bTemp
+ if (bTemp = FALSE) then
+ warnlog "Selected original size NOT OK :-("
endif
endif
hCloseDocument ()
- Printlog "'/// now CREATE a rectangle, select it, save it in SIZE and load the file afterwards ///'"
+ Printlog "Now create a rectangle, select it, save it in SIZE and load the file afterwards"
hNewDocument()
hTypeKeys "<TAB>"
gMouseClick 50, 50
hRechteckErstellen ( 10, 10, 30, 40 )
if hCallExport (OutputGrafikTBO + "2" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
- Kontext "BMPOptionen"
- if BMPOptionen.Exists (2) then
- Groesse.Check
- Breite.SetText "9"
- Hoehe.SetText "9"
- Groesse.Check 'Press "Size" one more time in order to make the change go through"
- sx1 = Breite.GetText
- sY = Hoehe.GetText
- BMPOptionen.OK
+ Kontext "BMPOptions"
+ if BMPOptions.Exists (2) then
+ Exportwidth.SetText "9"
+ if Exportmeasurement.GetSelText = "inches" then
+ sx1 = (Exportwidth.GetText)+ """"
+ printlog "sx1= " & sx1
+ else
+ sx1 = (Exportwidth.GetText)+ "cm"
+ endif
+
+ if Exportmeasurement.GetSelText = "inches" then
+ sY = (Exportheight.GetText)+ """"
+ printlog "sY= " & sY
+ else
+ sY = (Exportwidth.GetText)+ "cm"
+ endif
+ BMPOptions.OK
sleep 5
endif
if ( dir(OutputGrafikTBO + "2"+".bmp") <> "") then
@@ -814,6 +794,7 @@ qaerrorlog
else
warnlog "File didn't get saved :-("
endif
+ printlog "Closing doc."
hCloseDocument ()
sleep 5
hFileOpen (OutputGrafikTBO + "2"+".bmp")
@@ -834,31 +815,6 @@ qaerrorlog
endif
endif
- if hCallExport (OutputGrafikTBO + "3" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
- Kontext "BMPOptionen"
- if BMPOptionen.Exists (2) then
- Groesse.Check
- sX2 = Breite.GetText
- if (LiberalMeasurement(sx1, sX2)) <> TRUE then
- if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
- Printlog "Width was ok. Expected: " + sx1 + "' was: '" + sX2 + "'"
- else
- warnLog "Width is different expected: '" + sx1 + "' is: '" + sX2 + "'"
- endif
- endif
- sY2 = Hoehe.GetText
- if (LiberalMeasurement(sY, sY2)) <> TRUE then
- if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
- Printlog "Height was ok. Expected: " + sY + "' was: '" + sY2 + "'"
- else
- warnLog "Height is different expected: '" + sY + "' is: '" + sY2 + "'"
- endif
- endif
- BMPOptionen.Cancel
- sleep 5
- endif
- endif
-
call hCloseDocument
endcase 'tBMP
@@ -884,19 +840,11 @@ testcase tEMF
hFileOpen sDocument
if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Original.Check
- if Breite.IsEnabled then
- warnlog " :-("
- endif
- if Hoehe.IsEnabled then
- warnlog " :-("
- endif
- Groesse.Check
- Breite.More
- Hoehe.Less
- SVMOptionen.Cancel
+ Kontext "EMFOptions"
+ if EMFOptions.Exists (2) then
+ Exportwidth.More
+ Exportheight.Less
+ EMFOptions.Cancel
sleep 5
if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
Printlog "ok :-)"
@@ -915,12 +863,11 @@ testcase tEMF
end if
end if
if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Groesse.Check
- Breite.Less
- Hoehe.More
- SVMOptionen.OK
+ Kontext "EMFOptions"
+ if EMFOptions.Exists (2) then
+ Exportwidth.More
+ Exportheight.Less
+ EMFOptions.OK
sleep 5
endif
if ( dir(OutputGrafikTBO+sExt) <> "") then
@@ -935,53 +882,26 @@ testcase tEMF
Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
endif
hCloseDocument ()
- hFileOpen (sDocument)
- kontext "Filterauswahl"
- if Filterauswahl.Exists(10) then
- Warnlog "Error when loading the file. The Filter-dialogue came up. Test aborted."
- Filterauswahl.Cancel
- goto endsub
- endif
- printlog "making doc editable if it is readonly"
- call fMakeDocumentWritable
- hTypeKeys ("<escape><tab>")
- fGetSizeXY sx1, sY, TRUE
- if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Original.Check
- SVMOptionen.OK
- sleep 5
- endif
- if ( dir(OutputGrafikTBO & "1" & sExt) <> "") then
- Printlog "Ok :-) saved as: '" & OutputGrafikTBO & "1" & sExt & "'"
- else
- warnlog "File didn't get saved :-("
- endif
- hCloseDocument ()
- sleep 5
- hNewDocument()
- sleep 5
- Call hGrafikEinfuegen ( OutputGrafikTBO & "1" & sExt )
- bTemp = FALSE
- fGetSizeXY sx1, sY, bTemp
- if (bTemp = FALSE) then
- warnlog "Selected original size NOT OK :-("
- endif
- endif
- hCloseDocument ()
+
hNewDocument()
hRechteckErstellen ( 10, 10, 30, 40 )
if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Groesse.Check
- Breite.SetText "9"
- Hoehe.SetText "9"
- Groesse.Check 'Press "Size" one more time to make the change go through"
- sx1 = Breite.GetText
- sY = Hoehe.GetText
- SVMOptionen.OK
+ Kontext "EMFOptions"
+ if EMFOptions.Exists (2) then
+ Exportwidth.SetText "9"
+ if Exportmeasurement.GetSelText = "inches" then
+ sx1 = (Exportwidth.GetText)+ """"
+ printlog "sx1= " & sx1
+ else
+ sx1 = (Exportwidth.GetText)+ "cm"
+ endif
+ if Exportmeasurement.GetSelText = "inches" then
+ sY = (Exportheight.GetText)+ """"
+ printlog "sY= " & sY
+ else
+ sY = (Exportwidth.GetText)+ "cm"
+ endif
+ EMFOptions.OK
sleep 5
endif
if ( dir(OutputGrafikTBO & "2" & sExt) <> "") then
@@ -1002,10 +922,9 @@ testcase tEMF
endif
if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Groesse.Check
- sX2 = Breite.GetText
+ Kontext "EMFOptions"
+ if EMFOptions.Exists (2) then
+ sX2 = Exportwidth.GetText
if (LiberalMeasurement(sx1, sX2)) <> TRUE then
if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'"
@@ -1013,7 +932,7 @@ testcase tEMF
warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'"
endif
endif
- sY2 = Hoehe.GetText
+ sY2 = Exportheight.GetText
if (LiberalMeasurement(sY, sY2)) <> TRUE then
if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'"
@@ -1021,7 +940,7 @@ testcase tEMF
warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'"
endif
endif
- SVMOptionen.Cancel
+ EMFOptions.Cancel
sleep 5
endif
endif
@@ -1050,32 +969,26 @@ testcase tMET
sExt = ".met"
sDocument = gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString
+ printlog "loading Test File"
hFileOpen sDocument
+ printlog "----------1st: Trying to export and then canceling it"
if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
- Kontext "METOptionen"
- if METOptionen.Exists (2) then
- Original.Check
- if Breite.IsEnabled then
- warnlog " :-("
- endif
- if Hoehe.IsEnabled then
- warnlog " :-("
- endif
- Groesse.Check
- sTemp = Breite.getText
- Breite.More
- if (sTemp = Breite.getText) then
+ Kontext "METOptions"
+ if METOptions.Exists (2) then
+ sTemp = Exportwidth.getText
+ Exportwidth.More
+ if (sTemp = Exportwidth.getText) then
qaErrorLog "Width didn't change on pressing button 'More' #112225#"
- Breite.setText "10"
- Hoehe.setText "10"
+ Exportwidth.setText "10"
endif
- sTemp = Hoehe.getText
- Hoehe.Less
- if (sTemp = Hoehe.getText) then
+ sTemp = Exportheight.getText
+ Exportheight.Less
+ if (sTemp = Exportheight.getText) then
warnlog "Height didn't change on pressing button 'Less'"
endif
- METOptionen.Cancel
+ printlog "Canceling export..."
+ METOptions.Cancel
sleep 5
if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
Printlog "ok :-)"
@@ -1093,25 +1006,24 @@ testcase tMET
Active.OK
end if
end if
+ printlog "----------2nd: doing real export.."
if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
- Kontext "METOptionen"
- if METOptionen.Exists (2) then
- Groesse.Check
- sTemp = Breite.getText
- Breite.Less
- if (sTemp = Breite.getText) then
+ Kontext "METOptions"
+ if METOptions.Exists (2) then
+ sTemp = Exportwidth.getText
+ Exportwidth.Less
+ if (sTemp = Exportwidth.getText) then
warnlog "Width didn't change on pressing button 'Less'"
endif
- sTemp = Hoehe.getText
- Hoehe.More
- if (sTemp = Hoehe.getText) then
+ sTemp = Exportheight.getText
+ Exportheight.More
+ if (sTemp = Exportheight.getText) then
qaErrorLog "Height didn't change on pressing button 'More' #112225#"
- Breite.setText "10"
- Hoehe.setText "10"
+ Exportwidth.setText "10"
endif
- METOptionen.OK
+ METOptions.OK
iWaitIndex = 0
- do while METOptionen.Exists AND iWaitIndex < 30
+ do while METOptions.Exists AND iWaitIndex < 30
sleep (1)
iWaitIndex = iWaitIndex + 1
loop
@@ -1121,28 +1033,33 @@ testcase tMET
else
warnlog "File didn't get saved :-("
endif
+ printlog "Closing test doc."
hCloseDocument ()
sleep 5
+ printlog "----------3rd: Inserting export into new doc."
+ printlog "Opening new doc."
hNewDocument()
sleep 5
+ printlog "Inserting the exported file..."
Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
endif
+ printlog "Closing file with inserted graphic."
hCloseDocument ()
+ printlog "----------4th: Exporting part of test doc."
+ printlog "Opening test file.."
hFileOpen (sDocument)
sleep (10)
-
printlog "making doc editable if it is readonly"
call fMakeDocumentWritable
-
+ printlog "Selecting part of doc for export.."
hTypeKeys ("<escape><tab>")
fGetSizeXY sx1, sY, TRUE
if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then
- Kontext "METOptionen"
- if METOptionen.Exists (2) then
- Original.Check
- METOptionen.OK
+ Kontext "METOptions"
+ if METOptions.Exists (2) then
+ METOptions.OK
iWaitIndex = 0
- do while METOptionen.Exists AND iWaitIndex < 30
+ do while METOptions.Exists AND iWaitIndex < 30
sleep (1)
iWaitIndex = iWaitIndex + 1
loop
@@ -1152,32 +1069,51 @@ testcase tMET
else
warnlog "File didn't get saved :-("
endif
+ printlog "Closing testfile"
hCloseDocument ()
sleep 5
+ printlog "----------5th: Inserting exported part into new doc."
+ printlog "Opening new file.."
hNewDocument()
sleep 5
+ printlog "inserting exported part."
Call hGrafikEinfuegen ( OutputGrafikTBO & "1" & sExt )
bTemp = FALSE
+ printlog "Checking size."
fGetSizeXY sx1, sY, bTemp
if (bTemp = FALSE) then
warnlog "Selected original size NOT OK :-("
endif
endif
+ printlog "Closing doc."
hCloseDocument ()
+ printlog "----------6th: exporting fresh rectangle."
+ printlog "opening new file."
hNewDocument()
+ printlog "inserting rectangle."
hRechteckErstellen ( 10, 10, 30, 40 )
+ printlog "Exporting rectangle.."
if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then
- Kontext "METOptionen"
- if METOptionen.Exists (2) then
- Groesse.Check
- Breite.SetText "9"
- Hoehe.SetText "9"
- Groesse.Check ' Click "Size" one more time to make the changes go through.
- sx1 = Breite.GetText
- sY = Hoehe.GetText
- METOptionen.OK
+ Kontext "METOptions"
+ if METOptions.Exists (2) then
+ Exportwidth.SetText "9"
+ if Exportmeasurement.GetSelText = "inches" then
+ sx1 = (Exportwidth.GetText)+ """"
+ printlog "sx1= " & sx1
+ else
+ sx1 = (Exportwidth.GetText)+ "cm"
+ endif
+
+ if Exportmeasurement.GetSelText = "inches" then
+ sY = (Exportheight.GetText)+ """"
+ printlog "sY= " & sY
+ else
+ sY = (Exportwidth.GetText)+ "cm"
+ endif
+
+ METOptions.OK
iWaitIndex = 0
- do while METOptionen.Exists AND iWaitIndex < 30
+ do while METOptions.Exists AND iWaitIndex < 30
sleep (1)
iWaitIndex = iWaitIndex + 1
loop
@@ -1187,11 +1123,14 @@ testcase tMET
else
warnlog "File didn't get saved :-("
endif
+ printlog "closing doc."
hCloseDocument ()
sleep 5
+ printlog "----------7th:Opening exported file with rectangle"
hFileOpen (OutputGrafikTBO & "2" & sExt)
kontext "DocumentDraw"
DocumentDraw.TypeKeys ("<escape><tab>")
+ printlog "Checking file size."
ContextOriginalSize
bTemp = FALSE
fGetSizeXY sx1, sY, bTemp
@@ -1199,30 +1138,6 @@ testcase tMET
warnlog "Selected original size NOT OK :-("
endif
endif
- if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then
- Kontext "METOptionen"
- if METOptionen.Exists (2) then
- Groesse.Check
- sX2 = Breite.GetText
- if (LiberalMeasurement(sx1, sX2)) <> TRUE then
- if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
- Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'"
- else
- warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'"
- endif
- endif
- sY2 = Hoehe.GetText
- if (LiberalMeasurement(sY, sY2)) <> TRUE then
- if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
- Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'"
- else
- warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'"
- endif
- endif
- METOptionen.Cancel
- sleep 5
- endif
- endif
call hCloseDocument
endcase 'tMET
@@ -1270,27 +1185,20 @@ testcase tWMF
sFilter = "WMF - Windows Metafile (.wmf)"
sExt = ".wmf"
-
sDocument = gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString
+ printlog "Loading testdoc."
hFileOpen sDocument
+ printlog "Starting export as WMF and canceling.."
if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Original.Check
- if Breite.IsEnabled then
- warnlog " :-("
- endif
- if Hoehe.IsEnabled then
- warnlog " :-("
- endif
- Groesse.Check
- Breite.More
- Hoehe.Less
- SVMOptionen.Cancel
+ Kontext "WMFOptions"
+ if WMFOptions.Exists (2) then
+ Exportwidth.Less
+ Exportheight.More
+ WMFOptions.Cancel
sleep 5
if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
- Printlog "ok :-)"
+ Printlog "ok :-), nothing exported due to canceling."
else
warnlog "Dialog was canceled, but file got saved, too :-( - i35177"
endif
@@ -1305,15 +1213,15 @@ testcase tWMF
Active.OK
end if
end if
+ printlog "Doing real export."
if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Groesse.Check
- Breite.Less
- Hoehe.More
- SVMOptionen.OK
+ Kontext "WMFOptions"
+ if WMFOptions.Exists (2) then
+ Exportwidth.Less
+ Exportheight.More
+ WMFOptions.OK
iWaitIndex = 0
- do while SVMOptionen.Exists AND iWaitIndex < 30
+ do while WMFOptions.Exists AND iWaitIndex < 30
sleep (1)
iWaitIndex = iWaitIndex + 1
loop
@@ -1323,13 +1231,18 @@ testcase tWMF
else
warnlog "File didn't get saved :-("
endif
+ Printlog "Closing test doc."
hCloseDocument ()
sleep 5
+ printlog "Opening new odc."
hNewDocument()
sleep 5
+ printlog "Inserting exported graphic."
Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
endif
+ printlog "Closing."
hCloseDocument ()
+ Printlog "Opening exported file."
hFileOpen (sDocument)
sleep (10)
@@ -1339,12 +1252,11 @@ testcase tWMF
hTypeKeys ("<escape><tab>")
fGetSizeXY sx1, sY, TRUE
if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Original.Check
- SVMOptionen.OK
+ Kontext "WMFOptions"
+ if WMFOptions.Exists (2) then
+ WMFOptions.OK
iWaitIndex = 0
- do while SVMOptionen.Exists AND iWaitIndex < 30
+ do while WMFOptions.Exists AND iWaitIndex < 30
sleep (1)
iWaitIndex = iWaitIndex + 1
loop
@@ -1369,17 +1281,25 @@ testcase tWMF
hNewDocument()
hRechteckErstellen ( 10, 10, 30, 40 )
if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Groesse.Check
- Breite.SetText "9"
- Hoehe.SetText "9"
- Groesse.Check 'Check "Size" to make changes really go through.
- sx1 = Breite.GetText
- sY = Hoehe.GetText
- SVMOptionen.OK
+ Kontext "WMFOptions"
+ if WMFOptions.Exists (2) then
+ Exportwidth.SetText "9"
+ if Exportmeasurement.GetSelText = "inches" then
+ sx1 = (Exportwidth.GetText)+ """"
+ printlog "sx1= " & sx1
+ else
+ sx1 = (Exportwidth.GetText)+ "cm"
+ endif
+
+ if Exportmeasurement.GetSelText = "inches" then
+ sY = (Exportheight.GetText)+ """"
+ printlog "sY= " & sY
+ else
+ sY = (Exportwidth.GetText)+ "cm"
+ endif
+ WMFOptions.OK
iWaitIndex = 0
- do while SVMOptionen.Exists AND iWaitIndex < 30
+ do while WMFOptions.Exists AND iWaitIndex < 30
sleep (1)
iWaitIndex = iWaitIndex + 1
loop
@@ -1401,30 +1321,6 @@ testcase tWMF
warnlog "Selected original size NOT OK :-("
endif
endif
- if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then
- Kontext "SVMOptionen"
- if SVMOptionen.Exists (2) then
- Groesse.Check
- sX2 = Breite.GetText
- if (LiberalMeasurement(sx1, sX2)) <> TRUE then
- if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
- Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'"
- else
- warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'"
- endif
- endif
- sY2 = Hoehe.GetText
- if (LiberalMeasurement(sY, sY2)) <> TRUE then
- if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
- Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'"
- else
- warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'"
- endif
- endif
- SVMOptionen.Cancel
- sleep 5
- endif
- endif
call hCloseDocument
endcase 'tWMF
diff --git a/testautomation/graphics/required/includes/global/id_opt_2.inc b/testautomation/graphics/required/includes/global/id_opt_2.inc
index b959b7185..8d38b2b9d 100644
--- a/testautomation/graphics/required/includes/global/id_opt_2.inc
+++ b/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
diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc
index 4f919dfe3..57bac12e8 100644
--- a/testautomation/graphics/tools/id_tools.inc
+++ b/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