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

Caolán McNamara caolanm at redhat.com
Tue May 8 15:25:46 UTC 2018


 test/source/screenshot_test.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c7864c54302b8d44f96359df2eca735a6e80ebb7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 8 15:05:22 2018 +0100

    fix make screenshot
    
    Change-Id: I781dfbc7bb09afd0c2325bcc9fd98e31ec5c4f39
    Reviewed-on: https://gerrit.libreoffice.org/53983
    Tested-by: Jenkins <ci at libreoffice.org>
    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 9dce8bf09c45..8ab5d3b1f8eb 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -184,7 +184,12 @@ void ScreenshotTest::dumpDialogToPath(const OString& rUIXMLDescription)
         {
             VclPtr<vcl::Window> aOwnedToplevel;
 
-            std::unique_ptr<VclBuilder> xBuilder(new VclBuilder(pDialog, VclBuilderContainer::getUIRootDir(), OStringToOUString(rUIXMLDescription, RTL_TEXTENCODING_UTF8)));
+            bool bLegacy;
+            if (rUIXMLDescription == "cui/ui/textanimtabpage.ui")
+                bLegacy = false;
+            else
+                bLegacy = true;
+            std::unique_ptr<VclBuilder> xBuilder(new VclBuilder(pDialog, VclBuilderContainer::getUIRootDir(), OStringToOUString(rUIXMLDescription, RTL_TEXTENCODING_UTF8), OString(), css::uno::Reference<css::frame::XFrame>(), bLegacy));
             vcl::Window *pRoot = xBuilder->get_widget_root();
             Dialog *pRealDialog = dynamic_cast<Dialog*>(pRoot);
 


More information about the Libreoffice-commits mailing list