From 54c6230a19359ef6ea6a11ed326c520cdbe271d4 Mon Sep 17 00:00:00 2001 From: "Andrew Lee (李健秋)" Date: Sat, 7 Mar 2020 19:15:19 +0800 Subject: Drop replaced setActive call of each tests in tiledrendering module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We added a single setup method to replaced setActive call in each tests. This commit drop all the replaced setActive call in each tests in this tiledrendering module. Signed-off-by: Andrew Lee (李健秋) Change-Id: If0d0b8f6cd03bfbb935bd8a0023530799f5cde34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90158 Tested-by: Jenkins Reviewed-by: Michael Meeks --- sw/qa/extras/tiledrendering/tiledrendering.cxx | 75 -------------------------- 1 file changed, 75 deletions(-) (limited to 'sw') diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 2062b937ac9a..1e8baea4312f 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -364,7 +364,6 @@ void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload) void SwTiledRenderingTest::testRegisterCallback() { - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -395,7 +394,6 @@ void SwTiledRenderingTest::testPostKeyEvent() void SwTiledRenderingTest::testPostMouseEvent() { - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false); @@ -439,8 +437,6 @@ void SwTiledRenderingTest::testSetTextSelection() void SwTiledRenderingTest::testGetTextSelection() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("shape-with-text.fodt"); // No crash, just empty output for unexpected mime type. CPPUNIT_ASSERT_EQUAL(OString(), apitest::helper::transferable::getTextSelection(pXTextDocument->getSelection(), "foo/bar")); @@ -522,8 +518,6 @@ void SwTiledRenderingTest::testResetSelection() void SwTiledRenderingTest::testInsertShape() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("2-pages.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); @@ -552,8 +546,6 @@ static void lcl_search(bool bBackward) void SwTiledRenderingTest::testSearch() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("search.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -619,8 +611,6 @@ void SwTiledRenderingTest::testSearchViewArea() void SwTiledRenderingTest::testSearchTextFrame() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("search.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -653,7 +643,6 @@ void SwTiledRenderingTest::testSearchTextFrameWrapAround() void SwTiledRenderingTest::testDocumentSizeChanged() { - comphelper::LibreOfficeKit::setActive(); // Get the current document size. SwXTextDocument* pXTextDocument = createDoc("2-pages.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); @@ -671,8 +660,6 @@ void SwTiledRenderingTest::testDocumentSizeChanged() void SwTiledRenderingTest::testSearchAll() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("search.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -691,7 +678,6 @@ void SwTiledRenderingTest::testSearchAll() void SwTiledRenderingTest::testSearchAllNotifications() { - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("search.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -714,8 +700,6 @@ void SwTiledRenderingTest::testSearchAllNotifications() void SwTiledRenderingTest::testPageDownInvalidation() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("pagedown-invalidation.odt"); uno::Sequence aPropertyValues(comphelper::InitPropertySequence( { @@ -732,8 +716,6 @@ void SwTiledRenderingTest::testPageDownInvalidation() void SwTiledRenderingTest::testPartHash() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("pagedown-invalidation.odt"); int nParts = pXTextDocument->getParts(); for (int it = 0; it < nParts; it++) @@ -957,8 +939,6 @@ public: void SwTiledRenderingTest::testMissingInvalidation() { - comphelper::LibreOfficeKit::setActive(); - // Create two views. SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1(SfxViewShell::Current()); @@ -991,8 +971,6 @@ void SwTiledRenderingTest::testMissingInvalidation() void SwTiledRenderingTest::testViewCursors() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1(SfxViewShell::Current()); SfxLokHelper::createView(); @@ -1028,8 +1006,6 @@ void SwTiledRenderingTest::testViewCursors() void SwTiledRenderingTest::testShapeViewCursors() { - comphelper::LibreOfficeKit::setActive(); - // Load a document and create a view, so we have 2 ones. SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); ViewCallback aView1(SfxViewShell::Current()); @@ -1067,8 +1043,6 @@ void SwTiledRenderingTest::testShapeViewCursors() void SwTiledRenderingTest::testViewCursorVisibility() { - comphelper::LibreOfficeKit::setActive(); - // Load a document that has a shape and create two views. SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); ViewCallback aView1(SfxViewShell::Current()); @@ -1093,8 +1067,6 @@ void SwTiledRenderingTest::testViewCursorVisibility() void SwTiledRenderingTest::testViewCursorCleanup() { - comphelper::LibreOfficeKit::setActive(); - // Load a document that has a shape and create two views. SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); ViewCallback aView1(SfxViewShell::Current()); @@ -1125,8 +1097,6 @@ void SwTiledRenderingTest::testViewCursorCleanup() void SwTiledRenderingTest::testViewLock() { - comphelper::LibreOfficeKit::setActive(); - // Load a document that has a shape and create two views. SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); ViewCallback aView1(SfxViewShell::Current()); @@ -1153,7 +1123,6 @@ void SwTiledRenderingTest::testViewLock() void SwTiledRenderingTest::testTextEditViewInvalidations() { // Load a document that has a shape and create two views. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); ViewCallback aView1(SfxViewShell::Current()); SfxLokHelper::createView(); @@ -1184,7 +1153,6 @@ void SwTiledRenderingTest::testTextEditViewInvalidations() void SwTiledRenderingTest::testUndoInvalidations() { // Load a document and create two views. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1(SfxViewShell::Current()); int nView1 = SfxLokHelper::getView(); @@ -1217,7 +1185,6 @@ void SwTiledRenderingTest::testUndoInvalidations() void SwTiledRenderingTest::testUndoLimiting() { // Load a document and create two views. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); SwWrtShell* pWrtShell1 = pXTextDocument->GetDocShell()->GetWrtShell(); int nView1 = SfxLokHelper::getView(); @@ -1246,7 +1213,6 @@ void SwTiledRenderingTest::testUndoLimiting() void SwTiledRenderingTest::testUndoShapeLimiting() { // Load a document and create a view. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); SwWrtShell* pWrtShell1 = pXTextDocument->GetDocShell()->GetWrtShell(); int nView1 = SfxLokHelper::getView(); @@ -1284,7 +1250,6 @@ void SwTiledRenderingTest::testUndoShapeLimiting() void SwTiledRenderingTest::testUndoDispatch() { // Load a document and create two views. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); int nView1 = SfxLokHelper::getView(); SfxLokHelper::createView(); @@ -1324,7 +1289,6 @@ void SwTiledRenderingTest::testUndoDispatch() void SwTiledRenderingTest::testUndoRepairDispatch() { // Load a document and create two views. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); int nView1 = SfxLokHelper::getView(); SfxLokHelper::createView(); @@ -1367,7 +1331,6 @@ void SwTiledRenderingTest::testUndoRepairDispatch() void SwTiledRenderingTest::testShapeTextUndoShells() { // Load a document and create a view. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); sal_Int32 nView1 = SfxLokHelper::getView(); @@ -1392,7 +1355,6 @@ void SwTiledRenderingTest::testShapeTextUndoShells() void SwTiledRenderingTest::testShapeTextUndoGroupShells() { // Load a document and create a view. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); ViewCallback aView1(SfxViewShell::Current()); sal_Int32 nView1 = SfxLokHelper::getView(); @@ -1444,7 +1406,6 @@ void SwTiledRenderingTest::testShapeTextUndoGroupShells() void SwTiledRenderingTest::testTrackChanges() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); // Turn on track changes, type "zzz" at the end, and move to the start. @@ -1478,7 +1439,6 @@ void SwTiledRenderingTest::testTrackChanges() void SwTiledRenderingTest::testTrackChangesCallback() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -1506,7 +1466,6 @@ void SwTiledRenderingTest::testTrackChangesCallback() void SwTiledRenderingTest::testRedlineUpdateCallback() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -1546,7 +1505,6 @@ void SwTiledRenderingTest::testRedlineUpdateCallback() void SwTiledRenderingTest::testSetViewGraphicSelection() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("frame.odt"); int nView1 = SfxLokHelper::getView(); ViewCallback aView1(SfxViewShell::Current()); @@ -1572,7 +1530,6 @@ void SwTiledRenderingTest::testSetViewGraphicSelection() void SwTiledRenderingTest::testCreateViewGraphicSelection() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("frame.odt"); ViewCallback aView1(SfxViewShell::Current()); @@ -1606,7 +1563,6 @@ void SwTiledRenderingTest::testCreateViewGraphicSelection() void SwTiledRenderingTest::testCreateViewTextSelection() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1(SfxViewShell::Current()); @@ -1632,7 +1588,6 @@ void SwTiledRenderingTest::testCreateViewTextSelection() void SwTiledRenderingTest::testRedlineColors() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); // Turn on track changes, type "zzz" at the end. @@ -1653,7 +1608,6 @@ void SwTiledRenderingTest::testRedlineColors() void SwTiledRenderingTest::testCommentEndTextEdit() { // Create a document, type a character and remember the cursor position. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc(); ViewCallback aView1(SfxViewShell::Current()); pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0); @@ -1691,7 +1645,6 @@ void SwTiledRenderingTest::testCommentEndTextEdit() void SwTiledRenderingTest::testCommentInsert() { // Load a document with an as-char image in it. - comphelper::LibreOfficeKit::setActive(); comphelper::LibreOfficeKit::setTiledAnnotations(false); SwXTextDocument* pXTextDocument = createDoc("image-comment.odt"); SwDoc* pDoc = pXTextDocument->GetDocShell()->GetDoc(); @@ -1725,7 +1678,6 @@ void SwTiledRenderingTest::testCommentInsert() void SwTiledRenderingTest::testCursorPosition() { // Load a document and register a callback, should get an own cursor. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc(); ViewCallback aView1(SfxViewShell::Current()); @@ -1746,7 +1698,6 @@ void SwTiledRenderingTest::testPaintCallbacks() // paint <-> invalidate loop. // Load a document and register a callback for the first view. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc(); ViewCallback aView1(SfxViewShell::Current()); @@ -1767,7 +1718,6 @@ void SwTiledRenderingTest::testPaintCallbacks() void SwTiledRenderingTest::testUndoRepairResult() { // Load a document and create two views. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); int nView1 = SfxLokHelper::getView(); SfxLokHelper::createView(); @@ -1803,7 +1753,6 @@ void SwTiledRenderingTest::testUndoRepairResult() void SwTiledRenderingTest::testRedoRepairResult() { // Load a document and create two views. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); int nView1 = SfxLokHelper::getView(); SfxLokHelper::createView(); @@ -1862,8 +1811,6 @@ void checkUndoRepairStates(SwXTextDocument* pXTextDocument, SwView* pView1, SwVi void SwTiledRenderingTest::testDisableUndoRepair() { - comphelper::LibreOfficeKit::setActive(); - // Create two views. SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1(SfxViewShell::Current()); @@ -1924,7 +1871,6 @@ void SwTiledRenderingTest::testDisableUndoRepair() void SwTiledRenderingTest::testAllTrackedChanges() { // Load a document. - comphelper::LibreOfficeKit::setActive(); createDoc("dummy.fodt"); uno::Reference xPropSet(mxComponent, uno::UNO_QUERY); @@ -1997,8 +1943,6 @@ void SwTiledRenderingTest::testAllTrackedChanges() void SwTiledRenderingTest::testDocumentRepair() { - comphelper::LibreOfficeKit::setActive(); - // Create two views. SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); // view #1 @@ -2070,8 +2014,6 @@ void checkPageHeaderOrFooter(const SfxViewShell* pViewShell, sal_uInt16 nWhich, void SwTiledRenderingTest::testPageHeader() { - comphelper::LibreOfficeKit::setActive(); - createDoc("dummy.fodt"); SfxViewShell* pViewShell = SfxViewShell::Current(); // Check Page Header State @@ -2097,8 +2039,6 @@ void SwTiledRenderingTest::testPageHeader() void SwTiledRenderingTest::testPageFooter() { - comphelper::LibreOfficeKit::setActive(); - createDoc("dummy.fodt"); SfxViewShell* pViewShell = SfxViewShell::Current(); // Check Page Footer State @@ -2124,8 +2064,6 @@ void SwTiledRenderingTest::testPageFooter() void SwTiledRenderingTest::testTdf115088() { - comphelper::LibreOfficeKit::setActive(); - // We have three lines in the test document and we try to copy the second and third line // To the beginning of the document SwXTextDocument* pXTextDocument = createDoc("tdf115088.odt"); @@ -2160,7 +2098,6 @@ void SwTiledRenderingTest::testTdf115088() void SwTiledRenderingTest::testRedlineField() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); @@ -2181,7 +2118,6 @@ void SwTiledRenderingTest::testRedlineField() void SwTiledRenderingTest::testIMESupport() { - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); VclPtr pDocWindow = pXTextDocument->getDocWindow(); @@ -2213,7 +2149,6 @@ void SwTiledRenderingTest::testIMESupport() void SwTiledRenderingTest::testSplitNodeRedlineCallback() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("splitnode_redline_callback.fodt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -2272,7 +2207,6 @@ void SwTiledRenderingTest::testSplitNodeRedlineCallback() void SwTiledRenderingTest::testDeleteNodeRedlineCallback() { // Load a document. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("removenode_redline_callback.fodt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -2331,8 +2265,6 @@ void SwTiledRenderingTest::testDeleteNodeRedlineCallback() void SwTiledRenderingTest::testVisCursorInvalidation() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1(SfxViewShell::Current()); int nView1 = SfxLokHelper::getView(); @@ -2404,8 +2336,6 @@ void SwTiledRenderingTest::testVisCursorInvalidation() void SwTiledRenderingTest::testDeselectCustomShape() { - comphelper::LibreOfficeKit::setActive(); - SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false); @@ -2426,7 +2356,6 @@ void SwTiledRenderingTest::testDeselectCustomShape() void SwTiledRenderingTest::testSemiTransparent() { // Load a document where the top left tile contains a semi-transparent rectangle shape. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("semi-transparent.odt"); // Render a larger area, and then get the color of the bottom right corner of our tile. @@ -2455,7 +2384,6 @@ void SwTiledRenderingTest::testSemiTransparent() void SwTiledRenderingTest::testAnchorTypes() { - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); SwDoc* pDoc = pXTextDocument->GetDocShell()->GetDoc(); SwView* pView = pXTextDocument->GetDocShell()->GetView(); @@ -2472,7 +2400,6 @@ void SwTiledRenderingTest::testAnchorTypes() void SwTiledRenderingTest::testLanguageStatus() { - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); SwView* pView = pXTextDocument->GetDocShell()->GetView(); std::unique_ptr pItem; @@ -2489,7 +2416,6 @@ void SwTiledRenderingTest::testRedlineNotificationDuringSave() { // Load a document with redlines which are hidden at a layout level. // It's an empty document, just settings.xml and content.xml are custom. - comphelper::LibreOfficeKit::setActive(); SwXTextDocument* pXTextDocument = createDoc("redline-notification-during-save.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback, this); @@ -2505,7 +2431,6 @@ void SwTiledRenderingTest::testRedlineNotificationDuringSave() void SwTiledRenderingTest::testHyperlink() { - comphelper::LibreOfficeKit::setActive(); comphelper::LibreOfficeKit::setViewIdForVisCursorInvalidation(true); SwXTextDocument* pXTextDocument = createDoc("hyperlink.odt"); SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); -- cgit