[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sd/qa

[Miklos Vajna]

 sd/qa/unit/tiledrendering/tiledrendering.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 76bb5a2deeeec927747e8e624e455735356fc77e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jul 21 11:47:01 2016 +0200

    CppunitTest_sd_tiledrendering: fix undefined behavior, leading to crash
    
    Execute() version that takes an std::initializer_list<> is named
    ExecuteList(). But that's not available in this branch, so make sure
    that the last argument is a nullptr.
    
    Change-Id: Iaa42ac417abec334b1c053fb7d357dce529c6956

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index e26c033..47fd21a 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -294,7 +294,7 @@ void SdTiledRenderingTest::testPostKeyEvent()
     pView->MarkObj(pTextObj, pView->GetSdrPageView());
     SfxStringItem aInputString(SID_ATTR_CHAR, "x");
     pViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_ATTR_CHAR,
-            SfxCallMode::SYNCHRON, { &aInputString });
+            SfxCallMode::SYNCHRON, &aInputString, nullptr);
 
     pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
     pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
@@ -322,7 +322,7 @@ void SdTiledRenderingTest::testPostMouseEvent()
     pView->MarkObj(pTextObj, pView->GetSdrPageView());
     SfxStringItem aInputString(SID_ATTR_CHAR, "x");
     pViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_ATTR_CHAR,
-            SfxCallMode::SYNCHRON, { &aInputString });
+            SfxCallMode::SYNCHRON, &aInputString, nullptr);
     CPPUNIT_ASSERT(pView->GetTextEditObject());
     EditView& rEditView = pView->GetTextEditOutlinerView()->GetEditView();
     // Did we manage to go after the first character?