18 files changed, 17 insertions, 240 deletions
diff --git a/testautomation/framework/optional/includes/options_ooo_view.inc b/testautomation/framework/optional/includes/options_ooo_view.inc
index 9097134b0289..be3534fe6725 100755
--- a/testautomation/framework/optional/includes/options_ooo_view.inc
+++ b/testautomation/framework/optional/includes/options_ooo_view.inc
@@ -117,17 +117,6 @@ sub checkPage( sFile as string , bDisabled as boolean, optional iMiddleMouseButt
    checkCheckBox( sFile , "*" , VorschauInSchriftlisten )
    checkCheckBox( sFile , "*" , SchriftenHistorie )
    
-   if ( bDisabled ) then
-      checkCheckBox( sFile , "*" , OptimierteAusgabe )
-      checkCheckBox( sFile , "*" , OpenGL )
-   else
-      checkCheckBox( sFile , "*" , OpenGL )
-      'checkCheckBox( sFile , "state_optimierteausgabe" , OptimierteAusgabe )
-   endif
-   
-   
-   checkCheckBox( sFile , "*" , Dithering )
-   checkCheckBox( sFile , "*" , Volldarstellung )
    checkListBox( sFile , "*" , MousePositioning)
     ' needs to get handled differently on platforms!
     iMiddleMouseButton = MausAktion.getSelIndex
@@ -191,16 +180,6 @@ sub changePage( sFile as string , bInverted as boolean, optional iMiddleMouseBut
    setCheckBox( sFile , "*" , VorschauInSchriftlisten )
    setCheckBox( sFile , "*" , SchriftenHistorie )
    
-   if ( bInverted ) then
-      setCheckBox( sFile , "*" , OpenGL )
-      setCheckBox( sFile , "*" , OptimierteAusgabe )
-   else
-      setCheckBox( sFile , "*" , OptimierteAusgabe )
-      setCheckBox( sFile , "*" , OpenGL )
-   endif
-   
-   setCheckBox( sFile , "*" , Dithering )
-   setCheckBox( sFile , "*" , Volldarstellung )
    setListBox( sFile , "*" , MousePositioning )
     ' needs to get handled differently on platforms!
     if iMiddleMouseButtonExtern = 1 then
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
diff --git a/testautomation/tools/hid/cons.txt b/testautomation/tools/hid/cons.txt
deleted file mode 100755
index ad1b62d7671f..000000000000
--- a/testautomation/tools/hid/cons.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-644j_HID_Eigen 01010100101010101010101010
-
-TB_SW_TEXT_TOOLBOX 23265
-TB_SW_TABLE_TOOLBOX 23266
-TB_SW_GRAFIK_TOOLBOX 23268
-TB_SW_DRAW_TEXTBOX_TOOLBOX 23269
-TB_SW_DRAW_TEXT_TOOLBOX 23270
-TB_SW_NUM_TOOLBOX 23271
-TB_SW_OLE_TOOLBOX 23272
-TB_SW_TOOLS_TOOLBOX 23273
-TB_SW_PREVIEW_TOOLBOX 20631
-HDE_OL_SW_FORMAT_GRAFIK 23267
-HDE_HID_LAB_LAB 54920
-HDE_PDF_EXPORT_DLG 33375
-TB_WEB_TOOLS_TOOLBOX 20402
-TB_WEB_TOOLBOX 20403
-
-TB_SC_TEXT_TOOLBOX 25001
-TB_SC_DRAW_Text_TOOLBOX 25005
-TB_SC_PREVIEW_TOOLBOX 25006
-TB_SC_TOOLS_TOOLBOX 25035
-TB_SC_OLE_TOOLBOX 26436
-
-TB_IM_TOOLS_TOOLBOX 23011
-TB_IM_DIA_TOOLBOX 23012
-TB_IM_TOOLBOX 23030
-TB_IM_SLIDE_OBJ_TOOLBOX 23014
-TB_SD_BEZIER_TOOLBOX 23015
-TB_IM_TEXT_TOOLBOX 23016
-TB_IM_OUTLINIG_TOOLBOX 23017
-TB_SD_GLUEPOINTS_TOOLBOX 23019
-TB_IM_OPTIONS_TOOLBOX 23020
-TB_IM_COMMONTASK_TOOLBOX 23021
-TB_SD_TOOLS_TOOLBOX 23025
-TB_SD_OPTION_TOOLBOX 23026
-TB_SD_TOOLBOX 23027
-TB_SD_TEXT_TOOLBOX 23028
-
-TB_Fullscreen_Toolbox 558
-
-TB_Basic_Controls 63543
-
-HDE_PRN_UNX_PAPER 602472448
-HDE_PRN_UNX_PAPERSIZE 602476034
-HDE_PRN_UNX_ORIENTATION 602476036
-HDE_PRN_UNX_DUPLEX 602476038
-HDE_PRN_UNX_INPUT_SLOT 602476040
-HDE_PRN_UNX_SCALE 602479114
-HDE_PRN_UNX_DEVICE 602456064
-HDE_PRN_UNX_OPTION 602459652
-HDE_PRN_UNX_VALUE 602459654
-HDE_PRN_UNX_POSTSCRIPT 602465288
-HDE_PRN_UNX_COLOR 602459658
-HDE_PRN_UNX_COLORDEPTH 602465292
-HDE_PRN_UNX_COMPRESS 602457101
-
-SID_VERB_OPEN 6103
-SID_VERB_START 6102
-
-TB_Macro 14850
-TB_Macro_Controls 14916
-TZ_Filter_Warning 34195
-
-MSC_Super_ID 123456
-MSC_Super_ID2 1234567
-MSC_Super_ID3 12345678
-
-sfx2:ListBox:TP_CONFIG_ACCEL:BOX_ACC_KEY 575016462
-
-HID_OPTIONS_JAVA_LIST 39997
-
-PDF1TBO 867876864
-PDF2TBO 867860480
-
-FontWork1TBO 40026
-FontWork2TBO 40027
-
-Eval1TBO 64360
-Eval2TBO 64361
-HTMLTBO 808846359
-
-
-
diff --git a/testautomation/tools/hid/hid.bat b/testautomation/tools/hid/hid.bat
deleted file mode 100755
index b454bb366012..000000000000
--- a/testautomation/tools/hid/hid.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-perl.exe hid.pl hid.lst hid.txt cons.txt
-
diff --git a/testautomation/tools/hid/hid.pl b/testautomation/tools/hid/hid.pl
deleted file mode 100755
index 6ed824933cce..000000000000
--- a/testautomation/tools/hid/hid.pl
+++ /dev/null
@@ -1,98 +0,0 @@
-#**************************************************************************
-#* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#*
-#* Copyright 2008 by Sun Microsystems, Inc.
-#*
-#* OpenOffice.org - a multi-platform office productivity suite
-#*
-#* $RCSfile: hid.pl,v $
-#*
-#* $Revision: 1.4 $
-#*
-#* last change: $Author: tbo $ $Date: 2008/04/03 10:11:10 $
-#*
-#* This file is part of OpenOffice.org.
-#*
-#* OpenOffice.org is free software: you can redistribute it and/or modify
-#* it under the terms of the GNU Lesser General Public License version 3
-#* only, as published by the Free Software Foundation.
-#*
-#* OpenOffice.org is distributed in the hope that it will be useful,
-#* but WITHOUT ANY WARRANTY; without even the implied warranty of
-#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#* GNU Lesser General Public License version 3 for more details
-#* (a copy is included in the LICENSE file that accompanied this code).
-#*
-#* You should have received a copy of the GNU Lesser General Public License
-#* version 3 along with OpenOffice.org.  If not, see
-#* <http://www.openoffice.org/license.html>
-#* for a copy of the LGPLv3 License.
-#*
-#******************************************************************
-#*
-#* Owner : thorsten.bosbach@sun.com
-#*
-#* short description : Generate a cleaned hid.lst
-#*
-#******************************************************************
-#
-# syntax : hid.pl Input Output ConstantEntries
-# usually: hid.pl hid.lst hid.txt const.txt
-#
-
-for (@ARGV){print $_."\n";}
-open (HID,"<".@ARGV[0]) || die "Can't find old HID-file (first argument)";
-@ary=( <HID> );
-close HID;
-open (HID,">".@ARGV[1]) || die "Can't find new HID-file (second argument)";
-
-@longnum = @longname = ();
-
-for (@ary) {
-   s/MN_VIEW 21//g;                       # remove slots that are wrong
-   s/MN_INSERT 24//g;
-   s/MN_SUB_TOOLBAR 92//g;
-   s/SID_OBJECT_MIRROR 27085//g;
-   s/UID_SQLERROR_BUTTONMORE 38844//g;
-   s/MN_EXTRA 22//g;                     # -------------------------------------------
-   s/RID_UNDO_DELETE_WARNING 20558//g;
-   s/.* 01010101010//g;
-   s/ +/ /g;                              # remove double blanks
-   @x = split(/\s+/) ;                    # seperate Longnames and HIDs
-#   @x[0]=~ tr/a-z/A-Z/;
-#   @x[1]=~ tr/a-z/A-Z/;
-   $longname[++$#longname] = @x[0];
-   $longnum[++$#longnum]   = @x[1];
-   $_=@x[0]." ".@x[1]."\n";
-}
-
-@ary = @ary[ sort{                        # sort
-                @longnum[$a] <=> @longnum[$b] ||
-                @longname[$a] cmp @longname[$b]
-                }0..$#ary
-           ];
-
-# @ary = grep( !/^ *$/, @ary);
-
-#remove double entries
-
-$n="";
-for (@ary) {
-    if ($n eq $_   || $_>0  ){
-       $_="";
-     }
-     else{
-        $n=$_;
-     }
- }
-
-@ary = grep( !/^ *$/, @ary);
-
-# to insert the constant entries  at the beginning, read it and write it out
-open (CON,"<".@ARGV[2]) || die "Can't find constant entries-file: const.txt (third argument)";
-@const=( <CON> );
-close CON;
-print HID @const;
-
-print HID @ary;
-close HID;
diff --git a/testautomation/tools/hid/hid.sh b/testautomation/tools/hid/hid.sh
deleted file mode 100755
index f7c6d27a5f98..000000000000
--- a/testautomation/tools/hid/hid.sh
+++ /dev/null
@@ -1,2 +0,0 @@
- perl hid.pl hid.lst hid.txt cons.txt
- cp hid.txt ../../global/hid/hid.lst