Revert "split cui screenshot test in manageable pieces"

This reverts commit c3c0557801d8713fb99216bea37443471affc1f6.

Hopefully make TBs green again

Change-Id: Ifb574175fd3bbdce1520aea7953dd8fb95bed30b
Reviewed-on: https://gerrit.libreoffice.org/31018
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>

11 files changed, 175 insertions, 643 deletions

diff --git a/cui/CppunitTest_cui_dialogs_test_2.mk b/cui/CppunitTest_cui_dialogs_test_2.mk
deleted file mode 100644
index 24bf50e26e7b..000000000000
--- a/cui/CppunitTest_cui_dialogs_test_2.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitScreenShot,cui_dialogs_test2))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,cui_dialogs_test2, \
-    cui/qa/unit/cui-dialogs-test_2 \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,cui_dialogs_test2))
-
-$(eval $(call gb_CppunitTest_set_include,cui_dialogs_test2,\
-    -I$(SRCDIR)/cui/source/inc \
-    -I$(SRCDIR)/cui/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test2, \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    drawinglayer \
-    editeng \
-    i18nlangtag \
-    i18nutil \
-    msfilter \
-    oox \
-    sal \
-    salhelper \
-    sax \
-    sfx \
-    sot \
-    svl \
-    svt \
-    cui \
-    test \
-    tl \
-    tk \
-    ucbhelper \
-    unotest \
-    utl \
-    vcl \
-    xo \
-    $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_external,cui_dialogs_test2,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,cui_dialogs_test2))
-
-$(eval $(call gb_CppunitTest_use_ure,cui_dialogs_test2))
-$(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,cui_dialogs_test2))
-
-$(eval $(call gb_CppunitTest_use_rdb,cui_dialogs_test2,services))
-
-# $(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test2))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,cui_dialogs_test2))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cui/CppunitTest_cui_dialogs_test_3.mk b/cui/CppunitTest_cui_dialogs_test_3.mk
deleted file mode 100644
index 80511e4c6bb8..000000000000
--- a/cui/CppunitTest_cui_dialogs_test_3.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitScreenShot,cui_dialogs_test3))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,cui_dialogs_test3, \
-    cui/qa/unit/cui-dialogs-test_3 \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,cui_dialogs_test3))
-
-$(eval $(call gb_CppunitTest_set_include,cui_dialogs_test3,\
-    -I$(SRCDIR)/cui/source/inc \
-    -I$(SRCDIR)/cui/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test3, \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    drawinglayer \
-    editeng \
-    i18nlangtag \
-    i18nutil \
-    msfilter \
-    oox \
-    sal \
-    salhelper \
-    sax \
-    sfx \
-    sot \
-    svl \
-    svt \
-    cui \
-    test \
-    tl \
-    tk \
-    ucbhelper \
-    unotest \
-    utl \
-    vcl \
-    xo \
-    $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_external,cui_dialogs_test3,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,cui_dialogs_test3))
-
-$(eval $(call gb_CppunitTest_use_ure,cui_dialogs_test3))
-$(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,cui_dialogs_test3))
-
-$(eval $(call gb_CppunitTest_use_rdb,cui_dialogs_test3,services))
-
-# $(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test3))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,cui_dialogs_test3))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cui/CppunitTest_cui_dialogs_test_4.mk b/cui/CppunitTest_cui_dialogs_test_4.mk
deleted file mode 100644
index c5716b3de50d..000000000000
--- a/cui/CppunitTest_cui_dialogs_test_4.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitScreenShot,cui_dialogs_test4))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,cui_dialogs_test4, \
-    cui/qa/unit/cui-dialogs-test_4 \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,cui_dialogs_test4))
-
-$(eval $(call gb_CppunitTest_set_include,cui_dialogs_test4,\
-    -I$(SRCDIR)/cui/source/inc \
-    -I$(SRCDIR)/cui/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test4, \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    drawinglayer \
-    editeng \
-    i18nlangtag \
-    i18nutil \
-    msfilter \
-    oox \
-    sal \
-    salhelper \
-    sax \
-    sfx \
-    sot \
-    svl \
-    svt \
-    cui \
-    test \
-    tl \
-    tk \
-    ucbhelper \
-    unotest \
-    utl \
-    vcl \
-    xo \
-    $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_external,cui_dialogs_test4,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,cui_dialogs_test4))
-
-$(eval $(call gb_CppunitTest_use_ure,cui_dialogs_test4))
-$(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,cui_dialogs_test4))
-
-$(eval $(call gb_CppunitTest_use_rdb,cui_dialogs_test4,services))
-
-# $(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test4))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,cui_dialogs_test4))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index c174fb27bd17..0b217070d599 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -21,9 +21,6 @@ $(eval $(call gb_Module_add_l10n_targets,cui,\
 # screenshots
 $(eval $(call gb_Module_add_screenshot_targets,cui,\
     CppunitTest_cui_dialogs_test \
-    CppunitTest_cui_dialogs_test_2 \
-    CppunitTest_cui_dialogs_test_3 \
-    CppunitTest_cui_dialogs_test_4 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cui/qa/unit/cui-dialogs-test_2.cxx b/cui/qa/unit/cui-dialogs-test_2.cxx
deleted file mode 100644
index 5932e2e09411..000000000000
--- a/cui/qa/unit/cui-dialogs-test_2.cxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <sal/config.h>
-#include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
-#include <vcl/abstdlg.hxx>
-
-using namespace ::com::sun::star;
-
-/// Test opening a dialog in cui
-class CuiDialogsTest2 : public ScreenshotTest
-{
-private:
-    /// helper method to populate KnownDialogs, called in setUp(). Needs to be
-    /// written and has to add entries to KnownDialogs
-    virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
-
-    /// dialog creation for known dialogs by ID. Has to be implemented for
-    /// each registered known dialog
-    virtual VclPtr<VclAbstractDialog> createDialogByID(sal_uInt32 nID) override;
-
-public:
-    CuiDialogsTest2();
-    virtual ~CuiDialogsTest2() override;
-
-    // try to open a dialog
-    void openAnyDialog();
-
-    CPPUNIT_TEST_SUITE(CuiDialogsTest2);
-    CPPUNIT_TEST(openAnyDialog);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CuiDialogsTest2::CuiDialogsTest2()
-{
-}
-
-CuiDialogsTest2::~CuiDialogsTest2()
-{
-}
-
-void CuiDialogsTest2::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
-{
-    // leave empty should be in CuiDialogTest if any
-}
-
-VclPtr<VclAbstractDialog> CuiDialogsTest2::createDialogByID(sal_uInt32 /*nID*/)
-{
-    return nullptr;
-}
-
-void CuiDialogsTest2::openAnyDialog()
-{
-    /// process input file containing the UXMLDescriptions of the dialogs to dump
-    processDialogBatchFile("cui/qa/unit/data/cui-dialogs-test_2.txt");
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(CuiDialogsTest2);
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/qa/unit/cui-dialogs-test_3.cxx b/cui/qa/unit/cui-dialogs-test_3.cxx
deleted file mode 100644
index b4240be8da9e..000000000000
--- a/cui/qa/unit/cui-dialogs-test_3.cxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <sal/config.h>
-#include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
-#include <vcl/abstdlg.hxx>
-
-using namespace ::com::sun::star;
-
-/// Test opening a dialog in cui
-class CuiDialogsTest3 : public ScreenshotTest
-{
-private:
-    /// helper method to populate KnownDialogs, called in setUp(). Needs to be
-    /// written and has to add entries to KnownDialogs
-    virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
-
-    /// dialog creation for known dialogs by ID. Has to be implemented for
-    /// each registered known dialog
-    virtual VclPtr<VclAbstractDialog> createDialogByID(sal_uInt32 nID) override;
-
-public:
-    CuiDialogsTest3();
-    virtual ~CuiDialogsTest3() override;
-
-    // try to open a dialog
-    void openAnyDialog();
-
-    CPPUNIT_TEST_SUITE(CuiDialogsTest3);
-    CPPUNIT_TEST(openAnyDialog);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CuiDialogsTest3::CuiDialogsTest3()
-{
-}
-
-CuiDialogsTest3::~CuiDialogsTest3()
-{
-}
-
-void CuiDialogsTest3::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
-{
-    // leave empty should be in CuiDialogTest if any
-}
-
-VclPtr<VclAbstractDialog> CuiDialogsTest3::createDialogByID(sal_uInt32 /*nID*/)
-{
-    return nullptr;
-}
-
-void CuiDialogsTest3::openAnyDialog()
-{
-    /// process input file containing the UXMLDescriptions of the dialogs to dump
-    processDialogBatchFile("cui/qa/unit/data/cui-dialogs-test_3.txt");
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(CuiDialogsTest3);
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/qa/unit/cui-dialogs-test_4.cxx b/cui/qa/unit/cui-dialogs-test_4.cxx
deleted file mode 100644
index 3fde4d51d182..000000000000
--- a/cui/qa/unit/cui-dialogs-test_4.cxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <sal/config.h>
-#include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
-#include <vcl/abstdlg.hxx>
-
-using namespace ::com::sun::star;
-
-/// Test opening a dialog in cui
-class CuiDialogsTest4 : public ScreenshotTest
-{
-private:
-    /// helper method to populate KnownDialogs, called in setUp(). Needs to be
-    /// written and has to add entries to KnownDialogs
-    virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
-
-    /// dialog creation for known dialogs by ID. Has to be implemented for
-    /// each registered known dialog
-    virtual VclPtr<VclAbstractDialog> createDialogByID(sal_uInt32 nID) override;
-
-public:
-    CuiDialogsTest4();
-    virtual ~CuiDialogsTest4() override;
-
-    // try to open a dialog
-    void openAnyDialog();
-
-    CPPUNIT_TEST_SUITE(CuiDialogsTest4);
-    CPPUNIT_TEST(openAnyDialog);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CuiDialogsTest4::CuiDialogsTest4()
-{
-}
-
-CuiDialogsTest4::~CuiDialogsTest4()
-{
-}
-
-void CuiDialogsTest4::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
-{
-    // leave empty should be in CuiDialogTest if any
-}
-
-VclPtr<VclAbstractDialog> CuiDialogsTest4::createDialogByID(sal_uInt32 /*nID*/)
-{
-    return nullptr;
-}
-
-void CuiDialogsTest4::openAnyDialog()
-{
-    /// process input file containing the UXMLDescriptions of the dialogs to dump
-    processDialogBatchFile("cui/qa/unit/data/cui-dialogs-test_4.txt");
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(CuiDialogsTest4);
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/qa/unit/data/cui-dialogs-test.txt b/cui/qa/unit/data/cui-dialogs-test.txt
index c8cc78dcb2e2..4f9bf42fe2c3 100644
--- a/cui/qa/unit/data/cui-dialogs-test.txt
+++ b/cui/qa/unit/data/cui-dialogs-test.txt
@@ -13,7 +13,7 @@
 # workdir/screenshots using the pattern of the ui-file name.
 #
 # Syntax:
-# - empty lines are allowed
+# - emty lines are allowed
 # - lines starting with '#' are treated as comment
 # - all other lines should contain a *.ui filename in the same
 #   notation as in the dialog constructors (see code)
@@ -37,58 +37,190 @@
 # cui/ui/bitmaptabpage.ui
 # cui/ui/thesaurus.ui <- problems under Linux
 
-# this is part 1. in order to help the build time when building all
-# lang, the list of ui is split in mutiple part to balance the run time
-# or all the tests, which improve the overal elapsed time
-# of make screenshoot on big machines
-# covering a to e
-
-
-cui/ui/aboutconfigdialog.ui
-cui/ui/aboutconfigvaluedialog.ui
-cui/ui/aboutdialog.ui
+cui/ui/customizedialog.ui
+cui/ui/gallerythemedialog.ui
+cui/ui/formatcellsdialog.ui
+cui/ui/searchformatdialog.ui
+cui/ui/autocorrectdialog.ui
+cui/ui/borderareatransparencydialog.ui
+cui/ui/borderbackgrounddialog.ui
+cui/ui/calloutdialog.ui
+cui/ui/areadialog.ui
+cui/ui/linedialog.ui
+cui/ui/textdialog.ui
+cui/ui/positionsizedialog.ui
 cui/ui/accelconfigpage.ui
-cui/ui/acorexceptpage.ui
+cui/ui/menuassignpage.ui
+cui/ui/gallerygeneralpage.ui
+cui/ui/galleryfilespage.ui
+cui/ui/connpooloptions.ui
+cui/ui/dbregisterpage.ui
+cui/ui/optfontspage.ui
+cui/ui/optaccessibilitypage.ui
+cui/ui/optasianpage.ui
+cui/ui/optbasicidepage.ui
+cui/ui/optchartcolorspage.ui
+cui/ui/optappearancepage.ui
+cui/ui/optctlpage.ui
+cui/ui/optfltrpage.ui
+cui/ui/optfltrembedpage.ui
+cui/ui/optgeneralpage.ui
+cui/ui/optviewpage.ui
+cui/ui/optlanguagespage.ui
+cui/ui/optuserpage.ui
+cui/ui/opthtmlpage.ui
+cui/ui/optproxypage.ui
+cui/ui/optsecuritypage.ui
+cui/ui/optemailpage.ui
+cui/ui/optadvancedpage.ui
+cui/ui/optjsearchpage.ui
+cui/ui/optlingupage.ui
+cui/ui/optmemorypage.ui
+cui/ui/optopenclpage.ui
+cui/ui/optpathspage.ui
+cui/ui/optsavepage.ui
+cui/ui/optonlineupdatepage.ui
+cui/ui/personalization_tab.ui
+cui/ui/cellalignment.ui
 cui/ui/acoroptionspage.ui
-cui/ui/acorreplacepage.ui
-cui/ui/agingdialog.ui
 cui/ui/applyautofmtpage.ui
+cui/ui/acorreplacepage.ui
+cui/ui/acorexceptpage.ui
 cui/ui/applylocalizedpage.ui
-cui/ui/areadialog.ui
-cui/ui/areatabpage.ui
-cui/ui/asiantypography.ui
-cui/ui/assigncomponentdialog.ui
-cui/ui/autocorrectdialog.ui
-cui/ui/backgroundpage.ui
-cui/ui/baselinksdialog.ui
-cui/ui/blackorwhitelistentrydialog.ui
-cui/ui/borderareatransparencydialog.ui
-cui/ui/borderbackgrounddialog.ui
+cui/ui/wordcompletionpage.ui
+cui/ui/smarttagoptionspage.ui
 cui/ui/borderpage.ui
-cui/ui/breaknumberoption.ui
-cui/ui/calloutdialog.ui
+cui/ui/connectortabpage.ui
+cui/ui/croppage.ui
 cui/ui/calloutpage.ui
-cui/ui/cellalignment.ui
-cui/ui/certdialog.ui
-cui/ui/charnamepage.ui
-cui/ui/colorconfigwin.ui
+cui/ui/eventassignpage.ui
+cui/ui/numberingformatpage.ui
+cui/ui/picknumberingpage.ui
+cui/ui/pickbulletpage.ui
+cui/ui/pickoutlinepage.ui
+cui/ui/pickgraphicpage.ui
+cui/ui/numberingoptionspage.ui
+cui/ui/numberingpositionpage.ui
+cui/ui/pageformatpage.ui
+cui/ui/paraindentspacing.ui
+cui/ui/paragalignpage.ui
+cui/ui/textflowpage.ui
+cui/ui/asiantypography.ui
+cui/ui/swpossizepage.ui
+cui/ui/paratabspage.ui
+cui/ui/textanimtabpage.ui
 cui/ui/colorpage.ui
+cui/ui/gradientpage.ui
+cui/ui/linestyletabpage.ui
+cui/ui/lineendstabpage.ui
+cui/ui/eventsconfigpage.ui
+cui/ui/macroassignpage.ui
+cui/ui/backgroundpage.ui
+cui/ui/dimensionlinestabpage.ui
+cui/ui/textattrtabpage.ui
+cui/ui/areatabpage.ui
+cui/ui/hatchpage.ui
+cui/ui/linetabpage.ui
+cui/ui/shadowtabpage.ui
+cui/ui/rotationtabpage.ui
+cui/ui/slantcornertabpage.ui
+cui/ui/possizetabpage.ui
+cui/ui/transparencytabpage.ui
+cui/ui/distributionpage.ui
+cui/ui/hyperlinknewdocpage.ui
+cui/ui/hyperlinkdocpage.ui
+cui/ui/hyperlinkinternetpage.ui
+cui/ui/hyperlinkmailpage.ui
+cui/ui/charnamepage.ui
+cui/ui/effectspage.ui
+cui/ui/positionpage.ui
+cui/ui/twolinespage.ui
+cui/ui/movemenu.ui
+cui/ui/newtoolbardialog.ui
+cui/ui/iconselectordialog.ui
+cui/ui/iconchangedialog.ui
+cui/ui/assigncomponentdialog.ui
+cui/ui/aboutdialog.ui
 cui/ui/colorpickerdialog.ui
-cui/ui/comment.ui
-cui/ui/connectortabpage.ui
-cui/ui/connpooloptions.ui
-cui/ui/croppage.ui
+cui/ui/specialcharacters.ui
+cui/ui/fmsearchdialog.ui
+cui/ui/gallerysearchprogress.ui
+cui/ui/galleryapplyprogress.ui
+cui/ui/galleryupdateprogress.ui
+cui/ui/gallerytitledialog.ui
+cui/ui/gallerythemeiddialog.ui
 cui/ui/cuiimapdlg.ui
-cui/ui/customizedialog.ui
+cui/ui/recordnumberdialog.ui
+cui/ui/namedialog.ui
+cui/ui/objectnamedialog.ui
+cui/ui/objecttitledescdialog.ui
+cui/ui/messbox.ui
+cui/ui/hangulhanjaconversiondialog.ui
+cui/ui/hangulhanjaoptdialog.ui
+cui/ui/hangulhanjaadddialog.ui
+cui/ui/hangulhanjaeditdictdialog.ui
+cui/ui/hyperlinkmarkdialog.ui
+cui/ui/hyphenate.ui
+cui/ui/insertrowcolumn.ui
+cui/ui/baselinksdialog.ui
+cui/ui/multipathdialog.ui
+cui/ui/selectpathdialog.ui
+cui/ui/newtabledialog.ui
+cui/ui/password.ui
+cui/ui/pastespecial.ui
+cui/ui/comment.ui
+cui/ui/newlibdialog.ui
+cui/ui/scriptorganizer.ui
+cui/ui/showcoldialog.ui
+cui/ui/searchattrdialog.ui
+cui/ui/similaritysearchdialog.ui
+cui/ui/zoomdialog.ui
+cui/ui/certdialog.ui
 cui/ui/databaselinkdialog.ui
-cui/ui/dbregisterpage.ui
-cui/ui/dimensionlinestabpage.ui
-cui/ui/distributiondialog.ui
-cui/ui/distributionpage.ui
+cui/ui/aboutconfigvaluedialog.ui
+cui/ui/optnewdictionarydialog.ui
 cui/ui/editdictionarydialog.ui
+cui/ui/javastartparametersdialog.ui
+cui/ui/javaclasspathdialog.ui
+cui/ui/breaknumberoption.ui
 cui/ui/editmodulesdialog.ui
-cui/ui/effectspage.ui
-cui/ui/embossdialog.ui
+cui/ui/blackorwhitelistentrydialog.ui
+cui/ui/select_persona_dialog.ui
+cui/ui/securityoptionsdialog.ui
+cui/ui/optionsdialog.ui
+cui/ui/optionsdialog.ui
+cui/ui/tsaurldialog.ui
+cui/ui/storedwebconnectiondialog.ui
+cui/ui/percentdialog.ui
+cui/ui/macroassigndialog.ui
+cui/ui/spelloptionsdialog.ui
+cui/ui/distributiondialog.ui
 cui/ui/eventassigndialog.ui
-cui/ui/eventassignpage.ui
-cui/ui/eventsconfigpage.ui
+cui/ui/mosaicdialog.ui
+cui/ui/smoothdialog.ui
+cui/ui/solarizedialog.ui
+cui/ui/agingdialog.ui
+cui/ui/posterdialog.ui
+cui/ui/embossdialog.ui
+cui/ui/hyperlinkdialog.ui
+cui/ui/insertoleobject.ui
+cui/ui/insertfloatingframe.ui
+cui/ui/splitcellsdialog.ui
+cui/ui/macroselectordialog.ui
+cui/ui/spellingdialog.ui
+cui/ui/aboutconfigdialog.ui
+cui/ui/queryupdategalleryfilelistdialog.ui
+cui/ui/querydeletechartcolordialog.ui
+cui/ui/querydeletedictionarydialog.ui
+cui/ui/queryduplicatedialog.ui
+cui/ui/querynoloadedfiledialog.ui
+cui/ui/querydeletebitmapdialog.ui
+cui/ui/querysavelistdialog.ui
+cui/ui/querynosavefiledialog.ui
+cui/ui/querydeletecolordialog.ui
+cui/ui/querydeletegradientdialog.ui
+cui/ui/querydeletehatchdialog.ui
+cui/ui/querydeletelinestyledialog.ui
+cui/ui/querychangelineenddialog.ui
+cui/ui/querydeletelineenddialog.ui
+cui/ui/colorconfigwin.ui
diff --git a/cui/qa/unit/data/cui-dialogs-test_2.txt b/cui/qa/unit/data/cui-dialogs-test_2.txt
deleted file mode 100644
index 915ed1fa999a..000000000000
--- a/cui/qa/unit/data/cui-dialogs-test_2.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# See cui-dailog-test.txt for explanations
-
-# covering f to n
-
-cui/ui/fmsearchdialog.ui
-cui/ui/formatcellsdialog.ui
-cui/ui/galleryapplyprogress.ui
-cui/ui/galleryfilespage.ui
-cui/ui/gallerygeneralpage.ui
-cui/ui/gallerysearchprogress.ui
-cui/ui/gallerythemedialog.ui
-cui/ui/gallerythemeiddialog.ui
-cui/ui/gallerytitledialog.ui
-cui/ui/galleryupdateprogress.ui
-cui/ui/gradientpage.ui
-cui/ui/hangulhanjaadddialog.ui
-cui/ui/hangulhanjaconversiondialog.ui
-cui/ui/hangulhanjaeditdictdialog.ui
-cui/ui/hangulhanjaoptdialog.ui
-cui/ui/hatchpage.ui
-cui/ui/hyperlinkdialog.ui
-cui/ui/hyperlinkdocpage.ui
-cui/ui/hyperlinkinternetpage.ui
-cui/ui/hyperlinkmailpage.ui
-cui/ui/hyperlinkmarkdialog.ui
-cui/ui/hyperlinknewdocpage.ui
-cui/ui/hyphenate.ui
-cui/ui/iconchangedialog.ui
-cui/ui/iconselectordialog.ui
-cui/ui/insertfloatingframe.ui
-cui/ui/insertoleobject.ui
-cui/ui/insertrowcolumn.ui
-cui/ui/javaclasspathdialog.ui
-cui/ui/javastartparametersdialog.ui
-cui/ui/linedialog.ui
-cui/ui/lineendstabpage.ui
-cui/ui/linestyletabpage.ui
-cui/ui/linetabpage.ui
-cui/ui/macroassigndialog.ui
-cui/ui/macroassignpage.ui
-cui/ui/macroselectordialog.ui
-cui/ui/menuassignpage.ui
-cui/ui/messbox.ui
-cui/ui/mosaicdialog.ui
-cui/ui/movemenu.ui
-cui/ui/multipathdialog.ui
-cui/ui/namedialog.ui
-cui/ui/newlibdialog.ui
-cui/ui/newtabledialog.ui
-cui/ui/newtoolbardialog.ui
-cui/ui/numberingformatpage.ui
-cui/ui/numberingoptionspage.ui
-cui/ui/numberingpositionpage.ui
diff --git a/cui/qa/unit/data/cui-dialogs-test_3.txt b/cui/qa/unit/data/cui-dialogs-test_3.txt
deleted file mode 100644
index 4b76238e9025..000000000000
--- a/cui/qa/unit/data/cui-dialogs-test_3.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# See cui-dailog-test.txt for explanations
-
-# covering o
-
-cui/ui/objectnamedialog.ui
-cui/ui/objecttitledescdialog.ui
-cui/ui/optaccessibilitypage.ui
-cui/ui/optadvancedpage.ui
-cui/ui/optappearancepage.ui
-cui/ui/optasianpage.ui
-cui/ui/optbasicidepage.ui
-cui/ui/optchartcolorspage.ui
-cui/ui/optctlpage.ui
-cui/ui/optemailpage.ui
-cui/ui/optfltrembedpage.ui
-cui/ui/optfltrpage.ui
-cui/ui/optfontspage.ui
-cui/ui/optgeneralpage.ui
-cui/ui/opthtmlpage.ui
-cui/ui/optionsdialog.ui
-cui/ui/optionsdialog.ui
-cui/ui/optjsearchpage.ui
-cui/ui/optlanguagespage.ui
-cui/ui/optlingupage.ui
-cui/ui/optmemorypage.ui
-cui/ui/optnewdictionarydialog.ui
-cui/ui/optonlineupdatepage.ui
-cui/ui/optopenclpage.ui
-cui/ui/optpathspage.ui
-cui/ui/optproxypage.ui
-cui/ui/optsavepage.ui
-cui/ui/optsecuritypage.ui
-cui/ui/optuserpage.ui
-cui/ui/optviewpage.ui
-
diff --git a/cui/qa/unit/data/cui-dialogs-test_4.txt b/cui/qa/unit/data/cui-dialogs-test_4.txt
deleted file mode 100644
index 169186fd5d7e..000000000000
--- a/cui/qa/unit/data/cui-dialogs-test_4.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# See cui-dailog-test.txt for explanations
-
-# covering p to z
-
-cui/ui/pageformatpage.ui
-cui/ui/paragalignpage.ui
-cui/ui/paraindentspacing.ui
-cui/ui/paratabspage.ui
-cui/ui/password.ui
-cui/ui/pastespecial.ui
-cui/ui/percentdialog.ui
-cui/ui/personalization_tab.ui
-cui/ui/pickbulletpage.ui
-cui/ui/pickgraphicpage.ui
-cui/ui/picknumberingpage.ui
-cui/ui/pickoutlinepage.ui
-cui/ui/positionpage.ui
-cui/ui/positionsizedialog.ui
-cui/ui/possizetabpage.ui
-cui/ui/posterdialog.ui
-cui/ui/querychangelineenddialog.ui
-cui/ui/querydeletebitmapdialog.ui
-cui/ui/querydeletechartcolordialog.ui
-cui/ui/querydeletecolordialog.ui
-cui/ui/querydeletedictionarydialog.ui
-cui/ui/querydeletegradientdialog.ui
-cui/ui/querydeletehatchdialog.ui
-cui/ui/querydeletelineenddialog.ui
-cui/ui/querydeletelinestyledialog.ui
-cui/ui/queryduplicatedialog.ui
-cui/ui/querynoloadedfiledialog.ui
-cui/ui/querynosavefiledialog.ui
-cui/ui/querysavelistdialog.ui
-cui/ui/queryupdategalleryfilelistdialog.ui
-cui/ui/recordnumberdialog.ui
-cui/ui/rotationtabpage.ui
-cui/ui/scriptorganizer.ui
-cui/ui/searchattrdialog.ui
-cui/ui/searchformatdialog.ui
-cui/ui/securityoptionsdialog.ui
-cui/ui/select_persona_dialog.ui
-cui/ui/selectpathdialog.ui
-cui/ui/shadowtabpage.ui
-cui/ui/showcoldialog.ui
-cui/ui/similaritysearchdialog.ui
-cui/ui/slantcornertabpage.ui
-cui/ui/smarttagoptionspage.ui
-cui/ui/smoothdialog.ui
-cui/ui/solarizedialog.ui
-cui/ui/specialcharacters.ui
-cui/ui/spellingdialog.ui
-cui/ui/spelloptionsdialog.ui
-cui/ui/splitcellsdialog.ui
-cui/ui/storedwebconnectiondialog.ui
-cui/ui/swpossizepage.ui
-cui/ui/textanimtabpage.ui
-cui/ui/textattrtabpage.ui
-cui/ui/textdialog.ui
-cui/ui/textflowpage.ui
-cui/ui/transparencytabpage.ui
-cui/ui/tsaurldialog.ui
-cui/ui/twolinespage.ui
-cui/ui/wordcompletionpage.ui
-cui/ui/zoomdialog.ui
-