summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-02-21 17:47:59 +0100
committerAndras Timar <andras.timar@collabora.com>2018-02-22 15:57:55 +0100
commit4152ecf98622d81aef50b68c9165292ba244abb9 (patch)
treea4744fff25fa432114482b0c09ee8d6350100ecb /sd
parentd5f0b3d725f678c1a7eb4b8b4ab3a2279742260c (diff)
Add some extra assert to this test case
To find out why this test fails for some linux tinderbox. Change-Id: I49d1afbbac631abe49378b12b888615e3e0e1bef Reviewed-on: https://gerrit.libreoffice.org/50121 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 0a46237093c1750ee69ddb6a365098dc1d06b758) Reviewed-on: https://gerrit.libreoffice.org/50178 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/unit/tiledrendering/tiledrendering.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 0eabab25fab2..8b7a7ee89293 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1969,9 +1969,7 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
// Load the document.
comphelper::LibreOfficeKit::setActive();
SdXImpressDocument* pXImpressDocument = createDoc("paste_text_onslide.odp");
-
- ViewCallback aView1;
- SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback, &aView1);
+ CPPUNIT_ASSERT(pXImpressDocument);
// select second text object
pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::TAB);
@@ -2017,7 +2015,10 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
Scheduler::ProcessEventsToIdle();
// Check the position of the newly added text shape, created for pasted text
- SdrObject* pObject = pXImpressDocument->GetDocShell()->GetViewShell()->GetActualPage()->GetObj(2);
+ SdPage* pActualPage = pXImpressDocument->GetDocShell()->GetViewShell()->GetActualPage();
+ CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), pActualPage->GetObjCount());
+ SdrObject* pObject = pActualPage->GetObj(2);
+ CPPUNIT_ASSERT(pObject);
SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>(pObject);
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(OBJ_TEXT), pTextObj->GetObjIdentifier());