[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - test/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 11 11:12:46 UTC 2019


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

New commits:
commit 9a8dd40b1e0ad86b46c101d1046856c4e5d8039c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 11 10:05:08 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 11 13:12:02 2019 +0200

    fix assert in make screenshot
    
    Change-Id: Ie6cea9a97205a54f806c7e56561f712f8a106fb9
    Reviewed-on: https://gerrit.libreoffice.org/73808
    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 9385add57278..e046bc2a235d 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -192,7 +192,9 @@ void ScreenshotTest::dumpDialogToPath(const OString& rUIXMLDescription)
             VclPtr<vcl::Window> aOwnedToplevel;
 
             bool bLegacy;
-            bLegacy = rUIXMLDescription != "cui/ui/textanimtabpage.ui" && rUIXMLDescription != "cui/ui/areatabpage.ui";
+            bLegacy = rUIXMLDescription != "cui/ui/textanimtabpage.ui" &&
+                      rUIXMLDescription != "cui/ui/areatabpage.ui" &&
+                      rUIXMLDescription != "modules/schart/ui/tp_3D_SceneIllumination.ui";
             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