CWS-TOOLING: integrate CWS tbo05

2009-03-24 16:34:39 +0100 tbo  r269967 : #i97837# fix options page
2009-03-17 19:24:32 +0100 tbo  r269627 : #i97837#
2009-03-17 19:17:57 +0100 tbo  r269626 : #i97837#
2009-03-17 19:14:15 +0100 tbo  r269625 : #i97837#

13 files changed, 17 insertions, 34 deletions

diff --git a/testautomation/global/hid/hid.lst b/testautomation/global/hid/hid.lst
index c042a79f65b0..afe938a09f5d 100755
--- a/testautomation/global/hid/hid.lst
+++ b/testautomation/global/hid/hid.lst
@@ -1,4 +1,4 @@
-DEV300m39_HID_Eigen 01010100101010101010101010
+DEV300.m43 010101010101010
 
 TB_SW_TEXT_TOOLBOX 23265
 TB_SW_TABLE_TOOLBOX 23266
diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid
index c25b23a1bc3a..5361682df67e 100644
--- a/testautomation/global/sid/all.sid
+++ b/testautomation/global/sid/all.sid
@@ -91,9 +91,6 @@ BearbeitenRahmendokument SID_EDIT_FRAMESET
 BearbeitenFrameSet SID_EDIT_FRAMESET
 BearbeitenPlugIn SID_PLUGINS_ACTIVE
 BearbeitenImageMap SID_IMAP
-BearbeitenObjektBearbeiten SID_VERB_START
-BearbeitenObjektEdit SID_VERB_START
-BearbeitenObjektOeffnen SID_VERB_OPEN
 BearbeitenLiteraturdatenbank SID_COMP_BIBLIOGRAPHY
 
 ' **** Writer
diff --git a/testautomation/global/sid/context.sid b/testautomation/global/sid/context.sid
index 69e058c2686a..9b241eb4d65d 100644
--- a/testautomation/global/sid/context.sid
+++ b/testautomation/global/sid/context.sid
@@ -18,8 +18,6 @@ Stylist_Neu HID_STYLIST_NEW
 Stylist_Aendern HID_STYLIST_EDIT
 Stylist_Loeschen HID_STYLIST_DELETE
 
-' ** Kontextmenue OLEObjekte
-Edit SID_VERB_START
 'Open
 
 ' ** Kontextmenue Objekte
diff --git a/testautomation/global/system/includes/declare.inc b/testautomation/global/system/includes/declare.inc
index b959eee916e8..d26b3022af1f 100755
--- a/testautomation/global/system/includes/declare.inc
+++ b/testautomation/global/system/includes/declare.inc
@@ -58,6 +58,7 @@ sub GetUseFiles()
    Use "global\system\includes\iniinfo.inc"
 
 '   Use "global\tools\includes\optional\t_xml1.inc"
+   Use "global\tools\includes\required\t_tools1.inc"
    Use "global\tools\includes\required\t_tools2.inc"
    Use "global\tools\includes\required\t_lists.inc"
 
diff --git a/testautomation/global/tools/includes/required/t_tools2.inc b/testautomation/global/tools/includes/required/t_tools2.inc
index 7f7d66288d8f..731bea120afc 100755
--- a/testautomation/global/tools/includes/required/t_tools2.inc
+++ b/testautomation/global/tools/includes/required/t_tools2.inc
@@ -583,7 +583,7 @@ function GetBuildNumHidLst as String
       Open (gtHidLstPath + "hid.lst") For Input As #FileNum
       do until EOF(#FileNum) = True
          line input #FileNum, xmlZeile
-         iIndex = inStr (1, xmlZeile, "_HID_Eigen", 1)
+         iIndex = inStr (1, xmlZeile, "010101010101010", 1)
          sTemp = Left (xmlZeile, abs(iIndex - 1))
          ' usually only the first line is read
          if (sTemp <> "") then exit do
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index 874060e45213..16adf5252305 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -124,7 +124,7 @@ Value3 dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3
 
 *FilterNavigator HID_FILTER_NAVIGATOR
 
-*FilterWarning TZ_Filter_Warning
+*FilterWarning HID_SVXDLG_FILTER_WARNING
 
 *FindEntry HID_MM_FIND_ENTRY
 FindString sw:Edit:DLG_MM_FIND_ENTRY:ED_FIND
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index 5b130fcaf571..99c456292696 100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -72,8 +72,6 @@ OKButton HID_DLGDEPOT_0_CMDGOON_HISTORY
 CancelButton HID_DLGDEPOT_0_CMDCANCEL_HISTORY
 
 *PurchaseStarOffice HID_LICENSING_DIALOG
-back Eval1TBO
-nextbutton Eval2TBO
 TabPurchase HID_TP_PURCHASE
 getSerialNumber tab:PushButton:TP_PURCHASE:PB_PURCHASE_GET
 TabUnlockStarOffice HID_TP_UNLOCK
diff --git a/testautomation/global/win/etoolbox.win b/testautomation/global/win/etoolbox.win
index b8d7a54c409e..7f4a8e86414a 100755
--- a/testautomation/global/win/etoolbox.win
+++ b/testautomation/global/win/etoolbox.win
@@ -18,9 +18,6 @@ RemoveFilter SID_FM_REMOVE_FILTER_SORT
 ColumnArrangement HID_BIB_MAPPINGDLG
 DataSource HID_BIB_CHANGESOURCE
 
-*TB_Fullscreen TB_Fullscreen_Toolbox
-Fullscreen SID_WIN_FULLSCREEN
-
 *TB_Help HID_HELP_TOOLBOX
 Index HID_HELP_TOOLBOXITEM_INDEX
 GoToStart HID_HELP_TOOLBOXITEM_START
@@ -30,7 +27,7 @@ PrintButton HID_HELP_TOOLBOXITEM_PRINT
 SetBookmarks HID_HELP_TOOLBOXITEM_BOOKMARKS
 DisplayHelpAtStartUp HID_HELP_ONSTARTUP_BOX
 
-*TB_MacroControls TB_Basic_Controls
+*TB_MacroControls HID_BASICIDE_CONTROLS
 CommandButton SID_INSERT_PUSHBUTTON
 CheckBox SID_INSERT_CHECKBOX
 Label SID_INSERT_FIXEDTEXT
diff --git a/testautomation/global/win/spadmin.win b/testautomation/global/win/spadmin.win
index 08ffe3686c37..056a2605ecc9 100755
--- a/testautomation/global/win/spadmin.win
+++ b/testautomation/global/win/spadmin.win
@@ -78,19 +78,16 @@ CBRemoveFaxNumber padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BOX_SWALLOWFAX
 PBHelp padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_HELP
 PBRemove padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_REMOVE
 
-*TabSPAPaper HDE_PRN_UNX_PAPER
-LBPaperSize HDE_PRN_UNX_PAPERSIZE
-LBOrientation HDE_PRN_UNX_ORIENTATION
-LBDuplex HDE_PRN_UNX_DUPLEX
-LBPaperTray HDE_PRN_UNX_INPUT_SLOT
-MFScale HDE_PRN_UNX_SCALE
-
-*TabSPADevice HDE_PRN_UNX_DEVICE
-LBOption HDE_PRN_UNX_OPTION
-LBCurrentValue HDE_PRN_UNX_VALUE
-LBPSLevel HDE_PRN_UNX_POSTSCRIPT
-LBColor HDE_PRN_UNX_COLOR
-LBColorDepth HDE_PRN_UNX_COLORDEPTH
+*TabSPAPaper padmin:TabPage:RID_RTS_PAPERPAGE
+LBPaperSize padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_PAPER_BOX
+LBOrientation padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_ORIENTATION_BOX
+LBDuplex padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_DUPLEX_BOX
+LBPaperTray padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_SLOT_BOX
+
+*TabSPADevice padmin:TabPage:RID_RTS_DEVICEPAGE
+LBOption padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDKEY_BOX
+LBCurrentValue padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDVALUE_BOX
+LBColor padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_SPACE_BOX
 
 *TabSPAFontReplacement padmin:TabPage:RID_RTS_FONTSUBSTPAGE
 MLReplacedFonts padmin:MultiListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_SUBST_BOX
diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win
index 8a7bd29e2eec..b3af7e561d50 100755
--- a/testautomation/global/win/tab_a_d.win
+++ b/testautomation/global/win/tab_a_d.win
@@ -51,10 +51,6 @@ FontAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING
 AAPixel svx:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT
 VorschauInSchriftlisten svx:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW
 SchriftenHistorie svx:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY
-OpenGL svx:CheckBox:OFA_TP_VIEW:CB_3D_OPENGL
-OptimierteAusgabe svx:CheckBox:OFA_TP_VIEW:CB_3D_OPENGL_FASTER
-Dithering svx:CheckBox:OFA_TP_VIEW:CB_3D_DITHERING
-Volldarstellung svx:CheckBox:OFA_TP_VIEW:CB_3D_SHOWFULL
 IconsInMenueAnzeigen svx:CheckBox:OFA_TP_VIEW:CB_MENU_ICONS
 MausAktion svx:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE
 MousePositioning svx:ListBox:OFA_TP_VIEW:LB_MOUSEPOS
diff --git a/testautomation/global/win/tab_e_g.win b/testautomation/global/win/tab_e_g.win
index 354b138cf242..f15a2948fddb 100755
--- a/testautomation/global/win/tab_e_g.win
+++ b/testautomation/global/win/tab_e_g.win
@@ -63,7 +63,7 @@ Typ sw:ListBox:TP_LAB_LAB:BOX_TYPE
 NeuesDok HID_LABEL_INSERT
 Zurueck HID_TABDLG_RESET_BTN
 
-*TabEtikettenMedium HDE_HID_LAB_LAB
+*TabEtikettenMedium HID_BUSINESS_FMT_PAGE
 Endlos HID_BUSINESS_FMT_PAGE_CONT
 Bogen HID_BUSINESS_FMT_PAGE_SHEET
 Marke HID_BUSINESS_FMT_PAGE_BRAND
diff --git a/testautomation/global/win/tab_h_o.win b/testautomation/global/win/tab_h_o.win
index 19c3576018ad..f293c1bdd410 100755
--- a/testautomation/global/win/tab_h_o.win
+++ b/testautomation/global/win/tab_h_o.win
@@ -30,7 +30,7 @@ Grafikenkopieren svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF
 Drucklayout svx:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION
 WarnungAnzeigen svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING
 Zeichensatz svx:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET
-UseEnglishLocaleForNumbers HTMLTBO
+UseEnglishLocaleForNumbers svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US
 
 *TabHyperlinkRahmen HID_FRM_URL
 URL sw:Edit:TP_FRM_URL:ED_URL
diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win
index 4e79c7cfa6c5..cdef0ab8b6b4 100755
--- a/testautomation/global/win/tab_t_z.win
+++ b/testautomation/global/win/tab_t_z.win
@@ -90,7 +90,6 @@ TypZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR
 Tastatur HID_ACCELCONFIG_LISTBOX
 Bereich HID_CONFIGGROUP_ACC_LISTBOX
 Funktion HID_CONFIGFUNCTION_ACC_LISTBOX
-Tasten sfx2:ListBox:TP_CONFIG_ACCEL:BOX_ACC_KEY
 Aendern sfx2:PushButton:TP_CONFIG_ACCEL:BTN_ACC_CHANGE
 Loeschen sfx2:PushButton:TP_CONFIG_ACCEL:BTN_ACC_REMOVE
 Zuruecksetzen sfx2:PushButton:TP_CONFIG_ACCEL:BTN_RESET