From b8f1795a9136b4ab8e5fa6e62d86a2b113699a46 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Fri, 16 Mar 2018 18:07:52 +0530 Subject: sd lok: guard all tests with lok flag This was also the cause of one of the test failure in sd after 263790b806794a69d8f13f470e6a1933a9ebe53c Change-Id: I2a85faf416dad19c8aa8f544b54c7b84e49a8f96 Reviewed-on: https://gerrit.libreoffice.org/51418 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky --- sd/qa/unit/tiledrendering/tiledrendering.cxx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'sd') diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 73e1e2e629bc..2e879f56cf4f 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -326,6 +326,7 @@ xmlDocPtr SdTiledRenderingTest::parseXmlDump() void SdTiledRenderingTest::testRegisterCallback() { + comphelper::LibreOfficeKit::setActive(); SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); pViewShell->GetViewShellBase().registerLibreOfficeKitViewCallback(&SdTiledRenderingTest::callback, this); @@ -341,6 +342,7 @@ void SdTiledRenderingTest::testRegisterCallback() CPPUNIT_ASSERT(!m_aInvalidation.IsEmpty()); Rectangle aTopLeft(0, 0, 256*15, 256*15); // 1 px = 15 twips, assuming 96 DPI. CPPUNIT_ASSERT(m_aInvalidation.IsOver(aTopLeft)); + comphelper::LibreOfficeKit::setActive(false); } void SdTiledRenderingTest::testPostKeyEvent() @@ -410,6 +412,7 @@ void SdTiledRenderingTest::testPostMouseEvent() void SdTiledRenderingTest::testSetTextSelection() { + comphelper::LibreOfficeKit::setActive(); SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); uno::Reference xDrawPage(pXImpressDocument->getDrawPages()->getByIndex(0), uno::UNO_QUERY); uno::Reference xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY); @@ -434,10 +437,12 @@ void SdTiledRenderingTest::testSetTextSelection() pXImpressDocument->setTextSelection(LOK_SETTEXTSELECTION_END, aEnd.getX(), aEnd.getY()); // The new selection must include the ending dot, too -- but not the first word. CPPUNIT_ASSERT_EQUAL(OUString("bbb."), rEditView.GetSelected()); + comphelper::LibreOfficeKit::setActive(false); } void SdTiledRenderingTest::testGetTextSelection() { + comphelper::LibreOfficeKit::setActive(); SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); uno::Reference xDrawPage(pXImpressDocument->getDrawPages()->getByIndex(0), uno::UNO_QUERY); uno::Reference xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY); @@ -458,10 +463,12 @@ void SdTiledRenderingTest::testGetTextSelection() // Make sure returned RTF is not empty. CPPUNIT_ASSERT(!OString(pXImpressDocument->getTextSelection("text/rtf", aUsedFormat)).isEmpty()); + comphelper::LibreOfficeKit::setActive(false); } void SdTiledRenderingTest::testSetGraphicSelection() { + comphelper::LibreOfficeKit::setActive(); SdXImpressDocument* pXImpressDocument = createDoc("shape.odp"); sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); SdPage* pPage = pViewShell->GetActualPage(); @@ -491,10 +498,13 @@ void SdTiledRenderingTest::testSetGraphicSelection() // Check that a resize happened, but aspect ratio is not kept. CPPUNIT_ASSERT_EQUAL(aShapeBefore.getWidth(), aShapeAfter.getWidth()); CPPUNIT_ASSERT(aShapeBefore.getHeight() < aShapeAfter.getHeight()); + + comphelper::LibreOfficeKit::setActive(false); } void SdTiledRenderingTest::testUndoShells() { + comphelper::LibreOfficeKit::setActive(); // Load a document and set the page size. SdXImpressDocument* pXImpressDocument = createDoc("shape.odp"); uno::Sequence aPropertyValues(comphelper::InitPropertySequence( @@ -512,10 +522,12 @@ void SdTiledRenderingTest::testUndoShells() sal_Int32 nView1 = SfxLokHelper::getView(); // This was -1, SdUndoGroup did not track what view shell created it. CPPUNIT_ASSERT_EQUAL(nView1, pUndoManager->GetUndoAction()->GetViewShellId()); + comphelper::LibreOfficeKit::setActive(false); } void SdTiledRenderingTest::testResetSelection() { + comphelper::LibreOfficeKit::setActive(); SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp"); uno::Reference xDrawPage(pXImpressDocument->getDrawPages()->getByIndex(0), uno::UNO_QUERY); uno::Reference xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY); @@ -536,6 +548,7 @@ void SdTiledRenderingTest::testResetSelection() // Now use resetSelection() to reset the selection. pXImpressDocument->resetSelection(); CPPUNIT_ASSERT(!pView->GetTextEditObject()); + comphelper::LibreOfficeKit::setActive(false); } static void lcl_search(const OUString& rKey, bool bFindAll = false) @@ -649,6 +662,7 @@ void SdTiledRenderingTest::testSearchAllFollowedBySearch() // This used to give wrong result: 'search' after 'search all' still // returned 'third' CPPUNIT_ASSERT_EQUAL(OString("match"), pXImpressDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat)); + comphelper::LibreOfficeKit::setActive(false); } void SdTiledRenderingTest::testDontSearchInMasterPages() @@ -1540,6 +1554,7 @@ void SdTiledRenderingTest::testTdf104405() void SdTiledRenderingTest::testTdf81754() { + comphelper::LibreOfficeKit::setActive(); SdXImpressDocument* pXImpressDocument = createDoc("tdf81754.pptx"); sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); SdPage* pActualPage = pViewShell->GetActualPage(); @@ -1569,6 +1584,7 @@ void SdTiledRenderingTest::testTdf81754() CPPUNIT_ASSERT_EQUAL(OUString("Somethingxx"), aEdit.GetText(0)); xDocShRef->DoClose(); + comphelper::LibreOfficeKit::setActive(false); } void SdTiledRenderingTest::testTdf105502() -- cgit