summaryrefslogtreecommitdiff
path: root/testautomation/global
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation/global')
-rwxr-xr-xtestautomation/global/input/accelerators.txt1
-rwxr-xr-xtestautomation/global/input/filters/native_suffixes.dat106
-rwxr-xr-xtestautomation/global/input/macros.txt54
-rwxr-xr-xtestautomation/global/required/includes/g_001.inc52
-rwxr-xr-xtestautomation/global/required/includes/g_009.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/required/includes/g_customize.inc61
-rwxr-xr-xtestautomation/global/required/includes/g_numberformatter1.inc52
-rwxr-xr-xtestautomation/global/required/includes/g_option.inc63
-rw-r--r--testautomation/global/required/includes/g_option_application.inc52
-rw-r--r--testautomation/global/required/includes/g_printing.inc518
-rwxr-xr-x[-rw-r--r--]testautomation/global/sid/bars.sid1
-rwxr-xr-xtestautomation/global/system/includes/declare.inc52
-rwxr-xr-xtestautomation/global/system/includes/gvariabl.inc52
-rwxr-xr-xtestautomation/global/system/includes/iniinfo.inc52
-rwxr-xr-xtestautomation/global/system/includes/inivalue.inc52
-rwxr-xr-xtestautomation/global/system/includes/master.inc59
-rwxr-xr-xtestautomation/global/system/includes/status.inc52
-rwxr-xr-xtestautomation/global/system/includes/sysinfo.inc62
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/closeoffice.bas52
-rwxr-xr-xtestautomation/global/tools/compressstatus.bas52
-rwxr-xr-xtestautomation/global/tools/declare.bas52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_accels.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_basic_ide_tools.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_basic_organizer_tools.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_control_objects.inc209
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_ctrl_1.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_ctrl_2.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_docfuncs.inc95
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_extension_manager_tools.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_filetools.inc54
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_key_tools.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_listfuncs.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_locale_strings1.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_locale_tools.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_macro_tools.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_ole.inc94
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_proxy_info.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_security_tools.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_server_info.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_set_standard_controls.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_stringtools.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_toolbar_calc.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_toolbar_impress.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_toolbar_tools1.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_toolbar_writer.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_treelist_tools.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_ui_filters.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_user_info.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_xml1.inc52
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_xml2.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_xml_filter1.inc1516
-rwxr-xr-xtestautomation/global/tools/includes/required/t_dir.inc52
-rwxr-xr-xtestautomation/global/tools/includes/required/t_dirloc.inc52
-rwxr-xr-xtestautomation/global/tools/includes/required/t_doc1.inc53
-rwxr-xr-xtestautomation/global/tools/includes/required/t_doc2.inc52
-rwxr-xr-xtestautomation/global/tools/includes/required/t_files.inc58
-rwxr-xr-xtestautomation/global/tools/includes/required/t_filters.inc52
-rwxr-xr-xtestautomation/global/tools/includes/required/t_lists.inc52
-rwxr-xr-xtestautomation/global/tools/includes/required/t_menu.inc52
-rwxr-xr-xtestautomation/global/tools/includes/required/t_option.inc57
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/required/t_option2.inc58
-rwxr-xr-xtestautomation/global/tools/includes/required/t_tools1.inc52
-rwxr-xr-xtestautomation/global/tools/includes/required/t_tools2.inc56
-rwxr-xr-xtestautomation/global/tools/includes/required/t_tools3.inc52
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/record_macro.bas52
-rwxr-xr-xtestautomation/global/tools/resetoffice.bas52
-rwxr-xr-xtestautomation/global/tools/wintree.bas52
-rwxr-xr-xtestautomation/global/win/bars.win11
-rwxr-xr-xtestautomation/global/win/dial_a_c.win64
-rwxr-xr-xtestautomation/global/win/dial_d_h.win47
-rwxr-xr-xtestautomation/global/win/dial_i_o.win104
-rwxr-xr-xtestautomation/global/win/dial_p_s.win80
-rwxr-xr-xtestautomation/global/win/dial_t_z.win126
-rwxr-xr-xtestautomation/global/win/edia_a_c.win22
-rwxr-xr-xtestautomation/global/win/edia_d_h.win66
-rwxr-xr-xtestautomation/global/win/edia_i_o.win54
-rwxr-xr-xtestautomation/global/win/edia_p_s.win140
-rwxr-xr-xtestautomation/global/win/etab_a_d.win162
-rwxr-xr-xtestautomation/global/win/etab_e_g.win130
-rwxr-xr-xtestautomation/global/win/etab_h_o.win96
-rwxr-xr-xtestautomation/global/win/etab_p_s.win112
-rwxr-xr-xtestautomation/global/win/etab_t_z.win22
-rwxr-xr-xtestautomation/global/win/sys_dial.win18
-rwxr-xr-xtestautomation/global/win/tab_a_d.win192
-rwxr-xr-xtestautomation/global/win/tab_e_g.win110
-rwxr-xr-xtestautomation/global/win/tab_h_o.win331
-rwxr-xr-xtestautomation/global/win/tab_p_s.win190
-rwxr-xr-xtestautomation/global/win/tab_t_z.win277
89 files changed, 4092 insertions, 3985 deletions
diff --git a/testautomation/global/input/accelerators.txt b/testautomation/global/input/accelerators.txt
index 1f1d88214986..cb518c9e3335 100755
--- a/testautomation/global/input/accelerators.txt
+++ b/testautomation/global/input/accelerators.txt
@@ -158,6 +158,7 @@ ko-KR=mod2 u
zh-CN=mod2 u
zh-TW=mod2 u
sl=mod2 i
+cs=mod2 a
# This is the accelerator that switches tabs in the BASIC IDE. I found it by accident
diff --git a/testautomation/global/input/filters/native_suffixes.dat b/testautomation/global/input/filters/native_suffixes.dat
index 6c648955fbdb..7072b260ab04 100755
--- a/testautomation/global/input/filters/native_suffixes.dat
+++ b/testautomation/global/input/filters/native_suffixes.dat
@@ -1,53 +1,53 @@
-[569]
-#StarOffice 5.x
-#Binary File Format
-WRITER=.sdw
-CALC=.sdc
-IMPRESS=.sdd
-DRAW=.sda
-MATH=.smf
-HTML=.htm
-MASTERDOCUMENT=.sgl
-
-[641]
-#StarOffice 6.x
-#XML Format
-WRITER=.sxw
-CALC=.sxc
-IMPRESS=.sxi
-DRAW=.sxd
-MATH=.sxm
-HTML=.htm
-MASTERDOCUMENT=.sxg
-
-[645]
-#OpenOffice.org 1.x / StarOffice 7 / StarSuite 7
-#XML Format
-WRITER=.sxw
-CALC=.sxc
-IMPRESS=.sxi
-DRAW=.sxd
-MATH=.sxm
-HTML=.htm
-MASTERDOCUMENT=.sxg
-
-[680]
-#OpenOffice.org 2.0 / StarOffice 8 / StarSuite 8
-#OASIS Open Office XML File-Format
-WRITER=.odt
-CALC=.ods
-IMPRESS=.odp
-DRAW=.odg
-MATH=.odf
-HTML=.htm
-MASTERDOCUMENT=.odm
-
-[current]
-#the current build is 680
-WRITER=.odt
-CALC=.ods
-IMPRESS=.odp
-DRAW=.odg
-MATH=.odf
-HTML=.htm
-MASTERDOCUMENT=.odm
+[569]
+#StarOffice 5.x
+#Binary File Format
+WRITER=.sdw
+CALC=.sdc
+IMPRESS=.sdd
+DRAW=.sda
+MATH=.smf
+HTML=.htm
+MASTERDOCUMENT=.sgl
+
+[641]
+#StarOffice 6.x
+#XML Format
+WRITER=.sxw
+CALC=.sxc
+IMPRESS=.sxi
+DRAW=.sxd
+MATH=.sxm
+HTML=.htm
+MASTERDOCUMENT=.sxg
+
+[645]
+#OpenOffice.org 1.x / StarOffice 7 / StarSuite 7
+#XML Format
+WRITER=.sxw
+CALC=.sxc
+IMPRESS=.sxi
+DRAW=.sxd
+MATH=.sxm
+HTML=.htm
+MASTERDOCUMENT=.sxg
+
+[680]
+#OpenOffice.org 2.0 / StarOffice 8 / StarSuite 8
+#OASIS Open Office XML File-Format
+WRITER=.odt
+CALC=.ods
+IMPRESS=.odp
+DRAW=.odg
+MATH=.odf
+HTML=.htm
+MASTERDOCUMENT=.odm
+
+[current]
+#the current build is 680
+WRITER=.odt
+CALC=.ods
+IMPRESS=.odp
+DRAW=.odg
+MATH=.odf
+HTML=.htm
+MASTERDOCUMENT=.odm
diff --git a/testautomation/global/input/macros.txt b/testautomation/global/input/macros.txt
index 2210990ec93f..f34e54f607d1 100755
--- a/testautomation/global/input/macros.txt
+++ b/testautomation/global/input/macros.txt
@@ -220,45 +220,45 @@ End Sub
# ---------------------------------------------------------------------------- #
[i103691]
-option vbasupport 1
-
-Sub Main
- dim a, b
-
+option vbasupport 1
+
+Sub Main
+ dim a, b
+
if (not a = b) then
- msgbox( "not equal" )
- else
- msgbox( "Equal" )
- end if
-End Sub
+ msgbox( "not equal" )
+ else
+ msgbox( "Equal" )
+ end if
+End Sub
# ---------------------------------------------------------------------------- #
[i103697]
-Private Declare Function FooFunction Lib "foo" ( nVal )
-Public Declare Function FooFunction2 Lib "foo" ( nVal )
-
-sub main
- msgbox( "i103697" )
+Private Declare Function FooFunction Lib "foo" ( nVal )
+Public Declare Function FooFunction2 Lib "foo" ( nVal )
+
+sub main
+ msgbox( "i103697" )
end sub
# ---------------------------------------------------------------------------- #
[i103990]
-type MyType
- a( 3 ) as integer
- b as double
-end type
-
-Sub Main
- dim mt as MyType
- mt.a(0) = 42
- mt.a(1) = 43
- mt.b = 3.14
+type MyType
+ a( 3 ) as integer
+ b as double
+end type
+
+Sub Main
+ dim mt as MyType
+ mt.a(0) = 42
+ mt.a(1) = 43
+ mt.b = 3.14
msgbox( mt.a(0) )
msgbox( mt.a(1) )
if ( mt.b = 3.14 ) then
msgbox( "Pi" )
else
msgbox( "Error" )
- endif
-end sub
+ endif
+end sub
diff --git a/testautomation/global/required/includes/g_001.inc b/testautomation/global/required/includes/g_001.inc
index aace0152d061..5c717341b014 100755
--- a/testautomation/global/required/includes/g_001.inc
+++ b/testautomation/global/required/includes/g_001.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: g_001.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:03 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/required/includes/g_009.inc b/testautomation/global/required/includes/g_009.inc
index b3b3dc4cd8f9..71c172f0941a 100755
--- a/testautomation/global/required/includes/g_009.inc
+++ b/testautomation/global/required/includes/g_009.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: g_009.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:03 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/required/includes/g_customize.inc b/testautomation/global/required/includes/g_customize.inc
index 29b6dec58c61..e66a61baa2ac 100644..100755
--- a/testautomation/global/required/includes/g_customize.inc
+++ b/testautomation/global/required/includes/g_customize.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: g_customize.inc,v $
-'*
-'* $Revision: 1.4 $
-'*
-'* last change: $Author: rt $ $Date: 2008-08-28 11:41:02 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
@@ -108,6 +102,7 @@ testcase tToolsCustomize
Kontext "TabCustomizeMenu"
'/// Click button 'Command' ///'
+ sleep(1)
Command.click
printlog "opened second one"
WaitSlot()
@@ -123,6 +118,7 @@ testcase tToolsCustomize
WaitSlot()
Kontext "TabCustomizeMenu"
'/// Click button 'Command' ///'
+ sleep(1)
Command.click
printlog "opened third one"
WaitSlot()
@@ -192,8 +188,10 @@ testcase tToolsCustomize
waitslot
Kontext "TabCustomizeToolbars"
+ sleep(1)
'/// Click button 'Command' ///'
Command.click
+ waitslot
'/// Select the firste entry 'Rename' ///'
hMenuSelectNr(1)
'/// Dialog 'Name' comes up ///'
@@ -206,7 +204,9 @@ testcase tToolsCustomize
endif
Kontext "TabCustomizeToolbars"
+ sleep(1)
Command.click
+ waitslot
hMenuSelectNr(1)
Kontext "CustomizeToolbarsReName"
call DialogTest (CustomizeToolbarsReName)
@@ -217,7 +217,9 @@ testcase tToolsCustomize
waitslot
Kontext "TabCustomizeToolbars"
'/// Click button 'Command' ///'
+ sleep(1)
Command.click
+ waitslot
'/// Select the fifth entry 'Change Icon' ///'
hMenuSelectNr(5)
'/// Dialog 'Change Icon' comes up ///'
@@ -252,6 +254,7 @@ testcase tToolsCustomize
WaitSlot()
Kontext "TabCustomizeToolbars"
'/// On Tab Page 'Customize Menus' click on Button 'Toolbar' ///'
+ sleep(1)
MenuBtn.openMenu
WaitSlot()
hMenuSelectNr(1)
diff --git a/testautomation/global/required/includes/g_numberformatter1.inc b/testautomation/global/required/includes/g_numberformatter1.inc
index c26c7d4aed9a..e934e49d21c4 100755
--- a/testautomation/global/required/includes/g_numberformatter1.inc
+++ b/testautomation/global/required/includes/g_numberformatter1.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: g_numberformatter1.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:04 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : wolfram.garten@sun.com
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 515f37a83215..65e6bcf817fa 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: g_option.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: rt $ $Date: 2008-07-31 19:25:49 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
@@ -614,11 +608,6 @@ testcase tToolsOptionsInternet
gefunden = FALSE
Kontext "OptionenDlg"
Optionsliste.TypeKeys "<Down>"
- Kontext "ProxyWarnung"
- if ProxyWarnung.Exists(1) then
- NichtMehrAnzeigen.Check
- ProxyWarnung.OK
- endif
select case i
case 1 :
@@ -699,6 +688,12 @@ testcase tToolsOptionsImprovementProgram
printlog( "Update test for the tools/options dialog of the OOo Improvement Program" )
+ if (gOOO AND NOT gOOoImprovementIsEnabled) then
+ 'In StarOffice this test should always work - but on OOo contributet builds the function is not available - only on OOo builds provided by Sun Microsystems
+ qaErrorlog ("This build does not participate in the OOo Improvement Program - test exit")
+ goto endsub
+ endif
+
dim cLogFile as string
cLogFile = gOfficePath & "user\temp\feedback\Current.csv"
cLogFile = convertpath( cLogFile )
diff --git a/testautomation/global/required/includes/g_option_application.inc b/testautomation/global/required/includes/g_option_application.inc
index 1791e623d744..7d8ee2688ee4 100644
--- a/testautomation/global/required/includes/g_option_application.inc
+++ b/testautomation/global/required/includes/g_option_application.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: g_option.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: rt $ $Date: 2008-07-31 19:25:49 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc
new file mode 100644
index 000000000000..9e2a65a87979
--- /dev/null
+++ b/testautomation/global/required/includes/g_printing.inc
@@ -0,0 +1,518 @@
+'encoding UTF-8 Do not remove or change this line!
+'*******************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
+'*
+'* short description : Resource test for the printing dialog
+'*
+'\******************************************************************************
+
+private const MSG1 = "Incorrect default setting: "
+
+'*******************************************************************************
+
+sub g_printing()
+
+ call tPrintCommon()
+ call tPrintGeneral()
+ call tPrintApplication()
+ call tPrintLayout()
+ call tPrintOptions()
+
+end sub
+
+'*******************************************************************************
+
+testcase tPrintCommon()
+
+ printlog( "Common print options (main dialog)" )
+
+ printlog( "Open new document" )
+ hCreateDocument()
+
+ printlog( "Open printing dialog" )
+ FilePrint
+
+ kontext "Printing"
+ if ( Printing.exists( 2 ) ) then
+
+ call DialogTest( Printing )
+
+ if ( PreviewPageNumber.isEnabled() ) then
+ warnlog( "Page number should be disabled for empty document" )
+ endif
+
+ if ( ScrollBackward.isEnabled() ) then
+ warnlog( "Scroll backward button should be disabled for empty document" )
+ endif
+
+ if ( ScrollForward.isEnabled() ) then
+ warnlog( "Scroll forward button should be disabled for empty document" )
+ endif
+
+ kontext "Printing"
+ printlog( "Close print dialog")
+ Printing.cancel()
+
+ else
+ warnlog( "Printing dialog did not open" )
+ endif
+
+ printlog( "Close document" )
+ hDestroyDocument()
+
+endcase
+
+'*******************************************************************************
+
+testcase tPrintGeneral()
+
+ printlog( "General printing options - General tabpage" )
+
+ dim iSlidesPerPage as integer
+ dim iExpected as integer
+
+ printlog( "Open new document" )
+ hCreateDocument()
+
+ printlog( "Open printing dialog" )
+ FilePrint
+
+ kontext "Printing"
+ if ( Printing.exists( 2 ) ) then
+
+ PrintingTabControl.setPage( TabPrintGeneral )
+
+ kontext "TabPrintGeneral"
+ call DialogTest( TabPrintGeneral )
+
+ printlog( "PrinterList" )
+ if ( NOT PrinterList.isEnabled() ) then
+ warnlog( "Printer List is disabled" )
+ endif
+
+ printlog( "Number of copies/Collate" )
+ if ( NumberOfCopies.getText <> "1" ) then
+ warnlog( "Number of copies should be 1 by default, is " & NumberOfCopies.getText() )
+ endif
+
+ if ( Collate.isEnabled() ) then
+ warnlog( "<Collate> should not be enabled for just one copy" )
+ endif
+
+ NumberOfCopies.setText( "2" )
+
+ if ( Collate.isEnabled() ) then
+ cb_test( Collate, true, "" )
+ else
+ warnlog( "Collate should be enabled if number of copies <> 1" )
+ endif
+
+ NumberOfCopies.setText( "1" )
+
+ if ( Collate.isEnabled() ) then
+ warnlog( "<Collate> should not be enabled for just one copy" )
+ endif
+
+ printlog( "Properties/Details" )
+ Details.click() ' open
+ Details.click() ' close
+
+ if ( gPlatGroup = "unx" and lcase( gPlatform ) <> "osx" ) then
+ Properties.click()
+ kontext "TabSPAPaper"
+ if ( TabSPAPaper.exists( 2 ) ) then
+ TabSPAPaper.close()
+ else
+ warnlog( "Printer properties did not open." )
+ endif
+ else
+ printlog( "Skipping printer properties on Windows and MacOS X (no SPAdmin)" )
+ endif
+
+ kontext "TabPrintGeneral"
+ printlog( "General settings on the Tab-Page" )
+
+ select case( gApplication )
+ case "WRITER", "HTML", "MASTERDOCUMENT"
+
+ lb_test( PrintNotes, 4, 1, "" )
+
+ if ( NOT AllPages.isChecked() ) then
+ warnlog( MSG1 & "<All pages> should be checked" )
+ endif
+
+ if ( Pages.isEnabled() ) then
+ Pages.check()
+ PageRange.setText( "1-5,7" )
+ else
+ warnlog( "Pages setting disabled" )
+ endif
+
+ 'Selection.check()
+ 'AllPages.check()
+
+ case "CALC"
+
+ printlog( "Print ranges" )
+ if ( NOT SelectedSheets.isChecked() ) then
+ warnlog( MSG1 & "<Selected sheets> should be selected" )
+ endif
+
+ AllSheets.check()
+ SelectedSheets.check()
+ SelectedCells.check()
+
+ if ( NOT PrintAllPages.isChecked() ) then
+ warnlog( MSG1 & "<Thereof print all pages> should be selected" )
+ endif
+
+ PrintPages.check()
+ PageRange.setText( "1-5,8" )
+ PrintAllPages.check()
+
+ case "IMPRESS", "DRAW"
+
+ printlog( "Print ranges" )
+ if ( NOT AllSlides.isChecked() ) then
+ warnlog( MSG1 & "<All slides> should be selected" )
+ endif
+
+ Slides.check()
+ PageRange.setText( "1-6,9" )
+
+ Selection.check()
+
+
+ if ( gApplication = "IMPRESS" ) then
+
+ printlog( "General print options/layout (IMPRESS only)" )
+
+ lb_test( PartsToPrint, 4, 1, "" )
+
+ if ( SlidesPerPage.isEnabled() ) then
+ warnlog( "<Slides per page> should only be enabled for Handouts" )
+ endif
+
+ if ( ArrangeSlides.isEnabled() ) then
+ warnlog( "<Ararange slides> should only be enabled for Handouts" )
+ endif
+
+ PartsToPrint.select( 2 ) ' Should be "Handouts" to enable further controls
+
+ if ( NOT SlidesPerPage.isEnabled() ) then
+ warnlog( "<Slides per Page> should be enabled for Handouts" )
+ endif
+
+ if ( NOT ArrangeSlides.isEnabled() ) then
+ warnlog( "<Arrange slides> should be enabled for Handouts" )
+ endif
+
+ lb_test( SlidesPerPage, 6, 0, "" )
+ lb_test( ArrangeSlides, 2, 1, "" )
+
+ endif
+
+
+ case "MATH"
+
+ printlog( "Math does not have any special options on this tabpage" )
+
+ case default
+ warnlog( "Invalid gApplication: " & gApplication )
+ end select
+
+ kontext "Printing"
+ printlog( "Close print dialog" )
+ Printing.cancel()
+
+ else
+ warnlog( "Printing dialog did not open" )
+ endif
+
+ printlog( "Close document" )
+ hDestroyDocument()
+
+endcase
+
+'*******************************************************************************
+
+testcase tPrintApplication()
+
+ printlog( "Application specific printing options - Application tabpage" )
+
+ printlog( "Open new document" )
+ hCreateDocument()
+
+ printlog( "Open printing dialog" )
+ FilePrint
+
+ kontext "Printing"
+ if ( Printing.exists( 2 ) ) then
+
+ PrintingTabControl.setPage( TabApplication )
+
+ kontext "TabApplication"
+ call DialogTest( TabApplication )
+
+ printlog( "Check defaults, modify and reset controls" )
+ select case( gApplication )
+ case "WRITER", "HTML", "MASTERDOCUMENT"
+
+ cb_test( PrintPageBackground, true, "" )
+ 'cb_test( PrintGraphicsAndDiagrams, true, "" )
+ cb_test( PrintPicturesAndObjects, true, "" )
+ cb_test( PrintTextInBlack, false, "" )
+ cb_test( PrintBlankPages, true, "" )
+
+ if ( gApplication <> "HTML" ) then
+ cb_test( PrintHiddenText, false, "" )
+ cb_test( PrintTextPlaceholder, false, "" )
+ endif
+
+ case "CALC"
+
+ cb_test( IncludeEmptyPages, false, "" )
+
+ case "IMPRESS", "DRAW"
+
+ cb_test( SlideName, false, "" )
+ cb_test( DateAndTime, false, "" )
+ if ( gApplication = "IMPRESS" ) then
+ cb_test( HiddenPages, false, "" )
+ endif
+
+ printlog( "Color options" )
+ if ( NOT OriginalColors.isChecked() ) then
+ warnlog( MSG1 & "<Original colors> should be checked" )
+ endif
+
+ GrayScale.check()
+ BlackAndWhite.check()
+
+ printlog( "Scaling options" )
+ if ( NOT OriginalSize.isChecked() ) then
+ warnlog( MSG1 & "<Original size> should be checked" )
+ endif
+
+ FitToPage.check()
+ MultiplePages.check()
+ TilePaper.check()
+
+ case "MATH"
+
+ cb_test( TitleRow, true, "" )
+ cb_test( FormulaText, true, "" )
+ cb_test( Borders, true, "" )
+
+ if ( NOT OriginalSizeMath.isChecked() ) then
+ warnlog( MSG1 & "<Original size> should be selected" )
+ endif
+
+ FitToPageMath.check()
+ Scaling.check()
+ ScalingFactor.setText( "1000" )
+
+ case default
+
+ warnlog( "Invalid gApplication: " & gApplication )
+
+ end select
+
+ kontext "Printing"
+ printlog( "Close print dialog" )
+ Printing.cancel()
+
+ else
+ warnlog( "Printing dialog did not open" )
+ endif
+
+ printlog( "Close document" )
+ hDestroyDocument()
+
+endcase
+
+'*******************************************************************************
+
+testcase tPrintLayout()
+
+ printlog( "Layout printing options - Layout tabpage" )
+
+ printlog( "Open new document" )
+ hCreateDocument()
+
+ printlog( "Open printing dialog" )
+ FilePrint
+
+ kontext "Printing"
+ if ( Printing.exists( 2 ) ) then
+
+ ' Math does not have a layout page as it does not have any layout options
+ if ( gApplication <> "MATH" ) then
+
+ PrintingTabControl.setPage( TabLayout )
+
+ kontext "TabLayout"
+ call DialogTest( TabLayout )
+
+ printlog( "Controls common for (almost) all applications" )
+ if ( gApplication <> "CALC" ) then
+ if ( NOT PagesPerSheet.isChecked()) then
+ warnlog( MSG1 & "<Pages per sheet> should be selected" )
+ endif
+
+ lb_test( NumberOfPages, 7, 1, "" )
+ NumberOfPages.select( 7 )
+
+ if ( NumberOfColumns.getText() <> "1" ) then
+ warnlog( MSG1 & "<Pages> has incorrect default: " & NumberOfColumns.getText() )
+ endif
+
+ if ( NumberOfRows.getText() <> "1" ) then
+ warnlog( MSG1 & "<by> has incorrect default: " & NumberOfRows.getText() )
+ endif
+
+ NumberOfColumns.typeKeys( "<UP>" )
+ NumberOfRows.typeKeys( "<UP>" )
+ DistanceBetweenPages.typeKeys( "<UP>" )
+ MarginToSheetBorder.typeKeys( "<UP>" )
+
+ lb_test( PaperOrientation, 3, 1, "" )
+ else
+ if ( PagesPerSheet.isVisible() ) then
+ warnlog( "<Pages per Sheet> should not be visible for spreadsheet documents" )
+ endif
+ endif
+
+ lb_test( PrintOrder, 2, 1, "" )
+ cb_test( BorderAroundPages, false, "" )
+
+ select case( gApplication )
+ case "WRITER", "HTML", "MASTERDOCUMENT"
+
+ 'if ( NOT PrintBrochureRTL.isEnabled() ) then
+ ' warnlog( "<Brochure> listbox should be enabled" )
+ 'endif
+
+ Brochure.check()
+
+ 'lb_test( PrintBrochureRTL, 2, 1, "#i105265#" )
+
+ case "CALC"
+
+ printlog( "Calc does not have any options in this section" )
+
+ case "IMPRESS", "DRAW"
+
+ if ( BrochurePageSides.isEnabled() ) then
+ warnlog( "<Page sides> listbox should be disabled" )
+ endif
+ Brochure.check()
+ lb_test( BrochurePageSides, 3, 1, "" )
+
+ case default
+
+ warnlog( "Invalid gApplication: " & gApplication )
+
+ end select
+
+ else ' What we do if gApplication = MATH
+ try
+ PrintingTabControl.setPage( TabLayout )
+ warnlog( "Math should not have a layout page as no layout options exist" )
+ catch
+ printlog( "Math has no layout page. Good." )
+ endcatch
+ endif
+
+ kontext "Printing"
+ printlog( "Close print dialog" )
+ Printing.cancel()
+
+ else
+ warnlog( "Printing dialog did not open" )
+ endif
+
+ printlog( "Close document" )
+ hDestroyDocument()
+
+endcase
+
+'*******************************************************************************
+
+testcase tPrintOptions()
+
+ printlog( "Extended printing options - Options tabpage" )
+
+ printlog( "Open new document" )
+ hCreateDocument()
+
+ printlog( "Open printing dialog" )
+ FilePrint
+
+ kontext "Printing"
+ if ( Printing.exists( 2 ) ) then
+
+ PrintingTabControl.setPage( TabOptions )
+
+ kontext "TabOptions"
+ call DialogTest( TabOptions )
+
+ printlog( "Controls common for all applications" )
+ cb_test( PrintToFile, false, "" )
+ cb_test( PrintAsSingleJobs, false, "" )
+ cb_test( PrintReverse, false, "" )
+
+ printlog( "Application specific controls" )
+ select case( gApplication )
+ case "WRITER", "HTML", "MASTERDOCUMENT", "IMPRESS", "DRAW"
+
+ cb_test( PaperTrayFromPrefs, false, "" )
+
+ case "CALC", "MATH"
+
+ printlog( "Calc does not have any program specific options." )
+
+ case default
+
+ warnlog( "Invalid gApplication: " & gApplication )
+
+ end select
+
+ kontext "Printing"
+ printlog( "Close print dialog" )
+ Printing.cancel()
+
+ else
+ warnlog( "Printing dialog did not open" )
+ endif
+
+ printlog( "Close document" )
+ hDestroyDocument()
+
+endcase
+
diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid
index c22ff6975c02..1e3da63fd1ec 100644..100755
--- a/testautomation/global/sid/bars.sid
+++ b/testautomation/global/sid/bars.sid
@@ -133,7 +133,6 @@ OL_Objekt_SW_Hintergrundfarbe SID_BACKGROUND_COLOR
OL_Objekt_SW_GanzNachVorn SID_FRAME_TO_TOP
OL_Objekt_SW_GanzNachHinten SID_FRAME_TO_BOTTOM
OL_Objekt_SW_Verankerungwechseln FN_TOOL_ANKER
-OL_Objekt_SW_GrafikBearbeiten SID_SIM_START
OL_Objekt_SW_HorizontalSpiegeln FN_FLIP_HORZ_GRAFIC
OL_Objekt_SW_VertikalSpiegeln FN_FLIP_VERT_GRAFIC
OL_Objekt_SW_PositionUndGroesse SID_ATTR_TRANSFORM
diff --git a/testautomation/global/system/includes/declare.inc b/testautomation/global/system/includes/declare.inc
index d26b3022af1f..7c439c45ebe0 100755
--- a/testautomation/global/system/includes/declare.inc
+++ b/testautomation/global/system/includes/declare.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: declare.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: vg $ $Date: 2008-08-19 12:49:25 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc
index 52c9f9f54dd0..a8b9b3339c52 100755
--- a/testautomation/global/system/includes/gvariabl.inc
+++ b/testautomation/global/system/includes/gvariabl.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: gvariabl.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: vg $ $Date: 2008-08-19 12:49:36 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 64d19eab101f..720e4908e3d0 100755
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: iniinfo.inc,v $
-'*
-'* $Revision: 1.3 $
-'*
-'* last change: $Author: rt $ $Date: 2008-07-10 15:39:45 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/system/includes/inivalue.inc b/testautomation/global/system/includes/inivalue.inc
index db575562b39e..ba123abaf47b 100755
--- a/testautomation/global/system/includes/inivalue.inc
+++ b/testautomation/global/system/includes/inivalue.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: inivalue.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:05 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index b8895c7fa637..2745aca4bb95 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: master.inc,v $
-'*
-'* $Revision: 1.5 $
-'*
-'* last change: $Author: vg $ $Date: 2008-08-19 12:49:51 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
@@ -335,6 +329,13 @@ end sub
sub FirstOfficeStart
'/// First start-routine.
Dim i as integer
+ ' To nail down a possible culprint on test runs, the availability of existing user settings is checked.
+ ' In some environments the deleting of the settings might fail before the test is started - this will log it:
+ if (fileExists(gOfficePath)) then
+ qaErrorLog ("QA_DEBUG: User settings directory was not deleted before test start!: '" + gOfficePath + "'")
+ else
+ printlog ("QA_DEBUG: User settings directory is unavailable before soffice is started - this is good. '" + gOfficePath + "'")
+ endif
caselog "" '///+<ul><li>Stop the first default-output into the resultfile</li>
Call hStartTheOffice '///+<li>Start the office</li>
ResetApplication '///+<li>Make the first recovering without an error output.</li></ul>
diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc
index 32899a4d39bb..2c46d9464c95 100755
--- a/testautomation/global/system/includes/status.inc
+++ b/testautomation/global/system/includes/status.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: status.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:06 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/system/includes/sysinfo.inc b/testautomation/global/system/includes/sysinfo.inc
index eb5e91c9a459..959b297f1797 100755
--- a/testautomation/global/system/includes/sysinfo.inc
+++ b/testautomation/global/system/includes/sysinfo.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: sysinfo.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:06 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
@@ -67,7 +61,6 @@ Global Const SYS_OSX = 12
Global Const SYS_PPC = 13
Global Const SYS_SCO = 14
Global Const SYS_AIX = 15
-Global Const SYS_IRI = 16
Global Const SYS_HP = 17
Global Const SYS_FBSD = 18
Global Const SYS_NBSD = 19
@@ -97,7 +90,6 @@ sub PlatFormInit
'///+<TR><TD>Linux PPC</TD><TD>ppc</TD><TD>unx</TD></TR>
'///+<TR><TD>SCO UNIX</TD><TD>sco</TD><TD>unx</TD></TR>
'///+<TR><TD>AIX</TD><TD>aix</TD><TD>unx</TD></TR>
-'///+<TR><TD>Irix</TD><TD>iri</TD><TD>unx</TD></TR>
'///+<TR><TD>HP UNIX</TD><TD>hp</TD><TD>unx</TD></TR>
'///+<TR><TD>FreeBSD</TD><TD>fbsd</TD><TD>unx</TD></TR>
'///+<TR><TD>NetBSD</TD><TD>nbsd</TD><TD>unx</TD></TR>
@@ -120,7 +112,6 @@ sub PlatFormInit
PlatformName(SYS_PPC) = "Linux PPC" : PlatformExt(SYS_PPC) = "ppc"
PlatFormName(SYS_SCO) = "SCO Unix" : PlatFormExt(SYS_SCO) = "sco"
PlatFormName(SYS_AIX) = "AIX" : PlatFormExt(SYS_AIX) = "aix"
- PlatFormName(SYS_IRI) = "IRIX" : PlatFormExt(SYS_IRI) = "iri"
PlatFormName(SYS_HP) = "HP UNIX" : PlatFormExt(SYS_Hp) = "hp"
PlatFormName(SYS_FBSD) = "FreeBSD" : PlatFormExt(SYS_FBSD) = "fbsd"
PlatFormName(SYS_NBSD) = "NetBSD" : PlatFormExt(SYS_NBSD) = "nbsd"
@@ -143,7 +134,6 @@ sub PlatFormInit
PlatFormGroup(SYS_PPC) = "unx"
PlatFormGroup(SYS_SCO) = "unx"
PlatFormGroup(SYS_AIX) = "unx"
- PlatFormGroup(SYS_IRI) = "unx"
PlatFormGroup(SYS_HP) = "unx"
PlatFormGroup(SYS_FBSD) = "unx"
PlatFormGroup(SYS_NBSD) = "unx"
@@ -221,7 +211,6 @@ sub GetToolPlatform
'///+<TR><TD>Linux PPC</TD><TD>13</TD></TR>
'///+<TR><TD>SCO UNIX</TD><TD>02</TD></TR>
'///+<TR><TD>AIX</TD><TD>04</TD></TR>
-'///+<TR><TD>Irix</TD><TD>06</TD></TR>
'///+<TR><TD>HP UNIX</TD><TD>07</TD></TR>
'///+<TR><TD>FreeBSD</TD><TD>08</TD></TR>
'///+<TR><TD>NetBSD</TD><TD>14</TD></TR>
@@ -254,7 +243,7 @@ sub GetToolPlatform
qaErrorLog("The GUI-entry in '" + gTesttoolIni + "' is missing!"+Chr(13)+"Please insert the correct number for your operating system! In Section [GUI Platform], entry Current= "+Chr(13)+"Win95....: 100"+Chr(13)+"Win98....: 395"+Chr(13)+"WinNT....: 351 or 400"+Chr(13)+"WinSE....: 410"+Chr(13)+"WinME....: 490"+Chr(13)+"Win2000..: 500"+Chr(13)+"WinXP....: 501")
else
iGuiVersion = 01
- QAErrorLog("The GUI value in '" + gTesttoolIni + "' is missing!"+Chr(13)+"Please insert the correct number for your operating system! In Section [GUI Platform], entry Current= "+Chr(13)+"Solaris SPARC.: 01"+Chr(13)+"SCO UNIX......: 02"+Chr(13)+"Linux.........: 03"+Chr(13)+"AIX...........: 04"+Chr(13)+"Solaris x86...: 05"+Chr(13)+"Irix..........: 06"+Chr(13)+"HP-UX.........: 07"+Chr(13)+"FreeBSD........: 08"+Chr(13)+"Mac OS X......: 12"+Chr(13)+"Linux PPC.....: 13"+Chr(13)+"NetBSD.....: 14"+Chr(13)+"Linux 64 bit.....: 15"+Chr(13)+"Linux SPARC.....: 16")
+ QAErrorLog("The GUI value in '" + gTesttoolIni + "' is missing!"+Chr(13)+"Please insert the correct number for your operating system! In Section [GUI Platform], entry Current= "+Chr(13)+"Solaris SPARC.: 01"+Chr(13)+"SCO UNIX......: 02"+Chr(13)+"Linux.........: 03"+Chr(13)+"AIX...........: 04"+Chr(13)+"Solaris x86...: 05"+Chr(13)+"HP-UX.........: 07"+Chr(13)+"FreeBSD........: 08"+Chr(13)+"Mac OS X......: 12"+Chr(13)+"Linux PPC.....: 13"+Chr(13)+"NetBSD.....: 14"+Chr(13)+"Linux 64 bit.....: 15"+Chr(13)+"Linux SPARC.....: 16")
end if
end if
'///Get the variable <b>gSamePC</b>
@@ -302,7 +291,6 @@ sub GetToolPlatform
case 03 : gSystemnummer = SYS_LIN
case 04 : gSystemnummer = SYS_AIX
case 05 : gSystemnummer = SYS_X86
- case 06 : gSystemnummer = SYS_IRI
case 07 : gSystemnummer = SYS_HP
case 08 : gSystemnummer = SYS_FBSD
case 12 : gSystemnummer = SYS_OSX
@@ -345,7 +333,6 @@ sub GetOfficePlatform
'///+<TR><TD>Linux PPC</TD><TD>PPC</TD></TR>
'///+<TR><TD>SCO UNIX</TD><TD>SCO</TD></TR>
'///+<TR><TD>AIX</TD><TD>AIX</TD></TR>
-'///+<TR><TD>Irix</TD><TD>IRI</TD></TR>
'///+<TR><TD>HP UNIX</TD><TD>HP</TD></TR>
'///+<TR><TD>FreeBSD</TD><TD>FBSD</TD></TR>
'///+<TR><TD>NetBSD</TD><TD>NBSD</TD></TR>
@@ -374,7 +361,6 @@ sub GetOfficePlatform
case "PPC" : GUI = 13
case "SCO" : GUI = 14
case "AIX" : GUI = 15
- case "IRI" : GUI = 16
case "HP" : GUI = 17
case "FBSD" : GUI = 18
case "NBSD" : GUI = 19
diff --git a/testautomation/global/tools/closeoffice.bas b/testautomation/global/tools/closeoffice.bas
index c746a40a0d68..a2a9200d10c3 100644..100755
--- a/testautomation/global/tools/closeoffice.bas
+++ b/testautomation/global/tools/closeoffice.bas
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: closeoffice.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:06 $
-'*
-'* 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.
-'*
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' 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
diff --git a/testautomation/global/tools/compressstatus.bas b/testautomation/global/tools/compressstatus.bas
index a4166e8f9c7f..aa469847b5ba 100755
--- a/testautomation/global/tools/compressstatus.bas
+++ b/testautomation/global/tools/compressstatus.bas
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: compressstatus.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:06 $
-'*
-'* 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.
-'*
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' 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
diff --git a/testautomation/global/tools/declare.bas b/testautomation/global/tools/declare.bas
index cea62bc481f6..a874bb674a8c 100755
--- a/testautomation/global/tools/declare.bas
+++ b/testautomation/global/tools/declare.bas
@@ -1,33 +1,27 @@
'**************************************************************************
-'* 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: declare.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:06 $
-'*
-'* 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.
-'*
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' 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
diff --git a/testautomation/global/tools/includes/optional/t_accels.inc b/testautomation/global/tools/includes/optional/t_accels.inc
index ccaf5d5ba9ce..67a4c54277fe 100755
--- a/testautomation/global/tools/includes/optional/t_accels.inc
+++ b/testautomation/global/tools/includes/optional/t_accels.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_accels.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:57:02 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
index 2d7300950c6a..a4d8498a185d 100755
--- a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_basic_ide_tools.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: obo $ $Date: 2008-07-25 07:44:37 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
index eb2b302f9199..7523e4d4b24c 100755
--- a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_basic_organizer_tools.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:57:24 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_control_objects.inc b/testautomation/global/tools/includes/optional/t_control_objects.inc
index 79b28ece9214..40f9c5a35e20 100755
--- a/testautomation/global/tools/includes/optional/t_control_objects.inc
+++ b/testautomation/global/tools/includes/optional/t_control_objects.inc
@@ -1,127 +1,130 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_control_objects.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:57:33 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
'*
'* short description : Functions to manipulate controls by accessing them as objects
'*
-'*******************************************************************************
-'**
-' #0 checkRadioButtons ' check a group of RBs where the sel. RB is given by number
-' #0 checkRadioButton ' check a singe RB where the state is specified directly
-' #0 checkCheckbox ' check a single checkbox
-' #0 setCheckBox ' sets checkbox to status provided in reference file
-' #0 checkComboBox ' compares an index to one provided in a reference-file
-' #0 setComboBox ' selects an index provided by a reference file
-' #0 checkListBox ' compares an index to one provided in a reference-file
-' #0 setListBox ' selects an index provided by a reference file
-' #0 checkListItem ' check that a listitem is correct
-' #1 hSetControlValue ' Change the value of a EntryField (failsafe)
-'**
'\******************************************************************************
-function checkRadioButtons( _file as string , sKey as string , control1 as object , control2 as object , optional control3 as object , optional control4 as object ) as integer
-
- '///<h3>EXPERIMENTAL: Get/Set function for some control types</h3>
- '///<i>This is a function that allows to change the state/content of a
- '///+ control via a configuration file. This function is experimental
- '///+ and should not be used.<br>
- '///+ This function checks if the correct radiobutton of a group is selected.
- '///+ at least two radiobuttons must be provided, the third and fouth are optional.
- '///+ The value for sKey in the reference file must be of type integer</i><br>
-
- dim _sItem as string
- dim _iItem as integer
-
- ' lowercase sKey for comparision
- sKey = lcase( sKey )
-
- ' get the reference value for sKey as string
- _sItem = hGetFileData( _file , sKey )
+private const MSG1 = "Incorrect default setting: "
+
+'*******************************************************************************
+
+function cb_test( oControl as object, def_state as string, issueid as string ) as boolean
+
+ ' Small helper that prints a warnlog if a checkbox does not have the correct
+ ' default setting (checked -> def_state = TRUE). You can supply an issue id
+ ' which will be printed to the log. no parameter is optional, issueid can
+ ' be an empty string.
+
+ ' oControl: The checkbox itself
+ ' def_state: Default state (checked or unchecked)
+ ' issueid: Issue id as string "#i123456#" for QUASTe
+
+ dim con_state as boolean : con_state = oControl.isChecked()
+ dim con_name as string : con_name = oControl.name()
- ' cast it to int
- _iItem = val( _sItem )
+ printlog( con_name & " (Checkbox)" )
+ cb_test() = true
+
+ if ( def_state ) then
- ' check which one of the up to four radiobuttons is selected.
- select case _iItem
-
- case 1 :
- if ( control1.isChecked() = true ) then
- checkRadioButtons() = true
- printlog( " * Radiobutton 1 selected: ok" )
- else
- warnlog( "The wrong radiobutton is selected" )
+ if ( NOT con_state ) then
+ warnlog( issueid & " " & MSG1 & con_name & " should be checked" )
+ cb_test() = false
endif
- case 2 :
- if ( control2.isChecked() = true ) then
- checkRadioButtons() = true
- printlog( " * Radiobutton 2 selected: ok" )
- else
- warnlog( "The wrong radiobutton is selected" )
+ oControl.unCheck()
+ oControl.check()
+
+ else
+
+ if ( con_state ) then
+ warnlog( issueid & " " & MSG1 & con_name & " should be unchecked" )
+ cb_test() = false
endif
- case 3 :
- if ( isMissing( control3 ) = false ) then
- if ( control3.isChecked() = true ) then
- checkRadioButtons() = true
- printlog( " * Radiobutton 3 selected: ok" )
- else
- warnlog( "The wrong radiobutton is selected" )
- endif
- else
- warnlog( "referencing to non-existing control." )
- checkRadioButtons() = false
+ oControl.check()
+ oControl.unCheck()
+
+ endif
+
+end function
+
+'*******************************************************************************
+
+function lb_test( oControl as object, items as integer, preset as integer, issueid as string ) as boolean
+
+ ' Do some basic testing on listboxes
+ ' - verify that the number of entries is correct
+ ' - verify that the default selection is correct
+ ' - select each item and restore default
+
+ ' oControl: The Listbox as object
+ ' items: Number of items in the list
+ ' preset: Item which is selected by default (usually 1), skip with 0
+ ' issueid: Issue id as string "#i123456#" for QUASTe
+
+ dim con_name as string : con_name = oControl.name()
+ dim con_items as integer : con_items = oControl.getItemCount()
+ dim con_preset as integer : con_preset = oControl.getSelIndex()
+ dim con_iterator as integer
+
+ printlog( con_name & " (Listbox)" )
+ if ( oControl.isEnabled() ) then
+ lb_test() = true
+
+ if ( con_items <> items ) then
+ warnlog( issueid & " Incorrect itemcount in listbox: " & con_name )
+ printlog( "Expected: " & items )
+ printlog( "Found...: " & con_items )
+ lb_test() = false
endif
- case 4 :
- if ( isMissing( control4 ) = false ) then
- if ( control4.isChecked() = true ) then
- checkRadioButtons() = true
- printlog( " * Radiobutton 4 selected: ok" )
- else
- warnlog( "The wrong radiobutton is selected" )
+ if ( preset > 0 ) then
+ if ( con_preset <> preset ) then
+ warnlog( issueid & " Incorrect default setting (index): " & con_name )
+ printlog( "Expected: " & preset )
+ printlog( "Found...: " & con_preset )
+ lb_test() = false
endif
- else
- warnlog( "referencing to non-existing control." )
- checkRadioButtons() = false
endif
- case else
- warnlog( "Maximum of four connected radiobuttons allowed." )
- checkRadioButtons() = false
- end select
-
+ for con_iterator = 1 to items
+ oControl.select( con_iterator )
+ next con_iterator
+
+ if ( preset > 0 ) then oControl.select( preset )
+ else
+ printlog( "The control is disabled" & con_name )
+ lb_test() = false
+ endif
+
end function
'*******************************************************************************
diff --git a/testautomation/global/tools/includes/optional/t_ctrl_1.inc b/testautomation/global/tools/includes/optional/t_ctrl_1.inc
index 57ab5456e8f1..6a174c137373 100644..100755
--- a/testautomation/global/tools/includes/optional/t_ctrl_1.inc
+++ b/testautomation/global/tools/includes/optional/t_ctrl_1.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_ctrl_1.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:08 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : marc.neumann@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_ctrl_2.inc b/testautomation/global/tools/includes/optional/t_ctrl_2.inc
index c81e340655c7..67c53194ffe0 100644..100755
--- a/testautomation/global/tools/includes/optional/t_ctrl_2.inc
+++ b/testautomation/global/tools/includes/optional/t_ctrl_2.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_ctrl_2.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:08 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : marc.neumann@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc
index 704d10fea8ba..e1e4ed80f410 100755
--- a/testautomation/global/tools/includes/optional/t_docfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_docfuncs.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:57:47 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
@@ -95,22 +89,19 @@ end function
function hCloseNavigator() as boolean
'///<h3>Function to close the navigator</h3>
- '///<i>Starting point: Any document</i>
- '///<ul>
const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCloseNavigator::"
if ( VERBOSE ) then printlog( CFN & "Enter" )
- '///+<li>close the navigator if found</li>
Kontext "Navigator"
if ( Navigator.Exists() ) then
Navigator.Close()
+ Navigator.notExists( 2 )
if ( VERBOSE ) then printlog( CFN & "Closed Navigator" )
else
if ( VERBOSE ) then printlog( CFN & "Navigator not present" )
endif
- '///+<li>verify that the navigator is indeed closed, return true on success</li>
Kontext "Navigator"
if ( Navigator.exists() ) then
hCloseNavigator() = false
@@ -120,7 +111,6 @@ function hCloseNavigator() as boolean
endif
if ( VERBOSE ) then printlog( CFN & "Exit" )
- '///</ul>
end function
@@ -302,36 +292,16 @@ end function
function hCreateDocument() as boolean
- '///<h3>Create anew document, extends hNewDocument()</h3>
- '///<i>Starting point: Any document</i><br>
- '///<i>Note: When calling this function with gApplication "BACKGROUND" the
- '///+ function will actually close one document to get to the backing window</i><br>
- '///<u>Input</u>:
- '///<ol>
- '///+<li>Nothing, valid gApplication must be set</li>
- '///</ol>
- '///<u>Returns</u>:
- '///<ol>
- '///+<li>Errorstatus (boolean)</li>
- '///<ul>
- '///+<li>TRUE if a new document was created successfully</li>
- '///+<li>FALSE if anything went wrong</li>
- '///</ul>
- '///</ol>
- '///<u>Description</u>:
- '///<ul>
-
-
+ '///<h3>Create anew document, extends hNewDocument() by providing a returnvalue</h3>
+ ' TRUE = New document created, FALSE = Failed to create a new document '
const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCreateDocument::"
dim iDocCountBefore as integer
dim iDocCountAfter as integer
- '///+<li>Retrieve the number of open documents</li>
iDocCountBefore = getDocumentCount
if ( VERBOSE ) then printlog( CFN & "Number of open documents before: " & iDocCountBefore )
- '///+<li>Special treatment if gApplication = BACKGROUND (virtual gApplication)</li>
if ( ucase( gApplication ) = "BACKGROUND" ) then
do while( getDocumentCount > 0 )
hCloseDocument()
@@ -339,13 +309,8 @@ function hCreateDocument() as boolean
hCreateDocument() = true
else
- '///+<li>Open a new document using hNewDocument()</li>
call hNewDocument()
-
- '///+<li>Retrieve the number of open documents</li>
iDocCountAfter = getDocumentCount()
-
- '///+<li>Verify that there is exactly one more document than before</li>
if ( iDocCountAfter = ( iDocCountBefore + 1 ) ) then
hCreateDocument() = true
else
@@ -484,9 +449,7 @@ function hInitSingleDoc() as boolean
'///<u>Description:</u>
'///<ul>
'///+<li>Close all documents until we are on the backing window</li>
- do while ( getDocumentCount > 0 )
- call hCloseDocument()
- loop
+ hFileCloseAll()
'///+<li>Save the previous gApplication</li>
cOldApplication = gApplication
@@ -539,9 +502,7 @@ function hInitBackingMode() as boolean
'///<u>Description:</u>
'///<ul>
'///+<li>Close all documents until we are on the backing window</li>
- do while ( getDocumentCount > 0 )
- hCloseDocument()
- loop
+ hFileCloseAll()
'///+<li>verify that we do not have any open documents left (redundant check)</li>
if ( getDocumentCount = 0 ) then
diff --git a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
index 2dfc30ad52a8..c2bc116b91bc 100755
--- a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_extension_manager_tools.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:57:57 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_filetools.inc b/testautomation/global/tools/includes/optional/t_filetools.inc
index a18319c13dfa..ccb7baeb12db 100755
--- a/testautomation/global/tools/includes/optional/t_filetools.inc
+++ b/testautomation/global/tools/includes/optional/t_filetools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_filetools.inc,v $
-'*
-'* $Revision: 1.4 $
-'*
-'* last change: $Author: rt $ $Date: 2008-09-04 09:17:26 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
@@ -159,7 +153,7 @@ function hHandleActivesOnLoad( iTries as integer , iAdd as integer ) as boolean
hHandleActivesOnLoad() = FALSE
exit function
endif
- warnlog( "#105670# - File corruption warning, the template is broken" )
+ qaerrorlog( "#105670# - File corruption warning, the template is broken" )
endif
endif
diff --git a/testautomation/global/tools/includes/optional/t_key_tools.inc b/testautomation/global/tools/includes/optional/t_key_tools.inc
index 04df2e37313e..1a2be93ce50b 100755
--- a/testautomation/global/tools/includes/optional/t_key_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_key_tools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_key_tools.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:58:19 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_listfuncs.inc b/testautomation/global/tools/includes/optional/t_listfuncs.inc
index 4934a29759e3..837f15311f45 100755
--- a/testautomation/global/tools/includes/optional/t_listfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_listfuncs.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_listfuncs.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:58:28 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_locale_strings1.inc b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
index 3bb6d6913817..3b9c632783a3 100755
--- a/testautomation/global/tools/includes/optional/t_locale_strings1.inc
+++ b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_locale_strings1.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:08 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : oliver.craemer@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_locale_tools.inc b/testautomation/global/tools/includes/optional/t_locale_tools.inc
index 1bb362ee4ac8..afbec2b51cd2 100644..100755
--- a/testautomation/global/tools/includes/optional/t_locale_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_locale_tools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_locale_tools.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: rt $ $Date: 2008-07-31 19:02:31 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : oliver.craemer@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_macro_tools.inc b/testautomation/global/tools/includes/optional/t_macro_tools.inc
index cc0e5699b86b..04bc20698f64 100755
--- a/testautomation/global/tools/includes/optional/t_macro_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_macro_tools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_macro_tools.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: rt $ $Date: 2008-07-31 19:26:13 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_ole.inc b/testautomation/global/tools/includes/optional/t_ole.inc
index 457704f20b13..f09e6209b245 100755
--- a/testautomation/global/tools/includes/optional/t_ole.inc
+++ b/testautomation/global/tools/includes/optional/t_ole.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'*******************************************************************************
-'* 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: basic_delete_modules.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:13 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
@@ -65,15 +59,15 @@ end function
'*******************************************************************************
-function hGetOleObjectName( ObjectType as string ) as string
-
- dim oUnoOfficeConnection as object
- dim oUnoConfigurationAccess as object
- dim aPropertyValue(1) as new com.sun.star.beans.PropertyValue
+function hGetOleObjectName( ObjectType as string ) as string
+
+ dim oUnoOfficeConnection as object
+ dim oUnoConfigurationAccess as object
+ dim aPropertyValue(1) as new com.sun.star.beans.PropertyValue
dim xViewRoot as object
dim cConfigString as string
- dim cString as string
-
+ dim cString as string
+
const CFN = "global::tools::includes::optional::t_ole.inc::hGetOleObjectName(): "
' Test function parameters. They are <> gApplication as the API is case sensitive
@@ -94,22 +88,22 @@ function hGetOleObjectName( ObjectType as string ) as string
if ( VERBOSE ) then printlog( CFN & "Retrieving OLE name for: " & ObjectType )
- ' ...Embedding is physical path, ObjectNames the top node
- aPropertyValue( 0 ).Name = "nodepath"
+ ' ...Embedding is physical path, ObjectNames the top node
+ aPropertyValue( 0 ).Name = "nodepath"
aPropertyValue( 0 ).Value = "/org.openoffice.Office.Embedding/ObjectNames/" & ObjectType
- ' Connect to remote UNO
- oUnoOfficeConnection = hGetUnoService( TRUE )
-
- if ( isNull( oUnoOfficeConnection )) then
- warnlog( CFN & "Failed to establish UNO connection, hGetUnoService failed" )
- hGetOleObjectName() = ""
+ ' Connect to remote UNO
+ oUnoOfficeConnection = hGetUnoService( TRUE )
+
+ if ( isNull( oUnoOfficeConnection )) then
+ warnlog( CFN & "Failed to establish UNO connection, hGetUnoService failed" )
+ hGetOleObjectName() = ""
else
- ' Get a configuration provider
+ ' Get a configuration provider
oUnoConfigurationAccess = oUnoOfficeConnection.createInstance( "com.sun.star.configuration.ConfigurationProvider" )
' Get access
- xViewRoot = oUnoConfigurationAccess.createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", aPropertyValue() )
+ xViewRoot = oUnoConfigurationAccess.createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", aPropertyValue() )
cConfigString = xViewRoot.getByName( "ObjectUIName" )
' The string contains placeholders %PRODUCTNAME and %PRODUCTVERSION which have to be replaced
@@ -119,11 +113,11 @@ function hGetOleObjectName( ObjectType as string ) as string
else
cString = gProductName & " " & gOfficeVersion & " " & right( cConfigString, len( cConfigString ) - 29 )
endif
-
+
endif
- hGetOleObjectName() = cString
-
+ hGetOleObjectName() = cString
+
end function
'*******************************************************************************
@@ -139,7 +133,7 @@ function GetOleDefaultNames()
gOLEChart = hGetOleObjectName( "Chart" )
gOLEImpress = hGetOleObjectName( "Impress" )
gOLEDraw = hGetOleObjectName( "Draw" )
- gOLEMath = hGetOleObjectName( "Math" )
+ gOLEMath = hGetOleObjectName( "Math" )
end function
diff --git a/testautomation/global/tools/includes/optional/t_proxy_info.inc b/testautomation/global/tools/includes/optional/t_proxy_info.inc
index f87d157edc59..45e32075ae6b 100644..100755
--- a/testautomation/global/tools/includes/optional/t_proxy_info.inc
+++ b/testautomation/global/tools/includes/optional/t_proxy_info.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_proxy_info.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:08 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_security_tools.inc b/testautomation/global/tools/includes/optional/t_security_tools.inc
index c00c613749a8..df644783c7ce 100755
--- a/testautomation/global/tools/includes/optional/t_security_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_security_tools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_security_tools.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:58:56 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_server_info.inc b/testautomation/global/tools/includes/optional/t_server_info.inc
index 2fb8db6948d1..5583a1bf77aa 100644..100755
--- a/testautomation/global/tools/includes/optional/t_server_info.inc
+++ b/testautomation/global/tools/includes/optional/t_server_info.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_server_info.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:08 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
index 0c1fb00a0284..0d347012b31b 100644..100755
--- a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
+++ b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_set_standard_controls.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:08 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc
index 51bc373efc2c..94ef4902fe36 100644..100755
--- a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc
+++ b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_spreadsheet_tools1.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:08 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : oliver.craemer@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_stringtools.inc b/testautomation/global/tools/includes/optional/t_stringtools.inc
index d4d435222489..da5ff8bd6722 100755
--- a/testautomation/global/tools/includes/optional/t_stringtools.inc
+++ b/testautomation/global/tools/includes/optional/t_stringtools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_stringtools.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:59:14 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_calc.inc b/testautomation/global/tools/includes/optional/t_toolbar_calc.inc
index 77ff86c2a729..5f0a0468608c 100644..100755
--- a/testautomation/global/tools/includes/optional/t_toolbar_calc.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_calc.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_toolbar_calc.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:09 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_impress.inc b/testautomation/global/tools/includes/optional/t_toolbar_impress.inc
index 6ad6ce2940b0..3a5d081e163a 100644..100755
--- a/testautomation/global/tools/includes/optional/t_toolbar_impress.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_impress.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_toolbar_impress.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:09 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
index e6f5c88e40e7..717bc3981dc2 100644..100755
--- a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_toolbar_tools1.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:09 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
index 71557de7f9b4..8343af3cb5a5 100644..100755
--- a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_toolbar_writer.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:09 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_treelist_tools.inc b/testautomation/global/tools/includes/optional/t_treelist_tools.inc
index a55036239a3d..18ee4bb8ad76 100755
--- a/testautomation/global/tools/includes/optional/t_treelist_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_treelist_tools.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_treelist_tools.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008-06-20 07:59:34 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_ui_filters.inc b/testautomation/global/tools/includes/optional/t_ui_filters.inc
index 9fd5531921a9..14f8830969df 100644..100755
--- a/testautomation/global/tools/includes/optional/t_ui_filters.inc
+++ b/testautomation/global/tools/includes/optional/t_ui_filters.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_filters.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27: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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_user_info.inc b/testautomation/global/tools/includes/optional/t_user_info.inc
index ded2317e15bb..f9f3708db12c 100644..100755
--- a/testautomation/global/tools/includes/optional/t_user_info.inc
+++ b/testautomation/global/tools/includes/optional/t_user_info.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_user_info.inc,v $
-'*
-'* $Revision: 1.1.2.1 $
-'*
-'* last change: $Author: jsk $ $Date: 2008/08/27 10:09:36 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_xml1.inc b/testautomation/global/tools/includes/optional/t_xml1.inc
index b87bf002ea1a..f7dcd2ea7de3 100755
--- a/testautomation/global/tools/includes/optional/t_xml1.inc
+++ b/testautomation/global/tools/includes/optional/t_xml1.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_xml1.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:09 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_xml2.inc b/testautomation/global/tools/includes/optional/t_xml2.inc
index 61fc8fc42361..86909252b03a 100755
--- a/testautomation/global/tools/includes/optional/t_xml2.inc
+++ b/testautomation/global/tools/includes/optional/t_xml2.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_xml2.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:09 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/tools/includes/optional/t_xml_filter1.inc b/testautomation/global/tools/includes/optional/t_xml_filter1.inc
index 96992320558c..d3e2c022bd8b 100644..100755
--- a/testautomation/global/tools/includes/optional/t_xml_filter1.inc
+++ b/testautomation/global/tools/includes/optional/t_xml_filter1.inc
@@ -1,828 +1,822 @@
-'encoding UTF-8 Do not remove or change this line!
-'*******************************************************************************
-'* 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: t_xml_filter1.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:09 $
-'*
-'* 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 : helge.delfs@sun.com
-'*
-'* short description : Tools / XML Filter Settings Resource Test
-'*
-'\******************************************************************************
-
+'encoding UTF-8 Do not remove or change this line!
+'*******************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
+'*
+'* short description : Tools / XML Filter Settings Resource Test
+'*
+'\******************************************************************************
+
testcase tToolsXMLFilterSettings
- Dim iCountOfXSLTStylesAtBeginning as integer
- Dim iCountOfXSLTStylesAfterInstallCheck as integer
- Dim iApplicationEntries as integer
- Dim ia as integer
- Dim ib as integer
- Dim ic as integer
- Dim iCountMsgBox as integer
- Dim sErrorPointerTextForResultfile as string
- Dim sFilterPackagePath as string
- Dim sDocXMLTestFile as string
- Dim sWhichFilterToUse as string
- Dim sTempReadFilterName as string
- Dim bREMOVEXSLT as boolean
- Dim bJavaBroken as boolean
-
- 'Not being used for Writer/WEB
- if gApplication = "HTML" then
- goto endsub
- endif
-
- 'Define the pointer where all warnlogs/QAErrorLogs will come from in this routine.
- sErrorPointerTextForResultfile = "global::tools::inc::t_xml_filter1,inc::tToolsXMLFilterSettings: "
-
- 'Later it will be detected if the JRE is working with the office installation
- 'Here bJavaBroken will be set to the default behaviour (Java is detected and is working)
- bJavaBroken = FALSE
-
- '/// Opening new document.
- printlog "- Opening new (application) document."
- call hNewDocument
- '/// Calling the menu item <i>Tools -&gt; XML Filter Settings</i>
- ToolsXMLFilterSettings
- printlog "- XML Filter Settings"
- Kontext "XMLFilterSettings"
- if XMLFilterSettings.Exists(1) then
- call Dialogtest (XMLFilterSettings)
- else
- warnlog sErrorPointerTextForResultfile & "Slot to open the 'XML Filter Settings dialog' failed. Exiting."
- goto endsub
- end if
- 'Counting the existing XSLT stylesheets to verify them after the
- 'XSLT stylesheet Check. Setting bREMOVEXSLT = FALSE which only will
- 'be TRUE if the count of before and after the check are different.
- bREMOVEXSLT = FALSE
- iCountOfXSLTStylesAtBeginning = FilterList.GetItemCount
- '/// Closing the XML Filter Settings-dialog.
- printlog "Closing the 'XML Filter Settings'-dialog."
- CloseBtn.Click
- '/// Checking if there are any XSLT stylesheets available (<i>finitialXMLSetting(&quot;docbook or word or excel&quot;)</i>).
- printlog " + Checking if there are any XSLT stylesheets available."
- select case gApplication
- case "CALC" : sWhichFilterToUse = "excel"
- case "WRITER" : sWhichFilterToUse = "word"
- case else : sWhichFilterToUse = "docbook"
- end select
- if finitialXMLSetting(sWhichFilterToUse) = FALSE then
- warnlog "It wasn't possible to use/install external XML filter. Test aborting!"
- goto endsub
- end if
- ToolsXMLFilterSettings
- printlog "Open XML Filter Settings dialog again."
- Kontext "XMLFilterSettings"
- iCountOfXSLTStylesAfterInstallCheck = FilterList.GetItemCount
- if iCountOfXSLTStylesAfterInstallCheck <> iCountOfXSLTStylesAtBeginning then
- bREMOVEXSLT = TRUE
- end if
- '/// Checking disabling of buttons on this dialog.
- printlog " + Checking that Edit/Test/Delete/SaveToPackage buttons disabled when no filter is selected."
- if EditBtn.IsEnabled then
- FilterList.Typekeys "<MOD1 SPACE>"
- sleep(1)
- end if
- if EditBtn.IsEnabled then
- warnlog sErrorPointerTextForResultfile & "Edit button: Enabled when no entry is selected!?"
- end if
- if TestXSLTs.IsEnabled then
- warnlog sErrorPointerTextForResultfile & "TestXSLTs button: Enabled when no entry is selected!?"
- end if
- if DeleteBtn.IsEnabled then
- warnlog sErrorPointerTextForResultfile & "Delete button: Enabled when no entry is selected!?"
- end if
- if SaveToPackage.IsEnabled then
- warnlog sErrorPointerTextForResultfile & "SaveToPackage button: Enabled when no entry is selected!?"
- end if
- '/// Checking disabling of buttons on this dialog.
- printlog " + Checking that Edit/Test/Delete/SaveToPackage buttons enabled when one filter is selected."
- if NOT EditBtn.IsEnabled then
- FilterList.Typekeys "<SPACE>"
- sleep(1)
- end if
- if NOT EditBtn.IsEnabled then
- warnlog sErrorPointerTextForResultfile & "Edit button: Disabled when one entry is selected!?"
- end if
- if NOT TestXSLTs.IsEnabled then
- warnlog sErrorPointerTextForResultfile & "TestXSLTs button: Disabled when one entry is selected!?"
- end if
- if NOT DeleteBtn.IsEnabled then
- warnlog sErrorPointerTextForResultfile & "Delete button: Disabled when one entry is selected!?"
- end if
- if NOT SaveToPackage.IsEnabled then
- warnlog sErrorPointerTextForResultfile & "SaveToPackage button: Disabled when one entry is selected!?"
- end if
- '/// <i>[Loop]</i>
- '///+ <ol><li>Clicking the &quot;New&quot; button</li>
- '///+ <li>Clicking the &quot;Edit&quot; button</li></ol>
- Kontext "XMLFilterSettings"
- FilterList.TypeKeys "<HOME>"
- for ic = 1 to iCountOfXSLTStylesAfterInstallCheck
- Kontext "XMLFilterSettings"
+ Dim iCountOfXSLTStylesAtBeginning as integer
+ Dim iCountOfXSLTStylesAfterInstallCheck as integer
+ Dim iApplicationEntries as integer
+ Dim ia as integer
+ Dim ib as integer
+ Dim ic as integer
+ Dim iCountMsgBox as integer
+ Dim sErrorPointerTextForResultfile as string
+ Dim sFilterPackagePath as string
+ Dim sDocXMLTestFile as string
+ Dim sWhichFilterToUse as string
+ Dim sTempReadFilterName as string
+ Dim bREMOVEXSLT as boolean
+ Dim bJavaBroken as boolean
+
+ 'Not being used for Writer/WEB
+ if gApplication = "HTML" then
+ goto endsub
+ endif
+
+ 'Define the pointer where all warnlogs/QAErrorLogs will come from in this routine.
+ sErrorPointerTextForResultfile = "global::tools::inc::t_xml_filter1,inc::tToolsXMLFilterSettings: "
+
+ 'Later it will be detected if the JRE is working with the office installation
+ 'Here bJavaBroken will be set to the default behaviour (Java is detected and is working)
+ bJavaBroken = FALSE
+
+ '/// Opening new document.
+ printlog "- Opening new (application) document."
+ call hNewDocument
+ '/// Calling the menu item <i>Tools -&gt; XML Filter Settings</i>
+ ToolsXMLFilterSettings
+ printlog "- XML Filter Settings"
+ Kontext "XMLFilterSettings"
+ if XMLFilterSettings.Exists(1) then
+ call Dialogtest (XMLFilterSettings)
+ else
+ warnlog sErrorPointerTextForResultfile & "Slot to open the 'XML Filter Settings dialog' failed. Exiting."
+ goto endsub
+ end if
+ 'Counting the existing XSLT stylesheets to verify them after the
+ 'XSLT stylesheet Check. Setting bREMOVEXSLT = FALSE which only will
+ 'be TRUE if the count of before and after the check are different.
+ bREMOVEXSLT = FALSE
+ iCountOfXSLTStylesAtBeginning = FilterList.GetItemCount
+ '/// Closing the XML Filter Settings-dialog.
+ printlog "Closing the 'XML Filter Settings'-dialog."
+ CloseBtn.Click
+ '/// Checking if there are any XSLT stylesheets available (<i>finitialXMLSetting(&quot;docbook or word or excel&quot;)</i>).
+ printlog " + Checking if there are any XSLT stylesheets available."
+ select case gApplication
+ case "CALC" : sWhichFilterToUse = "excel"
+ case "WRITER" : sWhichFilterToUse = "word"
+ case else : sWhichFilterToUse = "docbook"
+ end select
+ if finitialXMLSetting(sWhichFilterToUse) = FALSE then
+ warnlog "It wasn't possible to use/install external XML filter. Test aborting!"
+ goto endsub
+ end if
+ ToolsXMLFilterSettings
+ printlog "Open XML Filter Settings dialog again."
+ Kontext "XMLFilterSettings"
+ iCountOfXSLTStylesAfterInstallCheck = FilterList.GetItemCount
+ if iCountOfXSLTStylesAfterInstallCheck <> iCountOfXSLTStylesAtBeginning then
+ bREMOVEXSLT = TRUE
+ end if
+ '/// Checking disabling of buttons on this dialog.
+ printlog " + Checking that Edit/Test/Delete/SaveToPackage buttons disabled when no filter is selected."
+ if EditBtn.IsEnabled then
+ FilterList.Typekeys "<MOD1 SPACE>"
+ sleep(1)
+ end if
+ if EditBtn.IsEnabled then
+ warnlog sErrorPointerTextForResultfile & "Edit button: Enabled when no entry is selected!?"
+ end if
+ if TestXSLTs.IsEnabled then
+ warnlog sErrorPointerTextForResultfile & "TestXSLTs button: Enabled when no entry is selected!?"
+ end if
+ if DeleteBtn.IsEnabled then
+ warnlog sErrorPointerTextForResultfile & "Delete button: Enabled when no entry is selected!?"
+ end if
+ if SaveToPackage.IsEnabled then
+ warnlog sErrorPointerTextForResultfile & "SaveToPackage button: Enabled when no entry is selected!?"
+ end if
+ '/// Checking disabling of buttons on this dialog.
+ printlog " + Checking that Edit/Test/Delete/SaveToPackage buttons enabled when one filter is selected."
+ if NOT EditBtn.IsEnabled then
+ FilterList.Typekeys "<SPACE>"
+ sleep(1)
+ end if
+ if NOT EditBtn.IsEnabled then
+ warnlog sErrorPointerTextForResultfile & "Edit button: Disabled when one entry is selected!?"
+ end if
+ if NOT TestXSLTs.IsEnabled then
+ warnlog sErrorPointerTextForResultfile & "TestXSLTs button: Disabled when one entry is selected!?"
+ end if
+ if NOT DeleteBtn.IsEnabled then
+ warnlog sErrorPointerTextForResultfile & "Delete button: Disabled when one entry is selected!?"
+ end if
+ if NOT SaveToPackage.IsEnabled then
+ warnlog sErrorPointerTextForResultfile & "SaveToPackage button: Disabled when one entry is selected!?"
+ end if
+ '/// <i>[Loop]</i>
+ '///+ <ol><li>Clicking the &quot;New&quot; button</li>
+ '///+ <li>Clicking the &quot;Edit&quot; button</li></ol>
+ Kontext "XMLFilterSettings"
+ FilterList.TypeKeys "<HOME>"
+ for ic = 1 to iCountOfXSLTStylesAfterInstallCheck
+ Kontext "XMLFilterSettings"
if ( XMLFilterSettings.exists( 2 ) ) then
-
- 'read the filter names from the dialog.
+
+ 'read the filter names from the dialog.
sTempReadFilterName = FilterList.GetItemText(ic)
-
- 'lower case comparison!
- sTempReadFilterName = lcase(sTempReadFilterName)
- if InStr(sTempReadFilterName , sWhichFilterToUse) <> 0 then
- FilterList.TypeKeys "<DOWN> " , ic-1
- ' printlog "DEBUG: Filtername: " & FilterList.GetItemText(ic)
- WaitSlot() ' Sort of NOOP
+
+ 'lower case comparison!
+ sTempReadFilterName = lcase(sTempReadFilterName)
+ if InStr(sTempReadFilterName , sWhichFilterToUse) <> 0 then
+ FilterList.TypeKeys "<DOWN> " , ic-1
+ ' printlog "DEBUG: Filtername: " & FilterList.GetItemText(ic)
+ WaitSlot() ' Sort of NOOP
endif
else
warnlog( "XML Filter Settings dialog too slow/not displayed" )
- endif
- next ic
- for ia = 1 to 2
- Kontext "XMLFilterSettings"
- select case ia
- case 1 : printlog "+- New"
- NewBtn.Click
- case 2 : printlog "+- Edit"
- EditBtn.Click
- end select
- sleep(1)
- Kontext "XMLFilter"
- if XMLFilter.Exists(2) then
- select case ia
- case 1 : printlog " (XML Filter: New)"
- case 2 : printlog " (XML Filter: Edit)"
- end select
- call Dialogtest (XMLFilter)
- Tabcontrol.SetPage TabXMLGeneral
- Kontext "TabXMLGeneral"
- printlog " +- TabXMLGeneral"
- if ia = 1 then
- '/// If the &quot;New&quot;-button has been used:
- call Dialogtest (TabXMLGeneral)
- iApplicationEntries = Application.GetItemCount
- '///+ <ul><li>Checking the count of applications. Should be 8.</li></ul>
- printlog " Checking the count of applications. Should be 8."
- if iApplicationEntries <> 8 then
- warnlog " +- There should be 8 applications listed in the 'Application'-listbox but there are " & iApplicationEntries & " available!"
- else
- printlog " +- 8 applications listed in 'Application' listbox."
- end if
- end if
- Kontext "XMLFilter"
- Tabcontrol.SetPage TabXMLTransformation
- Kontext "TabXMLTransformation"
- printlog " +- TabXMLTransformation"
- call Dialogtest (TabXMLTransformation)
- '/// On tab page &quot;Transformation&quot; press all &quot;Browse&quot;-buttons.
- printlog " +- On tab page 'Transformation' press all 'Browse'-buttons."
- for ib = 1 to 4
- Kontext "TabXMLTransformation"
- select case ib
- case 1 : printlog " +- Browse button 'DTD'"
- DTDBrowse.Click
- case 2 : printlog " +- Browse button 'XSLT for export'"
- XSLTForExportBrowse.Click
- case 3 : printlog " +- Browse button 'XSLT for import'"
- XSLTForImportBrowse.Click
- case 4 : printlog " +- Browse button 'Template for import'"
- BrowseTemplateForImport.Click
- end select
-
- Kontext "OeffnenDlg"
- if OeffnenDlg.Exists(3) then
- '/// After every click on &quot;Browse&quot;-button an &quot;FileOpen&quot;-dialog shoud be visible. Cancel that dialog.
- printlog " +- After every click on 'Browse'-button an 'FileOpen'-dialog shoud be visible. Cancel that dialog."
- call Dialogtest (OeffnenDlg)
- OeffnenDlg.Cancel
-
- else
- warnlog sErrorPointerTextForResultfile & "File Open dialog did not appeared."
- end if
- next ib
- '/// [Loop end]
+ endif
+ next ic
+ for ia = 1 to 2
+ Kontext "XMLFilterSettings"
+ select case ia
+ case 1 : printlog "+- New"
+ NewBtn.Click
+ case 2 : printlog "+- Edit"
+ EditBtn.Click
+ end select
+ sleep(1)
+ Kontext "XMLFilter"
+ if XMLFilter.Exists(2) then
+ select case ia
+ case 1 : printlog " (XML Filter: New)"
+ case 2 : printlog " (XML Filter: Edit)"
+ end select
+ call Dialogtest (XMLFilter)
+ Tabcontrol.SetPage TabXMLGeneral
+ Kontext "TabXMLGeneral"
+ printlog " +- TabXMLGeneral"
+ if ia = 1 then
+ '/// If the &quot;New&quot;-button has been used:
+ call Dialogtest (TabXMLGeneral)
+ iApplicationEntries = Application.GetItemCount
+ '///+ <ul><li>Checking the count of applications. Should be 8.</li></ul>
+ printlog " Checking the count of applications. Should be 8."
+ if iApplicationEntries <> 8 then
+ warnlog " +- There should be 8 applications listed in the 'Application'-listbox but there are " & iApplicationEntries & " available!"
+ else
+ printlog " +- 8 applications listed in 'Application' listbox."
+ end if
+ end if
Kontext "XMLFilter"
- if ( XMLFilter.exists( 3 ) ) then
- printlog " +- Closing 'XML Filter: New Filter'-dialog."
+ Tabcontrol.SetPage TabXMLTransformation
+ Kontext "TabXMLTransformation"
+ printlog " +- TabXMLTransformation"
+ call Dialogtest (TabXMLTransformation)
+ '/// On tab page &quot;Transformation&quot; press all &quot;Browse&quot;-buttons.
+ printlog " +- On tab page 'Transformation' press all 'Browse'-buttons."
+ for ib = 1 to 4
+ Kontext "TabXMLTransformation"
+ select case ib
+ case 1 : printlog " +- Browse button 'DTD'"
+ DTDBrowse.Click
+ case 2 : printlog " +- Browse button 'XSLT for export'"
+ XSLTForExportBrowse.Click
+ case 3 : printlog " +- Browse button 'XSLT for import'"
+ XSLTForImportBrowse.Click
+ case 4 : printlog " +- Browse button 'Template for import'"
+ BrowseTemplateForImport.Click
+ end select
+
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists(3) then
+ '/// After every click on &quot;Browse&quot;-button an &quot;FileOpen&quot;-dialog shoud be visible. Cancel that dialog.
+ printlog " +- After every click on 'Browse'-button an 'FileOpen'-dialog shoud be visible. Cancel that dialog."
+ call Dialogtest (OeffnenDlg)
+ OeffnenDlg.Cancel
+
+ else
+ warnlog sErrorPointerTextForResultfile & "File Open dialog did not appeared."
+ end if
+ next ib
+ '/// [Loop end]
+ Kontext "XMLFilter"
+ if ( XMLFilter.exists( 3 ) ) then
+ printlog " +- Closing 'XML Filter: New Filter'-dialog."
XMLFilter.Cancel
else
warnlog( "XML Filter Dialog not available" )
- endif
- '/// Closing &quot;XML Filter: New Filter&quot;-dialog
- else
- warnlog "XML Filter dialog did not appeared!"
- end if
- next ia
- Kontext "XMLFilterSettings"
- '/// Clicking &quot;Test XLSTs&quot;-button.
- printlog "+- Clicking 'Test XLSTs'-button."
- TestXSLTs.Click
-
- 'If it's an Import filter it makes no sense to test the export.
- if sWhichFilterToUse = "docbook" then
-
- printlog "+- E X P O R T (Writer, Impress)"
- Kontext "TestXMLFilter"
- if TestXMLFilter.Exists( 3 ) then
- call Dialogtest(TestXMLFilter)
- else
- warnlog sErrorPointerTextForResultfile & "Testing of the XML filter not possible. Exiting."
- Kontext "XMLFilterSettings"
- '/// Closing the &quot;XML Filter Settings&quot;-dialog.
- printlog "+- Closing the 'XML Filter Settings'-dialog."
- 'Deinstall the XSLT stylesheet if this routine has
- 'added one at the beginning.
- if bREMOVEXSLT = TRUE then
- call sRemoveXSLTFilter
- end if
- Kontext "XMLFilterSettings"
- CloseBtn.Click
- '/// Closing the opened application document.
- printlog "- Closing the opened application document."
- '/// ...if there is more than 1 document opened.
- if GetDocumentCount > 1 then
- call hCloseDocument
- end if
- 'Here the routine stops if the test dialog is not opening.
- goto endsub
- end if
- ExportBrowseBtn.Click
- '/// Press first &quot;Browse&quot;-button on the &quot;Test XML Filter&quot;-dialog.
- printlog " +-Press first 'Browse'-button on the 'Test XML Filter'-dialog."
-
- Kontext "OeffnenDlg"
- if OeffnenDlg.Exists( 3 ) then
- call Dialogtest (OeffnenDlg)
- OeffnenDlg.Cancel
- '/// Closing 'FileOpen'-Dialog.
- printlog " +- Closing 'FileOpen'-Dialog."
- else
- warnlog sErrorPointerTextForResultfile & "File Open dialog did not occoured?!"
+ endif
+ '/// Closing &quot;XML Filter: New Filter&quot;-dialog
+ else
+ warnlog "XML Filter dialog did not appeared!"
end if
-
+ next ia
+ Kontext "XMLFilterSettings"
+ '/// Clicking &quot;Test XLSTs&quot;-button.
+ printlog "+- Clicking 'Test XLSTs'-button."
+ TestXSLTs.Click
+
+ 'If it's an Import filter it makes no sense to test the export.
+ if sWhichFilterToUse = "docbook" then
+
+ printlog "+- E X P O R T (Writer, Impress)"
+ Kontext "TestXMLFilter"
+ if TestXMLFilter.Exists( 3 ) then
+ call Dialogtest(TestXMLFilter)
+ else
+ warnlog sErrorPointerTextForResultfile & "Testing of the XML filter not possible. Exiting."
+ Kontext "XMLFilterSettings"
+ '/// Closing the &quot;XML Filter Settings&quot;-dialog.
+ printlog "+- Closing the 'XML Filter Settings'-dialog."
+ 'Deinstall the XSLT stylesheet if this routine has
+ 'added one at the beginning.
+ if bREMOVEXSLT = TRUE then
+ call sRemoveXSLTFilter
+ end if
+ Kontext "XMLFilterSettings"
+ CloseBtn.Click
+ '/// Closing the opened application document.
+ printlog "- Closing the opened application document."
+ '/// ...if there is more than 1 document opened.
+ if GetDocumentCount > 1 then
+ call hCloseDocument
+ end if
+ 'Here the routine stops if the test dialog is not opening.
+ goto endsub
+ end if
+ ExportBrowseBtn.Click
+ '/// Press first &quot;Browse&quot;-button on the &quot;Test XML Filter&quot;-dialog.
+ printlog " +-Press first 'Browse'-button on the 'Test XML Filter'-dialog."
+
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists( 3 ) then
+ call Dialogtest (OeffnenDlg)
+ OeffnenDlg.Cancel
+ '/// Closing 'FileOpen'-Dialog.
+ printlog " +- Closing 'FileOpen'-Dialog."
+ else
+ warnlog sErrorPointerTextForResultfile & "File Open dialog did not occoured?!"
+ end if
+
Kontext "TestXMLFilter"
- if ( TestXMLFilter.exists( 2 ) ) then
- '/// If the application is Writer (because the default XSLT stylesheets are only Writer filter).
- '///+<ul><li>Clicking on &quot;Current Document&quot;-button.</li></ul>
- if gApplication = "WRITER" then
- printlog " +- Clicking on 'Current Document'-button."
- CurrentDocument.Click
-
- '/// If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
- Kontext "Messagebox"
- if MessageBox.Exists( 5 ) then
- warnlog Messagebox.GetText
- try
- Messagebox.Cancel
- catch
- Messagebox.OK
- endcatch
- else
- try
- Kontext "XMLFilterOutput"
- if XMLFilterOutput.Exists(1) then
- '/// &quot;XML Filter Output&quot;-dialog should be visible.
- printlog " +- 'XML Filter Output'-dialog should be visible."
- call Dialogtest(XMLFilterOutput)
- '/// Clicking &quot;Validate&quot;-button.
- printlog " +- Clicking 'Validate'-button."
- Validate.Click
- WaitSlot( 2000 )
- '/// Checking that the validate output control is visible inside the window.
- printlog " +- Checking that the validate output control is visible inside the window."
- if NOT ValidateOutput.isVisible then
- warnlog " +- Validate output is not visible!"
- end if
- '/// Closing &quot;XML Filter Output&quot;-dialog.
- printlog " +- Closing 'XML Filter Output'-dialog."
- XMLFilterOutput.Close
-
- else
- warnlog sErrorPointerTextForResultfile & "XML Filter Ouput dialog did not occoured."
- end if
- catch
- warnlog "Testing of XSLTs does not work."
- endcatch
- end if
- else
- Kontext "TestXMLFilter"
- printlog " +- 'Current Document'-button should not be enabled if no !"
- if CurrentDocument.IsEnabled then
- Kontext "DocumentWriter"
- try
- DocumentWriter.TypeKeys "A writer document exists!"
- catch
- QAErrorLog "'Current Document'-button is enabled but a 'Writer' XML filter has been selected! If there's no Writer document (may be in the background) also opened it would be a bug!"
- endcatch
+ if ( TestXMLFilter.exists( 2 ) ) then
+ '/// If the application is Writer (because the default XSLT stylesheets are only Writer filter).
+ '///+<ul><li>Clicking on &quot;Current Document&quot;-button.</li></ul>
+ if gApplication = "WRITER" then
+ printlog " +- Clicking on 'Current Document'-button."
+ CurrentDocument.Click
+
+ '/// If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
+ Kontext "Messagebox"
+ if MessageBox.Exists( 5 ) then
+ warnlog Messagebox.GetText
+ try
+ Messagebox.Cancel
+ catch
+ Messagebox.OK
+ endcatch
+ else
+ try
+ Kontext "XMLFilterOutput"
+ if XMLFilterOutput.Exists(1) then
+ '/// &quot;XML Filter Output&quot;-dialog should be visible.
+ printlog " +- 'XML Filter Output'-dialog should be visible."
+ call Dialogtest(XMLFilterOutput)
+ '/// Clicking &quot;Validate&quot;-button.
+ printlog " +- Clicking 'Validate'-button."
+ Validate.Click
+ WaitSlot( 2000 )
+ '/// Checking that the validate output control is visible inside the window.
+ printlog " +- Checking that the validate output control is visible inside the window."
+ if NOT ValidateOutput.isVisible then
+ warnlog " +- Validate output is not visible!"
+ end if
+ '/// Closing &quot;XML Filter Output&quot;-dialog.
+ printlog " +- Closing 'XML Filter Output'-dialog."
+ XMLFilterOutput.Close
+
+ else
+ warnlog sErrorPointerTextForResultfile & "XML Filter Ouput dialog did not occoured."
+ end if
+ catch
+ warnlog "Testing of XSLTs does not work."
+ endcatch
+ end if
+ else
+ Kontext "TestXMLFilter"
+ printlog " +- 'Current Document'-button should not be enabled if no !"
+ if CurrentDocument.IsEnabled then
+ Kontext "DocumentWriter"
+ try
+ DocumentWriter.TypeKeys "A writer document exists!"
+ catch
+ QAErrorLog "'Current Document'-button is enabled but a 'Writer' XML filter has been selected! If there's no Writer document (may be in the background) also opened it would be a bug!"
+ endcatch
end if
- end if
+ end if
else
warnlog( "FATAL: TestXMLFilter not available" )
- end if
+ end if
printlog "+- I M P O R T"
endif
-
+
Kontext "TestXMLFilter"
- if ( TestXMLFilter.exists( 2 ) ) then
- '/// Clicking &quot;Browse&quot;-button (Import).
- printlog " +- Clicking 'Browse'-button (Import)."
- ImportBrowseBtn.Click
-
- Kontext "OeffnenDlg"
- if OeffnenDlg.Exists( 2 ) then
- call Dialogtest (OeffnenDlg)
- '/// Closing &quot;FileOpen&quot;-dialog.
- printlog " +- Closing 'FileOpen'-dialog."
- OeffnenDlg.Cancel
- else
- warnlog sErrorPointerTextForResultfile & "File Open dialog did not occoured?!"
+ if ( TestXMLFilter.exists( 2 ) ) then
+ '/// Clicking &quot;Browse&quot;-button (Import).
+ printlog " +- Clicking 'Browse'-button (Import)."
+ ImportBrowseBtn.Click
+
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists( 2 ) then
+ call Dialogtest (OeffnenDlg)
+ '/// Closing &quot;FileOpen&quot;-dialog.
+ printlog " +- Closing 'FileOpen'-dialog."
+ OeffnenDlg.Cancel
+ else
+ warnlog sErrorPointerTextForResultfile & "File Open dialog did not occoured?!"
end if
else
warnlog( "FATAL: Dialog <TestXMLFilter> is not available" )
endif
-
- Kontext "TestXMLFilter"
- '/// Checking if 'Display Source'-checkbox is checked (should not be!).
- printlog " +- Checking if 'Display Source'-checkbox is checked (should not be!)."
- if NOT DisplaySource.IsChecked then
- DisplaySource.Check
- else
- warnlog " +- Display source should be NOT checked as default!"
- end if
- Kontext "TestXMLFilter"
- select case sWhichFilterToUse
- case "docbook" : '/// If DocBook XML is being tested use a DocBook XML file.
- sDocXMLTestFile = ConvertPath(gTestToolPath & "global\input\xml_filter\docbook.xml")
- case "word" : '/// If Word XML is being tested use a Word XML file.
- sDocXMLTestFile = ConvertPath(gTestToolPath & "global\input\xml_filter\word.xml")
- case "excel" : '/// If Excel XML is being tested use a Excel XML file.
- sDocXMLTestFile = ConvertPath(gTestToolPath & "global\input\xml_filter\excel.xml")
- case "xhtml" : '/// If XHTML is being tested that use a XHTML file.
- sDocXMLTestFile = ConvertPath(gTestToolPath & "global\input\xml_filter\xhtml.xhtml")
- case else : warnlog sErrorPointerTextForResultfile & "Wrong parameter has been used! Exiting"
- Kontext "TestXMLFilter"
- '/// Closing the &quot;Test XML Filter&quot;-dialog.
- printlog " +- Closing the 'Test XML Filter'-dialog"
- CloseBtn.Click
- Kontext "XMLFilterSettings"
- '/// Closing the &quot;XML Filter Settings&quot;-dialog.
- printlog "+- Closing the 'XML Filter Settings'-dialog."
- 'Deinstall the XSLT stylesheet if this routine has
- 'added one at the beginning.
- if bREMOVEXSLT = TRUE then
- call sRemoveXSLTFilter
- end if
- Kontext "XMLFilterSettings"
- CloseBtn.Click
- '/// Closing the opened application document.
- printlog "- Closing the opened application document."
- '/// ...if there is more than 1 document opened.
- if GetDocumentCount > 1 then
- Call hCloseDocument
- end if
- goto endsub
- end select
- '/// Clicking &quot;Browse&quot;-button (Import) again to test it with the XML file.
- printlog " +- Clicking 'Browse'-button (Import) again to test it the XML file."
- ImportBrowseBtn.Click
-
- Kontext "OeffnenDlg"
- if OeffnenDlg.Exists( 3 ) then
- call Dialogtest (OeffnenDlg)
- Dateiname.SetText sDocXMLTestFile
- Oeffnen.Click
- try
- ' If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
- Kontext "Messagebox"
- if Messagebox.Exists(2) then
- for iCountMsgBox = 1 to 5
- Kontext "Messagebox"
- if MessageBox.Exists(2) then
- if MessageBox.GetRT = 304 then
- if iCountMsgBox = 1 then
- warnlog sErrorPointerTextForResultfile & "No output window was visible! Exiting routine!"
- endif
- QAErrorLog "Dialog (" & iCountMsgBox & "): " & Messagebox.GetText
- Messagebox.OK
- bJavaBroken = TRUE
- if iCountMsgBox > 3 then
- warnlog "Instead of 3 times the missing Java RT box will be shown " & iCountMsgBox & " times."
- endif
- end if
- else
- exit for
- endif
- next iCountMsgBox
- endif
- Kontext "XMLFilterOutput"
- if XMLFilterOutput.Exists(3) then
- '/// &quot;XML Filter Output&quot;-dialog should be visible.
- printlog " +- 'XML Filter Output'-dialog should be visible."
- call Dialogtest(XMLFilterOutput)
- '/// Clicking &quot;Validate&quot;-button.
- printlog " +- Clicking 'Validate'-button."
- Validate.Click
-
- Kontext "Messagebox"
- if Messagebox.Exists( 2 ) then
- if bJavaBroken then
- Messagebox.OK
- else
- warnlog Messagebox.GetText
- Messagebox.OK
- endif
- endif
- '/// Checking that the validate output control is visible inside the window.
- printlog " +- Checking that the validate output control is visible inside the window."
- Kontext "XMLFilterOutput"
- if NOT ValidateOutput.isVisible then
- warnlog " +- Validate output is not visible!"
- end if
- '/// Closing &quot;XML Filter Output&quot;-dialog.
- printlog " +- Closing 'XML Filter Output'-dialog."
- Kontext "XMLFilterOutput"
- XMLFilterOutput.Close
- else
- warnlog sErrorPointerTextForResultfile & "No output window was visible! Exiting routine!"
- Kontext "TestXMLFilter"
- '/// Closing the &quot;Test XML Filter&quot;-dialog.
- printlog " +- Closing the 'Test XML Filter'-dialog"
- CloseBtn.Click
- Kontext "XMLFilterSettings"
- '/// Closing the &quot;XML Filter Settings&quot;-dialog.
- printlog "+- Closing the 'XML Filter Settings'-dialog."
- 'Deinstall the XSLT stylesheet if this routine has
- 'added one at the beginning.
- if bREMOVEXSLT = TRUE then
- call sRemoveXSLTFilter
- end if
- Kontext "XMLFilterSettings"
- CloseBtn.Click
- '/// Closing the opened application document.
- printlog "- Closing the opened application document."
- '/// ...if there is more than 1 document opened.
- if GetDocumentCount > 1 then
- call hCloseDocument
- end if
- 'Here the routine stops if there is no Java installed or the output was not visible.
- goto endsub
- end if
- catch
- '/// If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
- Kontext "Messagebox"
- if MessageBox.Exists( 2 ) then
- warnlog Messagebox.GetText
- Messagebox.OK
- warnlog sErrorPointerTextForResultfile & "Java is not usable! Exiting routine!"
- Kontext "TestXMLFilter"
- '/// Closing the &quot;Test XML Filter&quot;-dialog.
- printlog " +- Closing the 'Test XML Filter'-dialog"
- CloseBtn.Click
- Kontext "XMLFilterSettings"
- '/// Closing the &quot;XML Filter Settings&quot;-dialog.
- printlog "+- Closing the 'XML Filter Settings'-dialog."
- 'Deinstall the XSLT stylesheet if this routine has
- 'added one at the beginning.
- if bREMOVEXSLT = TRUE then
- call sRemoveXSLTFilter
- end if
- Kontext "XMLFilterSettings"
- CloseBtn.Click
- '/// Closing the opened application document.
- printlog "- Closing the opened application document."
- '/// ...if there is more than 1 document opened.
- if GetDocumentCount > 1 then
- call hCloseDocument
- end if
- goto endsub
- end if
- endcatch
- else
- warnlog sErrorPointerTextForResultfile & "File Open dialog missing! Not able to load test documents. Exiting routine!"
- Kontext "TestXMLFilter"
- '/// Closing the &quot;Test XML Filter&quot;-dialog.
- printlog " +- Closing the 'Test XML Filter'-dialog"
- CloseBtn.Click
- Kontext "XMLFilterSettings"
- '/// Closing the &quot;XML Filter Settings&quot;-dialog.
- printlog "+- Closing the 'XML Filter Settings'-dialog."
- 'Deinstall the XSLT stylesheet if this routine has
- 'added one at the beginning.
- if bREMOVEXSLT = TRUE then
- call sRemoveXSLTFilter
- end if
- Kontext "XMLFilterSettings"
- CloseBtn.Click
- '/// Closing the opened application document.
- printlog "- Closing the opened application document."
- '/// ...if there is more than 1 document opened.
- if GetDocumentCount > 1 then
- call hCloseDocument
- end if
- goto endsub
- end if
- '/// Closing the tested XML document
- printlog " +- Closing the tested XML document"
- '/// ...if there is more than 1 document opened.
- if GetDocumentCount > 1 then
- call hCloseDocument
- else
- QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
- end if
-
+
+ Kontext "TestXMLFilter"
+ '/// Checking if 'Display Source'-checkbox is checked (should not be!).
+ printlog " +- Checking if 'Display Source'-checkbox is checked (should not be!)."
+ if NOT DisplaySource.IsChecked then
+ DisplaySource.Check
+ else
+ warnlog " +- Display source should be NOT checked as default!"
+ end if
+ Kontext "TestXMLFilter"
+ select case sWhichFilterToUse
+ case "docbook" : '/// If DocBook XML is being tested use a DocBook XML file.
+ sDocXMLTestFile = ConvertPath(gTestToolPath & "global\input\xml_filter\docbook.xml")
+ case "word" : '/// If Word XML is being tested use a Word XML file.
+ sDocXMLTestFile = ConvertPath(gTestToolPath & "global\input\xml_filter\word.xml")
+ case "excel" : '/// If Excel XML is being tested use a Excel XML file.
+ sDocXMLTestFile = ConvertPath(gTestToolPath & "global\input\xml_filter\excel.xml")
+ case "xhtml" : '/// If XHTML is being tested that use a XHTML file.
+ sDocXMLTestFile = ConvertPath(gTestToolPath & "global\input\xml_filter\xhtml.xhtml")
+ case else : warnlog sErrorPointerTextForResultfile & "Wrong parameter has been used! Exiting"
+ Kontext "TestXMLFilter"
+ '/// Closing the &quot;Test XML Filter&quot;-dialog.
+ printlog " +- Closing the 'Test XML Filter'-dialog"
+ CloseBtn.Click
+ Kontext "XMLFilterSettings"
+ '/// Closing the &quot;XML Filter Settings&quot;-dialog.
+ printlog "+- Closing the 'XML Filter Settings'-dialog."
+ 'Deinstall the XSLT stylesheet if this routine has
+ 'added one at the beginning.
+ if bREMOVEXSLT = TRUE then
+ call sRemoveXSLTFilter
+ end if
+ Kontext "XMLFilterSettings"
+ CloseBtn.Click
+ '/// Closing the opened application document.
+ printlog "- Closing the opened application document."
+ '/// ...if there is more than 1 document opened.
+ if GetDocumentCount > 1 then
+ Call hCloseDocument
+ end if
+ goto endsub
+ end select
+ '/// Clicking &quot;Browse&quot;-button (Import) again to test it with the XML file.
+ printlog " +- Clicking 'Browse'-button (Import) again to test it the XML file."
+ ImportBrowseBtn.Click
+
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists( 3 ) then
+ call Dialogtest (OeffnenDlg)
+ Dateiname.SetText sDocXMLTestFile
+ Oeffnen.Click
+ try
+ ' If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
+ Kontext "Messagebox"
+ if Messagebox.Exists(2) then
+ for iCountMsgBox = 1 to 5
+ Kontext "Messagebox"
+ if MessageBox.Exists(2) then
+ if MessageBox.GetRT = 304 then
+ if iCountMsgBox = 1 then
+ warnlog sErrorPointerTextForResultfile & "No output window was visible! Exiting routine!"
+ endif
+ QAErrorLog "Dialog (" & iCountMsgBox & "): " & Messagebox.GetText
+ Messagebox.OK
+ bJavaBroken = TRUE
+ if iCountMsgBox > 3 then
+ warnlog "Instead of 3 times the missing Java RT box will be shown " & iCountMsgBox & " times."
+ endif
+ end if
+ else
+ exit for
+ endif
+ next iCountMsgBox
+ endif
+ Kontext "XMLFilterOutput"
+ if XMLFilterOutput.Exists(3) then
+ '/// &quot;XML Filter Output&quot;-dialog should be visible.
+ printlog " +- 'XML Filter Output'-dialog should be visible."
+ call Dialogtest(XMLFilterOutput)
+ '/// Clicking &quot;Validate&quot;-button.
+ printlog " +- Clicking 'Validate'-button."
+ Validate.Click
+
+ Kontext "Messagebox"
+ if Messagebox.Exists( 2 ) then
+ if bJavaBroken then
+ Messagebox.OK
+ else
+ warnlog Messagebox.GetText
+ Messagebox.OK
+ endif
+ endif
+ '/// Checking that the validate output control is visible inside the window.
+ printlog " +- Checking that the validate output control is visible inside the window."
+ Kontext "XMLFilterOutput"
+ if NOT ValidateOutput.isVisible then
+ warnlog " +- Validate output is not visible!"
+ end if
+ '/// Closing &quot;XML Filter Output&quot;-dialog.
+ printlog " +- Closing 'XML Filter Output'-dialog."
+ Kontext "XMLFilterOutput"
+ XMLFilterOutput.Close
+ else
+ warnlog sErrorPointerTextForResultfile & "No output window was visible! Exiting routine!"
+ Kontext "TestXMLFilter"
+ '/// Closing the &quot;Test XML Filter&quot;-dialog.
+ printlog " +- Closing the 'Test XML Filter'-dialog"
+ CloseBtn.Click
+ Kontext "XMLFilterSettings"
+ '/// Closing the &quot;XML Filter Settings&quot;-dialog.
+ printlog "+- Closing the 'XML Filter Settings'-dialog."
+ 'Deinstall the XSLT stylesheet if this routine has
+ 'added one at the beginning.
+ if bREMOVEXSLT = TRUE then
+ call sRemoveXSLTFilter
+ end if
+ Kontext "XMLFilterSettings"
+ CloseBtn.Click
+ '/// Closing the opened application document.
+ printlog "- Closing the opened application document."
+ '/// ...if there is more than 1 document opened.
+ if GetDocumentCount > 1 then
+ call hCloseDocument
+ end if
+ 'Here the routine stops if there is no Java installed or the output was not visible.
+ goto endsub
+ end if
+ catch
+ '/// If Java is not [correctly] installed a messagebox will be shown and the test of the filter will be canceled!
+ Kontext "Messagebox"
+ if MessageBox.Exists( 2 ) then
+ warnlog Messagebox.GetText
+ Messagebox.OK
+ warnlog sErrorPointerTextForResultfile & "Java is not usable! Exiting routine!"
+ Kontext "TestXMLFilter"
+ '/// Closing the &quot;Test XML Filter&quot;-dialog.
+ printlog " +- Closing the 'Test XML Filter'-dialog"
+ CloseBtn.Click
+ Kontext "XMLFilterSettings"
+ '/// Closing the &quot;XML Filter Settings&quot;-dialog.
+ printlog "+- Closing the 'XML Filter Settings'-dialog."
+ 'Deinstall the XSLT stylesheet if this routine has
+ 'added one at the beginning.
+ if bREMOVEXSLT = TRUE then
+ call sRemoveXSLTFilter
+ end if
+ Kontext "XMLFilterSettings"
+ CloseBtn.Click
+ '/// Closing the opened application document.
+ printlog "- Closing the opened application document."
+ '/// ...if there is more than 1 document opened.
+ if GetDocumentCount > 1 then
+ call hCloseDocument
+ end if
+ goto endsub
+ end if
+ endcatch
+ else
+ warnlog sErrorPointerTextForResultfile & "File Open dialog missing! Not able to load test documents. Exiting routine!"
+ Kontext "TestXMLFilter"
+ '/// Closing the &quot;Test XML Filter&quot;-dialog.
+ printlog " +- Closing the 'Test XML Filter'-dialog"
+ CloseBtn.Click
+ Kontext "XMLFilterSettings"
+ '/// Closing the &quot;XML Filter Settings&quot;-dialog.
+ printlog "+- Closing the 'XML Filter Settings'-dialog."
+ 'Deinstall the XSLT stylesheet if this routine has
+ 'added one at the beginning.
+ if bREMOVEXSLT = TRUE then
+ call sRemoveXSLTFilter
+ end if
+ Kontext "XMLFilterSettings"
+ CloseBtn.Click
+ '/// Closing the opened application document.
+ printlog "- Closing the opened application document."
+ '/// ...if there is more than 1 document opened.
+ if GetDocumentCount > 1 then
+ call hCloseDocument
+ end if
+ goto endsub
+ end if
+ '/// Closing the tested XML document
+ printlog " +- Closing the tested XML document"
+ '/// ...if there is more than 1 document opened.
+ if GetDocumentCount > 1 then
+ call hCloseDocument
+ else
+ QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
+ end if
+
Kontext "TestXMLFilter"
- if ( TestXMLFilter.exists( 1 ) ) then
- if bJavaBroken = FALSE then
- '/// Clicking on &quot;Recent File&quot;-Button.
- printlog " +- Clicking on 'Recent File'-Button."
- RecentFile.Click
-
- Kontext "XMLFilterOutput"
- '/// &quot;XML Filter Output&quot;-dialog should be visible.
- printlog " +- 'XML Filter Output'-dialog should be visible."
-
- Kontext "XMLFilterOutput"
- '/// Closing &quot;XML Filter Output&quot;-dialog.
- printlog " +- Closing 'XML Filter Output'-dialog."
- XMLFilterOutput.Close
-
- '/// Closing the tested XML document
- printlog " +- Closing the tested XML document"
- '/// ...if there is more than 1 document opened.
- if GetDocumentCount > 1 then
- call hCloseDocument
- else
- QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
- end if
-
- Kontext "TestXMLFilter"
- '/// Closing the &quot;Test XML Filter&quot;-dialog.
- printlog " +- Closing the 'Test XML Filter'-dialog"
+ if ( TestXMLFilter.exists( 1 ) ) then
+ if bJavaBroken = FALSE then
+ '/// Clicking on &quot;Recent File&quot;-Button.
+ printlog " +- Clicking on 'Recent File'-Button."
+ RecentFile.Click
+
+ Kontext "XMLFilterOutput"
+ '/// &quot;XML Filter Output&quot;-dialog should be visible.
+ printlog " +- 'XML Filter Output'-dialog should be visible."
+
+ Kontext "XMLFilterOutput"
+ '/// Closing &quot;XML Filter Output&quot;-dialog.
+ printlog " +- Closing 'XML Filter Output'-dialog."
+ XMLFilterOutput.Close
+
+ '/// Closing the tested XML document
+ printlog " +- Closing the tested XML document"
+ '/// ...if there is more than 1 document opened.
+ if GetDocumentCount > 1 then
+ call hCloseDocument
+ else
+ QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
+ end if
+
+ Kontext "TestXMLFilter"
+ '/// Closing the &quot;Test XML Filter&quot;-dialog.
+ printlog " +- Closing the 'Test XML Filter'-dialog"
endif
else
warnlog( "Dialog <TestXMLFilter> is not available" )
endif
-
- CloseBtn.Click
+
+ CloseBtn.Click
Kontext "XMLFilterSettings"
- if ( XMLFilterSettings.exists( 1 ) ) then
- '/// Clicking &quot;Delete&quot;-button.
- printlog " +- Clicking 'Delete'-button"
- DeleteBtn.Click
- Kontext
- if Active.Exists(1) then
- if Active.GetRT = 304 then
- Active.No
- end if
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ '/// Clicking &quot;Delete&quot;-button.
+ printlog " +- Clicking 'Delete'-button"
+ DeleteBtn.Click
+ Kontext
+ if Active.Exists(1) then
+ if Active.GetRT = 304 then
+ Active.No
+ end if
end if
else
warnlog( "Dialog <XMLFilterSettings> is not available" )
endif
-
- '/// Clicking 'Save to Package'-button.
- Kontext "XMLFilterSettings"
- if ( XMLFilterSettings.exists( 1 ) ) then
-
- printlog " +- Clicking 'Save to Package'-button."
- SaveToPackage.Click
-
- Kontext "SpeichernDlg"
- if SpeichernDlg.Exists( 3 ) then
- call Dialogtest(SpeichernDlg)
- SpeichernDlg.Cancel
- '/// Closing 'File Save As'-Dialog.
- printlog " +- Closing 'File Save As'-Dialog."
- else
- warnlog sErrorPointerTextForResultfile & "Save As dialog missing!"
+
+ '/// Clicking 'Save to Package'-button.
+ Kontext "XMLFilterSettings"
+ if ( XMLFilterSettings.exists( 1 ) ) then
+
+ printlog " +- Clicking 'Save to Package'-button."
+ SaveToPackage.Click
+
+ Kontext "SpeichernDlg"
+ if SpeichernDlg.Exists( 3 ) then
+ call Dialogtest(SpeichernDlg)
+ SpeichernDlg.Cancel
+ '/// Closing 'File Save As'-Dialog.
+ printlog " +- Closing 'File Save As'-Dialog."
+ else
+ warnlog sErrorPointerTextForResultfile & "Save As dialog missing!"
end if
else
warnlog( "Dialog <XMLFilterSettings> is not available" )
endif
-
- '/// Clicking 'Open Package'-button.
- Kontext "XMLFilterSettings"
- if ( XMLFilterSettings.exists( 1 ) ) then
- printlog " +- Clicking 'Open Package'-button."
- OpenPackage.Click
-
- Kontext "OeffnenDlg"
- if OeffnenDlg.Exists( 3 ) then
- call Dialogtest(OeffnenDlg)
- OeffnenDlg.Cancel
- '/// Closing 'FileOpen'-Dialog.
- printlog " +- Closing 'FileOpen'-Dialog."
- else
- warnlog sErrorPointerTextForResultfile & "File open dialog missing!"
- end if
+
+ '/// Clicking 'Open Package'-button.
+ Kontext "XMLFilterSettings"
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ printlog " +- Clicking 'Open Package'-button."
+ OpenPackage.Click
+
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists( 3 ) then
+ call Dialogtest(OeffnenDlg)
+ OeffnenDlg.Cancel
+ '/// Closing 'FileOpen'-Dialog.
+ printlog " +- Closing 'FileOpen'-Dialog."
+ else
+ warnlog sErrorPointerTextForResultfile & "File open dialog missing!"
+ end if
else
warnlog( "Dialog <XMLFilterSettings> is not available" )
endif
- '/// Closing the &quot;XML Filter Settings&quot;-dialog.
- Kontext "XMLFilterSettings"
- if ( XMLFilterSettings.exists( 1 ) ) then
- printlog "+- Closing the 'XML Filter Settings'-dialog."
- 'Deinstall the XSLT stylesheet if this routine has
- 'added one at the beginning.
- if bREMOVEXSLT = TRUE then
- call sRemoveXSLTFilter
- end if
+ '/// Closing the &quot;XML Filter Settings&quot;-dialog.
+ Kontext "XMLFilterSettings"
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ printlog "+- Closing the 'XML Filter Settings'-dialog."
+ 'Deinstall the XSLT stylesheet if this routine has
+ 'added one at the beginning.
+ if bREMOVEXSLT = TRUE then
+ call sRemoveXSLTFilter
+ end if
else
warnlog( "Dialog <XMLFilterSettings> is not available" )
endif
- Kontext "XMLFilterSettings"
- if ( XMLFilterSettings.exists( 1 ) ) then
- CloseBtn.Click
+ Kontext "XMLFilterSettings"
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ CloseBtn.Click
'/// Closing the opened application document.
else
warnlog( "Dialog <XMLFilterSettings> is not available" )
endif
-
- printlog "- Closing the opened application document."
- '/// ...if there is more than 1 document opened.
- if ( hFileCloseAll() <> 2 ) then
- QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
+
+ printlog "- Closing the opened application document."
+ '/// ...if there is more than 1 document opened.
+ if ( hFileCloseAll() <> 2 ) then
+ QAErrorLog "#i27370# Normaly there should be a second document but there is none!"
end if
-endcase
-
-'-------------------------------------------------------------------------
-
-sub fInitialXMLSetting( sXMLFilterType as string ) as boolean
-'/// This small function adds the latest and greatest XSLT stylesheet
-'///+ to the office.<br>
-'///+ The result is TRUE if the packages are already available or if they
-'///+ have been installed successfully in this routine.
-'/// <u>Input</u>: excel, word, docbook, xhtml
-'/// <u>Output</u>: TRUE or FALSE
- Dim iCountOfDefaultXSLTStyles as integer
- Dim iSecondCountOfDefaultXSLTStyles as integer
- Dim sFilterPackagePath as string
- Dim sTempReadFilterName as string
- Dim ia as integer
-
- 'Setting boolean to FALSE
- fInitialXMLSetting = FALSE
- '/// Opening new document.
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Opening new " & gApplication & " document."
- call hNewDocument
- '/// Calling the menu item <i>Tools -&gt; XML Filter Settings</i>
- ToolsXMLFilterSettings
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Opening the XML Filter Settings dialog."
- Kontext "XMLFilterSettings"
- call Dialogtest (XMLFilterSettings)
- '/// Checking if there are any XSLT stylesheets available.
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Checking if there are any XSLT stylesheets available."
- iCountOfDefaultXSLTStyles = FilterList.GetItemCount
- ' printlog "DEBUG (a): " & iCountOfDefaultXSLTStyles
- if iCountOfDefaultXSLTStyles <> 0 then
- '/// Check if the same filter already exists.
- 'Using lowercased input parameter.
- sXMLFilterType = lcase(sXMLFilterType)
- for ia = 1 to iCountOfDefaultXSLTStyles
- Kontext "XMLFilterSettings"
- 'read the filter names from the dialog.
- sTempReadFilterName = FilterList.GetItemText(ia)
- ' printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: DEBUG: (" & ia & ") " & sTempReadFilterName
- 'lower case comparison!
- sTempReadFilterName = lcase(sTempReadFilterName)
- 'if a _part_ of the filtername matches the readed filter name the criteria is true!
- if InStr(sTempReadFilterName , sXMLFilterType) <> 0 then
- fInitialXMLSetting = TRUE
- Kontext "XMLFilterSettings"
- CloseBtn.Click
- Call hCloseDocument
- exit sub
- end if
- next ia
- 'if no filter name maches the for...next loop will be left
- 'and the same routine as used for 0 filter installed will
- 'be used to install a filter package.
- end if
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: The XML filter is not available: Adding the " & sXMLFilterType & " XML filter."
- '///+ The packages will be used from &quot;qatesttool/global/input/xslt_stylesheets/*.jar&quot;
- ' printlog "DEBUG: " & sXMLFilterType
- select case sXMLFilterType
- case "excel" : sFilterPackagePath = ConvertPath(gTestToolPath & "global\input\xslt_stylesheets\excel.jar")
- case "word" : sFilterPackagePath = ConvertPath(gTestToolPath & "global\input\xslt_stylesheets\word.jar")
- case "docbook" : sFilterPackagePath = ConvertPath(gTestToolPath & "global\input\xslt_stylesheets\docbook.jar")
- case "xhtml" : sFilterPackagePath = ConvertPath(gTestToolPath & "global\input\xslt_stylesheets\xhtml.jar")
- end select
- OpenPackage.Click
+endcase
+
+'-------------------------------------------------------------------------
+
+sub fInitialXMLSetting( sXMLFilterType as string ) as boolean
+'/// This small function adds the latest and greatest XSLT stylesheet
+'///+ to the office.<br>
+'///+ The result is TRUE if the packages are already available or if they
+'///+ have been installed successfully in this routine.
+'/// <u>Input</u>: excel, word, docbook, xhtml
+'/// <u>Output</u>: TRUE or FALSE
+ Dim iCountOfDefaultXSLTStyles as integer
+ Dim iSecondCountOfDefaultXSLTStyles as integer
+ Dim sFilterPackagePath as string
+ Dim sTempReadFilterName as string
+ Dim ia as integer
+
+ 'Setting boolean to FALSE
+ fInitialXMLSetting = FALSE
+ '/// Opening new document.
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Opening new " & gApplication & " document."
+ call hNewDocument
+ '/// Calling the menu item <i>Tools -&gt; XML Filter Settings</i>
+ ToolsXMLFilterSettings
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Opening the XML Filter Settings dialog."
+ Kontext "XMLFilterSettings"
+ call Dialogtest (XMLFilterSettings)
+ '/// Checking if there are any XSLT stylesheets available.
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Checking if there are any XSLT stylesheets available."
+ iCountOfDefaultXSLTStyles = FilterList.GetItemCount
+ ' printlog "DEBUG (a): " & iCountOfDefaultXSLTStyles
+ if iCountOfDefaultXSLTStyles <> 0 then
+ '/// Check if the same filter already exists.
+ 'Using lowercased input parameter.
+ sXMLFilterType = lcase(sXMLFilterType)
+ for ia = 1 to iCountOfDefaultXSLTStyles
+ Kontext "XMLFilterSettings"
+ 'read the filter names from the dialog.
+ sTempReadFilterName = FilterList.GetItemText(ia)
+ ' printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: DEBUG: (" & ia & ") " & sTempReadFilterName
+ 'lower case comparison!
+ sTempReadFilterName = lcase(sTempReadFilterName)
+ 'if a _part_ of the filtername matches the readed filter name the criteria is true!
+ if InStr(sTempReadFilterName , sXMLFilterType) <> 0 then
+ fInitialXMLSetting = TRUE
+ Kontext "XMLFilterSettings"
+ CloseBtn.Click
+ Call hCloseDocument
+ exit sub
+ end if
+ next ia
+ 'if no filter name maches the for...next loop will be left
+ 'and the same routine as used for 0 filter installed will
+ 'be used to install a filter package.
+ end if
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: The XML filter is not available: Adding the " & sXMLFilterType & " XML filter."
+ '///+ The packages will be used from &quot;qatesttool/global/input/xslt_stylesheets/*.jar&quot;
+ ' printlog "DEBUG: " & sXMLFilterType
+ select case sXMLFilterType
+ case "excel" : sFilterPackagePath = ConvertPath(gTestToolPath & "global\input\xslt_stylesheets\excel.jar")
+ case "word" : sFilterPackagePath = ConvertPath(gTestToolPath & "global\input\xslt_stylesheets\word.jar")
+ case "docbook" : sFilterPackagePath = ConvertPath(gTestToolPath & "global\input\xslt_stylesheets\docbook.jar")
+ case "xhtml" : sFilterPackagePath = ConvertPath(gTestToolPath & "global\input\xslt_stylesheets\xhtml.jar")
+ end select
+ OpenPackage.Click
Kontext "OeffnenDlg"
- if ( OeffnenDlg.exists( 2 ) ) then
- call Dialogtest (OeffnenDlg)
- Dateiname.SetText sFilterPackagePath
+ if ( OeffnenDlg.exists( 2 ) ) then
+ call Dialogtest (OeffnenDlg)
+ Dateiname.SetText sFilterPackagePath
Oeffnen.Click
-
- Kontext
- if Active.Exists(3) then
- if Active.GetRT = 304 then
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: " & Active.GetText
- Active.OK
- Kontext "XMLFilterSettings"
- iSecondCountOfDefaultXSLTStyles = FilterList.GetItemCount
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Checking again the count of installed XSLT stylesheets."
- if iSecondCountOfDefaultXSLTStyles <> (iCountOfDefaultXSLTStyles+1) then
- warnlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: It was not possible to add " & sXMLFilterType & "-XML filter!"
- warnlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Test aborted!"
- exit sub
- else
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: XML filter has been installed!"
- fInitialXMLSetting = TRUE
- end if
- end if
+
+ Kontext
+ if Active.Exists(3) then
+ if Active.GetRT = 304 then
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: " & Active.GetText
+ Active.OK
+ Kontext "XMLFilterSettings"
+ iSecondCountOfDefaultXSLTStyles = FilterList.GetItemCount
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Checking again the count of installed XSLT stylesheets."
+ if iSecondCountOfDefaultXSLTStyles <> (iCountOfDefaultXSLTStyles+1) then
+ warnlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: It was not possible to add " & sXMLFilterType & "-XML filter!"
+ warnlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Test aborted!"
+ exit sub
+ else
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: XML filter has been installed!"
+ fInitialXMLSetting = TRUE
+ end if
+ end if
end if
else
warnlog( "Dialog <OeffnenDlg> is not available" )
endif
-
+
Kontext "XMLFilterSettings"
- if ( XMLFilterSettings.exists( 1 ) ) then
- '/// Closing the XML Filter Settings-dialog.
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Closing the 'XML Filter Settings'-dialog."
+ if ( XMLFilterSettings.exists( 1 ) ) then
+ '/// Closing the XML Filter Settings-dialog.
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Closing the 'XML Filter Settings'-dialog."
CloseBtn.Click
else
warnlog( "Dialog <XMLFilterSettings> is not available" )
- endif
- '/// Closing the opened application document.
- printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Closing the opened application document."
- call hCloseDocument
-end sub
-
-'-------------------------------------------------------------------------
-
-sub sRemoveXSLTFilter
- Dim sXMLFilterType as string
- Dim iCountOfDefaultXSLTStyles as integer
- Dim ia as integer
- Dim sTempReadFilterName as string
- Kontext "XMLFilterSettings"
- select case gApplication
- case "CALC" : sXMLFilterType = "excel"
- case "WRITER" : sXMLFilterType = "word"
- case else : sXMLFilterType = "docbook"
- end select
- iCountOfDefaultXSLTStyles = FilterList.GetItemCount
- if iCountOfDefaultXSLTStyles <> 0 then
- '/// Search for the filter in filter list.
- 'Using lowercased input parameter.
- for ia = 1 to iCountOfDefaultXSLTStyles
- Kontext "XMLFilterSettings"
- 'read the filter names from the dialog.
- sTempReadFilterName = FilterList.GetItemText(ia)
- 'lower case comparison!
- if InStr(sTempReadFilterName , sXMLFilterType) <> 0 then
- '/// If the filter has been found delete it.
- FilterList.TypeKeys "<HOME>"
- wait( 100 )
- FilterList.TypeKeys "<DOWN>" , (ia-1)
- wait( 100 )
- DeleteBtn.Click
- Kontext
- if Active.Exists(1) then
- if Active.GetRT = 304 then
- Active.Yes
- end if
- end if
- exit sub
- end if
- next ia
- else
- warnlog "The count of XML filters has to be >0! Problem?"
- end if
-end sub
-
+ endif
+ '/// Closing the opened application document.
+ printlog "global::tools::inc::t_xml_filter1,inc::fInitialXMLSetting: Closing the opened application document."
+ call hCloseDocument
+end sub
+
+'-------------------------------------------------------------------------
+
+sub sRemoveXSLTFilter
+ Dim sXMLFilterType as string
+ Dim iCountOfDefaultXSLTStyles as integer
+ Dim ia as integer
+ Dim sTempReadFilterName as string
+ Kontext "XMLFilterSettings"
+ select case gApplication
+ case "CALC" : sXMLFilterType = "excel"
+ case "WRITER" : sXMLFilterType = "word"
+ case else : sXMLFilterType = "docbook"
+ end select
+ iCountOfDefaultXSLTStyles = FilterList.GetItemCount
+ if iCountOfDefaultXSLTStyles <> 0 then
+ '/// Search for the filter in filter list.
+ 'Using lowercased input parameter.
+ for ia = 1 to iCountOfDefaultXSLTStyles
+ Kontext "XMLFilterSettings"
+ 'read the filter names from the dialog.
+ sTempReadFilterName = FilterList.GetItemText(ia)
+ 'lower case comparison!
+ if InStr(sTempReadFilterName , sXMLFilterType) <> 0 then
+ '/// If the filter has been found delete it.
+ FilterList.TypeKeys "<HOME>"
+ wait( 100 )
+ FilterList.TypeKeys "<DOWN>" , (ia-1)
+ wait( 100 )
+ DeleteBtn.Click
+ Kontext
+ if Active.Exists(1) then
+ if Active.GetRT = 304 then
+ Active.Yes
+ end if
+ end if
+ exit sub
+ end if
+ next ia
+ else
+ warnlog "The count of XML filters has to be >0! Problem?"
+ end if
+end sub
+
diff --git a/testautomation/global/tools/includes/required/t_dir.inc b/testautomation/global/tools/includes/required/t_dir.inc
index 31f9bc210a34..1875bf5a50c5 100755
--- a/testautomation/global/tools/includes/required/t_dir.inc
+++ b/testautomation/global/tools/includes/required/t_dir.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_dir.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:09 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/tools/includes/required/t_dirloc.inc b/testautomation/global/tools/includes/required/t_dirloc.inc
index 6f64df945e64..fd820048f0ca 100755
--- a/testautomation/global/tools/includes/required/t_dirloc.inc
+++ b/testautomation/global/tools/includes/required/t_dirloc.inc
@@ -1,33 +1,27 @@
'**************************************************************************
-'* 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: t_dirloc.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27: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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc
index f1bc0f538722..77039370315c 100755
--- a/testautomation/global/tools/includes/required/t_doc1.inc
+++ b/testautomation/global/tools/includes/required/t_doc1.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_doc1.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27: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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
@@ -189,6 +183,7 @@ sub hNewDocument ( optional bANewDoc )
case else : WarnLog "hNewDocument: No Applikation named '" + gApplication + "' exists in this routine!"
end select
Sleep 2
+
end sub
'
'-------------------------------------------------------------------------------
diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc
index 27d00f1236e7..a55f0cbb5f1f 100755
--- a/testautomation/global/tools/includes/required/t_doc2.inc
+++ b/testautomation/global/tools/includes/required/t_doc2.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_doc2.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: obo $ $Date: 2008-07-21 12:08:27 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index db3205e58de0..824ef0801652 100755
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'*******************************************************************************
-'* 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: t_files.inc,v $
-'*
-'* $Revision: 1.4 $
-'*
-'* last change: $Author: rt $ $Date: 2008-08-28 11:59:04 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
@@ -64,7 +58,7 @@ function hGrafikEinfuegen ( Grafik$ ) as Boolean
if ( GrafikEinfuegenDlg.exists( 2 ) ) then
Vorschau.Uncheck
- if gApplication <> "HTML" AND gApplication <> "HTML" then
+ if gApplication <> "HTML" then
Verknuepfen.UnCheck
end if
@@ -87,13 +81,15 @@ function hGrafikEinfuegen ( Grafik$ ) as Boolean
Kontext "GrafikEinfuegenDlg"
if GrafikEinfuegenDlg.Exists then
GrafikEinfuegenDlg.Cancel
+ GarfikEinfuegenDlg.notExists( 4 )
endif
else
hGrafikEinfuegen = IsImageLoaded
end if
else
- 'GrafikEinfuegeDlg not open
+ warnlog( "Insert graphics dialog not open" )
endif
+
end function
'
'-------------------------------------------------------------------------------
diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc
index 174527a8550d..abc1561a67b2 100755
--- a/testautomation/global/tools/includes/required/t_filters.inc
+++ b/testautomation/global/tools/includes/required/t_filters.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_filters.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27: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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/required/t_lists.inc b/testautomation/global/tools/includes/required/t_lists.inc
index b13c6c0b786f..fb1cd03d845f 100755
--- a/testautomation/global/tools/includes/required/t_lists.inc
+++ b/testautomation/global/tools/includes/required/t_lists.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_lists.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27: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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/tools/includes/required/t_menu.inc b/testautomation/global/tools/includes/required/t_menu.inc
index 3b0833a51284..d919bc85e539 100755
--- a/testautomation/global/tools/includes/required/t_menu.inc
+++ b/testautomation/global/tools/includes/required/t_menu.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'*******************************************************************************
-'* 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: t_menu.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27: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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc
index 6ba837d79f84..cb1e4b5d25f1 100755
--- a/testautomation/global/tools/includes/required/t_option.inc
+++ b/testautomation/global/tools/includes/required/t_option.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_option.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27: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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
@@ -279,11 +273,6 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
Kontext "ExtrasOptionenDlg"
select case Tabpagename
case "PROXY"
- Kontext "ProxyWarnung"
- if ProxyWarnung.Exists then
- NichtMehrAnzeigen.Check
- ProxyWarnung.OK
- end if
Kontext "TabProxyServer"
if TabProxyServer.exists(2) then bCorPage = TRUE
case "SEARCH"
diff --git a/testautomation/global/tools/includes/required/t_option2.inc b/testautomation/global/tools/includes/required/t_option2.inc
index 74f49d9e3916..a379019b46bf 100644..100755
--- a/testautomation/global/tools/includes/required/t_option2.inc
+++ b/testautomation/global/tools/includes/required/t_option2.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_option2.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:11 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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
@@ -136,9 +130,9 @@ sub DialogeFuerTypenKontrollieren
if OeffnenDlg.Exists() then
if ( Dateityp.IsVisible ) then
Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!"
- OeffnenDlg.Cancel
- exit do
endif
+ OeffnenDlg.Cancel
+ exit do
endif
Kontext "PfadeAuswaehlen"
@@ -146,6 +140,8 @@ sub DialogeFuerTypenKontrollieren
PfadeAuswaehlen.Cancel
exit do
end if
+
+ iExitCounter = iExitCounter + 1
loop
Kontext "TabPfade"
else
diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc
index 6fbfd5358e52..4a7017e73271 100755
--- a/testautomation/global/tools/includes/required/t_tools1.inc
+++ b/testautomation/global/tools/includes/required/t_tools1.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'*******************************************************************************
-'* 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: t_tools1.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:11 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : joerg.skottke@sun.com
diff --git a/testautomation/global/tools/includes/required/t_tools2.inc b/testautomation/global/tools/includes/required/t_tools2.inc
index 731bea120afc..2e32f72a1969 100755
--- a/testautomation/global/tools/includes/required/t_tools2.inc
+++ b/testautomation/global/tools/includes/required/t_tools2.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_tools2.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:11 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
@@ -763,7 +757,7 @@ function fGetProductName as string
'Using the bootstraprc/bootstrap.ini file in ../program dir
'to get the value of 'ProductKey'
- if gPlatform = lcase("osx") then
+ if ( lcase( gPlatform ) = "osx" ) then
sfile = convertPath(gNetzOfficePath + "MacOS/bootstrap")
else
sfile = convertPath(gNetzOfficePath + "program/bootstrap")
@@ -826,7 +820,7 @@ function FindBuildID as String
' bootstrap.ini/rc part
if (gSamePC = TRUE) then
' since CWS nativefixer18 the information from bootstrap file is spread across bootstrap and version
- if gPlatform = lcase("osx") then
+ if ( lcase( gPlatform ) = "osx" ) then
sPlatformProgramPath = "MacOS"
else
sPlatformProgramPath = "program"
diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc
index c2e976659e2b..50d55fca7a2e 100755
--- a/testautomation/global/tools/includes/required/t_tools3.inc
+++ b/testautomation/global/tools/includes/required/t_tools3.inc
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: t_tools3.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:11 $
-'*
-'* 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.
-'*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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 : helge.delfs@sun.com
diff --git a/testautomation/global/tools/record_macro.bas b/testautomation/global/tools/record_macro.bas
index a3a6d9107c46..d4d7095e9efc 100644..100755
--- a/testautomation/global/tools/record_macro.bas
+++ b/testautomation/global/tools/record_macro.bas
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: record_macro.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:06 $
-'*
-'* 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.
-'*
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' 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
diff --git a/testautomation/global/tools/resetoffice.bas b/testautomation/global/tools/resetoffice.bas
index 5f4dec84abba..e6566c15de0c 100755
--- a/testautomation/global/tools/resetoffice.bas
+++ b/testautomation/global/tools/resetoffice.bas
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: resetoffice.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:06 $
-'*
-'* 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.
-'*
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' 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
diff --git a/testautomation/global/tools/wintree.bas b/testautomation/global/tools/wintree.bas
index 305412319d00..944091e37f48 100755
--- a/testautomation/global/tools/wintree.bas
+++ b/testautomation/global/tools/wintree.bas
@@ -1,34 +1,28 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
-'* 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: wintree.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:06 $
-'*
-'* 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.
-'*
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' 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
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 650273826ad2..e29318019aa5 100755
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -1,17 +1,12 @@
'encoding UTF-8 Do not remove or change this line!
'**************************************************************************
+'*
'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
'*
-'* Copyright 2008 by Sun Microsystems, Inc.
+'* Copyright 2000, 2010 Oracle and/or its affiliates.
'*
'* OpenOffice.org - a multi-platform office productivity suite
'*
-'* $RCSfile: bars.win,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:11 $
-'*
'* This file is part of OpenOffice.org.
'*
'* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -592,7 +587,6 @@ EigenschaftenControls SID_SHOW_BROWSER
EigenschaftenObjekt .uno:FrameDialog
GanzNachHinten .uno:SendToBack
GanzNachVorn .uno:BringToFront
-GrafikBearbeiten SID_SIM_START
Hintergrundfarbe .uno:BackgroundColor
Hintergrundmuster SID_BACKGROUND_PATTERN
HorizontalSpiegeln FN_FLIP_HORZ_GRAFIC
@@ -672,7 +666,6 @@ Flaechenstil SID_ATTR_FILL_STYLE
Gamma .uno:GrafGamma
GanzNachHinten SID_FRAME_TO_BOTTOM
GanzNachVorn SID_FRAME_TO_TOP
-GrafikBearbeiten SID_SIM_START
GrafikEigenschaften FN_FORMAT_GRAFIC_DLG
Grafikmodus .uno:GrafMode
Gruenanteil .uno:GrafGreen
diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win
index b353eb0622a5..dfb4686ad750 100755
--- a/testautomation/global/win/dial_a_c.win
+++ b/testautomation/global/win/dial_a_c.win
@@ -1,8 +1,8 @@
*Aehnlichkeitssuche HID_SEARCHSIMILARITY
-ZeichenHinzufuegen svx:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER
-ZeichenTauschen svx:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER
-Kombinieren svx:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX
-ZeichenEntfernen svx:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER
+ZeichenHinzufuegen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER
+ZeichenTauschen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER
+Kombinieren cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX
+ZeichenEntfernen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER
*Aenderungenanzeigen FID_CHG_ACCEPT
TabControl HID_REDLINING_TABCONTROL
@@ -54,10 +54,10 @@ Abspielen sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY
LetztesBild sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST
*AppletEinfuegen SID_INSERT_APPLET
-Klasse svx:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE
-ClassLocation svx:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION
-Suchen svx:PUSHBUTTON:MD_INSERT_OBJECT_APPLET:BTN_CLASS
-Optionen svx:MULTILINEEDIT:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS
+Klasse cui:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE
+ClassLocation cui:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION
+Suchen cui:PUSHBUTTON:MD_INSERT_OBJECT_APPLET:BTN_CLASS
+Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS
*AsciiFilterOptionen HID_ASCII_FILTER
Zeichensatz sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET
@@ -158,36 +158,36 @@ Minimieren32 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2
NewStyle3 sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW
*Bemassung HID_PAGE_MEASURE
-Liniendistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST
-HLUeberhang svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG
-HLDistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST
-LinkeHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN
-RechteHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN
-AnzeigeUnterhalb svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE
-AnzeigeParallel svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL
-MetrikAnzeigen svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT
-MetrikList svx:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT
+Liniendistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST
+HLUeberhang cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG
+HLDistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST
+LinkeHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN
+RechteHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN
+AnzeigeUnterhalb cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE
+AnzeigeParallel cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL
+MetrikAnzeigen cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT
+MetrikList cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT
Textposition HID_MEASURE_CTL_POSITION
-AutomatischVertikal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV
-AutomatischHorizontal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH
+AutomatischVertikal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV
+AutomatischHorizontal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH
Preview HID_MEASURE_CTL_PREVIEW
-DecimalPlaces svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES
+DecimalPlaces cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES
*BenutzerwoerterbuchAnlegen HID_OPTIONS_DICT_NEW
-WoerterbuchName svx:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME
-Sprache svx:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG
-Ausnahme svx:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT
+WoerterbuchName cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME
+Sprache cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG
+Ausnahme cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT
*BenutzerwoerterbuchBearbeiten HID_OPTIONS_DICT_EDIT
-Buch svx:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS
-Sprache svx:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG
-Inhalt svx:Edit:RID_SFXDLG_EDITDICT:ED_WORD
-Wort svx:Edit:RID_SFXDLG_EDITDICT:ED_WORD
-Aufnehmen svx:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE
-Neu svx:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE
-Entfernen svx:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE
-Loeschen svx:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE
-ReplaceBy svx:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE
+Buch cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS
+Sprache cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG
+Inhalt cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD
+Wort cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD
+Aufnehmen cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE
+Neu cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE
+Entfernen cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE
+Loeschen cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE
+ReplaceBy cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE
WordList HID_OPTIONS_DICT_EDIT_ENTRIES_LIST
*BenutzerverzeichnisDefinieren HID_DLG_NEW_USER_IDX
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 0d64547f5e0a..48724c5eaa27 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -20,9 +20,9 @@ HideItems HID_SC_DPSUBT_HIDE
Hierarchy sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_HIERARCHY
*DateienAuswaehlen HID_FILEDLG_MAILMRGE2
-Hinzufuegen svx:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH
-Loeschen svx:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH
-Pfade svx:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH
+Hinzufuegen cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH
+Loeschen cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH
+Pfade cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH
*Datenpilot SID_OPENDLG_PIVOTTABLE
Zusaetze sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE
@@ -214,8 +214,6 @@ AusDruckereinstellung sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN
*DruckerZusaetzeWriter HID_OPTPRINT_PAGE
Grafiken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF
-Tabellen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB
-Zeichnungen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW
Kontrollfelder sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD
Hintergrund sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND
HiddenText sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT
@@ -224,7 +222,6 @@ RightToLeft sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL
SchwarzDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT
LinkeSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP
RechteSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP
-Umgekehrt sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE
Prospekt sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT
Keine sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO
NurNotizen sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY
@@ -253,14 +250,14 @@ PopuplisteRechts sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP
AddressBook sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE
*EinfuegenSpalten FN_TABLE_INSERT_COL_DLG
-Anzahl svx:NumericField:DLG_INS_ROW_COL:ED_COUNT
-Davor svx:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE
-Dahinter svx:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER
+Anzahl cui:NumericField:DLG_INS_ROW_COL:ED_COUNT
+Davor cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE
+Dahinter cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER
*EinfuegenZeilen FN_TABLE_INSERT_ROW_DLG
-Anzahl svx:NumericField:DLG_INS_ROW_COL:ED_COUNT
-Davor svx:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE
-Dahinter svx:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER
+Anzahl cui:NumericField:DLG_INS_ROW_COL:ED_COUNT
+Davor cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE
+Dahinter cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER
*EbeneEinfuegenDlg SID_INSERTLAYER
EbenenName sd:Edit:DLG_INSERT_LAYER:EDT_NAME
@@ -289,15 +286,15 @@ Groesse svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC
Breite svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC
Hoehe svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC
-*EPSOptionen goodies:ModalDialog:DLG_EXPORT_EPS
-VorschauTif goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF
-InterchangeEPSI goodies:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI
-Level1 goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1
-Level2 goodies:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2
-Farbe goodies:RadioButton:DLG_EXPORT_EPS:RB_COLOR
-Graustufen goodies:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE
-LZWKodierung goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW
-Keine goodies:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE
+*EPSOptionen filter:ModalDialog:DLG_EXPORT_EPS
+VorschauTif filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF
+InterchangeEPSI filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI
+Level1 filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1
+Level2 filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2
+Farbe filter:RadioButton:DLG_EXPORT_EPS:RB_COLOR
+Graustufen filter:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE
+LZWKodierung filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW
+Keine filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE
*EtikettenSynchronisieren HID_SYNC_BTN
Synchronisieren SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC
@@ -326,7 +323,7 @@ Kennwort sc:Edit:RID_SCDLG_DAPISERVICE:ED_PASSWD
*ExtrasOptionenDlg HID_OFADLG_OPTIONS_TREE
Optionsliste HID_OFADLG_TREELISTBOX
-Zurueck svx:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK
+Zurueck cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK
*FeldAuswahl HID_FIELD_SEL_WIN
Liste HID_FIELD_SEL
@@ -492,9 +489,9 @@ Aktualisieren HID_TEMPLDLG_UPDATEBYEXAMPLE
Vorlagenliste HID_TEMPLATE_FMT
Gruppenliste HID_TEMPLATE_FILTER
-*GifOptionen goodies:ModalDialog:DLG_EXPORT_GIF
-Interlace goodies:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED
-TransparentSpeichern goodies:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT
+*GifOptionen filter:ModalDialog:DLG_EXPORT_GIF
+Interlace filter:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED
+TransparentSpeichern filter:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT
*GroupingDlg HID_SC_DPDATEGROUP
AutoStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART
diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win
index 78f203f1ffc5..aa965b42f51d 100755
--- a/testautomation/global/win/dial_i_o.win
+++ b/testautomation/global/win/dial_i_o.win
@@ -23,12 +23,12 @@ Dokument HID_IMAPDLG_GRAPHWND
Adresse SID_OPENURL
BearbeitenText svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT
-*ImageMapHyperlink svx:ModalDialog:RID_SVXDLG_IMAPURL
-URL svx:Edit:RID_SVXDLG_IMAPURL:EDT_URL
-Alternativetext svx:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION
-Frame svx:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS
-Name svx:Edit:RID_SVXDLG_IMAPURL:EDT_NAME
-Description svx:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION
+*ImageMapHyperlink cui:ModalDialog:RID_SVXDLG_IMAPURL
+URL cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL
+Alternativetext cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION
+Frame cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS
+Name cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME
+Description cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION
*IndividuellePraesentation SID_CUSTOMSHOW_DLG
Neu SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_NEW
@@ -59,11 +59,11 @@ Namen3 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3
Namen4 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4
*InhaltEinfuegen HID_PASTE_DLG
-AlsSymbol svx:CHECKBOX:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON
-AndersSymbol svx:PUSHBUTTON:MD_PASTE_OBJECT:PB_CHANGE_ICON
-VerknuepfungMit svx:RADIOBUTTON:MD_PASTE_OBJECT:RB_PASTE_LINK
-Auswahl svx:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST
-EinfuegenAls svx:RadioButton:MD_PASTE_OBJECT:RB_PASTE
+AlsSymbol cui:CHECKBOX:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON
+AndersSymbol cui:PUSHBUTTON:MD_PASTE_OBJECT:PB_CHANGE_ICON
+VerknuepfungMit cui:RADIOBUTTON:MD_PASTE_OBJECT:RB_PASTE_LINK
+Auswahl cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST
+EinfuegenAls cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE
*InhalteEinfuegenCalc FID_INS_CELL_CONTENTS
AllesEinfuegen sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSALL
@@ -154,8 +154,8 @@ Toleranz svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE
Auswahl HID_POPUP_LINEEND_CTRL
*Linienstil HID_DLG_MESSBOX
-Aendern svx:PushButton:RID_SVXDLG_MESSBOX:BTN_1
-Hinzufuegen svx:PushButton:RID_SVXDLG_MESSBOX:BTN_2
+Aendern cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1
+Hinzufuegen cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2
*LinksFuellen FID_FILL_TO_LEFT
@@ -226,26 +226,26 @@ Beschreibung basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR
HilfeIdentifikation basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID
HilfeDateiname basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME
-*MakroZuweisen svx:TabPage:RID_SVXPAGE_EVENTASSIGN
+*MakroZuweisen cui:TabPage:RID_SVXPAGE_EVENTASSIGN
Ereignis HID_MACRO_LB_EVENT
Bereich HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP
Makroname HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS
-Zuweisen svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN
-Aufheben svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE
-Scripttyp svx:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE
+Zuweisen cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN
+Aufheben cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE
+Scripttyp cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE
*Massstab SID_ATTR_ZOOM
-Optimal svx:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL
-GanzeSeite svx:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE
-Seitenbreite svx:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH
-Vergroesserung100 svx:RadioButton:RID_SVXDLG_ZOOM:BTN_100
-VergroesserungStufenlos svx:RadioButton:RID_SVXDLG_ZOOM:BTN_USER
-Stufenlos svx:MetricField:RID_SVXDLG_ZOOM:ED_USER
-Automatic svx:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC
-Singlepage svx:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE
-Columns svx:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS
-Columnsfield svx:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS
-Bookmode svx:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK
+Optimal cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL
+GanzeSeite cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE
+Seitenbreite cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH
+Vergroesserung100 cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100
+VergroesserungStufenlos cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER
+Stufenlos cui:MetricField:RID_SVXDLG_ZOOM:ED_USER
+Automatic cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC
+Singlepage cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE
+Columns cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS
+Columnsfield cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS
+Bookmode cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK
*MassstabSeitenansicht HID_PPREV_ZOOM
Spalten sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_COL
@@ -259,31 +259,31 @@ Vorgaben1 sc:ImageButton:RID_SCDLG_TABOP:RB_FORMULARANGE
Vorgaben2 sc:ImageButton:RID_SCDLG_TABOP:RB_ROWCELL
Vorgaben3 sc:ImageButton:RID_SCDLG_TABOP:RB_COLCELL
-*MetOptionen GOODIES:MODALDIALOG:DLG_EXPORT_EMET
-Original GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL
-Groesse GOODIES:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE
-Breite GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX
-Hoehe GOODIES:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY
+*MetOptionen FILTER:MODALDIALOG:DLG_EXPORT_EMET
+Original FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL
+Groesse FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE
+Breite FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX
+Hoehe FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY
*ModuleBearbeiten HID_EDIT_MODULES
-Sprache svx:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE
+Sprache cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE
Module HID_CLB_EDIT_MODULES_MODULES
-PrioPLus svx:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP
-PrioMinus svx:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN
-Zurueck svx:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK
+PrioPLus cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP
+PrioMinus cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN
+Zurueck cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK
Benutzerwoerterbuch HID_CLB_EDIT_MODULES_DICS
*DescriptionObject HID_DLG_OBJECT_TITLE_DESC
-DescriptionTitle svx:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE
-DescriptionText svx:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC
+DescriptionTitle cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE
+DescriptionText cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC
*NameDlg HID_DLG_NAME
-Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING
+LinieName NameDlg
*NameDlgObject HID_DLG_OBJECT_NAME
-NameField svx:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME
+NameField cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME
+NameDlgGroup NameDlg
NameField HID_FORMAT_NAME_OBJECT_NAME
@@ -420,10 +420,10 @@ Y sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y
Modulname basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME
*NotizBearbeiten SID_POSTIT
-Texteingabe svx:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT sw:MultiLineEdit:DLG_POSTIT:ED_EDIT
-Autor svx:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR sw:PushButton:DLG_POSTIT:BTN_AUTHOR
-Vor SVX:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_NEXT
-Zurueck SVX:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_PREV
+Texteingabe cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT sw:MultiLineEdit:DLG_POSTIT:ED_EDIT
+Autor cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR sw:PushButton:DLG_POSTIT:BTN_AUTHOR
+Vor cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_NEXT
+Zurueck cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_PREV
*NummernkreisOptionen HID_DLG_SEQUENCE_OPTION
Ebene sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL
@@ -432,7 +432,7 @@ Trenner sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR
+NotizEinfuegen NotizBearbeiten
+NotizEinfuegenCalc NotizBearbeiten
-Text svx:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT
+Text cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT
*ObenFuellen FID_FILL_TO_TOP
@@ -445,11 +445,11 @@ ObjektListe HID_BASICIDE_OBJECTCAT
Objektname sw:Edit:DLG_RENAME_XNAMED:ED_NEW_NAME
*OLEObjektEinfuegen SID_INSERT_OBJECT
-NeuErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT
-AusDateiErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE
-Objekttyp svx:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE
-OleDatei svx:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH
-Verknuepfen svx:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK
-Durchsuchen svx:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH
+NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT
+AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE
+Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE
+OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH
+Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK
+Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH
+OptionenDlg ExtrasOptionenDlg
diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win
index 9db53f313aaf..6f76fe17b2bd 100755
--- a/testautomation/global/win/dial_p_s.win
+++ b/testautomation/global/win/dial_p_s.win
@@ -15,24 +15,24 @@ SchutzAufheben HID_CHG_PROTECT
PasswortEingabe sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER
PasswortBestaetigen sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM
-*PBMOptionen goodies:ModalDialog:DLG_EXPORT_EPBM
-Binaer goodies:RadioButton:DLG_EXPORT_EPBM:RB_RAW
-Ascii goodies:RadioButton:DLG_EXPORT_EPBM:RB_ASCII
+*PBMOptionen filter:ModalDialog:DLG_EXPORT_EPBM
+Binaer filter:RadioButton:DLG_EXPORT_EPBM:RB_RAW
+Ascii filter:RadioButton:DLG_EXPORT_EPBM:RB_ASCII
*PfadeAuswaehlen HID_MULTIPATH
Pfade HID_OPTIONS_MULTIPATH_LIST
-Hinzufuegen SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH
-Loeschen SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH
+Hinzufuegen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH
+Loeschen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH
-*PGMOptionen goodies:ModalDialog:DLG_EXPORT_EPGM
-Binaer goodies:RadioButton:DLG_EXPORT_EPGM:RB_RAW
-Ascii goodies:RadioButton:DLG_EXPORT_EPGM:RB_ASCII
+*PGMOptionen filter:ModalDialog:DLG_EXPORT_EPGM
+Binaer filter:RadioButton:DLG_EXPORT_EPGM:RB_RAW
+Ascii filter:RadioButton:DLG_EXPORT_EPGM:RB_ASCII
-*PICTOPtionen goodies:ModalDialog:DLG_EXPORT_EPCT
-Original goodies:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL
-Groesse goodies:RadioButton:DLG_EXPORT_EPCT:RB_SIZE
-Breite goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX
-Hoehe goodies:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY
+*PICTOPtionen filter:ModalDialog:DLG_EXPORT_EPCT
+Original filter:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL
+Groesse filter:RadioButton:DLG_EXPORT_EPCT:RB_SIZE
+Breite filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX
+Hoehe filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY
*Pipette SID_BMPMASK svx:DockingWindow:RID_SVXDLG_BMPMASK
PipetteKnopf HID_BMPMASK_TBI_PIPETTE
@@ -71,20 +71,17 @@ RegularExpression sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP
NoDuplication sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE
*PlugInEinfuegen SID_INSERT_PLUGIN
-DateiUrl svx:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL
-Durchsuchen svx:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL
-Optionen svx:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS
+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 goodies:ModalDialog:DLG_EXPORT_EPPM
-Binaer goodies:RadioButton:DLG_EXPORT_EPPM:RB_RAW
-Ascii goodies:RadioButton:DLG_EXPORT_EPPM:RB_ASCII
-
-*ProxyWarnung svx:ModalDialog:RID_OFADLG_OPTIONS_TREE_HINT
-NichtMehrAnzeigen svx:CheckBox:RID_OFADLG_OPTIONS_TREE_HINT:CB_DISABLE
+*PPMOptionen filter:ModalDialog:DLG_EXPORT_EPPM
+Binaer filter:RadioButton:DLG_EXPORT_EPPM:RB_RAW
+Ascii filter:RadioButton:DLG_EXPORT_EPPM:RB_ASCII
*QuelleAuswaehlen HID_DATAPILOT_TYPE
AktuelleSelektion sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_SELECTION
@@ -93,12 +90,11 @@ ExterneQuelle sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_EXTERNAL
*Rechtschreibung HID_SPELLCHECK
Original HID_SPELLDLG_SETWORD
-Wort HID_SPLDLG_EDIT_NEWWORD
Ersetzen HID_SPLDLG_BUTTON_CHANGE
AlleErsetzen HID_SPLDLG_BUTTON_CHANGEALL
Ignorieren HID_SPLDLG_BUTTON_IGNORE
AlleIgnorieren HID_SPLDLG_BUTTON_IGNOREALL
-Sprache svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE
+Sprache cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE
RechtschreibungSchliessen HID_SPLDLG_BUTTON_CLOSE
*Redlining HID_REDLINE_ACCEPT
@@ -112,11 +108,11 @@ Ablehnen HID_REDLINING_VIEW_PB_REJECT
AlleAblehnen HID_REDLINING_VIEW_PB_REJECTALL
Undo HID_REDLINING_VIEW_PB_UNDO
-TabFilter HID_REDLINING_FILTER_PAGE SVX:TABPAGE:SID_REDLIN_FILTER_PAGE
-Datum HID_REDLINING_FILTER_CB_DATE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE
-DatumListe HID_REDLINING_FILTER_LB_DATE SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE
-Datum1 HID_REDLINING_FILTER_DF_DATE SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE
-Zeit1 HID_REDLINING_FILTER_TF_DATE SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE
+TabFilter HID_REDLINING_FILTER_PAGE cui:TABPAGE:SID_REDLIN_FILTER_PAGE
+Datum HID_REDLINING_FILTER_CB_DATE cui:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE
+DatumListe HID_REDLINING_FILTER_LB_DATE cui:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE
+Datum1 HID_REDLINING_FILTER_DF_DATE cui:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE
+Zeit1 HID_REDLINING_FILTER_TF_DATE cui:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE
Aktuell1 HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK
Datum2 HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2
Zeit2 HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2
@@ -126,8 +122,6 @@ AutoListe HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AU
Bereich HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE
BereichText HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE
Button HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF
-'Aktion HID_REDLINING_FILTER_CB_RANGE
-'Aktionsliste HID_REDLINING_FILTER_LB_ACTION
Aktion HID_REDLINING_FILTER_CB_ACTION SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_ACTION
Aktionsliste HID_REDLINING_FILTER_LB_ACTION SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_ACTION
Comment HID_REDLINING_FILTER_CB_COMMENT SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_COMMENT
@@ -238,25 +232,25 @@ FormatStarWriter sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_SW
Datenbankfeldliste sw:ListBox:DLG_MAILMERGE:LB_COLUMN
*Silbentrennung HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE
-Wort svx:Edit:RID_SVXDLG_HYPHENATE:ED_WORD
-Vor svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT
-Zurueck svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT
-Weiter svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE
-Entfernen svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE
+Wort cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD
+Vor cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT
+Zurueck cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT
+Weiter cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE
+Entfernen cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE
*SilbentrennungOptionen HID_LNGDLG_NUM_PREBREAK
-ZeichenVorUmbruch svx:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK
+ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK
*Sonderzeichen SID_CHARMAP
-Schrift svx:ListBox:RID_SVXDLG_CHARMAP:LB_FONT
+Schrift cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT
SchriftListe HID_CHARMAP_CTL_SHOWSET
-Loeschen svx:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE
+Loeschen cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE
Zeichenanzeige HID_CHARMAP_CTL_SHOWCHAR
Textanzeige HID_CHARMAP_CTL_SHOWTEXT
-Subset svx:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET
+Subset cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET
-*SonstigesJavaabschaltung svx:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
-NichtMehrAnzeigen svx:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE
+*SonstigesJavaabschaltung cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
+NichtMehrAnzeigen cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE
*Sortieren FN_SORTING_DLG
Schluessel1 sw:CheckBox:DLG_SORTING:CB_KEY1
@@ -348,7 +342,7 @@ FilterkriterienMin sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA
FilterergebnisMin sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA
*SpracheAuswaehlen HID_THES_LANGUAGE
-Auswahl svx:ListBox:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE
+Auswahl cui:ListBox:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE
*StandardFilter SID_FILTER
FeldName1 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1
diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win
index 6016206baeed..e660fdaeaf96 100755
--- a/testautomation/global/win/dial_t_z.win
+++ b/testautomation/global/win/dial_t_z.win
@@ -142,12 +142,12 @@ Textmarken sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK
Loeschen sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE
*Thesaurus SID_THESAURUS
-Wort svx:ListBox:RID_SVXDLG_THESAURUS:LB_WORD
-Ersetzen svx:Edit:RID_SVXDLG_THESAURUS:ED_REPL
-Bedeutung svx:ListBox:RID_SVXDLG_THESAURUS:LB_MEAN
-Synonym svx:ListBox:RID_SVXDLG_THESAURUS:LB_SYNON
-Nachschlagen svx:PushButton:RID_SVXDLG_THESAURUS:BTN_LOOKUP
-Sprache svx:PushButton:RID_SVXDLG_THESAURUS:BTN_LANGUAGE
+Wort cui:ListBox:RID_SVXDLG_THESAURUS:LB_WORD
+Ersetzen cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL
+Bedeutung cui:ListBox:RID_SVXDLG_THESAURUS:LB_MEAN
+Synonym cui:ListBox:RID_SVXDLG_THESAURUS:LB_SYNON
+Nachschlagen cui:PushButton:RID_SVXDLG_THESAURUS:BTN_LOOKUP
+Sprache cui:PushButton:RID_SVXDLG_THESAURUS:BTN_LANGUAGE
*Ueberblenden SID_POLYGON_MORPHING
Attributierung sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES
@@ -191,24 +191,24 @@ URL sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL
URLText sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL
*Verbinder HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION
-Linie1 SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
-Linie2 SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
-Linie3 SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3
-Typ SVX:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPE
-AnfangHorizontal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1
-AnfangVertikal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1
-EndeHorizontal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2
-EndeVertikal SVX:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2
+Linie1 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
+Linie2 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
+Linie3 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3
+Typ cui:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPE
+AnfangHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1
+AnfangVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1
+EndeHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2
+EndeVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2
Vorschau HID_PAGE_CONNECTION_CTL_PREVIEW
-*VerknuepfungenBearbeiten svx:ModalDialog:MD_UPDATE_BASELINKS
+*VerknuepfungenBearbeiten cui:ModalDialog:MD_UPDATE_BASELINKS
Liste HID_LINKDLG_TABLB
-VerknuepfungBearbeiten svx:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE
-Automatisch svx:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC
-Manuell svx:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL
-Aktualisieren svx:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW
-Aendern svx:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE
-Loesen svx:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK
+VerknuepfungBearbeiten cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE
+Automatisch cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC
+Manuell cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL
+Aktualisieren cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW
+Aendern cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE
+Loesen cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK
*VersendenMonitor HID_MERGE_PRINTMONITOR
@@ -225,51 +225,16 @@ Kommentar SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS
Schliessen SFX2:PUSHBUTTON:DLG_COMMENTS:PB_CLOSE
*VerteilenDlg HID_PAGE_DISTRIBUTE
-KeineHorizontal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE
-Links svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT
-MitteHorizontal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER
-AbstandHorizontal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE
-Rechts svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT
-KeineVertikal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE
-Oben svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP
-MitteVertikal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER
-AbstandVertikal svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE
-Unten svx:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM
-
-
-' *VerzeichnisformBearbeitenStichwort HID_FORMEDT_INDEX
-' Aufbau sw:ListBox:DLG_FORMEDT:LB_ENTRY
-' Aufbau1 sw:Edit:DLG_FORMEDT:ED_ENTRY
-' Eintrag sw:PushButton:DLG_FORMEDT:BT_ENTRY
-' Tab sw:PushButton:DLG_FORMEDT:BT_TAB
-' Seite sw:PushButton:DLG_FORMEDT:BT_PAGE
-' Stufen sw:ListBox:DLG_FORMEDT:LB_LEVEL
-' Absatzvorlagen sw:ListBox:DLG_FORMEDT:LB_PARALAY
-' Standard sw:PushButton:DLG_FORMEDT:BT_STD
-' Zuordnen sw:PushButton:DLG_FORMEDT:BT_ASSIGN
-
-' *VerzeichnisformBearbeitenBenutzer HID_FORMEDT_USER
-' Aufbau sw:ListBox:DLG_FORMEDT:LB_ENTRY
-' Aufbau1 sw:Edit:DLG_FORMEDT:ED_ENTRY
-' Eintrag sw:PushButton:DLG_FORMEDT:BT_ENTRY
-' Tab sw:PushButton:DLG_FORMEDT:BT_TAB
-' Seite sw:PushButton:DLG_FORMEDT:BT_PAGE
-' Stufen sw:ListBox:DLG_FORMEDT:LB_LEVEL
-' Absatzvorlagen sw:ListBox:DLG_FORMEDT:LB_PARALAY
-' Standard sw:PushButton:DLG_FORMEDT:BT_STD
-' Zuordnen sw:PushButton:DLG_FORMEDT:BT_ASSIGN
-
-' *VerzeichnisformBearbeitenInhalt HID_FORMEDT_CONTENT
-' Aufbau sw:ListBox:DLG_FORMEDT:LB_ENTRY
-' Aufbau1 sw:Edit:DLG_FORMEDT:ED_ENTRY
-' Eintrag sw:PushButton:DLG_FORMEDT:BT_ENTRY
-' Tab sw:PushButton:DLG_FORMEDT:BT_TAB
-' Seite sw:PushButton:DLG_FORMEDT:BT_PAGE
-' Stufen sw:ListBox:DLG_FORMEDT:LB_LEVEL
-' Absatzvorlagen sw:ListBox:DLG_FORMEDT:LB_PARALAY
-' Standard sw:PushButton:DLG_FORMEDT:BT_STD
-' Zuordnen sw:PushButton:DLG_FORMEDT:BT_ASSIGN
-' Hyperlink sw:PushButton:DLG_FORMEDT:BT_JUMP
+KeineHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE
+Links cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT
+MitteHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER
+AbstandHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE
+Rechts cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT
+KeineVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE
+Oben cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP
+MitteVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER
+AbstandVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE
+Unten cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM
*VerzeichniseintragEinfuegen FN_INSERT_IDX_ENTRY_DLG
EintragOk HID_INSERT_IDX_MRK_OK
@@ -301,9 +266,6 @@ Vorheriger HID_INSERT_IDX_MRK_PREV
*VorlageErzeugen SID_STYLE_NEW_BY_EXAMPLE SID_TEMPLATE_NEW_BY_EXAMPLE
Vorlagenname sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL
-' *VorlagenAuswaehlen HID_SEL_TEMPLATE
-' Vorlagenliste SW:LISTBOX:DLG_SEL_TEMPLATE:LB_TEMPLATES
-
*Vorlagenkatalog SID_STYLE_CATALOG
Vorlagen sfx2:ListBox:RID_STYLECATALOG:BT_TOOL
Ansicht HID_TEMPLATE_FMT
@@ -334,17 +296,17 @@ Breite svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC
Hoehe svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC
*Zahlenformat HID_NUMBERFORMAT
-Kategorie svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
+Kategorie cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
KategorieFormat HID_NUMBERFORMAT_LB_FORMAT
'FormatZahl
-FormatCode svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
+FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
Hinzufuegen HID_NUMBERFORMAT_TBI_ADD
Entfernen HID_NUMBERFORMAT_TBI_REMOVE
-Sprache svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
-Nachkommastellen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
-FuehrendeNullen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
-NegativInRot svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
-Tausenderpunkt svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
+Sprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
+Nachkommastellen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
+FuehrendeNullen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
+NegativInRot cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
+Tausenderpunkt cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
*ZeileAusblenden FID_ROW_HIDE
@@ -377,11 +339,11 @@ GanzeSpalten sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELCOLS
Hoehe sw:MetricField:DLG_ROW_HEIGHT:ED_HEIGHT
Dynamisch sw:CheckBox:DLG_ROW_HEIGHT:CB_AUTOHEIGHT
-*ZellenTeilen svx:ModalDialog:RID_SVX_SPLITCELLDLG
-Anzahl svx:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT
-Horizontal svx:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ
-Vertikal svx:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT
-GleichmaessigTeilen svx:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP
+*ZellenTeilen cui:ModalDialog:RID_SVX_SPLITCELLDLG
+Anzahl cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT
+Horizontal cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ
+Vertikal cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT
+GleichmaessigTeilen cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP
*ZielImDokument HID_HYPERLINK_MARKWND
'Uebernehmen Kein Eintrag in Hid.Lst
@@ -395,4 +357,4 @@ VariableZelle sc:Edit:RID_SCDLG_SOLVER:ED_VARCELL
Vorgaben2 sc:ImageButton:RID_SCDLG_SOLVER:RB_VARCELL
*Zusammenfassen SID_AUTOFORMAT
-Mindestgroesse svx:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN
+Mindestgroesse cui:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN
diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win
index aad530cf36e3..a062d5db9cf0 100755
--- a/testautomation/global/win/edia_a_c.win
+++ b/testautomation/global/win/edia_a_c.win
@@ -66,7 +66,7 @@ CheckRequiredFields HID_DSADMIN_CHECK_REQUIRED_FIELDS
*Aging SID_GRFFILTER_SEPIA
-AgingDegree svx:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA
+AgingDegree cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA
*AlienWarning HID_WARNING_ALIENFORMAT
DoNotShowAgain sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF
@@ -78,14 +78,14 @@ ReplaceExistingLibraries basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL
*ApplyGallery HID_GALLERY_APPLY
-*AssingComponent svx:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT
-ComponentMethodName svx:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD
+*AssingComponent cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT
+ComponentMethodName cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD
-*AssignMacro svx:TabPage:RID_SVXPAGE_MACROASSIGN
+*AssignMacro cui:TabPage:RID_SVXPAGE_MACROASSIGN
EventListBox HID_SVX_MACRO_LB_EVENT
-AssignButton svx:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN
-Component svx:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT
-RemoveButton svx:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE
+AssignButton cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN
+Component cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT
+RemoveButton cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE
*AutopilotAgenda HID_AGWIZ
ItemScrollbar HID_AGWIZ_5_SCROLL_BAR
@@ -340,7 +340,7 @@ Pass basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS
*CellWarning HID_SC_REPLCELLSWARN
*ChangeIcon HID_SVX_CONFIG_ICON_SELECTOR
-Import svx:PushButton:MD_ICONSELECTOR:BTN_IMPORT
+Import cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT
*ChangePassword HID_DLG_PASSWORD
OldPassword dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD
@@ -468,11 +468,11 @@ MoveUp sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_UP
MoveDown sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DOWN
*CustomizeMenuName HID_SVX_CONFIG_NAME_SUBMENU
-Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING
*CustomizeMenuReName HID_SVX_CONFIG_RENAME_MENU_ITEM
-Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING
*CustomizeToolbarsReName HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM
-Eingabefeld svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index ea63881d097d..de1b69ab4429 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -53,10 +53,10 @@ MySQLHostName HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER
MySQLPort HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT
AdoURL HID_PAGE_DBWIZARD_ADO_ET_ADOURL
-*CreateDatabaseLink svx:ModalDialog:DLG_DOCUMENTLINK
+*CreateDatabaseLink cui:ModalDialog:DLG_DOCUMENTLINK
DatabaseFile SID_OPENURL
-Browse svx:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE
-RegisteredName svx:Edit:DLG_DOCUMENTLINK:ET_NAME
+Browse cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE
+RegisteredName cui:Edit:DLG_DOCUMENTLINK:ET_NAME
*DigitalSignature HID_XMLSEC_DLG_DIGSIG
ViewCertificate xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT
@@ -225,11 +225,11 @@ IndexFields HID_DLGINDEX_INDEXDETAILS_FIELD
DatabaseIndexesClose dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE
*RecordSearch HID_FM_DLG_SEARCH
-SearchForText svx:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT
-SearchForNull svx:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL
-SearchForNotNull svx:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL
+SearchForText cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT
+SearchForNull cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL
+SearchForNotNull cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL
SearchText HID_SEARCH_TEXT
-Formular svx:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM
+Formular cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM
AllFields HID_SEARCH_ALLFIELDS
FieldSelection HID_SEARCH_FIELDSELECTION
Position HID_SEARCH_POSITION
@@ -427,18 +427,18 @@ Title HID_GALLERY_TITLE_EDIT
*HangulHanjaConversion HID_DIALOG_HANGULHANJA
Original HID_SPELLDLG_SETWORD
Word HID_HANGULDLG_EDIT_NEWWORD
-Find svx:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND
+Find cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND
Suggestions HID_HANGULDLG_SUGGESTIONS_LIST
-HangulAndHanja svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION
-HanjaHangul svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED
-HangulHanja svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED
-HanjaAsRubyAbove svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE
-HanjaAsRubyBelow svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW
-HangulAsRubyAbove svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE
-HangulAsRubyBelow svx:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW
-HangulOnly svx:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY
-HanjaOnly svx:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY
-ReplaceByCharacter svx:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER
+HangulAndHanja cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION
+HanjaHangul cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED
+HangulHanja cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED
+HanjaAsRubyAbove cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE
+HanjaAsRubyBelow cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW
+HangulAsRubyAbove cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE
+HangulAsRubyBelow cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW
+HangulOnly cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY
+HanjaOnly cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY
+ReplaceByCharacter cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER
Ignore HID_HANGULDLG_BUTTON_IGNORE
AlwaysIgnore HID_HANGULDLG_BUTTON_IGNOREALL
Replace HID_HANGULDLG_BUTTON_CHANGE
@@ -447,23 +447,23 @@ Options HID_HANGULDLG_BUTTON_OPTIONS
Grid HID_HANGULDLG_SUGGESTIONS_GRID
*HangulHanjaOptions HID_HANGULHANJA_OPT_DLG
-NewDictionary svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW
-EditDictionary svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT
-DeleteDictionary svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE
+NewDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW
+EditDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT
+DeleteDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE
UserDefineDictionary HID_HANGULHANJA_OPT_DICTS_LB
-IgnorePostPositionalWord svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST
-ShowEntries svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST
-ReplaceUniqueEntries svx:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE
+IgnorePostPositionalWord cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST
+ShowEntries cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST
+ReplaceUniqueEntries cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE
*HangulHanjaNewDictionary HID_HANGULHANJA_NEWDICT_DLG
-DictionaryName svx:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME
+DictionaryName cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME
*HangulHanjaEditDictionary HID_HANGULHANJA_EDIT_DLG
-Book svx:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK
-Original svx:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL
-Suggestion1 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1
-Suggestion2 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2
-Suggestion3 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3
-Suggestion4 svx:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4
-NewEntry svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW
-DeleteEntry svx:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE
+Book cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK
+Original cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL
+Suggestion1 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1
+Suggestion2 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2
+Suggestion3 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3
+Suggestion4 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4
+NewEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW
+DeleteEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE
diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win
index 569012019ec0..17e3e286f237 100755
--- a/testautomation/global/win/edia_i_o.win
+++ b/testautomation/global/win/edia_i_o.win
@@ -134,16 +134,16 @@ ConstantValueMinus HID_SCH_STATISTIK_MINUS_VALUE
ErrorIndicator HID_SCH_CT_INDICATE
*JavaClassPath HID_OPTIONS_JAVA_CLASSPATH
-ClassPath svx:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH
-AddArchive svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE
-AddFolder svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH
-Remove svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH
+ClassPath cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH
+AddArchive cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE
+AddFolder cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH
+Remove cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH
*JavaStartParameter HID_OPTIONS_JAVA_PARAMETER
-StartParameter svx:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER
-Assign svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN
-AssignedStartParameters svx:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED
-Remove svx:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE
+StartParameter cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER
+Assign cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN
+AssignedStartParameters cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED
+Remove cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE
*JoinProperties HID_DLG_QRY_JOIN
Type HID_DLG_QRY_JOINTYPE
@@ -247,9 +247,9 @@ mZoomlistbox HID_AVMEDIA_ZOOMLISTBOX
mTimeedit HID_AVMEDIA_TIMEEDIT
*MenuOrganiser HID_SVX_CONFIG_MENU_ORGANIZER
-MenuName svx:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME
-ButtonUp svx:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP
-ButtonDown svx:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN
+MenuName cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME
+ButtonUp cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP
+ButtonDown cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN
*ModifyLink sfx2:ModalDialog:MD_DDE_LINKEDIT
ModifyDDEApplication sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_APP
@@ -257,9 +257,9 @@ ModifyDDEFile sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_TOPIC
ModifyDDECategory sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_ITEM
*Mosaic SID_GRFFILTER_MOSAIC
-Width svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH
-Height svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT
-EnhanceEdges svx:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES
+Width cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH
+Height cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT
+EnhanceEdges cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES
*NewAddressList HID_MM_CREATEADDRESSLIST
New sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEW
@@ -283,9 +283,9 @@ MoveRight sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT
MoveDown sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN
Select sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD
-*NewToolbar svx:ModalDialog:MD_NEW_TOOLBAR
-ToolbarName svx:Edit:MD_NEW_TOOLBAR:EDT_STRING
-SaveIn svx:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN
+*NewToolbar cui:ModalDialog:MD_NEW_TOOLBAR
+ToolbarName cui:Edit:MD_NEW_TOOLBAR:EDT_STRING
+SaveIn cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN
*NewsletterLayout HID_DLGNEWSLTR_DIALOG
Newsletter HID_DLGNEWSLTR_OPTSTANDARDLAYOUT
@@ -296,15 +296,15 @@ Duplex HID_DLGNEWSLTR_OPTDOUBLESIDED
OKButton HID_DLGNEWSLTR_CMDGOON
*OLEObjektInsert SID_INSERT_OBJECT
-NeuErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT
-AusDateiErstellen svx:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE
-Objekttyp svx:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE
-OleDatei svx:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH
-Verknuepfen svx:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK
-Durchsuchen svx:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH
-
-*InsertTableImpress svx:ModalDialog:RID_SVX_NEWTABLE_DLG
-NumberOfColumns svx:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS
-NumberOfRows svx:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS
+NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT
+AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE
+Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE
+OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH
+Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK
+Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH
+
+*InsertTableImpress cui:ModalDialog:RID_SVX_NEWTABLE_DLG
+NumberOfColumns cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS
+NumberOfRows cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS
*TableDesign sd:ModalDialog:DLG_TABLEDESIGNPANE
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index ea5e9cf266db..a95316d03619 100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -64,13 +64,108 @@ HideToolbar filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR
HideWindowControls filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL
*Posterize SID_GRFFILTER_POSTER
-PosterColors svx:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER
+PosterColors cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER
*PortfolioCurrency HID_DLGDEPOT_DIALOG_HISTORY
Currency HID_DLGDEPOT_LSTMARKETS
OKButton HID_DLGDEPOT_0_CMDGOON_HISTORY
CancelButton HID_DLGDEPOT_0_CMDCANCEL_HISTORY
+*Printing .HelpId:vcl:PrintDialog:Dialog
+PreviewWindow .HelpId:vcl:PrintDialog:Preview
+PreviewPageNumber .HelpId:vcl:PrintDialog:PageEdit
+ScrollBackward .HelpId:vcl:PrintDialog:BackwardBtn
+ScrollForward .HelpId:vcl:PrintDialog:ForwardBtn
+Print .HelpId:vcl:PrintDialog:OK
+Cancel .HelpId:vcl:PrintDialog:Cancel
+
+PrintingTabControl .HelpId:vcl:PrintDialog:TabPages
+TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage
+TabApplication .HelpId:vcl:PrintDialog:TabPage:10
+TabLayout .HelpId:vcl:PrintDialog:NUpPage
+TabOptions .HelpId:vcl:PrintDialog:OptPage
+
+*TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage
+PrinterList .HelpId:vcl:PrintDialog:JobPage:PrinterList
+NumberOfCopies .HelpId:vcl:PrintDialog:JobPage:Copies
+Collate .HelpId:vcl:PrintDialog:JobPage:Collate
+PrintNotes .HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox
+AllPages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0
+AllSlides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0
+AllSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0
+Pages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1
+Slides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1
+SelectedSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1
+PrintAllPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:0
+PrintPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:1
+PageRange .HelpId:vcl:PrintDialog:PageRange:Edit
+Selection .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2
+SelectedCells .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2
+Details .HelpId:vcl:PrintDialog:JobPage:DetailsBtn
+Properties .HelpId:vcl:PrintDialog:JobPage:Properties
+PageCount .HelpId:vcl:PrintDialog:NumPagesText
+PartsToPrint .HelpId:vcl:PrintDialog:PageContentType:ListBox
+SlidesPerPage .HelpId:vcl:PrintDialog:SlidesPerPage:ListBox
+ArrangeSlides .HelpId:vcl:PrintDialog:SlidesPerPageOrder:ListBox
+
+*TabApplication .HelpId:vcl:PrintDialog:TabPage:10
+PrintPageBackground .HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox
+PrintGraphicsAndDiagrams .HelpId:vcl:PrintDialog:PrintTablesGraphicsAndDiagrams:CheckBox
+PrintPicturesAndObjects .HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox
+PrintHiddenText .HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox
+PrintTextPlaceholder .HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox
+PrintFormControls .HelpId:vcl:PrintDialog:PrintControls:CheckBox
+PrintTextInBlack .HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox
+PrintBlankPages .HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox
+IncludeEmptyPages .HelpId:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox
+SlideName .HelpId:vcl:PrintDialog:IsPrintName:CheckBox
+DateAndTime .HelpId:vcl:PrintDialog:IsPrintDateTime:CheckBox
+HiddenPages .HelpId:vcl:PrintDialog:IsPrintHidden:CheckBox
+TilePaper .HelpId:vcl:PrintDialog:PageOptions:RadioButton:3
+OriginalColors .HelpId:vcl:PrintDialog:Quality:RadioButton:0
+Grayscale .HelpId:vcl:PrintDialog:Quality:RadioButton:1
+BlackAndWhite .HelpId:vcl:PrintDialog:Quality:RadioButton:2
+MultiplePages .HelpId:vcl:PrintDialog:PageOptions:RadioButton:2
+TitleRow .HelpId:vcl:PrintDialog:TitleRow:CheckBox
+FormulaText .HelpId:vcl:PrintDialog:FormulaText:CheckBox
+Borders .HelpId:vcl:PrintDialog:Border:CheckBox
+OriginalSize .HelpId:vcl:PrintDialog:PageOptions:RadioButton:0
+OriginalSizeMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:0
+FitToPage .HelpId:vcl:PrintDialog:PageOptions:RadioButton:1
+FitToPageMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:1
+Scaling .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:2
+ScalingFactor .HelpId:vcl:PrintDialog:PrintScale:NumericField
+
+*TabLayout .HelpId:vcl:PrintDialog:NUpPage
+PagesPerSheet .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheet
+NumberOfPages .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheetBox
+NumberOfColumns .HelpId:vcl:PrintDialog:NUpPage:ColumnsBox
+NumberOfRows .HelpId:vcl:PrintDialog:NUpPage:RowsBox
+BorderAroundPages .HelpId:vcl:PrintDialog:NUpPage:BorderBox
+Brochure .HelpId:vcl:PrintDialog:NUpPage:Brochure
+DistanceBetweenPages .HelpId:vcl:PrintDialog:NUpPage:PageMarginBox
+MarginToSheetBorder .HelpId:vcl:PrintDialog:NUpPage:SheetMarginBox
+PaperOrientation .HelpId:vcl:PrintDialog:NUpPage:OrientationBox
+PrintOrder .HelpId:vcl:PrintDialog:NUpPage:OrderBox
+IncludePages .HelpId:vcl:PrintDialog:PrintLeftRightPages:ListBox
+PrintBrochureRTL .HelpId:vcl:PrintDialog:PrintProspectRTL:ListBox
+BrochurePageSides .HelpId:vcl:PrintDialog:PrintProspectInclude:ListBox
+
+*TabOptions .HelpId:vcl:PrintDialog:OptPage
+PrintToFile .HelpId:vcl:PrintDialog:OptPage:ToFile
+PrintAsSingleJobs .HelpId:vcl:PrintDialog:OptPage:SingleJobs
+PrintReverse .HelpId:vcl:PrintDialog:OptPage:Reverse
+PaperTrayFromPrefs .HelpId:vcl:PrintDialog:PrintPaperFromSetup:CheckBox
+
+*PurchaseStarOffice HID_LICENSING_DIALOG
+TabPurchase HID_TP_PURCHASE
+getSerialNumber tab:PushButton:TP_PURCHASE:PB_PURCHASE_GET
+TabUnlockStarOffice HID_TP_UNLOCK
+SerialNumberA tab:Edit:TP_UNLOCK:ED_UNLOCK_A
+SerialNumberB tab:Edit:TP_UNLOCK:ED_UNLOCK_B
+SerialNumberC tab:Edit:TP_UNLOCK:ED_UNLOCK_C
+TabSummary HID_TP_SUMMARY
+
*QueryEditWindow HID_CTL_QRYSQLEDIT
*QueryDesignTable HID_CTL_QRYDGNTAB
@@ -166,10 +261,10 @@ LightSource HID_GRFFILTER_EMBOSS_LIGHT
FieldTitle sw:Edit:DLG_MM_ADD_RENAME_ENTRY:ED_FIELDNAME
*RenameMenu HID_SVX_CONFIG_RENAME_MENU
-NewName svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+NewName cui:Edit:RID_SVXDLG_NAME:EDT_STRING
*RenameToolbar HID_SVX_CONFIG_RENAME_TOOLBAR
-NewName svx:Edit:RID_SVXDLG_NAME:EDT_STRING
+NewName cui:Edit:RID_SVXDLG_NAME:EDT_STRING
*Registration HID_REGISTRATION_DIALOG
Now svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW
@@ -248,14 +343,14 @@ Type sw:Edit:DLG_SAVE_LABEL:ED_TYPE
*ScriptOrganizer HID_SCRIPTORG_DIALOG
ScriptTreeList HID_SCRIPTSBOX
-PBRun svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN
-PBCreate svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE
-PBEdit svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT
-PBRename svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME
-PBDelete svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL
+PBRun cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN
+PBCreate cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE
+PBEdit cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT
+PBRename cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME
+PBDelete cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL
-*ScriptNameDlg svx:ModalDialog:RID_DLG_NEWLIB
-EFObjectName svx:Edit:RID_DLG_NEWLIB:ED_LIBNAME
+*ScriptNameDlg cui:ModalDialog:RID_DLG_NEWLIB
+EFObjectName cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME
*ScriptSelector HID_SELECTOR_DIALOG
LibraryTreeList HID_SELECTOR_CATEGORIES
@@ -336,8 +431,8 @@ Resolution chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION
DataPointsOrder chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER
*Solarization SID_GRFFILTER_SOLARIZE
-Value svx:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD
-Invert svx:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT
+Value cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD
+Invert cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT
*Solver SID_OPENDLG_OPTSOLVER
TargetCell sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL
@@ -401,17 +496,17 @@ ExtendSelection sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_EXTSORT
CurrentSelection sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_CURSORT
*Spellcheck HID_SPELLCHECK
-NotInDictionary svx:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD
-Suggestions svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION
-DictionaryLanguage svx:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE
+NotInDictionary cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD
+Suggestions cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION
+DictionaryLanguage cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE
IgnoreOnce HID_SPLDLG_BUTTON_IGNORE
IgnoreAll HID_SPLDLG_BUTTON_IGNOREALL
-AddToDictionary svx:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT
+AddToDictionary cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT
Change HID_SPLDLG_BUTTON_CHANGE
ChangeAll HID_SPLDLG_BUTTON_CHANGEALL
-AutoCorrect svx:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR
-SpellcheckOptions svx:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS
-SpellcheckUndo svx:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO
+AutoCorrect cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR
+SpellcheckOptions cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS
+SpellcheckUndo cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO
SpellcheckClose HID_SPLDLG_BUTTON_CLOSE
*SQLException dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN
@@ -456,6 +551,7 @@ PrintButton HID_HELP_TOOLBOXITEM_PRINT
SetBookmarks HID_HELP_TOOLBOXITEM_BOOKMARKS
*SaveScheme HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
+
SchemeName HID_OPTIONS_COLORCONFIG_NAME_SCHEME
*SecurityWarning HID_XMLSECDLG_MACROWARN
@@ -522,7 +618,7 @@ Back HID_DLGHOLIDAYCAL_0_CMDOWNDATA
Create HID_DLGHOLIDAYCAL_0_CMDOK
*StoredPasswordsDialog HID_DLG_WEBCONNECTION_INFO
-Remove svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE
-RemoveAll svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL
-changePassword svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE
+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
diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win
index 65008b14a2db..f2214f266741 100755
--- a/testautomation/global/win/etab_a_d.win
+++ b/testautomation/global/win/etab_a_d.win
@@ -1,13 +1,13 @@
*TabAccessibility HID_OPTIONS_ACCESSIBILITYCONFIG
-ForPagePreviews svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS
-HelpTips svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP
-After svx:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP
-AllowAnimatedGraphics svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS
-AllowAnimatedText svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS
-AlwaysUseAutomaticFontColor svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR
-SupportAssistiveTechnologyTools svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL
-UseTextSelectionCursor svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION
-AutomaticDetectHC svx:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC
+ForPagePreviews cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS
+HelpTips cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP
+After cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP
+AllowAnimatedGraphics cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS
+AllowAnimatedText cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS
+AlwaysUseAutomaticFontColor cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR
+SupportAssistiveTechnologyTools cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL
+UseTextSelectionCursor cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION
+AutomaticDetectHC cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC
*TabAdabas HID_DSADMIN_PAGE_ADABAS
Hostname dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME
@@ -42,9 +42,9 @@ UserName HID_DSADMIN_USER_ADO
PasswordRequired HID_DSADMIN_PWDREC_ADO
*TabAppearance HID_OPTIONS_COLORCONFIG
-Scheme svx:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME
-Save svx:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME
-Delete svx:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME
+Scheme cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME
+Save cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME
+Delete cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME
ColorList HID_OPTIONS_COLORCONFIG_COLORLIST_WIN
LBGeneralDocBg HID_COLORPAGE_DOCCOLOR_LB
CBGeneralTextBd HID_COLORPAGE_DOCBOUNDARIES_CB
@@ -93,47 +93,47 @@ LBBasicReservedExpression HID_COLORPAGE_BASICKEYWORD_LB
LBBasicError HID_COLORPAGE_BASICERROR_LB
*TabArea HID_AREA_AREA
-BackgroundColour svx:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD
-BackgroundColourList svx:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR
-FillOptions svx:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE
-ColourList svx:ListBox:RID_SVXPAGE_AREA:LB_COLOR
-GradientList svx:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT
-HatchingList svx:ListBox:RID_SVXPAGE_AREA:LB_HATCHING
-BitmapList svx:ListBox:RID_SVXPAGE_AREA:LB_BITMAP
-Automatic svx:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT
-Increments svx:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT
-Tile svx:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE
-Stretch svx:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH
-Relative svx:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE
-Original svx:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL
-Width svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE
-Height svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE
-XOffset svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET
-YOffset svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET
-Row svx:RadioButton:RID_SVXPAGE_AREA:RBT_ROW
-Column svx:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN
-Offset svx:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET
+BackgroundColour cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD
+BackgroundColourList cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR
+FillOptions cui:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE
+ColourList cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR
+GradientList cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT
+HatchingList cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING
+BitmapList cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP
+Automatic cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT
+Increments cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT
+Tile cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE
+Stretch cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH
+Relative cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE
+Original cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL
+Width cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE
+Height cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE
+XOffset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET
+YOffset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET
+Row cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW
+Column cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN
+Offset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET
*TabAsianLayout HID_SVXPAGE_CHAR_TWOLINES
-TwoLinesEachLine svx:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES
-BeginningCharacter svx:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET
-EndCharacter svx:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET
+TwoLinesEachLine cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES
+BeginningCharacter cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET
+EndCharacter cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET
*TabAsianLayoutOptions HID_OPTIONS_ASIAN_LAYOUT
-WesternCharactersOnly svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING
-WesternTextAndPunctuation svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT
-NoCompression svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP
-CompressPunctuationOnly svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP
-CompressPunctuationAndJapaneseKana svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP
-Language svx:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE
-Standard svx:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD
-NoStartOfLine svx:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START
-NoEndOfLine svx:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END
+WesternCharactersOnly cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING
+WesternTextAndPunctuation cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT
+NoCompression cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP
+CompressPunctuationOnly cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP
+CompressPunctuationAndJapaneseKana cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP
+Language cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE
+Standard cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD
+NoStartOfLine cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START
+NoEndOfLine cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END
*TabAsianTypography HID_SVXPAGE_PARA_ASIAN
-ApplyList svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN
-AllowHangingPunctuation svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC
-ApplySpacingBetween svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE
+ApplyList cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN
+AllowHangingPunctuation cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC
+ApplySpacingBetween cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE
*TabAutoCaption HID_OPTCAPTION_PAGE
ObjectList HID_OPTCAPTION_CLB
@@ -169,20 +169,20 @@ Remove HID_NUM_RESET
TextDirection chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR
*TabChartAxisNumbers HID_NUMBERFORMAT
- Category svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
- FormatCurrency svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY
+ Category cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
+ FormatCurrency cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY
FormatString HID_NUMBERFORMAT_LB_FORMAT
- Language svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
- Sourceformat svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT
- DecimalPlaces svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
- LeadingZeroes svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
- NegativNumbersRed svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
- ThousandsSeparator svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
- FormatCode svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
+ Language cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
+ Sourceformat cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT
+ DecimalPlaces cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
+ LeadingZeroes cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
+ NegativNumbersRed cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
+ ThousandsSeparator cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
+ FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
AddButton HID_NUMBERFORMAT_TBI_ADD
EditCommentButton HID_NUMBERFORMAT_TBI_INFO
RemoveButton HID_NUMBERFORMAT_TBI_REMOVE
- Comment svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT
+ Comment cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT
*TabChartAxisScale chart2:TabPage:TP_SCALE
MinimumValue chart2:SpinField:TP_SCALE:EDT_MIN
@@ -270,11 +270,11 @@ InsertInSheet chart2:ListBox:TP_LOCATION:LB_TABLE
*TabCreateOptionGroup extensions:TabPage:RID_PAGE_OPTIONS_FINAL
GroupCaption extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT
-*TabConnections svx:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS
+*TabConnections cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS
DriverList HID_OFA_CONNPOOL_DRIVERLIST
-ConnectionPoolingEnabled svx:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS
-EnablePoolingForThisDriver svx:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING
-Timeout svx:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT
+ConnectionPoolingEnabled cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS
+EnablePoolingForThisDriver cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING
+Timeout cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT
*TabConnection dbaccess:TabPage:PAGE_CONNECTION
dBasePath HID_DSADMIN_DBASE_PATH
@@ -319,40 +319,40 @@ Reset sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_RESET
Default sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_DEFAULT
*TabComplexTextLayout HID_OPTIONS_CTL
-UseSequenceChecking svx:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING
-Logical svx:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL
-Visual svx:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL
-Numerals svx:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS
-Restricted svx:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED
-TypeAndReplace svx:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE
+UseSequenceChecking cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING
+Logical cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL
+Visual cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL
+Numerals cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS
+Restricted cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED
+TypeAndReplace cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE
*TabCustomizeEvents HID_SVX_CONFIG_EVENT
-SaveIn svx:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN
+SaveIn cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN
EventListbox HID_SVX_MACRO_LB_EVENT
-AssignMacro svx:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN
-RemoveMacro svx:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE
+AssignMacro cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN
+RemoveMacro cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE
ResetBtn HID_TABDLG_RESET_BTN
*TabCustomizeMenu HID_SVX_CONFIG_MENU
-Menu svx:ListBox:RID_SVXPAGE_MENUS:LB_MENUS
-BtnNew svx:PushButton:RID_SVXPAGE_MENUS:BTN_NEW
-MenuBtn svx:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE
-AddCommands svx:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS
-Command svx:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY
-BtnUp svx:ImageButton:RID_SVXPAGE_MENUS:BTN_UP
-BtnDown svx:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN
-SaveIn svx:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN
+Menu cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS
+BtnNew cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW
+MenuBtn cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE
+AddCommands cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS
+Command cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY
+BtnUp cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP
+BtnDown cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN
+SaveIn cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN
ResetBtn HID_TABDLG_RESET_BTN
Entries HID_SVX_CONFIG_MENU_CONTENTS
*TabCustomizeToolbars HID_SVX_CONFIG_TOOLBAR
-Menu svx:ListBox:RID_SVXPAGE_MENUS:LB_MENUS
+Menu cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS
BtnNew HID_SVX_NEW_TOOLBAR
MenuBtn HID_SVX_MODIFY_TOOLBAR
AddCommands HID_SVX_NEW_TOOLBAR_ITEM
Command HID_SVX_MODIFY_TOOLBAR_ITEM
-BtnUp svx:ImageButton:RID_SVXPAGE_MENUS:BTN_UP
-BtnDown svx:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN
+BtnUp cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP
+BtnDown cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN
SaveIn HID_SVX_SAVE_IN
ToolbarContents HID_SVX_CONFIG_TOOLBAR_CONTENTS
ResetBtn HID_TABDLG_RESET_BTN
diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win
index 69e4782a488e..09fd5e9067b8 100755
--- a/testautomation/global/win/etab_e_g.win
+++ b/testautomation/global/win/etab_e_g.win
@@ -7,8 +7,8 @@ TextAnimation sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM
DelayBetweenCharacters sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY
*TabEmail HID_OPTIONS_MAIL
-EmailProgram svx:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL
-EmailOpen svx:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL
+EmailProgram cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL
+EmailOpen cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL
*TabEntrance HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE
Effects sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS
@@ -108,57 +108,57 @@ FathersName desktop:Edit:TP_USER:ED_USER_FATHER
*TabFirstStartWelcome HID_FIRSTSTART_WELCOME
*TabFont HID_SVXPAGE_CHAR_NAME
-Font svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK
-Style svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK
-Size svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK
-Language svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK
-FontWest svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME
-StyleWest svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE
-SizeWest svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE
-LanguageWest svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG
-FontEast svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME
-StyleEast svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE
-SizeEast svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE
-LanguageEast svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG
-FontCTL svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME
-StyleCTL svx:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE
-SizeCTL svx:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE
-LanguageCTL svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG
-Color svx:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2
+Font cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK
+Style cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK
+Size cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK
+Language cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK
+FontWest cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME
+StyleWest cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE
+SizeWest cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE
+LanguageWest cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG
+FontEast cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME
+StyleEast cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE
+SizeEast cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE
+LanguageEast cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG
+FontCTL cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME
+StyleCTL cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE
+SizeCTL cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE
+LanguageCTL cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG
+Color cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2
*TabFontEffects HID_SVXPAGE_CHAR_EFFECTS
-Underline svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE
-Color svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR
-Effects svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2
-StrikeThrough svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT
-IndividualWords svx:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS
-Emphasis svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS
-Position svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION
-Outline svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE
-Overline svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE
-OverlineColor svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR
-Shadow svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW
-Blinking svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING
-Relief svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF
-FontColor svx:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR
-Hidden svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN
+Underline cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE
+Color cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR
+Effects cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2
+StrikeThrough cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT
+IndividualWords cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS
+Emphasis cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS
+Position cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION
+Outline cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE
+Overline cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE
+OverlineColor cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR
+Shadow cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW
+Blinking cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING
+Relief cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF
+FontColor cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR
+Hidden cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN
*TabFontPosition HID_SVXPAGE_CHAR_POSITION
-SuperScript svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
-Normal svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS
-Subscript svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS
-RaiseLower svx:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW
-RelativeFontSize svx:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE
-Automatic svx:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW
-n0Degree svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG
-n90Degree svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG
-n270Degree svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG
-FitToLine svx:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE
-ScaleWith svx:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH
-Spacing svx:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2
-SpacingBy svx:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2
-PairKerning svx:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING
-Super svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
+SuperScript cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
+Normal cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS
+Subscript cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS
+RaiseLower cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW
+RelativeFontSize cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE
+Automatic cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW
+n0Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG
+n90Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG
+n270Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG
+FitToLine cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE
+ScaleWith cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH
+Spacing cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2
+SpacingBy cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2
+PairKerning cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING
+Super cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
*TabFormat3dViewGeometry SID_3D_VIEW
AxisRotationXaxis chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION
@@ -194,22 +194,22 @@ Super svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
TextDirection2 HID_SCH_TEXTDIRECTION_EQUATION
*TabFormatChartLine HID_LINE_LINE
- Style svx:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE
- Color svx:ListBox:RID_SVXPAGE_LINE:LB_COLOR
- Width svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH
- Transparency svx:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT
- StyleLeft svx:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE
- WidthLeft svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH
- CenterLeft svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START
- StyleRight svx:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE
- WidthRight svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH
- CenterRight svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END
- SynchroniteEnds svx:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE
- CornerStyle svx:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE
- IconSelect svx:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP
- IconWidth svx:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH
- IconHeigth svx:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT
- KeepRatio svx:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO
+ Style cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE
+ Color cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR
+ Width cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH
+ Transparency cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT
+ StyleLeft cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE
+ WidthLeft cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH
+ CenterLeft cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START
+ StyleRight cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE
+ WidthRight cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH
+ CenterRight cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END
+ SynchroniteEnds cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE
+ CornerStyle cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE
+ IconSelect cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP
+ IconWidth cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH
+ IconHeigth cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT
+ KeepRatio cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO
+TabFormatChartBorders TabFormatChartLine
diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win
index 66ce34a2c5a6..244e02f717bc 100755
--- a/testautomation/global/win/etab_h_o.win
+++ b/testautomation/global/win/etab_h_o.win
@@ -11,38 +11,38 @@ URL sfx2:Edit:TP_DOCINFORELOAD:ED_URL
BrowseURL sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL
Frame sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME
-*TabOOoImprovement svx:TabPage:RID_SVXPAGE_IMPROVEMENT
-ParticipateYes svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES
-ParticipateNo svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO
-ShowData svx:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA
+*TabOOoImprovement cui:TabPage:RID_SVXPAGE_IMPROVEMENT
+ParticipateYes cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES
+ParticipateNo cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO
+ShowData cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA
*TabJava HID_OPTIONS_JAVA
-UseJava svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE
+UseJava cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE
JavaList HID_OPTIONS_JAVA_LIST
-Add svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD
-Parameters svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER
-ClassPath svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH
+Add cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD
+Parameters cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER
+ClassPath cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH
*TabJapaneseFind HID_SVXPAGE_JSEARCH_OPTIONS
-MatchCase svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE
-MatchFullHalf svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH
-MatchHiraganaKatakana svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA
-MatchContractions svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS
-MatchMinusDashChoOn svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON
-MatchRepeatcharacterMarks svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS
-MatchVariantFormKanji svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI
-MatchOldKanaForms svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS
-MatchDiZiDuZu svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU
-MatchBaVaHaFa svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA
-MatchTsiThiChiDhiZi svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI
-MatchHyuFyuByuVyu svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU
-MatchDeSheZeJe svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE
-MatchIaIya svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA
-MatchKiKu svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU
-PunctuationCharacters svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION
-WhitespaceCharacters svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES
-ProlongedSoundmarks svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK
-MiddleDots svx:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT
+MatchCase cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE
+MatchFullHalf cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH
+MatchHiraganaKatakana cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA
+MatchContractions cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS
+MatchMinusDashChoOn cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON
+MatchRepeatcharacterMarks cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS
+MatchVariantFormKanji cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI
+MatchOldKanaForms cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS
+MatchDiZiDuZu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU
+MatchBaVaHaFa cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA
+MatchTsiThiChiDhiZi cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI
+MatchHyuFyuByuVyu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU
+MatchDeSheZeJe cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE
+MatchIaIya cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA
+MatchKiKu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU
+PunctuationCharacters cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION
+WhitespaceCharacters cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES
+ProlongedSoundmarks cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK
+MiddleDots cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT
*TabJDBC HID_DSADMIN_PAGE_JDBC
JDBCDriverClass HID_DSADMIN_DRIVERCLASS
@@ -67,6 +67,18 @@ Records HID_DSADMIN_LDAP_ROWCOUNT
DataSource extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE
Table extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE
+*TabLocalizedOptions HID_OFAPAGE_AUTOCORR_QUOTE
+LocalizedOptionsList HID_OFAPAGE_QUOTE_CLB
+LocalizedOptions HID_OFAPAGE_QUOTE_SW_CLB
+SingleQuotesReplace cui:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO
+SingleQuotesStart cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE
+SingleQuotesEnd cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE
+SingleQuotesDefault cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD
+DoubleQuotesReplace cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO
+DoubleQuotesStart cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE
+DoubleQuotesEnd cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE
+DoubleQuotesDefault cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD
+
*TabMailMergeEMail HID_TP_MAILCONFIG
YourName sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME
EmailAddress sw:Edit:TP_MAILCONFIG:ED_ADDRESS
@@ -170,15 +182,15 @@ EditButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT
*TabMemory HID_OFA_TP_MEMORY
-UndoSteps svx:NumericField:OFA_TP_MEMORY:ED_UNDO
-StarOffice svx:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE
-MemoryPerObject svx:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE
-RemoveFromMemoryAfter svx:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME
-NumberOfObjects svx:NumericField:OFA_TP_MEMORY:NF_OLECACHE
-LoadQuickstarter svx:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH
+UndoSteps cui:NumericField:OFA_TP_MEMORY:ED_UNDO
+StarOffice cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE
+MemoryPerObject cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE
+RemoveFromMemoryAfter cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME
+NumberOfObjects cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE
+LoadQuickstarter cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH
-*TabMozillaPlugin svx:TabPage:RID_SVXPAGE_INET_MOZPLUGIN
-Enable svx:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE
+*TabMozillaPlugin cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN
+Enable cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE
*TabMySQLJDBC dbaccess:TabPage:PAGE_MYSQL_JDBC
HostName HID_DSADMIN_HOSTNAME
@@ -209,13 +221,13 @@ UseCatalogs HID_DSADMIN_USECATALOG
+TabOfficeView TabAnsichtAllgemein
*TabOnlineUpdate HID_SVX_OPTIONS_ONLINEUPDATE
-CheckAutomatically svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK
-EveryDay svx:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY
-EveryWeek svx:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK
-EveryMonth svx:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH
-CheckNow svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW
-DownloadAutomatically svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD
-Change svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH
+CheckAutomatically cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK
+EveryDay cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY
+EveryWeek cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK
+EveryMonth cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH
+CheckNow cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW
+DownloadAutomatically cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD
+Change cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH
*TabOracleJDBC dbaccess:TabPage:PAGE_ORACLE_JDBC
HostName HID_DSADMIN_HOSTNAME
diff --git a/testautomation/global/win/etab_p_s.win b/testautomation/global/win/etab_p_s.win
index 7a61877be522..46f4a46b2f63 100755
--- a/testautomation/global/win/etab_p_s.win
+++ b/testautomation/global/win/etab_p_s.win
@@ -2,39 +2,39 @@
TransferPersonalData desktop:CheckBox:TP_MIGRATION:CB_MIGRATION
*TabPositionAndSize HID_TRANS_POSITION_SIZE
-PositionX svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X
-PositionY svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y
-Width svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH
-Height svx:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT
-KeepRatio svx:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE
-ProtectPosition svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT
-ProtectSize svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT
-FitWidthText svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH
-FitHeightText svx:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT
-AnchorPosition svx:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT
-Anchor svx:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR
+PositionX cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X
+PositionY cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y
+Width cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH
+Height cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT
+KeepRatio cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE
+ProtectPosition cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT
+ProtectSize cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT
+FitWidthText cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH
+FitHeightText cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT
+AnchorPosition cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT
+Anchor cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR
PositionPosition HID_TPPOSITION_CTRL
SizePosition HID_TPSIZE_CTRL
*TabPositionAndSizeWriter HID_SVXPAGE_SWPOSSIZE
-Width svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH
-Height svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT
-KeepRatio svx:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO
-Topage svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE
-Toparagraph svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA
-Tocharacter svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR
-Ascharacter svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR
-ToFrame svx:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME
-ProtectPosition svx:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION
-ProtectSize svx:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE
-Horizontal svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI
-Horizontalby svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY
-Horizontalto svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO
-Mirror svx:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR
-Vertical svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT
-Verticalby svx:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY
-Verticalto svx:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO
-Followtextflow svx:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW
+Width cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH
+Height cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT
+KeepRatio cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO
+Topage cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE
+Toparagraph cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA
+Tocharacter cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR
+Ascharacter cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR
+ToFrame cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME
+ProtectPosition cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION
+ProtectSize cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE
+Horizontal cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI
+Horizontalby cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY
+Horizontalto cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO
+Mirror cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR
+Vertical cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT
+Verticalby cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY
+Verticalto cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO
+Followtextflow cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW
*TabPrintStarOffice HID_TP_COMMONPRINTOPTIONS
Printer sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT
@@ -62,41 +62,43 @@ SuppressOutput sc:CheckBox:RID_SCPAGE_PRINT:BTN_SKIPEMPTYPAGES
PrintOnly sc:CheckBox:RID_SCPAGE_PRINT:BTN_SELECTEDSHEETS
*TabProxyServer HID_OPTIONS_PROXY
-ProxyServer svx:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE
-HttpProxy svx:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY
-HttpPort svx:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT
-FtpProxy svx:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY
-FtpPort svx:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT
-NoProxy svx:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR
+ProxyServer cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE
+HttpProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY
+HttpPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT
+HttpsProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY
+HttpsPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT
+FtpProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY
+FtpPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT
+NoProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR
-*TabRegisteredDatabase svx:TabPage:RID_SFXPAGE_DBREGISTER
+*TabRegisteredDatabase cui:TabPage:RID_SFXPAGE_DBREGISTER
RegisteredDatabases HID_DBPATH_CTL_PATH
-NewBtn svx:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW
-EditBtn svx:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT
-DeleteBtn svx:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE
+NewBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW
+EditBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT
+DeleteBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE
*TabSectionIndent HID_SECTION_INDENTS_PAGE
IndentBefore sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE
IndentAfter sw:MetricField:TP_SECTION_INDENTS:MF_AFTER
-*TabSecurity svx:TabPage:RID_SVXPAGE_INET_SECURITY
-MacroSecurity svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC
-RecommendToOpenDocumentReadOnly svx:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECOMMREADONLY
-RecordChanges svx:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECORDCHANGES
-Protect svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_PROTRECORDS
-PersistentlySavePasswords svx:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS
-Options svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS
-MasterPassword svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD
-ShowPasswords svx:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS
+*TabSecurity cui:TabPage:RID_SVXPAGE_INET_SECURITY
+MacroSecurity cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC
+RecommendToOpenDocumentReadOnly cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECOMMREADONLY
+RecordChanges cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_RECORDCHANGES
+Protect cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_PROTRECORDS
+PersistentlySavePasswords cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS
+Options cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS
+MasterPassword cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD
+ShowPasswords cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS
*TabSecurityOptionsAndWarnings HID_DLG_SECURITY_OPTIONS
-SavingOrSendingDocuments svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS
-SigningDocuments svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS
-PrintingDocuments svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS
-CreatingPDFfiles svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF
-RemovePersonalInformationOnSaving svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO
-RecommendPasswordProtectionOnSaving svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD
-CtrlClickRequiredToFollowHyperlinks svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK
+SavingOrSendingDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS
+SigningDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS
+PrintingDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS
+CreatingPDFfiles cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF
+RemovePersonalInformationOnSaving cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO
+RecommendPasswordProtectionOnSaving cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD
+CtrlClickRequiredToFollowHyperlinks cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK
*TabSecurityLevel HID_XMLSEC_TP_SECLEVEL
VeryHigh xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH
diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win
index 07bed1592061..aa0155908c5d 100755
--- a/testautomation/global/win/etab_t_z.win
+++ b/testautomation/global/win/etab_t_z.win
@@ -40,17 +40,17 @@ TriggerStart sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE
Shape sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER
*TabTransparency HID_AREA_TRANSPARENCE
-NoTransparency svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF
-Transparency svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR
-Gradient svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT
-TransparencyPercent svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT
-Type svx:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES
-CenterX svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X
-CenterY svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y
-Angle svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE
-Border svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER
-StartValue svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE
-EndValue svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE
+NoTransparency cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF
+Transparency cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR
+Gradient cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT
+TransparencyPercent cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT
+Type cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES
+CenterX cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X
+CenterY cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y
+Angle cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE
+Border cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER
+StartValue cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE
+EndValue cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE
*TabTrendLineType chart2:TabPage:TP_TRENDLINE
None HID_SCH_TRENDLINE_RB_NONE
diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win
index aeca03118da6..4cacc4dda5cc 100755
--- a/testautomation/global/win/sys_dial.win
+++ b/testautomation/global/win/sys_dial.win
@@ -1,21 +1,3 @@
-' **** general print-Dialog ( File/Print )
-' ****
-*DruckenDlg svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG
-Drucker svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES
-Eigenschaften svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES
-AusdruckInDatei svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT
-Alles svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL
-Seiten svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES
-SeitenText svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES
-Auswahl svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION
-Exemplare svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES
-Sortieren svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE
-Zusaetze svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS
-EditFaxNo svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO
-AllSheets svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS
-SelectedSheets svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS
-SelectedCells svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS
-
' **** general Printersettings-Dialog ( File/Printer settings )
' ****
*DruckerEinrichten svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG
diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win
index fbcba2599a74..af6d933aefb4 100755
--- a/testautomation/global/win/tab_a_d.win
+++ b/testautomation/global/win/tab_a_d.win
@@ -17,26 +17,26 @@ Einfuegungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT
Verschiebungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE
*TabAllgemein HID_OPTIONS_GENERAL
-Firma svx:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY
-VorName svx:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME
-ZuName svx:Edit:RID_SFXPAGE_GENERAL:ED_NAME
-NameDesVaters svx:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME
-Strasse svx:Edit:RID_SFXPAGE_GENERAL:ED_STREET
-Apartmentnummer svx:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR
-Land svx:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY
-PLZ svx:Edit:RID_SFXPAGE_GENERAL:ED_PLZ
-Ort svx:Edit:RID_SFXPAGE_GENERAL:ED_CITY
-Kuerzel svx:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME
-TelPriv svx:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT
-TelGe svx:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY
-Fax svx:Edit:RID_SFXPAGE_GENERAL:ED_FAX
-EMail svx:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL
-Titel svx:Edit:RID_SFXPAGE_GENERAL:ED_TITLE
-Position svx:Edit:RID_SFXPAGE_GENERAL:ED_POSITION
-City svx:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY
-Zip svx:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE
-Street svx:Edit:RID_SFXPAGE_GENERAL:ED_STREET
-State SVX:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE
+Firma cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY
+VorName cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME
+ZuName cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME
+NameDesVaters cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME
+Strasse cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET
+Apartmentnummer cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR
+Land cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY
+PLZ cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ
+Ort cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY
+Kuerzel cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME
+TelPriv cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT
+TelGe cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY
+Fax cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX
+EMail cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL
+Titel cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE
+Position cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION
+City cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY
+Zip cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE
+Street cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET
+State cui:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE
Zurueck HID_TABDLG_RESET_BTN
+TabAllgemeines TabAllgemein
@@ -45,60 +45,60 @@ Zurueck HID_TABDLG_RESET_BTN
NeuesThema HID_GALLERY_EDIT_MSNAME
*TabAnsichtAllgemein HID_OFA_TP_VIEW
-FontScale svx:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE
-IconStyle svx:ListBox:OFA_TP_VIEW:LB_ICONSTYLE
-IconScale svx:ListBox:OFA_TP_VIEW:LB_ICONSIZE
-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
-UseHardwareAcceleration svx:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL
-UseAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE
-IconsInMenueAnzeigen svx:ListBox:OFA_TP_VIEW:LB_MENU_ICONS
-MausAktion svx:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE
-MousePositioning svx:ListBox:OFA_TP_VIEW:LB_MOUSEPOS
-UseSystemFont svx:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT
-Transparency svx:CheckBox:OFA_TP_VIEW:CB_SELECTION
-SelectionOpacity svx:MetricField:OFA_TP_VIEW:MF_SELECTION
+FontScale cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE
+IconStyle cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE
+IconScale cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE
+FontAntiAliasing cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING
+AAPixel cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT
+VorschauInSchriftlisten cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW
+SchriftenHistorie cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY
+UseHardwareAcceleration cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL
+UseAntiAliasing cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE
+IconsInMenueAnzeigen cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS
+MausAktion cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE
+MousePositioning cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS
+UseSystemFont cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT
+Transparency cui:CheckBox:OFA_TP_VIEW:CB_SELECTION
+SelectionOpacity cui:MetricField:OFA_TP_VIEW:MF_SELECTION
*TabAusnahmen HID_OFAPAGE_AUTOCORR_EXCEPT
-Abkuerzungen svx:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV
-AbkuerzungenListe svx:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV
-AbkuerzungenNeu svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV
-AbkuerzungenLoeschen svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV
-AbkuerzungenAutomatisch svx:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV
-Woerter svx:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS
-WoerterListe svx:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS
-WoerterNeu svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS
-WoerterLoeschen svx:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS
-WoerterAutomatisch svx:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS
+Abkuerzungen cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV
+AbkuerzungenListe cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV
+AbkuerzungenNeu cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV
+AbkuerzungenLoeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV
+AbkuerzungenAutomatisch cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV
+Woerter cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS
+WoerterListe cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS
+WoerterNeu cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS
+WoerterLoeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS
+WoerterAutomatisch cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS
Zurueck HID_TABDLG_RESET_BTN
WelcheSprache HID_AUTOCORR_LANGUAGE
*TabAusrichtung HID_ALIGNMENT
-ListeHAusrichtung svx:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN
-ListeVAusrichtung svx:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN
-Einzug svx:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT
-Zeilenumbruch svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP
-Silbentrennung svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH
-Grad SVX:NUMERICFIELD:RID_SVXPAGE_ALIGNMENT:NF_DEGREES
+ListeHAusrichtung cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN
+ListeVAusrichtung cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN
+Einzug cui:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT
+Zeilenumbruch cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP
+Silbentrennung cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH
+Grad cui:NUMERICFIELD:RID_SVXPAGE_ALIGNMENT:NF_DEGREES
Bezugskante HID_ALIGNMENT_CTR_BORDER_LOCK
-VertikaleAusrichtung svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL
-Gestapelt svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED
-ShrinkToFit svx:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK
-SetAlignmentOptions svx:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR
+VertikaleAusrichtung cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL
+Gestapelt cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED
+ShrinkToFit cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK
+SetAlignmentOptions cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR
AlignmentDial HID_ALIGNMENT_CTR_DIAL
*TabAusrichtungAbsatz HID_FORMAT_PARAGRAPH_ALIGN
-Links SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN
-Rechts SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN
-Zentriert SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN
-Blocksatz SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN
-LetzteZeile SVX:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE
-EinzelnesWortAustreiben SVX:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND
-VertikaleTextausrichtung svx:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN
-TextrasterFangen svx:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP
-TextDirection svx:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION
+Links cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN
+Rechts cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN
+Zentriert cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN
+Blocksatz cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN
+LetzteZeile cui:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE
+EinzelnesWortAustreiben cui:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND
+VertikaleTextausrichtung cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN
+TextrasterFangen cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP
+TextDirection cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION
*TabBedingung HID_COND_COLL
AlsBedingteVorlage sw:CheckBox:TP_CONDCOLL:CB_CONDITION
@@ -117,17 +117,17 @@ Zuweisen sw:PushButton:TP_CONDCOLL:PB_ASSIGN
'Zurueck HID_TABDLG_RESET_BTN
*TabBemassung HID_PAGE_MEASURE
-Liniendistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST
-HLUebergang svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG
-HLDistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST
-LinkeHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN
-RechteHL svx:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN
-AnzeigeUnterhalb svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE
-AnzeigeParallel svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL
-MetrikAnzeigen svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT
+Liniendistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST
+HLUebergang cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG
+HLDistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST
+LinkeHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN
+RechteHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN
+AnzeigeUnterhalb cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE
+AnzeigeParallel cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL
+MetrikAnzeigen cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT
Textposition HID_MEASURE_CTL_POSITION
-AutomatischVertikal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV
-AutomatischHorizontal svx:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH
+AutomatischVertikal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV
+AutomatischHorizontal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH
*TabBenutzer HID_DOCINFOUSER
Info0 sfx2:Edit:TP_DOCINFOUSER:ED_INFO1
@@ -183,24 +183,24 @@ Loeschen basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE
*TabBitmap HID_AREA_BITMAP
'PixelEditor
-Vordergrund svx:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR
-Hintergrund svx:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR
-Tabelle svx:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS
-Hinzufuegen svx:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD
-Aendern svx:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY
-Import svx:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT
-Loeschen svx:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE
+Vordergrund cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR
+Hintergrund cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR
+Tabelle cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS
+Hinzufuegen cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD
+Aendern cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY
+Import cui:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT
+Loeschen cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE
Zurueck HID_TABDLG_RESET_BTN
*TabDateien HID_GALLERY_BROWSER
-Dateityp svx:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE
-Suche svx:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH
-Dateiliste svx:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND
-Hinzufuegen svx:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE
-HinzufuegenAlle svx:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL
-Vorschau svx:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW
+Dateityp cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE
+Suche cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH
+Dateiliste cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND
+Hinzufuegen cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE
+HinzufuegenAlle cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL
+Vorschau cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW
*TabDatenbank HID_FLD_DB
Feldtyp SW:LISTBOX:TP_FLD_DB:LB_DBTYPE
@@ -275,9 +275,9 @@ Einfuegen HID_FIELD_INSERT
Schliessen HID_FIELD_CLOSE
*TabDrehung HID_TRANS_ANGLE
-PositionX svx:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X
-PositionY svx:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y
-Winkel svx:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE
+PositionX cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X
+PositionY cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y
+Winkel cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE
Drehpunkt HID_TPROTATION_CTRL1
Drehwinkel HID_TPROTATION_CTRL2
@@ -303,24 +303,20 @@ SchwarzWeiss SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BLACKWHITE
*TabDruckenHTML HID_OPTPRINT_PAGE
Grafiken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF
-Tabellen SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB
Kontrollfelder SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD
Hintergrund SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND
SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT
-Umgekehrt SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE
Prospekt SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT
Keine SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO
NurNotizen SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY
Dokumentende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END
Seitenende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND
-EinzelneDruckauftraege sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS
AusDruckereinstellung SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP
+LeereSeitenDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES
Fax SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX
*TabDruckenWriter HID_OPTPRINT_PAGE
Grafiken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF
-Tabellen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB
-Zeichnungen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW
Kontrollfelder sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD
Hintergrund sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND
HiddenText sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT
@@ -329,13 +325,11 @@ RightToLeft sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL
SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT
LinkeSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP
RechteSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP
-Umgekehrt sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE
Prospekt sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT
Keine sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO
NurNotizen sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY
Dokumentende sw:RadioButton:TP_OPTPRINT_PAGE:RB_END
Seitenende sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND
-EinzelneDruckauftraege sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS
AusDruckereinstellung sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP
LeereSeitenDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES
Fax sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX
diff --git a/testautomation/global/win/tab_e_g.win b/testautomation/global/win/tab_e_g.win
index f15a2948fddb..d34d387acffc 100755
--- a/testautomation/global/win/tab_e_g.win
+++ b/testautomation/global/win/tab_e_g.win
@@ -1,16 +1,16 @@
*TabEigenschaften SID_INSERT_FLOATINGFRAME
-FrameName svx:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME
-Inhalt svx:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL
-Oeffnen svx:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN
-An svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON
-Aus svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF
-Automatisch svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO
-UmrandungAn svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON
-UmrandungAus svx:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF
-Breite svx:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH
-Hoehe svx:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT
-BreiteStandard svx:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT
-HoeheStandard svx:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT
+FrameName cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME
+Inhalt cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL
+Oeffnen cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN
+An cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON
+Aus cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF
+Automatisch cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO
+UmrandungAn cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON
+UmrandungAus cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF
+Breite cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH
+Hoehe cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT
+BreiteStandard cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT
+HoeheStandard cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT
*TabEingabehilfe SC:TABPAGE:TP_VALIDATION_INPUTHELP
EingabehilfenbeiSelektion SC:TRISTATEBOX:TP_VALIDATION_INPUTHELP:TSB_HELP
@@ -18,16 +18,16 @@ Titel SC:EDIT:TP_VALIDATION_INPUTHELP:EDT_TITLE
EingabeHilfe SC:MULTILINEEDIT:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP
*TabEinzuegeUndAbstaende HID_FORMAT_PARAGRAPH_STD
-Automatisch svx:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO
-Vonlinks svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT
-ErsteZeile svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT
-VonRechts svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT
-Oben svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST
-Unten svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST
-Zeilenabstand svx:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST
-Um svx:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT
-Von SVX:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC
-Registerhaltigkeit svx:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER
+Automatisch cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO
+Vonlinks cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT
+ErsteZeile cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT
+VonRechts cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT
+Oben cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST
+Unten cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST
+Zeilenabstand cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST
+Um cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT
+Von cui:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC
+Registerhaltigkeit cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER
*TabEndnoten HID_ENDNOTE_OPTIONS
Numerierung sw:ListBox:TP_ENDNOTEOPTION:LB_NUMVIEW
@@ -40,12 +40,12 @@ ZeichenvorlageEndnotenbereich sw:ListBox:TP_ENDNOTEOPTION:LB_TEXT_CHARFMT
ZeichenvorlageTextbereich sw:ListBox:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT
*TabErsetzung HID_OFAPAGE_AUTOCORR_REPLACE
-NurText svx:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY
-Kuerzel svx:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT
-ErsetzenDurch svx:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE
+NurText cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY
+Kuerzel cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT
+ErsetzenDurch cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE
Liste HID_OFACTL_AUTOCORR_REPLACE
-Neu svx:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE
-Loeschen svx:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE
+Neu cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE
+Loeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE
Zurueck HID_TABDLG_RESET_BTN
WelcheSprache HID_AUTOCORR_LANGUAGE
@@ -74,39 +74,39 @@ Zurueck HID_TABDLG_RESET_BTN
*TabFangenEinrasten HID_SD_OPTIONS_SNAP sc:hidspecial:HID_SC_WIN_PREVIEW
*TabFarben HID_OPTIONS_COLOR
-FarbName svx:Edit:RID_SVXPAGE_COLOR:EDT_NAME
-Farbe svx:ListBox:RID_SVXPAGE_COLOR:LB_COLOR
-Farbmodell svx:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL
+FarbName cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME
+Farbe cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR
+Farbmodell cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL
R HID_TPCOLOR_RGB_1
G HID_TPCOLOR_RGB_2
B HID_TPCOLOR_RGB_3
C HID_TPCOLOR_CMYK_1
M HID_TPCOLOR_CMYK_2
Y HID_TPCOLOR_CMYK_3
-K svx:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4
-Aendern svx:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY
-Hinzufuegen svx:PushButton:RID_SVXPAGE_COLOR:BTN_ADD
-Loeschen svx:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE
-Bearbeiten svx:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON
+K cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4
+Aendern cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY
+Hinzufuegen cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD
+Loeschen cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE
+Bearbeiten cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON
*TabFarbverlaeufe HID_AREA_GRADIENT
-Typ svx:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES
-ZentrumX svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X
-ZentrumY svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y
-Winkel svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE
-Rand svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER
-Von svx:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM
-Bis svx:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO
-VonWert svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM
-BisWert svx:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO
-Tabelle svx:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS
-Hinzufuegen svx:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD
-Aendern svx:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY
-Loeschen svx:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE
+Typ cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES
+ZentrumX cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X
+ZentrumY cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y
+Winkel cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE
+Rand cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER
+Von cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM
+Bis cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO
+VonWert cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM
+BisWert cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO
+Tabelle cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS
+Hinzufuegen cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD
+Aendern cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY
+Loeschen cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE
*TabFehlermeldung SC:TABPAGE:TP_VALIDATION_ERROR
FehlermeldungbeiEingabe SC:TRISTATEBOX:TP_VALIDATION_ERROR:TSB_SHOW
@@ -262,11 +262,11 @@ Durchsuchen sw:PushButton:TP_GRF_EXT:PB_BROWSE
Auswahl HID_VALUESET_NUMBMP
Optionen HID_NUM_FORMAT_BTN
Zurueck HID_TABDLG_RESET_BTN
-LinkGraphics svx:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED
+LinkGraphics cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED
*TabGrundfarben HID_OPTIONS_CHART_DEFCOLORS
-Farbliste svx:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST
-Standard svx:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT
+Farbliste cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST
+Standard cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT
*TabGrundschriften HID_STD_FONT
StandardSchrift sw:ComboBox:TP_STD_FONT:LB_STANDARD
diff --git a/testautomation/global/win/tab_h_o.win b/testautomation/global/win/tab_h_o.win
index e4335f279385..c31ece1bffe2 100755
--- a/testautomation/global/win/tab_h_o.win
+++ b/testautomation/global/win/tab_h_o.win
@@ -1,36 +1,36 @@
*TabHintergrund HID_BACKGROUND
-Als svx:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR
-Fuer svx:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX
-FuerAbsatz SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX
+Als cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR
+Fuer cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX
+FuerAbsatz cui:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX
Hintergrundfarbe HID_BACKGROUND_CTL_BGDCOLORSET
-Verknuepfen svx:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK
-Vorschau svx:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW
-Durchsuchen svx:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE
-Position svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION
-Flaeche svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA
-Kachel svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE
+Verknuepfen cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK
+Vorschau cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW
+Durchsuchen cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE
+Position cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION
+Flaeche cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA
+Kachel cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE
ArtPosition HID_BACKGROUND_CTL_POSITION
-'ArtPosition svx:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION
+'ArtPosition cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION
'Muster HID_BACKGROUND_CTL_PATTERNSET
'Musterfarbe HID_BACKGROUND_CTL_PATCOLORSET
-*TabHTML svx:TabPage:RID_OFAPAGE_HTMLOPT
-Groesse1 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1
-Groesse2 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2
-Groesse3 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3
-Groesse4 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4
-Groesse5 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5
-Groesse6 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6
-Groesse7 svx:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7
-UnbekannteHTML svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS
-FontEinstellungen svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES
-Export svx:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT
-StarBasic svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC
-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 svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US
+*TabHTML cui:TabPage:RID_OFAPAGE_HTMLOPT
+Groesse1 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1
+Groesse2 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2
+Groesse3 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3
+Groesse4 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4
+Groesse5 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5
+Groesse6 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6
+Groesse7 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7
+UnbekannteHTML cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS
+FontEinstellungen cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES
+Export cui:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT
+StarBasic cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC
+Grafikenkopieren cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF
+Drucklayout cui:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION
+WarnungAnzeigen cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING
+Zeichensatz cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET
+UseEnglishLocaleForNumbers cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US
*TabHyperlinkRahmen HID_FRM_URL
URL sw:Edit:TP_FRM_URL:ED_URL
@@ -57,61 +57,61 @@ Zurueck HID_ICCDIALOG_RESET_BTN
Uebernehmen HID_ICCDIALOG_OK_BTN
+TabHyperlinkInternet Hyperlink
-Internet svx:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET
-FTP svx:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP
-Telnet svx:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET
+Internet cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET
+FTP cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP
+Telnet cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET
ZielUrl HID_HYPERDLG_INET_PATH
-Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME
-Form svx:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM
-Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION
-NameText svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT
-Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT
-Loginname svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN
-Passwort svx:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD
-AnonymerBenutzer svx:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS
-WWWBrowser svx:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE
-Target svx:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET
+Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME
+Form cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM
+Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION
+NameText cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT
+Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT
+Loginname cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN
+Passwort cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD
+AnonymerBenutzer cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS
+WWWBrowser cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE
+Target cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET
*TabHyperlinkMailUndNews HID_HYPERLINK_MAIL
-EMail svx:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL
-News svx:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS
+EMail cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL
+News cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS
Receiver HID_HYPERDLG_MAIL_PATH
-Betreff svx:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT
-Adressbuch svx:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK
-Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME
-Form svx:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM
-Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION
-NameText svx:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT
-Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT
+Betreff cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT
+Adressbuch cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK
+Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME
+Form cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM
+Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION
+NameText cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT
+Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT
Auswahl HID_ICCDIALOG_CHOICECTRL
Zurueck HID_ICCDIALOG_RESET_BTN
Uebernehmen HID_ICCDIALOG_OK_BTN
*TabHyperlinkDokument HID_HYPERLINK_DOCUMENT
Path HID_HYPERDLG_DOC_PATH
-DateiOeffnen svx:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN
-Ziel svx:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC
-Target svx:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE
-Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME
-Form svx:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM
-Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION
-NameText svx:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT
-Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT
+DateiOeffnen cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN
+Ziel cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC
+Target cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE
+Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME
+Form cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM
+Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION
+NameText cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT
+Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT
Auswahl HID_ICCDIALOG_CHOICECTRL
Zurueck HID_ICCDIALOG_RESET_BTN
Uebernehmen HID_ICCDIALOG_OK_BTN
*TabHyperlinkNeuesDokument HID_HYPERLINK_NEWDOCUMENT
-SofortBearbeiten svx:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW
-SpaeterBearbeiten svx:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER
-Datei svx:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC
-Dateityp svx:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES
-Pfad svx:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE
-Frame svx:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME
-Form svx:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM
-Hinweis svx:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION
-NameText svx:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT
-Ereignisse svx:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT
+SofortBearbeiten cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW
+SpaeterBearbeiten cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER
+Datei cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC
+Dateityp cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES
+Pfad cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE
+Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME
+Form cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM
+Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION
+NameText cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT
+Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT
Auswahl HID_ICCDIALOG_CHOICECTRL
Zurueck HID_ICCDIALOG_RESET_BTN
Uebernehmen HID_ICCDIALOG_OK_BTN
@@ -270,20 +270,20 @@ Diagramme sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS
Masseinheit sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC
Tabulatorenabstand sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB
-*TabLauftext svx:TabPage:RID_SVXPAGE_TEXTANIMATION
-Effekt svx:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT
-NachOben svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP
-NachLinks svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT
-NachUnten svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN
-NachRechts svx:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT
-TextSichtbarBeimStarten svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE
-TextSichtbarBeimBeenden svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE
-Endlos svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS
-Anzahl svx:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT
-Automatisch svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO
-Verzoegerung svx:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY
-Pixel svx:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL
-Schrittweite svx:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT
+*TabLauftext cui:TabPage:RID_SVXPAGE_TEXTANIMATION .
+Effekt cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT
+NachOben cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP
+NachLinks cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT
+NachUnten cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN
+NachRechts cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT
+TextSichtbarBeimStarten cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE
+TextSichtbarBeimBeenden cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE
+Endlos cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS
+Anzahl cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT
+Automatisch cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO
+Verzoegerung cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY
+Pixel cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL
+Schrittweite cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT
*TabLayoutCalc HID_SCPAGE_LAYOUT
Masseinheit SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT
@@ -301,95 +301,83 @@ NieAktualisieren sc:RadioButton:RID_SCPAGE_LAYOUT:RB_NEVER
Druckermasse sc:CheckBox:RID_SCPAGE_LAYOUT:CB_TEXTFMT
Ueberschreibwarnung sc:CheckBox:RID_SCPAGE_LAYOUT:CB_REPLWARN
-' *TabLayoutDraw HID_SD_OPTIONS_LAYOUT
-' LinealeSichtbar SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_RULER
-' Hilfslinien SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_HELPLINES
-' Handles SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_HANDLES_BEZIER
-' Umriss SD:CHECKBOX:TP_OPTIONS_LAYOUT:CBX_MOVE_OUTLINE
-' Masseinheit SD:LISTBOX:TP_OPTIONS_LAYOUT:LB_METRIC
-' Tabulator SD:METRICFIELD:TP_OPTIONS_LAYOUT:MTR_FLD_TABSTOP
-
-' *TabLayoutHTML HID_LAYOUT_OPT
-
-' *TabLayoutWriter HID_LAYOUT_OPT
-
*TabLegende HID_CAPTION
Art HID_CAPTION_CTL_TYPE
-Abstand SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND
-Ansatz SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ
-Laenge SVX:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE
-Position SVX:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL
-Optimal SVX:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE
+Abstand cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND
+Ansatz cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ
+Laenge cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE
+Position cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL
+Optimal cui:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE
*TabLinguistik HID_OPTIONS_LINGU
Sprachmodule HID_CLB_LINGU_MODULES
-SprachmoduleBearbeiten svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT
+SprachmoduleBearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT
Optionen HID_CLB_LINGU_OPTIONS
-OptionenBearbeiten svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT
+OptionenBearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT
Benutzerwoerterbuch HID_CLB_EDIT_MODULES_DICS
-Neu svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC
-Bearbeiten svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC
-Loeschen svx:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC
+Neu cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC
+Bearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC
+Loeschen cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC
*TabLinie HID_LINE_LINE
-Breite svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH
-BreiteLinks svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH
-BreiteRechts svx:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH
-EndenSynchronisieren svx:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE
-Farbe svx:ListBox:RID_SVXPAGE_LINE:LB_COLOR
-Stil svx:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE
-StilLinks svx:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE
-StilRechts svx:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE
-Transparenz svx:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT
-ZentriertLinks svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START
-ZentriertRechts svx:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END
-CornerStyle svx:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE
+Breite cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH
+BreiteLinks cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH
+BreiteRechts cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH
+EndenSynchronisieren cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE
+Farbe cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR
+Stil cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE
+StilLinks cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE
+StilRechts cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE
+Transparenz cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT
+ZentriertLinks cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START
+ZentriertRechts cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END
+CornerStyle cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE
*TabLinienenden HID_LINE_ENDDEF
-Aendern svx:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY
-Hinzufuegen svx:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD
-Liste svx:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS
-Loeschen svx:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE
-Textfeld svx:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME
+Aendern cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY
+Hinzufuegen cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD
+Liste cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS
+Loeschen cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE
+Textfeld cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME
*TabLinienstile HID_LINE_DEF
-Abstand svx:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE
-Aendern svx:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY
-AnLinienbreite svx:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE
-AnzahlLinks svx:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1
-AnzahlRechts svx:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2
-Hinzufuegen svx:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD
-LaengeLinks svx:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1
-LaengeRechts svx:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2
-Linienstil svx:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES
-Loeschen svx:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE
-TypLinks svx:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1
-TypRechts svx:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2
+Abstand cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE
+Aendern cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY
+AnLinienbreite cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE
+AnzahlLinks cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1
+AnzahlRechts cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2
+Hinzufuegen cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD
+LaengeLinks cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1
+LaengeRechts cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2
+Linienstil cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES
+Loeschen cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE
+TypLinks cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1
+TypRechts cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2
*TabLiteraturAllgemein HID_BIB_CONTROL_PAGE
-*TabMakro svx:TabPage:RID_SVXPAGE_EVENTASSIGN
+*TabMakro cui:TabPage:RID_SVXPAGE_EVENTASSIGN
Ereignis HID_MACRO_LB_EVENT
Bereich HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP
Makroname HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS
-Zuweisen svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN
-Aufheben svx:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE
-Scripttyp svx:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE
-
-*TabMicrosoftOffice97 svx:TabPage:RID_OFAPAGE_MSFILTEROPT
-WinwordBasicLaden svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE
-WinwordBasicSpeichern svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG
-ExcelBasicLaden svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE
-ExecutableCode svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL
-ExcelBasicSpeichern svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG
-PowerpointBasicLaden svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE
-PowerpointBasicSpeichern svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG
-
-*TabMicrosoftOffice2 svx:TabPage:RID_OFAPAGE_MSFILTEROPT2
+Zuweisen cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN
+Aufheben cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE
+Scripttyp cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE
+
+*TabMicrosoftOffice97 cui:TabPage:RID_OFAPAGE_MSFILTEROPT
+WinwordBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE
+WinwordBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG
+ExcelBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE
+ExecutableCode cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL
+ExcelBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG
+PowerpointBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE
+PowerpointBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG
+
+*TabMicrosoftOffice2 cui:TabPage:RID_OFAPAGE_MSFILTEROPT2
Auswahl HID_OFAPAGE_MSFLTR2_CLB
*TabModule basctl:TabPage:RID_TP_MODULS
@@ -437,20 +425,9 @@ OutlineLevel sw:ListBox:TP_NUMPARA:LB_OUTLINE_LEVEL
*TabOptionen HID_OFAPAGE_AUTOCORR_OPTIONS
Einstellungen HID_OFAPAGE_AUTOCORR_CLB
-*TabOptionenDlgAllgemein HID_OFADLG_TREE_GENERAL
-*TabOptionenDlgBild HID_OFADLG_TREE_IMAGE
-*TabOptionenDlgBrowser HID_OFADLG_TREE_BROWSER
-*TabOptionenDlgFormel HID_OFADLG_TREE_FORMULA
-*TabOptionenDlgHTMLDokument HID_OFADLG_TREE_HTML
-*TabOptionenDlgInternet HID_OFADLG_TREE_INTERNET
-*TabOptionenDlgPraesentation HID_OFADLG_TREE_PRESENTATION
-*TabOptionenDlgTabellendokument HID_OFADLG_TREE_CALC
-*TabOptionenDlgTextdokument HID_OFADLG_TREE_TEXT
-*TabOptionenDlgZeichnung HID_OFADLG_TREE_DRAWING
-
*TabOptionenAutokorrektur HID_OFAPAGE_AUTOFMT_OPTIONS
Einstellungen HID_OFAPAGE_AUTOFORMAT_CLB
-Bearbeiten svx:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT
+Bearbeiten cui:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT
*TabOptionenTeilergebnisse HID_SCPAGE_SUBT_OPTIONS
NeueSeiteBeiGruppenwechsel sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK
@@ -463,20 +440,20 @@ Aufsteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING
Absteigend SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING
*TabOptionenNumerierung HID_SVXPAGE_NUM_OPTIONS
-Ebene svx:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL
-Numerierung svx:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT
-Davor svx:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX
-Dahinter svx:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX
-Zeichenvorlage svx:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT
-Vollstaendig svx:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL
-BeginnBei svx:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START
-FortlaufeneNumerierung svx:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL
-Zeichen svx:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET
-Auswahl svx:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP
-Breite svx:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH
-Hoehe svx:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT
-Abgleich svx:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO
-Ausrichtung svx:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT
+Ebene cui:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL
+Numerierung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT
+Davor cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX
+Dahinter cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX
+Zeichenvorlage cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT
+Vollstaendig cui:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL
+BeginnBei cui:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START
+FortlaufeneNumerierung cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL
+Zeichen cui:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET
+Auswahl cui:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP
+Breite cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH
+Hoehe cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT
+Abgleich cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO
+Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT
*TabHeaderFooterSlide HID_SD_TABPAGE_HEADERFOOTER_SLIDE
DateTime sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME
diff --git a/testautomation/global/win/tab_p_s.win b/testautomation/global/win/tab_p_s.win
index b5d016228785..5a51e737b471 100755
--- a/testautomation/global/win/tab_p_s.win
+++ b/testautomation/global/win/tab_p_s.win
@@ -1,19 +1,19 @@
*TabPfade HID_OPTIONS_PATH
-Standard svx:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD
-Bearbeiten SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH
+Standard cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD
+Bearbeiten cui:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH
Typ HID_OPTPATH_CTL_PATH
*TabPositionNumerierung HID_SVXPAGE_NUM_POSITION
-Level svx:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL
-Alignment svx:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2
-NumberFollowedBy svx:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY
-NumberFollowedByAt svx:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB
-AlignedAt svx:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT
-IndentAt svx:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT
-Ausrichtung svx:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN
-AbstandTextNumerierung svx:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST
-Relativ svx:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE
-Standard svx:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD
+Level cui:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL
+Alignment cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2
+NumberFollowedBy cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY
+NumberFollowedByAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB
+AlignedAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT
+IndentAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT
+Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN
+AbstandTextNumerierung cui:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST
+Relativ cui:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE
+Standard cui:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD
*TabPositionKapitelnumerierung HID_NUM_POSITION
Level sw:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL
@@ -75,69 +75,69 @@ Einfuegen HID_FIELD_INSERT
Schliessen HID_FIELD_CLOSE
*TabSchatten HID_AREA_SHADOW
-Anzeigen svx:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW
+Anzeigen cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW
Position HID_TPSHADOW_CTRL
-Entfernung svx:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE
-Farbe svx:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR
-Transparenz svx:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT
+Entfernung cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE
+Farbe cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR
+Transparenz cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT
*TabSchraegstellen HID_TRANS_SLANT
-Radius svx:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS
-Winkel svx:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE
+Radius cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS
+Winkel cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE
*TabSchraffuren HID_AREA_HATCH
-Abstand svx:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE
-Winkel svx:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE
+Abstand cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE
+Winkel cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE
Definition HID_TPHATCH_CTRL
-Linientyp svx:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE
-Linienfarbe svx:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR
-Tabelle svx:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS
-Hinzufuegen svx:PushButton:RID_SVXPAGE_HATCH:BTN_ADD
-Aendern svx:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY
-Loeschen svx:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE
-Oeffnen svx:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD
-Speichern svx:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE
+Linientyp cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE
+Linienfarbe cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR
+Tabelle cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS
+Hinzufuegen cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD
+Aendern cui:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY
+Loeschen cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE
+Oeffnen cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD
+Speichern cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE
*TabSchriftErsetzung HID_OFA_FONT_SUBSTITUTION
-Anwenden svx:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE
-Schriftart svx:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1
+Anwenden cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE
+Schriftart cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1
Liste HID_OFA_FONT_SUBST_CLB
-ErsetzenDurch svx:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2
+ErsetzenDurch cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2
Uebernehmen HID_OFA_SUBST_APPLY
Loeschen HID_OFA_SUBST_DELETE
-Fonts svx:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME
-NonProportional svx:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP
-Size svx:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT
+Fonts cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME
+NonProportional cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP
+Size cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT
*TabSeite HID_FORMAT_PAGE
-Links svx:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN
-Rechts svx:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN
-Oben svx:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN
-Unten svx:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN
-Seitenlayout svx:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT
-Numerierung svx:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT
-Papierformat svx:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE
-Breite svx:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH
-Hoehe svx:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT
-Schacht svx:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY
-Horizontal svx:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ
-Vertikal svx:CheckBox:RID_SVXPAGE_PAGE:CB_VERT
-Hoch svx:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT
-Quer svx:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE
-Einschalten SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER
-AbsatzVorlage SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER
-Textfluss svx:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW
-FitObject svx:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT
+Links cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN
+Rechts cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN
+Oben cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN
+Unten cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN
+Seitenlayout cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT
+Numerierung cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT
+Papierformat cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE
+Breite cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH
+Hoehe cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT
+Schacht cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY
+Horizontal cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ
+Vertikal cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT
+Hoch cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT
+Quer cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE
+Einschalten cui:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER
+AbsatzVorlage cui:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER
+Textfluss cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW
+FitObject cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT
*TabSonstigesAllgemein HID_OFA_TP_MISC
-Zweistellig svx:NumericField:OFA_TP_MISC:NF_YEARVALUE
-Aktivieren svx:CheckBox:OFA_TP_MISC:CB_HELPAGENT
-Zuruecksetzen svx:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET
-Tips svx:CheckBox:OFA_TP_MISC:CB_TOOLTIP
-ExtendedTips svx:CheckBox:OFA_TP_MISC:CB_EXTHELP
-StarOfficeDialogeBenutzen svx:CheckBox:OFA_TP_MISC:CB_FILEDLG
-DruckenStatus svx:CheckBox:OFA_TP_MISC:CB_DOCSTATUS
-StyleSheet svx:ListBox:OFA_TP_MISC:LB_HELPFORMAT
+Zweistellig cui:NumericField:OFA_TP_MISC:NF_YEARVALUE
+Aktivieren cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT
+Zuruecksetzen cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET
+Tips cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP
+ExtendedTips cui:CheckBox:OFA_TP_MISC:CB_EXTHELP
+StarOfficeDialogeBenutzen cui:CheckBox:OFA_TP_MISC:CB_FILEDLG
+DruckenStatus cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS
+StyleSheet cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT
*TabSonstigesDraw HID_SD_OPTIONS_MISC
Schnellbearbeitung SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT
@@ -240,30 +240,30 @@ Weiter sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP
Zuruecksetzen HID_TABDLG_RESET_BTN
*TabSpeichern HID_OPTIONS_SAVE
-BenutzerspezifischeEinstellungen svx:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS
-DokumenteigenschaftenBearbeiten SVX:CHECKBOX:RID_SFXPAGE_SAVE:BTN_DOCINFO
-Sicherungskopie svx:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP
-AutomatischSpeichern svx:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE
-Minuten SVX:NUMERICFIELD:RID_SFXPAGE_SAVE:ED_AUTOSAVE
-NoPrettyPrinting svx:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING
-URLimDateisystem SVX:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS
-URLimInternet SVX:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET
-Dokumenttyp svx:ListBox:RID_SFXPAGE_SAVE:LB_APP
-Filter svx:ListBox:RID_SFXPAGE_SAVE:LB_FILTER
-WarnWhenSavingAlienFormat svx:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT
-LoadPrinterSettingsWithDocument svx:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER
+BenutzerspezifischeEinstellungen cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS
+DokumenteigenschaftenBearbeiten cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_DOCINFO
+Sicherungskopie cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP
+AutomatischSpeichern cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE
+Minuten cui:NUMERICFIELD:RID_SFXPAGE_SAVE:ED_AUTOSAVE
+NoPrettyPrinting cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING
+URLimDateisystem cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS
+URLimInternet cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET
+Dokumenttyp cui:ListBox:RID_SFXPAGE_SAVE:LB_APP
+Filter cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER
+WarnWhenSavingAlienFormat cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT
+LoadPrinterSettingsWithDocument cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER
*TabSprachen HID_OFA_TP_LANGUAGES
-UILanguage svx:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE
-Gebietsschema svx:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING
-DecimalSeparator svx:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR
-StandardWaehrung svx:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY
-Westlich svx:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG
-Asiatisch svx:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG
-AktuellesDokument svx:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC
-Aktivieren svx:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT
-LanguageComplexScript svx:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG
-ComplexScriptEnabled svx:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT
+UILanguage cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE
+Gebietsschema cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING
+DecimalSeparator cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR
+StandardWaehrung cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY
+Westlich cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG
+Asiatisch cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG
+AktuellesDokument cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC
+Aktivieren cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT
+LanguageComplexScript cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG
+ComplexScriptEnabled cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT
*TabStatistik HID_DOC_STAT
Aktualisieren sw:PushButton:TP_DOC_STAT:PB_PDATE
@@ -271,17 +271,17 @@ Aktualisieren sw:PushButton:TP_DOC_STAT:PB_PDATE
*TabStatistikCalc sc:TabPage:RID_SCPAGE_STAT
*TabSuche HID_OPTIONS_SEARCH
-SuchenIn svx:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH
-DienstName svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME
-Und svx:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND
-Oder svx:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR
-Exakt svx:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT
-Praefix svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL
-Suffix svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX
-Trenner svx:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR
-Schreibstil svx:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE
-Hinzufuegen svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD
-Aendern svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE
-Loeschen svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE
-Neu svx:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW
+SuchenIn cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH
+DienstName cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME
+Und cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND
+Oder cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR
+Exakt cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT
+Praefix cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL
+Suffix cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX
+Trenner cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR
+Schreibstil cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE
+Hinzufuegen cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD
+Aendern cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE
+Loeschen cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE
+Neu cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW
diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win
index 6196e652b5b9..be8f4870de47 100755
--- a/testautomation/global/win/tab_t_z.win
+++ b/testautomation/global/win/tab_t_z.win
@@ -53,50 +53,50 @@ Zahlenformaterkennung sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING
AutomatischeAusrichtung sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT
*TabTabulatoren HID_TABULATOR
-AlleLoeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL
-Fuellzeichen1 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO
-Fuellzeichen2 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS
-Fuellzeichen3 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE
-Fuellzeichen4 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE
-Fuellzeichen5 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER
-FuellzeichenZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER
-Loeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL
-Neu svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW
-Position svx:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS
-TypLinks svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT
-TypRechts svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT
-TypZentriert svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER
-TypDezimal svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL
-TypZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR
+AlleLoeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL
+Fuellzeichen1 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO
+Fuellzeichen2 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS
+Fuellzeichen3 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE
+Fuellzeichen4 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE
+Fuellzeichen5 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER
+FuellzeichenZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER
+Loeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL
+Neu cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW
+Position cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS
+TypLinks cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT
+TypRechts cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT
+TypZentriert cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER
+TypDezimal cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL
+TypZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR
*TabTabulator HID_TABULATOR
-AlleLoeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL
-Fuellzeichen1 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO
-Fuellzeichen2 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS
-Fuellzeichen3 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE
-Fuellzeichen4 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE
-Fuellzeichen5 svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER
-FuellzeichenZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER
-Loeschen svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL
-Neu svx:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW
-Position svx:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS
-TypLinks svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT
-TypRechts svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT
-TypZentriert svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER
-TypDezimal svx:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL
-TypZeichen svx:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR
+AlleLoeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL
+Fuellzeichen1 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO
+Fuellzeichen2 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS
+Fuellzeichen3 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE
+Fuellzeichen4 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE
+Fuellzeichen5 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER
+FuellzeichenZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER
+Loeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL
+Neu cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW
+Position cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS
+TypLinks cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT
+TypRechts cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT
+TypZentriert cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER
+TypDezimal cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL
+TypZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR
*TabTastatur HID_CONFIG_ACCEL
Tastatur HID_ACCELCONFIG_LISTBOX
Bereich HID_CONFIGGROUP_ACC_LISTBOX
Funktion HID_CONFIGFUNCTION_ACC_LISTBOX
-Aendern svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE
-Loeschen svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE
-Zuruecksetzen svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET
-Laden svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD
-Speichern svx:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE
-StarOffice svx:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE
-Application svx:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE
+Aendern cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE
+Loeschen cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE
+Zuruecksetzen cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET
+Laden cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD
+Speichern cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE
+StarOffice cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE
+Application cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE
*TabTeilergebnisseOptionen HID_SCPAGE_SUBT_OPTIONS
NeueSeiteBeiGruppenwechsel sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK
@@ -109,36 +109,36 @@ Aufsteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING
Absteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING
*TabText HID_PAGE_TEXTATTR
-BreiteAnTextAnpassen svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH
-HoeheAnTextAnpassen svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT
-AmRahmenAnpassen svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE
-Konturfluss svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR
-WordWrap svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT
-ResizeShape svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE
-Links svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT
-Rechts svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT
-Oben svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP
-Unten svx:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM
+BreiteAnTextAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH
+HoeheAnTextAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT
+AmRahmenAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE
+Konturfluss cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR
+WordWrap cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT
+ResizeShape cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE
+Links cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT
+Rechts cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT
+Oben cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP
+Unten cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM
AnchorPosition HID_TEXTATTR_CTL_POSITION
-GanzeBreite svx:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH
+GanzeBreite cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH
*TabTextfluss HID_FORMAT_PARAGRAPH_EXT
-Automatisch svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN
-AbZeichenende svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE
-AbZeichenAnfang svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER
-Trennstellen svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH
-Umbruch svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK
-UmbruchTyp svx:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE
-UmbruchPosition svx:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION
-MitSeitenvorlage svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL
-Vorlage svx:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL
-AbsatzNichtTrennen svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER
-AbsaetzeZusammenhalten svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER
-Schusterjungenregelung svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS
-SchusterZeilen svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS
-Hurenkinderregelung svx:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS
-HurenkinderZeilen svx:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS
-Seitenzahl SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM
+Automatisch cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN
+AbZeichenende cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE
+AbZeichenAnfang cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER
+Trennstellen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH
+Umbruch cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK
+UmbruchTyp cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE
+UmbruchPosition cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION
+MitSeitenvorlage cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL
+Vorlage cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL
+AbsatzNichtTrennen cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER
+AbsaetzeZusammenhalten cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER
+Schusterjungenregelung cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS
+SchusterZeilen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS
+Hurenkinderregelung cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS
+HurenkinderZeilen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS
+Seitenzahl cui:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM
*TabTextflussTabelle HID_TABLE_TEXTFLOW
Umbruch SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK
@@ -157,28 +157,17 @@ TextDirection sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION
VerticalAlignment sw:ListBox:TP_TABLE_TEXTFLOW:LB_VERTORIENT
*TabTransparenz HID_AREA_TRANSPARENCE
-KeineTransparenz svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF
-LineareTransparenz svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR
-Transparenzverlauf svx:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT
-MFLinTransparenz svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT
-TransparenzverlaufTyp svx:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES
-MFZentrumX svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X
-MFZentrumY svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y
-MFWinkel svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE
-MFRand svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER
-MFStartwert svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE
-MFEndwert svx:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE
-
-*TabTypografisch HID_OFAPAGE_AUTOCORR_QUOTE
-EinfacheErsetzen svx:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO
-DoppelteErsetzen svx:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO
-EinfachWortanfang svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE
-EinfachWortende svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE
-EinfachStandard svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD
-DoppeltWortanfang svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE
-DoppeltWortende svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE
-DoppeltStandard svx:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD
-Zurueck HID_TABDLG_RESET_BTN
+KeineTransparenz cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF
+LineareTransparenz cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR
+Transparenzverlauf cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT
+MFLinTransparenz cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT
+TransparenzverlaufTyp cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES
+MFZentrumX cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X
+MFZentrumY cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y
+MFWinkel cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE
+MFRand cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER
+MFStartwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE
+MFEndwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE
*TabUmlauf HID_FRM_EXT
Kein sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP
@@ -198,18 +187,18 @@ NurAussen sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE
*TabUmrandung HID_BORDER
Vorgaben HID_BORDER_CTL_PRESETS
-Stil svx:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE
-StilFarbe svx:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR
+Stil cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE
+StilFarbe cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR
Position HID_BORDER_CTL_SHADOWS
-Groesse svx:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE
-SchattenFarbe svx:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR
+Groesse cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE
+SchattenFarbe cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR
Zurueck HID_TABDLG_RESET_BTN
Standard HID_TABDLG_STANDARD_BTN
-Links svx:MetricField:RID_SVXPAGE_BORDER:MF_LEFT
-Rechts svx:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT
-Oben svx:MetricField:RID_SVXPAGE_BORDER:MF_TOP
-Unten svx:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM
-Synchronisieren svx:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC
+Links cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT
+Rechts cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT
+Oben cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP
+Unten cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM
+Synchronisieren cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC
+TabUmrandungChart TabLinie
@@ -230,14 +219,14 @@ Einfuegen HID_FIELD_INSERT
Schliessen HID_FIELD_CLOSE
*TabVerbinder HID_PAGE_CONNECTION
-Linie1 svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
-Linie2 svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
-Linie3 svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3
-AnfangHorizontal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1
-AnfangVertikal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1
-EndeHorizontal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2
-EndeVertikal svx:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2
-Typ svx:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE
+Linie1 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1
+Linie2 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2
+Linie3 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3
+AnfangHorizontal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1
+AnfangVertikal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1
+EndeHorizontal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2
+EndeVertikal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2
+Typ cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE
*TabVerwalten HID_MANAGE_STYLES
VorlagenName sfx2:Edit:TP_MANAGE_STYLES:ED_NAME
@@ -330,48 +319,39 @@ Maximum sc:Edit:TP_VALIDATION_VALUES:EDT_MAX
ShowSelectionList sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST
ListSortEntries sc:CheckBox:TP_VALIDATION_VALUES:CB_SORTLIST
CriteriaListEntries sc:MultiLineEdit:TP_VALIDATION_VALUES:EDT_LIST
+SourceShrink sc:ImageButton:TP_VALIDATION_VALUES:RB_VALIDITY_REF
+ValidityReset HID_TABDLG_RESET_BTN
*TabWortergaenzung HID_OFAPAGE_AUTOCOMPLETE_OPTIONS
-WoerterErgaenzen svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV
-VorschlaegeSammeln svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT
-AlsTipphilfe svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP
-MinWortlaenge svx:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN
-MaxEintraege svx:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES
-AnnehmenMit svx:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY
-GesammelteWorte svx:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES
-EintragLoeschen svx:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES
-AppendSpace svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE
-KeepList svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST
+WoerterErgaenzen cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV
+VorschlaegeSammeln cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT
+AlsTipphilfe cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP
+MinWortlaenge cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN
+MaxEintraege cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES
+AnnehmenMit cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY
+GesammelteWorte cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES
+EintragLoeschen cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES
+AppendSpace cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE
+KeepList cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST
*TabZahlen HID_NUMBERFORMAT
-Kategorie svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
+Kategorie cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
ZahlenFormat HID_NUMBERFORMAT_LB_FORMAT
-Sprache svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
+Sprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE
FormatPreview HID_NUMBERFORMAT_WND_NUMBER_PREVIEW
-FormatCode svx:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
-FuehrendeNullen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
-Nachkommastellen svx:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
-NegativInRot svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
-Tausenderpunkt svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
+FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT
+FuehrendeNullen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES
+Nachkommastellen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS
+NegativInRot cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED
+Tausenderpunkt cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND
PBHinzufuegen HID_NUMBERFORMAT_TBI_ADD
PBEntfernen HID_NUMBERFORMAT_TBI_REMOVE
PBInfo HID_NUMBERFORMAT_TBI_INFO
-Kommentar SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT
+Kommentar cui:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT
Zurueck HID_TABDLG_RESET_BTN
-FormatSprache svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY
+FormatSprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY
Standard HID_TABDLG_STANDARD_BTN
-Standardformat svx:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT
-
-' *TabZeichen HID_FORMAT_CHAR_STD
-' Schriftart svx:ComboBox:RID_SVXPAGE_CHAR_STD:LB_FONT
-' Schriftstil svx:ComboBox:RID_SVXPAGE_CHAR_STD:LB_STYLE
-' Schriftgroesse svx:MetricBox:RID_SVXPAGE_CHAR_STD:LB_SIZE
-' Kontur svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_OUTLINE
-' Schatten svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_SHADOW
-' Unterstreichen svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_UNDERLINE
-' Durchstreichen svx:TriStateBox:RID_SVXPAGE_CHAR_STD:BTN_STRIKEOUT
-' Farbe svx:ListBox:RID_SVXPAGE_CHAR_STD:LB_COLOR
-' Sprache svx:ListBox:RID_SVXPAGE_CHAR_STD:LB_LANGUAGE
+Standardformat cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT
*TabZeilennumerierung HID_LINENUMBERING
Einschalten SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON
@@ -394,24 +374,17 @@ Zurueck HID_TABDLG_RESET_BTN
Standard HID_TABDLG_STANDARD_BTN
*TabZuschneiden HID_SVXPAGE_GRFCROP
-Links svx:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT
-Rechts svx:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT
-Oben svx:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP
-Unten svx:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM
-GroesseBeibehalten svx:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST
-MassstabBeibehalten svx:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST
-GroesseBreite svx:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH
-GroesseHoehe svx:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT
-MassstabBreite svx:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM
-MassstabHoehe svx:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM
-Originalgroesse svx:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE
-
-'*TabZuweisen sfx2:TabPage:RID_SFX_TP_MACROASSIGN
-'Ereignis sw:ListBox:TP_MACROASSIGN:LB_EVENT
-'Bereich sw:ListBox:TP_MACROASSIGN:LB_GROUP
-'Makroname sw:ListBox:TP_MACROASSIGN:LB_NAME
-'Zuweisen sw:PushButton:TP_MACROASSIGN:PB_ASSIGN
-'Aufheben sw:PushButton:TP_MACROASSIGN:PB_DELETE
+Links cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT
+Rechts cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT
+Oben cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP
+Unten cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM
+GroesseBeibehalten cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST
+MassstabBeibehalten cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST
+GroesseBreite cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH
+GroesseHoehe cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT
+MassstabBreite cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM
+MassstabHoehe cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM
+Originalgroesse cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE
*TabZusaetze HID_FRM_ADD
ObjektName sw:Edit:TP_FRM_ADD:ED_NAME