[Libreoffice-commits] core.git: test/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Dec 19 10:57:21 UTC 2019


 test/source/screenshot_test.cxx |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 0c5f36e5f77e5b9cd155c29fd54c0878be31de0a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Dec 18 16:46:42 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Dec 19 11:56:31 2019 +0100

    these .ui no longer need special handling
    
    Change-Id: I1b112ea6780ff5da2b8aa86f8039b47e98219f08
    Reviewed-on: https://gerrit.libreoffice.org/85407
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index 5c40d47a7719..ad63f98b8809 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -218,14 +218,7 @@ void ScreenshotTest::dumpDialogToPath(const OString& rUIXMLDescription)
                               rUIXMLDescription == "modules/dbreport/ui/conditionwin.ui";
         if (bNonConforming) // skip these broken ones
             return;
-        bool bLegacy = rUIXMLDescription == "fps/ui/explorerfiledialog.ui" ||
-                       rUIXMLDescription == "fps/ui/remotefilesdialog.ui" ||
-                       rUIXMLDescription == "sfx/ui/floatingrecord.ui";
-        std::unique_ptr<weld::Builder> xBuilder;
-        if (bLegacy)
-            xBuilder.reset(Application::CreateInterimBuilder(mxParentWidget.get(), OStringToOUString(rUIXMLDescription, RTL_TEXTENCODING_UTF8)));
-        else
-            xBuilder.reset(Application::CreateBuilder(mxParentWidget.get(), OStringToOUString(rUIXMLDescription, RTL_TEXTENCODING_UTF8)));
+        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(mxParentWidget.get(), OStringToOUString(rUIXMLDescription, RTL_TEXTENCODING_UTF8)));
         dumpDialogToPath(*xBuilder);
     }
 }


More information about the Libreoffice-commits mailing list