strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qa: call ProcessEventsToIdle inside dispatchCommand

Browse source 
Change-Id: I909e6f334f4a659282141a97ccb3ffdea6ecc364
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147397
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli 2023-02-21 14:07:38 +01:00
parent 88e29df0c2
commit d52b97175b
22 changed files with 6 additions and 486 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
chart2/qa/extras/uichart.cxx
View file

@ -47,16 +47,13 @@ void Chart2UiChartTest::testCopyPasteToNewSheet(uno::Reference<chart::XChartDocu
comphelper::makePropertyValue("ToObject", aObjectName),
};
dispatchCommand(mxComponent, ".uno:GoToObject", aPropertyValues);
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// create a new document
load("private:factory/scalc");
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
uno::Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc2.is());
@ -140,16 +137,13 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf151091)
comphelper::makePropertyValue("ToObject", OUString("Object 1")),
};
dispatchCommand(mxComponent, ".uno:GoToObject", aPropertyValues);
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// create a new writer document
load("private:factory/swriter");
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
aSeriesList = getWriterChartColumnDescriptions(mxComponent);
@ -216,16 +210,13 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf98690)
comphelper::makePropertyValue("ToObject", OUString("Chart 2")),
};
dispatchCommand(mxComponent, ".uno:GoToObject", aPropertyValues);
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// create a new document
load("private:factory/scalc");
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
uno::Reference<chart::XChartDocument> xChartDoc2(getChartCompFromSheet(0, 0, mxComponent),
uno::UNO_QUERY_THROW);

2
desktop/qa/desktop_lib/test_desktop_lib.cxx
View file

@ -606,7 +606,6 @@ void DesktopLOKTest::testSearchCalc()
{"SearchItem.Command", uno::Any(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
}));
dispatchCommand(mxComponent, ".uno:ExecuteSearch", aPropertyValues);
Scheduler::ProcessEventsToIdle();
std::vector<OString> aSelections;
sal_Int32 nIndex = 0;
@ -637,7 +636,6 @@ void DesktopLOKTest::testSearchAllNotificationsCalc()
{"SearchItem.Command", uno::Any(static_cast<sal_uInt16>(SvxSearchCmd::FIND_ALL))},
}));
dispatchCommand(mxComponent, ".uno:ExecuteSearch", aPropertyValues);
Scheduler::ProcessEventsToIdle();
// This was 1, make sure that we get no notifications about selection changes during search.
CPPUNIT_ASSERT_EQUAL(0, m_nSelectionBeforeSearchResult);

1
sc/qa/extras/scpdfexport.cxx
View file

@ -454,7 +454,6 @@ void ScPDFExportTest::testTdf120190()
dispatchCommand(mxComponent, ".uno:GoToCell", aArgs);
dispatchCommand(mxComponent, ".uno:ConvertFormulaToValue", {});
Scheduler::ProcessEventsToIdle();
// A1
ScRange range1(0, 0, 0, 0, 0, 0);

4
sc/qa/unit/jumbosheets-test.cxx
View file

@ -273,12 +273,10 @@ void ScJumboSheetsTest::testTdf134553()
pViewShell->SelectObject(u"Diagram 1");
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), pPage->GetObjCount());
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
pOleObj = pPage->GetObj(0);
CPPUNIT_ASSERT(pOleObj);
@ -318,10 +316,8 @@ void ScJumboSheetsTest::testTdf147509()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ScDocShell::GetViewData()->GetCurY());
dispatchCommand(mxComponent, ".uno:SelectColumn", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:InsertColumnsAfter", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("A"), pDoc->GetString(ScAddress(0, 0, 0)));

37
sc/qa/unit/tiledrendering/tiledrendering.cxx
View file

@ -771,7 +771,6 @@ void ScTiledRenderingTest::testTextViewSelection()
// Create a selection on two cells in the second view, that's a text selection in LOK terms.
aView1.m_bTextViewSelectionInvalidated = false;
dispatchCommand(mxComponent, ".uno:GoRightSel", {});
Scheduler::ProcessEventsToIdle();
// Make sure the first view got its notification.
CPPUNIT_ASSERT(aView1.m_bTextViewSelectionInvalidated);
}
@ -788,7 +787,6 @@ void ScTiledRenderingTest::testDocumentSizeChanged()
comphelper::makePropertyValue("ToPoint", OUString("$A$30")),
};
dispatchCommand(mxComponent, ".uno:GoToCell", aPropertyValues);
Scheduler::ProcessEventsToIdle();
// Assert that the size in the payload is not 0.
CPPUNIT_ASSERT(m_aDocumentSize.getWidth() > 0);
CPPUNIT_ASSERT(m_aDocumentSize.getHeight() > 0);
@ -861,7 +859,6 @@ void ScTiledRenderingTest::testMoveShapeHandle()
{"NewPosY", uno::Any(y+1)}
}));
dispatchCommand(mxComponent, ".uno:MoveShapeHandle", aPropertyValues);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
CPPUNIT_ASSERT_EQUAL(x-1, oldX);
@ -1084,7 +1081,6 @@ void ScTiledRenderingTest::testAutoSum()
uno::Sequence<beans::PropertyValue> aArgs;
dispatchCommand(mxComponent, ".uno:AutoSum", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView.m_sCellFormula.startsWith("=SUM("));
}
@ -1104,7 +1100,6 @@ void ScTiledRenderingTest::testHideColRow()
}));
dispatchCommand(mxComponent, ".uno:SelectColumn", aArgs2);
Scheduler::ProcessEventsToIdle();
}
SCCOL nOldCurX = ScDocShell::GetViewData()->GetCurX();
@ -1112,7 +1107,6 @@ void ScTiledRenderingTest::testHideColRow()
{
uno::Sequence<beans::PropertyValue> aArgs;
dispatchCommand(mxComponent, ".uno:HideColumn", aArgs);
Scheduler::ProcessEventsToIdle();
}
SCCOL nNewCurX = ScDocShell::GetViewData()->GetCurX();
@ -1131,7 +1125,6 @@ void ScTiledRenderingTest::testHideColRow()
{ "Modifier", uno::Any(sal_uInt16(0)) }
}));
dispatchCommand(mxComponent, ".uno:SelectRow", aArgs2);
Scheduler::ProcessEventsToIdle();
}
nOldCurX = ScDocShell::GetViewData()->GetCurX();
@ -1139,7 +1132,6 @@ void ScTiledRenderingTest::testHideColRow()
{
uno::Sequence<beans::PropertyValue> aArgs;
dispatchCommand(mxComponent, ".uno:HideRow", aArgs);
Scheduler::ProcessEventsToIdle();
}
nNewCurX = ScDocShell::GetViewData()->GetCurX();
nNewCurY = ScDocShell::GetViewData()->GetCurY();
@ -1178,7 +1170,6 @@ void ScTiledRenderingTest::testInvalidateOnCopyPasteCells()
// paste cells
aView.m_bInvalidateTiles = false;
dispatchCommand(mxComponent, ".uno:Paste", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView.m_bInvalidateTiles);
}
@ -1203,7 +1194,6 @@ void ScTiledRenderingTest::testInvalidateOnInserRowCol()
aView.m_bInvalidateTiles = false;
aView.m_aInvalidations.clear();
dispatchCommand(mxComponent, ".uno:InsertRows", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView.m_bInvalidateTiles);
CPPUNIT_ASSERT_EQUAL(size_t(2), aView.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(-75, 51240, 32212230, 63990), aView.m_aInvalidations[0]);
@ -1220,7 +1210,6 @@ void ScTiledRenderingTest::testInvalidateOnInserRowCol()
aView.m_bInvalidateTiles = false;
aView.m_aInvalidations.clear();
dispatchCommand(mxComponent, ".uno:InsertColumns", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView.m_bInvalidateTiles);
CPPUNIT_ASSERT_EQUAL(size_t(2), aView.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(254925, -15, 32212230, 63990), aView.m_aInvalidations[0]);
@ -1250,7 +1239,6 @@ void ScTiledRenderingTest::testCommentCallback()
{"Author", uno::Any(OUString("LOK User1"))},
}));
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Add' action
CPPUNIT_ASSERT_EQUAL(std::string("Add"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
@ -1281,7 +1269,6 @@ void ScTiledRenderingTest::testCommentCallback()
{"Author", uno::Any(OUString("LOK User2"))},
});
dispatchCommand(mxComponent, ".uno:EditAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Modify' action
CPPUNIT_ASSERT_EQUAL(std::string("Modify"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
@ -1303,7 +1290,6 @@ void ScTiledRenderingTest::testCommentCallback()
{"Id", uno::Any(OUString::createFromAscii(aCommentId.c_str()))}
});
dispatchCommand(mxComponent, ".uno:DeleteNote", aArgs);
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Remove' action
CPPUNIT_ASSERT_EQUAL(std::string("Remove"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
@ -1347,14 +1333,12 @@ void ScTiledRenderingTest::testUndoLimiting()
// try to execute undo in view #2
SfxLokHelper::setView(nView2);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// check that undo has not been executed on view #2
CPPUNIT_ASSERT_EQUAL(std::size_t(1), pUndoManager->GetUndoActionCount());
// try to execute undo in view #1
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// check that undo has been executed on view #1
CPPUNIT_ASSERT_EQUAL(std::size_t(0), pUndoManager->GetUndoActionCount());
@ -1364,14 +1348,12 @@ void ScTiledRenderingTest::testUndoLimiting()
// try to execute redo in view #2
SfxLokHelper::setView(nView2);
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
// check that redo has not been executed on view #2
CPPUNIT_ASSERT_EQUAL(std::size_t(1), pUndoManager->GetRedoActionCount());
// try to execute redo in view #1
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
// check that redo has been executed on view #1
CPPUNIT_ASSERT_EQUAL(std::size_t(0), pUndoManager->GetRedoActionCount());
}
@ -1409,7 +1391,6 @@ void ScTiledRenderingTest::testUndoRepairDispatch()
// try to execute undo in view #2
SfxLokHelper::setView(nView2);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// check that undo has not been executed on view #2
CPPUNIT_ASSERT_EQUAL(std::size_t(1), pUndoManager->GetUndoActionCount());
@ -1420,7 +1401,6 @@ void ScTiledRenderingTest::testUndoRepairDispatch()
{"Repair", uno::Any(true)}
}));
dispatchCommand(mxComponent, ".uno:Undo", aPropertyValues);
Scheduler::ProcessEventsToIdle();
// check that undo has been executed on view #2 in repair mode
CPPUNIT_ASSERT_EQUAL(std::size_t(0), pUndoManager->GetUndoActionCount());
}
@ -1450,14 +1430,12 @@ void ScTiledRenderingTest::testInsertGraphicInvalidations()
{ "FileName", uno::Any(createFileURL(u"smile.png")) }
}));
dispatchCommand(mxComponent, ".uno:InsertGraphic", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView.m_bInvalidateTiles);
// undo image insertion in view and see if both views are invalidated
aView.m_bInvalidateTiles = false;
uno::Sequence<beans::PropertyValue> aArgs2;
dispatchCommand(mxComponent, ".uno:Undo", aArgs2);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView.m_bInvalidateTiles);
}
@ -1955,7 +1933,6 @@ void ScTiledRenderingTest::testInsertDeletePageInvalidation()
{ "Index", uno::Any(sal_Int32(1)) }
}));
dispatchCommand(mxComponent, ".uno:Insert", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView1.m_bInvalidateTiles);
CPPUNIT_ASSERT_EQUAL(size_t(6), aView1.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(0, 0, 1000000000, 1000000000), aView1.m_aInvalidations[0]);
@ -1968,7 +1945,6 @@ void ScTiledRenderingTest::testInsertDeletePageInvalidation()
{ "Index", uno::Any(sal_Int32(1)) }
}));
dispatchCommand(mxComponent, ".uno:Remove", aArgs2);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView1.m_bInvalidateTiles);
CPPUNIT_ASSERT_EQUAL(size_t(5), aView1.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(0, 0, 1000000000, 1000000000), aView1.m_aInvalidations[0]);
@ -2823,7 +2799,6 @@ void ScTiledRenderingTest::testSheetViewDataCrash()
{ "Index", uno::Any(sal_Int32(2)) }
}));
dispatchCommand(mxComponent, ".uno:Insert", aArgs);
Scheduler::ProcessEventsToIdle();
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::PAGEDOWN | KEY_MOD1);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::PAGEDOWN | KEY_MOD1);
Scheduler::ProcessEventsToIdle();
@ -2858,7 +2833,6 @@ void ScTiledRenderingTest::testTextBoxInsert()
{ "CreateDirectly", uno::Any(true) }
}));
dispatchCommand(mxComponent, ".uno:DrawText", aArgs);
Scheduler::ProcessEventsToIdle();
// check if we have textbox selected
CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
@ -2896,7 +2870,6 @@ void ScTiledRenderingTest::testCommentCellCopyPaste()
{"Author", uno::Any(OUString("LOK Client"))},
}));
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Add' action
CPPUNIT_ASSERT_EQUAL(std::string("Add"), aView.m_aCommentCallbackResult.get<std::string>("action"));
@ -2913,12 +2886,10 @@ void ScTiledRenderingTest::testCommentCellCopyPaste()
// Single cell(with comment) copy paste test
{
dispatchCommand(mxComponent, ".uno:Copy", aCopyPasteArgs);
Scheduler::ProcessEventsToIdle();
pTabViewShell->SetCursor(1, 49);
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Paste", aCopyPasteArgs); // Paste to cell B50
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Add' action
CPPUNIT_ASSERT_EQUAL(std::string("Add"), aView.m_aCommentCallbackResult.get<std::string>("action"));
@ -2945,12 +2916,10 @@ void ScTiledRenderingTest::testCommentCellCopyPaste()
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", aCopyPasteArgs);
Scheduler::ProcessEventsToIdle();
pTabViewShell->SetCursor(3, 49);
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Paste", aCopyPasteArgs); // Paste to cell D50
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Add' action
CPPUNIT_ASSERT_EQUAL(std::string("Add"), aView.m_aCommentCallbackResult.get<std::string>("action"));
@ -2990,7 +2959,6 @@ void ScTiledRenderingTest::testInvalidEntrySave()
uno::Sequence<beans::PropertyValue> aArgs;
dispatchCommand(mxComponent, ".uno:Save", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_MESSAGE("Should not be marked modified after save", !pDocSh->IsModified());
@ -3054,14 +3022,12 @@ void ScTiledRenderingTest::testUndoReordering()
// try to execute undo in view #1
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// check that undo has been executed on view #1
CPPUNIT_ASSERT_EQUAL(std::size_t(1), pUndoManager->GetUndoActionCount());
// try to execute undo in view #2
SfxLokHelper::setView(nView2);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// check that undo has been executed on view #2
CPPUNIT_ASSERT_EQUAL(std::size_t(0), pUndoManager->GetUndoActionCount());
}
@ -3131,7 +3097,6 @@ void ScTiledRenderingTest::testUndoReorderingRedo()
// View 1 presses undo, and the second cell is erased
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(std::size_t(2), pUndoManager->GetUndoActionCount());
CPPUNIT_ASSERT_EQUAL(OUString("xx"), pDoc->GetString(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 1, 0)));
@ -3151,7 +3116,6 @@ void ScTiledRenderingTest::testUndoReorderingRedo()
// View 1 presses undo again, and the first cell is erased
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(std::size_t(1), pUndoManager->GetUndoActionCount());
CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 1, 0)));
@ -3221,7 +3185,6 @@ void ScTiledRenderingTest::testUndoReorderingMulti()
// View 1 presses undo
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(std::size_t(2), pUndoManager->GetUndoActionCount());
CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_EQUAL(OUString("CC"), pDoc->GetString(ScAddress(0, 2, 0)));

87
sc/qa/unit/uicalc/uicalc.cxx
View file

@ -346,12 +346,10 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf103994)
goToCell("A1");
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
goToCell("B1");
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have failed with
// - Expected: ='file:///tmp/lu124171irlmb.tmp'#$Sheet1.A1
@ -433,11 +431,9 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf107869)
goToCell("A1");
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
goToCell("A2");
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_MESSAGE("There should be a note on A1", pDoc->HasNote(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_MESSAGE("There should be a note on A2", pDoc->HasNote(ScAddress(0, 1, 0)));
@ -445,10 +441,8 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf107869)
goToCell("A1");
dispatchCommand(mxComponent, ".uno:SelectRow", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:DeleteRows", {});
Scheduler::ProcessEventsToIdle();
for (size_t i = 0; i < 10; ++i)
{
@ -457,7 +451,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf107869)
CPPUNIT_ASSERT_MESSAGE("There should be no note on A2", !pDoc->HasNote(ScAddress(0, 1, 0)));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("A"), pDoc->GetString(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_EQUAL(OUString("B"), pDoc->GetString(ScAddress(0, 1, 0)));
@ -465,19 +458,15 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf107869)
CPPUNIT_ASSERT_MESSAGE("There should be a note on A2", pDoc->HasNote(ScAddress(0, 1, 0)));
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
}
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
goToCell("A1:A2");
dispatchCommand(mxComponent, ".uno:SelectRow", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:DeleteRows", {});
Scheduler::ProcessEventsToIdle();
for (size_t i = 0; i < 10; ++i)
{
@ -487,7 +476,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf107869)
CPPUNIT_ASSERT_MESSAGE("There should be no note on A2", !pDoc->HasNote(ScAddress(0, 1, 0)));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("A"), pDoc->GetString(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_EQUAL(OUString("B"), pDoc->GetString(ScAddress(0, 1, 0)));
@ -495,7 +483,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf107869)
CPPUNIT_ASSERT_MESSAGE("There should be a note on A2", pDoc->HasNote(ScAddress(0, 1, 0)));
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
}
}
@ -542,7 +529,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf63805)
CPPUNIT_ASSERT_EQUAL(OUString("2014-05-31"), pDoc->GetString(ScAddress(0, 19, 0)));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("2012-10-31"), pDoc->GetString(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 1, 0)));
@ -589,16 +575,13 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf94208)
goToCell("A3:A8");
dispatchCommand(mxComponent, ".uno:SelectRow", {});
Scheduler::ProcessEventsToIdle();
//type Control-D/Fill Down
dispatchCommand(mxComponent, ".uno:FillDown", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0.0, pDoc->GetValue(ScAddress(0, 0, 0)));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have failed with
// - Expected: 1
@ -723,13 +706,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf119162)
// Without the fix in place, this test would have hung here
dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"Test" + OUStringChar(u'\xA')),
pDoc->GetString(ScAddress(0, 0, 0)));
dispatchCommand(mxComponent, ".uno:ChangeCaseToLower", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"test" + OUStringChar(u'\xA')),
pDoc->GetString(ScAddress(0, 0, 0)));
@ -753,7 +734,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf90579)
goToCell("C1:C2");
dispatchCommand(mxComponent, ".uno:ConvertFormulaToValue", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("2310"), pDoc->GetString(ScAddress(2, 0, 0)));
CPPUNIT_ASSERT_EQUAL(OUString("LibreOffice"), pDoc->GetString(ScAddress(2, 1, 0)));
@ -761,7 +741,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf90579)
CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetFormula(2, 1, 0));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("2310"), pDoc->GetString(ScAddress(2, 0, 0)));
CPPUNIT_ASSERT_EQUAL(OUString("LibreOffice"), pDoc->GetString(ScAddress(2, 1, 0)));
@ -777,7 +756,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf124820)
goToCell("B2");
dispatchCommand(mxComponent, ".uno:Strikeout", {});
Scheduler::ProcessEventsToIdle();
saveAndReload("Calc Office Open XML");
pDoc = getScDoc();
@ -800,7 +778,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf119155)
// Without the fix in place, this test would have hung here
dispatchCommand(mxComponent, ".uno:ChangeCaseToTitleCase", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("Collagene Expert Targeted Wrinkle Corrector Unboxed 10 Ml"),
pDoc->GetString(ScAddress(2, 1, 0)));
@ -823,7 +800,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf146795)
goToCell("B2");
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// Move to B3
ScModelObj* pModelObj = comphelper::getFromUnoTunnel<ScModelObj>(mxComponent);
@ -838,7 +814,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf146795)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("a"), pDoc->GetString(ScAddress(1, 1, 0)));
CPPUNIT_ASSERT_EQUAL(OUString("a"), pDoc->GetString(ScAddress(1, 2, 0)));
@ -869,7 +844,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf147744)
goToCell("A2");
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// Move to A3
ScModelObj* pModelObj = comphelper::getFromUnoTunnel<ScModelObj>(mxComponent);
@ -882,7 +856,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf147744)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1.0, pDoc->GetValue(ScAddress(0, 1, 0)));
CPPUNIT_ASSERT_EQUAL(0.0, pDoc->GetValue(ScAddress(0, 2, 0)));
@ -917,14 +890,12 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf138432)
goToCell("A1");
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
goToCell("A2");
typeString(u"=");
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
ScModelObj* pModelObj = comphelper::getFromUnoTunnel<ScModelObj>(mxComponent);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN);
@ -1077,7 +1048,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf145640)
goToCell("A2:F17");
dispatchCommand(mxComponent, ".uno:SortDescending", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("=SUM(A15:B15:C15:D15:E15:F15)"), pDoc->GetFormula(6, 3, 0));
@ -1087,7 +1057,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf145640)
CPPUNIT_ASSERT_EQUAL(10.0, pDoc->GetValue(ScAddress(6, 3, 0)));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("=SUM(A4:B4:C4:D4:E4:F4)"), pDoc->GetFormula(6, 3, 0));
CPPUNIT_ASSERT_EQUAL(10.0, pDoc->GetValue(ScAddress(6, 3, 0)));
@ -1115,12 +1084,10 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf97215)
// Without the fix in place, this test would have hung here
dispatchCommand(mxComponent, ".uno:SortAscending", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("Inserted at bottom"), pDoc->GetString(ScAddress(0, 0, 0)));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("Inserted at bottom"), pDoc->GetString(ScAddress(0, 23, 0)));
@ -1355,20 +1322,16 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf95306)
// Use Adding Selection
dispatchCommand(mxComponent, ".uno:StatusSelectionModeExp", {});
Scheduler::ProcessEventsToIdle();
goToCell("B1");
dispatchCommand(mxComponent, ".uno:SelectColumn", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:GoRight", {});
dispatchCommand(mxComponent, ".uno:GoRight", {});
dispatchCommand(mxComponent, ".uno:SelectColumn", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:HideColumn", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(!pDoc->ColHidden(0, 0));
CPPUNIT_ASSERT(pDoc->ColHidden(1, 0));
@ -1377,7 +1340,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf95306)
CPPUNIT_ASSERT(!pDoc->ColHidden(4, 0));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(!pDoc->ColHidden(0, 0));
CPPUNIT_ASSERT(!pDoc->ColHidden(1, 0));
@ -1411,7 +1373,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf102525)
CPPUNIT_ASSERT_EQUAL(OUString("{=IF($A$1:$A$4>2,1,2)}"), pDoc->GetFormula(1, 0, 0));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(2.0, pDoc->GetValue(1, 0, 0));
CPPUNIT_ASSERT_EQUAL(2.0, pDoc->GetValue(1, 1, 0));
@ -1480,18 +1441,15 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf117706)
// Use Adding Selection
dispatchCommand(mxComponent, ".uno:StatusSelectionModeExp", {});
Scheduler::ProcessEventsToIdle();
goToCell("A1");
dispatchCommand(mxComponent, ".uno:SelectRow", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:GoDown", {});
dispatchCommand(mxComponent, ".uno:GoDown", {});
lcl_AssertCurrentCursorPosition(*pDocSh, u"A3");
dispatchCommand(mxComponent, ".uno:SelectRow", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
@ -1547,14 +1505,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf149503)
ScDocument* pDoc = getScDoc();
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
ScDPCollection* pDPs = pDoc->GetDPCollection();
CPPUNIT_ASSERT_EQUAL(size_t(1), pDPs->GetCount());
@ -1566,10 +1521,8 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf108292)
ScDocument* pDoc = getScDoc();
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// Open a new document
createScDoc();
@ -1577,7 +1530,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf108292)
// Without the fix in place, this test would have crashed
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("2D"), pDoc->GetString(ScAddress(26, 0, 0)));
}
@ -1593,18 +1545,15 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testMultiRangeCol)
// Use Adding Selection
dispatchCommand(mxComponent, ".uno:StatusSelectionModeExp", {});
Scheduler::ProcessEventsToIdle();
goToCell("A1");
dispatchCommand(mxComponent, ".uno:SelectColumn", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:GoRight", {});
dispatchCommand(mxComponent, ".uno:GoRight", {});
lcl_AssertCurrentCursorPosition(*pDocSh, u"C1");
dispatchCommand(mxComponent, ".uno:SelectColumn", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
@ -1910,14 +1859,12 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf108654)
CPPUNIT_ASSERT_EQUAL(OUString("=VLOOKUP(C127,#REF!,D$1,0)"), aFormula);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
aFormula = pDoc->GetFormula(3, 126, 1);
CPPUNIT_ASSERT_EQUAL(OUString(""), aFormula);
CPPUNIT_ASSERT_EQUAL(static_cast<SCTAB>(2), pDoc->GetTableCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<SCTAB>(1), pDoc->GetTableCount());
}
@ -1979,19 +1926,16 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf133326)
CPPUNIT_ASSERT_EQUAL(static_cast<SCTAB>(2), pDoc->GetTableCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
aFormula = pDoc->GetFormula(0, 0, 1);
CPPUNIT_ASSERT_EQUAL(OUString(""), aFormula);
CPPUNIT_ASSERT_EQUAL(static_cast<SCTAB>(2), pDoc->GetTableCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<SCTAB>(1), pDoc->GetTableCount());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<SCTAB>(2), pDoc->GetTableCount());
aFormula = pDoc->GetFormula(0, 0, 1);
@ -1999,7 +1943,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf133326)
// Without the fix in place, it would have crashed here
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
aFormula = pDoc->GetFormula(0, 0, 1);
CPPUNIT_ASSERT_EQUAL(OUString("=RAND()*1000000"), aFormula);
@ -2013,7 +1956,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf126685)
ScDocument* pDoc = getScDoc();
dispatchCommand(mxComponent, ".uno:SelectAll", {}); // test should crash here without the fix
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(
OUString("Control Height will change from 0.65 to 0.61 cm with 120dpi ..."),
@ -2051,13 +1993,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf119793)
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(5084), xShape->getPosition().X);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1381), xShape->getPosition().Y);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have failed with
// - Expected: 4984
@ -2148,15 +2088,12 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf124818)
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage->GetObjCount());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), pPage->GetObjCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage->GetObjCount());
}
@ -2318,14 +2255,12 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf124822)
CPPUNIT_ASSERT_EQUAL(OUString("X"), pDoc->GetString(ScAddress(0, 0, 2)));
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 0, 2)));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("X"), pDoc->GetString(ScAddress(0, 0, 2)));
}
@ -2357,7 +2292,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf118189)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
aFormula = pDoc->GetFormula(0, 77, 0);
CPPUNIT_ASSERT_EQUAL(OUString("=FALSE()"), aFormula);
@ -2401,13 +2335,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf118207)
CPPUNIT_ASSERT_EQUAL(OUString("=FALSE()"), aFormula);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
aFormula = pDoc->GetFormula(1, 77, 0);
CPPUNIT_ASSERT_EQUAL(OUString("=FALSE()"), aFormula);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
aFormula = pDoc->GetFormula(1, 77, 0);
CPPUNIT_ASSERT_EQUAL(OUString(""), aFormula);
@ -2415,7 +2347,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf118207)
CPPUNIT_ASSERT_EQUAL(OUString(""), aFormula);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
aFormula = pDoc->GetFormula(0, 77, 0);
CPPUNIT_ASSERT_EQUAL(OUString("=FALSE()"), aFormula);
@ -2444,7 +2375,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf124778)
uno::Sequence<beans::PropertyValue> aArgs
= comphelper::InitPropertySequence({ { "Text", uno::Any(OUString("Comment")) } });
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_MESSAGE("There should be a note on A1", pDoc->HasNote(ScAddress(0, 0, 0)));
@ -2469,7 +2399,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf138428)
uno::Sequence<beans::PropertyValue> aArgs
= comphelper::InitPropertySequence({ { "Text", uno::Any(OUString("Comment")) } });
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
ScDocument* pDoc = getScDoc();
CPPUNIT_ASSERT_MESSAGE("There should be a note on A1", pDoc->HasNote(ScAddress(0, 0, 0)));
@ -2487,25 +2416,21 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf138428)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_MESSAGE("There should be a note on A1", pDoc->HasNote(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_MESSAGE("There shouldn't be a note on B1", !pDoc->HasNote(ScAddress(1, 0, 0)));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_MESSAGE("There shouldn't be a note on A1", !pDoc->HasNote(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_MESSAGE("There shouldn't be a note on B1", !pDoc->HasNote(ScAddress(1, 0, 0)));
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_MESSAGE("There should be a note on A1", pDoc->HasNote(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_MESSAGE("There shouldn't be a note on B1", !pDoc->HasNote(ScAddress(1, 0, 0)));
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_MESSAGE("There should be a note on A1", pDoc->HasNote(ScAddress(0, 0, 0)));
CPPUNIT_ASSERT_MESSAGE("There should be a note on B1", pDoc->HasNote(ScAddress(1, 0, 0)));
@ -2547,7 +2472,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf130614)
lcl_SelectObjectByName(*getViewShell(), u"Object 1");
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// Open a new document
createScDoc();
@ -2555,7 +2479,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf130614)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
SdrPage* pPage = pDrawLayer->GetPage(0);
@ -2807,13 +2730,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf134675)
goToCell("A:A");
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// Select column B to Z
goToCell("B:Z");
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
for (size_t i = 1; i < 24; ++i)
{
@ -2913,7 +2834,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf107952)
goToCell("D10");
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have failed with
// - Expected: 1
@ -2924,7 +2844,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf107952)
goToCell("D10");
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
lcl_AssertCurrentCursorPosition(*pDocSh, u"B1");
}
@ -2961,13 +2880,11 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf144022)
goToCell("A5:B79");
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
goToCell("D5");
//Without the fix in place, this test would have crashed
dispatchCommand(mxComponent, ".uno:PasteTransposed", {});
Scheduler::ProcessEventsToIdle();
for (size_t i = 3; i < 76; ++i)
{
@ -2987,12 +2904,10 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf99386)
goToCell("A1:B1");
dispatchCommand(mxComponent, ".uno:ToggleMergeCells", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("0"), pDoc->GetString(ScAddress(1, 1, 0)));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("This"), pDoc->GetString(ScAddress(1, 0, 0)));
@ -3052,7 +2967,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf152014)
goToCell("A1");
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// Create a second document
mxComponent2 = loadFromDesktop("private:factory/scalc");
@ -3061,7 +2975,6 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf152014)
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xFrames->getCount());
dispatchCommand(mxComponent2, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
ScModelObj* pModelObj2 = comphelper::getFromUnoTunnel<ScModelObj>(mxComponent2);
CPPUNIT_ASSERT(pModelObj2);

2
sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
View file

@ -131,7 +131,6 @@ void LOKitSearchTest::lcl_search(const OUString& rKey, bool bFindAll, bool bBack
}));
dispatchCommand(mxComponent, ".uno:ExecuteSearch", aPropertyValues);
Scheduler::ProcessEventsToIdle();
}
void LOKitSearchTest::lcl_replace(const OUString& rKey, const OUString& rReplace, bool bAll)
@ -147,7 +146,6 @@ void LOKitSearchTest::lcl_replace(const OUString& rKey, const OUString& rReplace
}));
dispatchCommand(mxComponent, ".uno:ExecuteSearch", aPropertyValues);
Scheduler::ProcessEventsToIdle();
}
namespace

33
sd/qa/unit/tiledrendering/tiledrendering.cxx
View file

@ -573,7 +573,6 @@ void SdTiledRenderingTest::testUndoShells()
{"AttributePageSize.Height", uno::Any(static_cast<sal_Int32>(10000))},
}));
dispatchCommand(mxComponent, ".uno:AttributePageSize", aPropertyValues);
Scheduler::ProcessEventsToIdle();
// Assert that view shell ID tracking works for SdUndoAction subclasses.
SdDrawDocument* pDocument = pXImpressDocument->GetDoc();
@ -732,7 +731,6 @@ void SdTiledRenderingTest::testInsertTable()
}));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
// get the table
sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell();
@ -758,7 +756,6 @@ void SdTiledRenderingTest::testDeleteTable()
}));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell();
SdrView* pSdrView = pViewShell->GetView();
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
@ -1663,8 +1660,6 @@ void SdTiledRenderingTest::testTdf104405()
uno::Sequence aArgs{ comphelper::makePropertyValue("PersistentCopy", true) };
dispatchCommand(mxComponent, ".uno:FormatPaintbrush", aArgs);
Scheduler::ProcessEventsToIdle();
// now click on the table
pView->MarkObj(pTableObject, pView->GetSdrPageView());
pTableObject->setActiveCell(sdr::table::CellPos(0,0));
@ -1755,7 +1750,6 @@ void SdTiledRenderingTest::testTdf105502()
// Grow font size for the selection.
dispatchCommand(mxComponent, ".uno:Grow", {});
Scheduler::ProcessEventsToIdle();
// Assert that the selected A1 has now a larger font than the unselected
// A2.
@ -1805,7 +1799,6 @@ void SdTiledRenderingTest::testCommentCallbacks()
{"Text", uno::Any(OUString("Comment"))},
});
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Add' action
CPPUNIT_ASSERT_EQUAL(std::string("Add"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
@ -1830,7 +1823,6 @@ void SdTiledRenderingTest::testCommentCallbacks()
{"Text", uno::Any(OUString("Reply to comment"))},
});
dispatchCommand(mxComponent, ".uno:ReplyToAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Modify' action
CPPUNIT_ASSERT_EQUAL(std::string("Modify"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
@ -1855,7 +1847,6 @@ void SdTiledRenderingTest::testCommentCallbacks()
{"Text", uno::Any(OUString("Edited comment"))},
});
dispatchCommand(mxComponent, ".uno:EditAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Modify' action
CPPUNIT_ASSERT_EQUAL(std::string("Modify"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
@ -1873,7 +1864,6 @@ void SdTiledRenderingTest::testCommentCallbacks()
{"Id", uno::Any(OUString::number(nComment1))},
});
dispatchCommand(mxComponent, ".uno:DeleteAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
// We received a LOK_CALLBACK_COMMENT callback with comment 'Remove' action
CPPUNIT_ASSERT_EQUAL(std::string("Remove"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
@ -1905,7 +1895,6 @@ void SdTiledRenderingTest::testCommentChangeImpress()
{"Text", uno::Any(OUString("Comment"))},
});
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(std::string("Add"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
@ -1923,7 +1912,6 @@ void SdTiledRenderingTest::testCommentChangeImpress()
{"PositionY", uno::Any(sal_Int32(20))}
});
dispatchCommand(mxComponent, ".uno:EditAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(std::string("Modify"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
CPPUNIT_ASSERT_EQUAL(std::string("Comment"), aView1.m_aCommentCallbackResult.get<std::string>("text"));
@ -1953,7 +1941,6 @@ void SdTiledRenderingTest::testCommentChangeDraw()
{"Text", uno::Any(OUString("Comment"))},
});
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(std::string("Add"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
@ -1971,7 +1958,6 @@ void SdTiledRenderingTest::testCommentChangeDraw()
{"PositionY", uno::Any(sal_Int32(20))}
});
dispatchCommand(mxComponent, ".uno:EditAnnotation", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(std::string("Modify"), aView1.m_aCommentCallbackResult.get<std::string>("action"));
CPPUNIT_ASSERT_EQUAL(std::string("Comment"), aView1.m_aCommentCallbackResult.get<std::string>("text"));
@ -2004,7 +1990,6 @@ void SdTiledRenderingTest::testMultiViewInsertDeletePage()
// Insert slide in 1st view
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:InsertPage", aArgs);
Scheduler::ProcessEventsToIdle();
// See if the current slide number changed in 2nd view too
SfxLokHelper::setView(nView2);
@ -2013,7 +1998,6 @@ void SdTiledRenderingTest::testMultiViewInsertDeletePage()
// Delete the page in 1st view now
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:DeletePage", aArgs);
Scheduler::ProcessEventsToIdle();
// See if current slide number changed in 2nd view too
SfxLokHelper::setView(nView2);
@ -2067,7 +2051,6 @@ void SdTiledRenderingTest::testMultiViewInsertDeletePage2()
// Insert slide in 1st view
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:InsertPage", aArgs);
Scheduler::ProcessEventsToIdle();
// See if the current slide number changed in 2nd view too
SfxLokHelper::setView(nView2);
@ -2076,7 +2059,6 @@ void SdTiledRenderingTest::testMultiViewInsertDeletePage2()
// Delete the page in 1st view now
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:DeletePage", aArgs);
Scheduler::ProcessEventsToIdle();
// See if current slide number changed in 2nd view too
SfxLokHelper::setView(nView2);
@ -2251,7 +2233,6 @@ void SdTiledRenderingTest::testLanguageAllText()
{ "Language", uno::Any(OUString("Default_English (USA)")) },
});
dispatchCommand(mxComponent, ".uno:LanguageStatus", aArgs);
Scheduler::ProcessEventsToIdle();
// Assert that the shape text language was changed.
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
@ -2344,7 +2325,6 @@ void SdTiledRenderingTest::testTdf115783()
{ "FontHeight.Height", uno::Any(static_cast<float>(12)) },
});
dispatchCommand(mxComponent, ".uno:FontHeight", aArgs);
Scheduler::ProcessEventsToIdle();
// Create a text selection on the B1 cell.
pTableObject->setActiveCell(sdr::table::CellPos(1, 0));
@ -2357,11 +2337,9 @@ void SdTiledRenderingTest::testTdf115783()
// Copy selection, paste at the start of the cell.
aArgs = {};
dispatchCommand(mxComponent, ".uno:Copy", aArgs);
Scheduler::ProcessEventsToIdle();
rEditView.SetSelection(ESelection(0, 0, 0, 0));
aArgs = {};
dispatchCommand(mxComponent, ".uno:Paste", aArgs);
Scheduler::ProcessEventsToIdle();
pView->SdrEndTextEdit();
// And now verify that the cell has the correct font size.
@ -2421,7 +2399,6 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
// Copy some text
dispatchCommand(mxComponent, ".uno:Copy", uno::Sequence<beans::PropertyValue>());
Scheduler::ProcessEventsToIdle();
pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::ESCAPE);
pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::ESCAPE);
@ -2429,7 +2406,6 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
// Paste onto the slide
dispatchCommand(mxComponent, ".uno:Paste", uno::Sequence<beans::PropertyValue>());
Scheduler::ProcessEventsToIdle();
pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::ESCAPE);
pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::ESCAPE);
@ -2528,7 +2504,6 @@ void SdTiledRenderingTest::testCutSelectionChange()
// Cut the selected text
dispatchCommand(mxComponent, ".uno:Cut", uno::Sequence<beans::PropertyValue>());
Scheduler::ProcessEventsToIdle();
// Selection is removed
CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(0), m_aSelection.size());
@ -2558,7 +2533,6 @@ void SdTiledRenderingTest::testRegenerateDiagram()
// regenerate diagram
dispatchCommand(mxComponent, ".uno:RegenerateDiagram", uno::Sequence<beans::PropertyValue>());
Scheduler::ProcessEventsToIdle();
// diagram content (child shape count) should be the same as in the beginning
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), pActualPage->GetObj(0)->GetSubList()->GetObjCount());
@ -2575,7 +2549,6 @@ void SdTiledRenderingTest::testInsertDeletePageInvalidation()
aView1.m_bTilesInvalidated = false;
aView1.m_aInvalidations.clear();
dispatchCommand(mxComponent, ".uno:InsertPage", uno::Sequence<beans::PropertyValue>());
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView1.m_bTilesInvalidated);
CPPUNIT_ASSERT_EQUAL(9, pXImpressDocument->getParts());
CPPUNIT_ASSERT_EQUAL(size_t(9), aView1.m_aInvalidations.size());
@ -2584,7 +2557,6 @@ void SdTiledRenderingTest::testInsertDeletePageInvalidation()
aView1.m_bTilesInvalidated = false;
aView1.m_aInvalidations.clear();
dispatchCommand(mxComponent, ".uno:DeletePage", uno::Sequence<beans::PropertyValue>());
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView1.m_bTilesInvalidated);
CPPUNIT_ASSERT_EQUAL(8, pXImpressDocument->getParts());
CPPUNIT_ASSERT_EQUAL(size_t(8), aView1.m_aInvalidations.size());
@ -2633,7 +2605,6 @@ void SdTiledRenderingTest::testSlideDuplicateUndo()
// Duplicate the first slide on view 1 and undo it.
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:DuplicatePage", {});
Scheduler::ProcessEventsToIdle();
pXImpressDocument->setPart(0, /*bAllowChangeFocus=*/false);
pXImpressDocument->setPart(1, /*bAllowChangeFocus=*/false);
SfxLokHelper::setView(nView0);
@ -2699,7 +2670,6 @@ void SdTiledRenderingTest::testMoveShapeHandle()
{"NewPosY", uno::Any(y+1)}
}));
dispatchCommand(mxComponent, ".uno:MoveShapeHandle", aPropertyValues);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
CPPUNIT_ASSERT_EQUAL(x-1, oldX);
@ -2723,13 +2693,10 @@ void SdTiledRenderingTest::testPasteUndo()
ESelection aWordSelection(0, 0, 0, 1); // "w" of "world"
rEditView.SetSelection(aWordSelection);
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
// When undoing a paste:
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// Then make sure the cursor position is still at the beginning:
ESelection aSelection = rEditView.GetSelection();

46
sd/qa/unit/uiimpress.cxx
View file

@ -162,7 +162,6 @@ void SdUiImpressTest::lcl_search(const OUString& rKey, bool bFindAll, bool bBack
}));
dispatchCommand(mxComponent, ".uno:ExecuteSearch", aPropertyValues);
Scheduler::ProcessEventsToIdle();
}
CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf111522)
@ -265,7 +264,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf124708)
createSdImpressDoc("tdf124708.ppt");
dispatchCommand(mxComponent, ".uno:NextPage", {});
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(2);
@ -275,16 +273,13 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf124708)
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(16), pActualPage->GetObjCount());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Delete", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), pActualPage->GetObjCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(16), pActualPage->GetObjCount());
}
@ -389,16 +384,12 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf139996)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:MovePageUp", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:MovePageDown", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:MovePageTop", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:MovePageBottom", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, rPageSelector.GetSelectedPageCount());
}
@ -443,7 +434,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf126605)
createSdImpressDoc();
dispatchCommand(mxComponent, ".uno:InsertPage", {});
Scheduler::ProcessEventsToIdle();
insertStringToObject(0, u"Test", /*bUseEscape*/ false);
@ -470,13 +460,11 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf126605)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:ParaRightToLeft", {});
Scheduler::ProcessEventsToIdle();
xPropSet->getPropertyValue("WritingMode") >>= nWritingMode;
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, nWritingMode);
dispatchCommand(mxComponent, ".uno:ParaLeftToRight", {});
Scheduler::ProcessEventsToIdle();
xPropSet->getPropertyValue("WritingMode") >>= nWritingMode;
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, nWritingMode);
@ -487,15 +475,12 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf100950)
createSdImpressDoc();
dispatchCommand(mxComponent, ".uno:InsertPage", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:InsertPage", {});
Scheduler::ProcessEventsToIdle();
insertStringToObject(0, u"Test", /*bUseEscape*/ true);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
sd::slidesorter::SlideSorterViewShell* pSSVS = getSlideSorterViewShell();
auto& rSSController = pSSVS->GetSlideSorter().GetController();
@ -510,15 +495,12 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf129346)
createSdImpressDoc();
dispatchCommand(mxComponent, ".uno:DiaMode", {});
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(1);
dispatchCommand(mxComponent, ".uno:InsertPage", {});
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(2);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(1);
}
@ -536,7 +518,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testmoveSlides)
{ "IsPageObj", uno::Any(false) } }));
dispatchCommand(mxComponent, ".uno:InsertPage", aArgs);
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(2);
CPPUNIT_ASSERT_EQUAL(OUString("Test 1"), pViewShell->GetActualPage()->GetName());
@ -547,7 +528,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testmoveSlides)
{ "IsPageObj", uno::Any(false) } });
dispatchCommand(mxComponent, ".uno:InsertPage", aArgs);
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(3);
CPPUNIT_ASSERT_EQUAL(OUString("Test 2"), pViewShell->GetActualPage()->GetName());
@ -556,7 +536,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testmoveSlides)
for (size_t i = 2; i > 0; --i)
{
dispatchCommand(mxComponent, ".uno:MovePageUp", {});
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(i);
CPPUNIT_ASSERT_EQUAL(OUString("Test 2"), pViewShell->GetActualPage()->GetName());
}
@ -565,20 +544,17 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testmoveSlides)
for (size_t i = 2; i < 4; ++i)
{
dispatchCommand(mxComponent, ".uno:MovePageDown", {});
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(i);
CPPUNIT_ASSERT_EQUAL(OUString("Test 2"), pViewShell->GetActualPage()->GetName());
}
// Move slide 'Test 2' to the top
dispatchCommand(mxComponent, ".uno:MovePageFirst", {});
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(1);
CPPUNIT_ASSERT_EQUAL(OUString("Test 2"), pViewShell->GetActualPage()->GetName());
// Move slide 'Test 2' to the bottom
dispatchCommand(mxComponent, ".uno:MovePageLast", {});
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(3);
CPPUNIT_ASSERT_EQUAL(OUString("Test 2"), pViewShell->GetActualPage()->GetName());
}
@ -612,52 +588,42 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf148620)
uno::Sequence<beans::PropertyValue> aArgs(
comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(sal_Int32(0)) } }));
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nsix\nFive"), xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nsix\nFour\nFive"), xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nsix\nThree\nFour\nFive"), xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nsix\nTwo\nThree\nFour\nFive"), xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineUp", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"six\nOne\nTwo\nThree\nFour\nFive"), xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nsix\nTwo\nThree\nFour\nFive"), xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nsix\nThree\nFour\nFive"), xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nsix\nFour\nFive"), xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nsix\nFive"), xShape->getString());
dispatchCommand(mxComponent, ".uno:OutlineDown", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(u"One\nTwo\nThree\nFour\nFive\nsix"), xShape->getString());
}
@ -672,7 +638,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf141703)
{ { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
// Move to A1 using Alt + Tab and write 'A'
for (int i = 0; i < 3; i++)
@ -728,12 +693,10 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf127481)
{ { "Rows", uno::Any(sal_Int32(1)) }, { "Columns", uno::Any(sal_Int32(1)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), pActualPage->GetObjCount());
dispatchCommand(mxComponent, ".uno:DuplicatePage", aArgs);
Scheduler::ProcessEventsToIdle();
checkCurrentPageNumber(2);
@ -859,7 +822,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf38669)
uno::Sequence<beans::PropertyValue> aArgs(
comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1) } }));
dispatchCommand(mxComponent, ".uno:BasicShapes.rectangle", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
@ -894,7 +856,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf151417)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Edit", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDrawPage->getCount());
}
@ -909,7 +870,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf123841)
uno::Sequence<beans::PropertyValue> aArgs(
comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1) } }));
dispatchCommand(mxComponent, ".uno:Rect_Unfilled", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
@ -996,13 +956,11 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testCharColorTheme)
xController->select(uno::Any(xShape));
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Text", {});
Scheduler::ProcessEventsToIdle();
auto pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
sd::ViewShell* pViewShell = pImpressDocument->GetDocShell()->GetViewShell();
SdrView* pView = pViewShell->GetView();
CPPUNIT_ASSERT(pView->IsTextEdit());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
// When picking a theme color on the sidebar:
uno::Sequence<beans::PropertyValue> aColorArgs = {
@ -1012,7 +970,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testCharColorTheme)
comphelper::makePropertyValue("ColorLumOff", static_cast<sal_Int16>(8000)),
};
dispatchCommand(mxComponent, ".uno:Color", aColorArgs);
Scheduler::ProcessEventsToIdle();
// Then make sure the theme "metadata" is set in the document model:
pView->EndTextEditCurrentView();
@ -1059,7 +1016,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testFillColorTheme)
comphelper::makePropertyValue("ColorLumOff", static_cast<sal_Int16>(6000)),
};
dispatchCommand(mxComponent, ".uno:FillColor", aColorArgs);
Scheduler::ProcessEventsToIdle();
// Then make sure the theme index is not lost when the sidebar sets it:
{
@ -1135,7 +1091,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf148810)
CPPUNIT_ASSERT_EQUAL(sal_Int16(0), nNumberingLevel);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
nNumberingLevel = -1;
xPropSet->getPropertyValue("NumberingLevel") >>= nNumberingLevel;
@ -1151,7 +1106,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf127696)
createSdImpressDoc();
dispatchCommand(mxComponent, ".uno:InsertPage", {});
Scheduler::ProcessEventsToIdle();
insertStringToObject(0, u"Test", /*bUseEscape*/ false);
dispatchCommand(mxComponent, ".uno:SelectAll", {});

2
sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
View file

@ -334,7 +334,6 @@ CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend)
// Undo second change
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("He heard quiet steps behind him. "),
getParagraph(1)->getString());
CPPUNIT_ASSERT_EQUAL(OUString("That didn't bode well. Who could be following him this late at "
@ -351,7 +350,6 @@ CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend)
// Undo first change
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(2),
pDoc->getOnlineAccessibilityCheck()->getNumberOfAccessibilityIssues());
CPPUNIT_ASSERT_EQUAL(

2
sw/qa/extras/layout/layout.cxx
View file

@ -3704,7 +3704,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testKeepWithNextPlusFlyFollowTextFlow)
}
dispatchCommand(mxComponent, ".uno:Fieldnames", {});
Scheduler::ProcessEventsToIdle();
{
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
@ -3722,7 +3721,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testKeepWithNextPlusFlyFollowTextFlow)
}
dispatchCommand(mxComponent, ".uno:Fieldnames", {});
Scheduler::ProcessEventsToIdle();
{
xmlDocUniquePtr pXmlDoc = parseLayoutDump();

4
sw/qa/extras/tiledrendering/tiledrendering.cxx
View file

@ -1252,7 +1252,6 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testUndoReordering)
// When view 1 presses undo:
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// Then make sure view 1's last undo action is invoked, out of order:
// Without the accompanying fix in place, this test would have failed with:
@ -1302,11 +1301,9 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testUndoReorderingRedo)
// When view 1 presses undo, twice:
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// First just s(econd) is erased:
CPPUNIT_ASSERT_EQUAL(OUString("f"), pTextNode1->GetText());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// Then make sure view 1's undo actions are invoked, out of order:
// Without the accompanying fix in place, this test would have failed with:
@ -1356,7 +1353,6 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testUndoReorderingMulti)
// When view 1 presses undo:
SfxLokHelper::setView(nView1);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// Then make sure view 1's undo action is invoked, out of order:
// Without the accompanying fix in place, this test would have failed with:

2
sw/qa/extras/uiwriter/uiwriter.cxx
View file

@ -1488,7 +1488,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf137532)
CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, getProperty<float>(xCursor, "CharWeight"));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
xCursor.set(xText->createTextCursorByRange(getRun(getParagraph(1), 1)));
CPPUNIT_ASSERT(xCursor.is());
@ -1500,7 +1499,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf137532)
CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, getProperty<float>(xCursor, "CharWeight"));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
xCursor.set(xText->createTextCursorByRange(getRun(getParagraph(1), 1)));
CPPUNIT_ASSERT(xCursor.is());

16
sw/qa/extras/uiwriter/uiwriter2.cxx
View file

@ -445,7 +445,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134250)
// this would crash in 2 different ways
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
@ -455,13 +454,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134250)
xTextContent->getAnchor()->getString());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
@ -469,7 +466,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134250)
xTextContent->getAnchor()->getString());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
@ -505,14 +501,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134436)
// first, the section doesn't get deleted
dispatchCommand(mxComponent, ".uno:Delete", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
CPPUNIT_ASSERT_EQUAL(OUString(""), pWrtShell->GetCursor()->GetText());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
@ -520,14 +514,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134436)
// second, the section does get deleted because point is at the end
dispatchCommand(mxComponent, ".uno:Delete", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount());
CPPUNIT_ASSERT_EQUAL(OUString(""), pWrtShell->GetCursor()->GetText());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
@ -535,21 +527,18 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134436)
// the problem was that the section was not deleted on Redo
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount());
CPPUNIT_ASSERT_EQUAL(OUString(""), pWrtShell->GetCursor()->GetText());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
CPPUNIT_ASSERT_EQUAL(OUString("a\nb\n"), pWrtShell->GetCursor()->GetText());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount());
@ -580,7 +569,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134252)
xCursor->getString());
dispatchCommand(mxComponent, ".uno:Delete", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
@ -588,7 +576,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134252)
// this would crash
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xSections->getCount());
@ -596,14 +583,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134252)
xCursor->getString());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
CPPUNIT_ASSERT_EQUAL(OUString(""), xCursor->getString());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xSections->getCount());
@ -611,7 +596,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf134252)
xCursor->getString());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());

99
sw/qa/extras/uiwriter/uiwriter3.cxx
View file

@ -47,17 +47,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf145731)
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(9, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
@ -70,36 +67,29 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf147199)
CPPUNIT_ASSERT_EQUAL(7, getShapes());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(7, getShapes());
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(14, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(7, getShapes());
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(7, getShapes());
}
@ -111,16 +101,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf139843)
int nPages = getPages();
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(nPages, getPages());
}
@ -131,10 +118,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf146848)
createSwDoc("tdf77014.odt");
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess> xFieldsAccess(
@ -144,7 +129,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf146848)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
xFields = xFieldsAccess->createEnumeration();
@ -165,29 +149,24 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf149507)
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
@ -198,7 +177,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf114973)
createSwDoc("tdf114973.fodt");
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
SwDoc* const pDoc = getSwDoc();
SwWrtShell* const pWrtShell = pDoc->GetDocShell()->GetWrtShell();
@ -206,18 +184,15 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf114973)
CPPUNIT_ASSERT(!pWrtShell->IsInHeaderFooter());
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// check that hidden paragraphs at start and end are deleted
dispatchCommand(mxComponent, ".uno:Delete", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(int(1), getParagraphs());
CPPUNIT_ASSERT_EQUAL(OUString(), getParagraph(1)->getString());
// check that hidden paragraphs at start and end are copied
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(int(3), getParagraphs());
CPPUNIT_ASSERT_EQUAL(OUString("hidden first paragraph"), getParagraph(1)->getString());
@ -235,17 +210,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf145321)
CPPUNIT_ASSERT_EQUAL(3, getPages());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(3, getShapes());
CPPUNIT_ASSERT_EQUAL(3, getPages());
@ -696,15 +668,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf138482)
CPPUNIT_ASSERT_EQUAL(2, getShapes());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Delete", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(2, getShapes());
}
@ -720,16 +689,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134965)
for (sal_Int32 i = 0; i < 10; ++i)
{
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
}
@ -747,11 +713,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf128375)
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have crashed cutting the second document
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
}
@ -768,15 +732,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135061)
CPPUNIT_ASSERT_EQUAL(4, getShapes());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
for (sal_Int32 i = 0; i < 5; ++i)
{
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
}
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xIndexAccess->getCount());
@ -786,7 +747,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135061)
{
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
}
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
@ -828,12 +788,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132911)
CPPUNIT_ASSERT_EQUAL(8, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(4, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(0, getShapes());
@ -848,18 +806,15 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132911)
CPPUNIT_ASSERT_EQUAL(8, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(4, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(0, getShapes());
//tdf#135247: Without the fix in place, this would have crashed
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(4, getShapes());
}
@ -911,7 +866,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf124904)
// remove the first word "Heading" (with change tracking) to update the referenced text
dispatchCommand(mxComponent, ".uno:DelToEndOfWord", {});
Scheduler::ProcessEventsToIdle();
// This was "Reference to Heading of document file"
CPPUNIT_ASSERT_EQUAL(OUString("Reference to of example document "),
@ -919,7 +873,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf124904)
// don't hide the wholly deleted referenced text
dispatchCommand(mxComponent, ".uno:DelToEndOfLine", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("Reference to Heading of example document file"),
getParagraph(2)->getString());
}
@ -952,22 +905,18 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134404)
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:InsertPagebreak", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(2, getPages());
dispatchCommand(mxComponent, ".uno:SwBackspace", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, the image would have been deleted
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
@ -996,15 +945,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132321)
CPPUNIT_ASSERT_EQUAL(1, getShapes());
dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:SwBackspace", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, the button form would have also been deleted
CPPUNIT_ASSERT_EQUAL(1, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
}
@ -1048,11 +994,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132597)
{ { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(1, getPages());
@ -1076,11 +1020,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf139737)
{ { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
}
CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf150845)
@ -1092,7 +1034,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf150845)
uno::Sequence<beans::PropertyValue> aArgs(
comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1) } }));
dispatchCommand(mxComponent, ".uno:Edit", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
}
@ -1213,7 +1154,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf144840)
{ { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
@ -1248,7 +1188,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf131963)
{ { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have crashed here
@ -1274,11 +1213,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132596)
{ { "SelectedFormat", uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
@ -1322,15 +1259,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf133967)
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
for (sal_Int32 i = 0; i < 10; ++i)
{
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
}
// Without the fix in place, this test would have failed with:
@ -1383,27 +1317,22 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130094)
pWrtShell->Down(/*bSelect=*/true);
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("First"), getParagraph(1)->getString());
CPPUNIT_ASSERT_EQUAL(OUString("Second"), getParagraph(2)->getString());
CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(3)->getString());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("First"), getParagraph(1)->getString());
CPPUNIT_ASSERT_EQUAL(OUString("Second"), getParagraph(2)->getString());
CPPUNIT_ASSERT_EQUAL(OUString("Third"), getParagraph(3)->getString());
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("First"), getParagraph(1)->getString());
CPPUNIT_ASSERT_EQUAL(OUString("Second"), getParagraph(2)->getString());
@ -1660,17 +1589,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf141175)
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
//Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(1, getPages());
@ -1720,7 +1646,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126504)
xTransfer->Copy();
dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {});
Scheduler::ProcessEventsToIdle();
TransferableDataHelper aHelper(xTransfer);
SwTransferable::Paste(*pWrtShell, aHelper);
@ -1730,20 +1655,17 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126504)
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(1, getPages());
//Without the fix in place, it would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(1, getPages());
@ -1799,7 +1721,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134253)
//Without the fix in place, it would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(6, getPages());
@ -1863,9 +1784,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf140975)
// Set the Anchor of the shape to As_Char
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:SetAnchorToChar", {});
Scheduler::ProcessEventsToIdle();
// Get the layout of the textbox
auto pExportDump = parseLayoutDump();
@ -1967,10 +1886,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf140828)
uno::Reference<beans::XPropertySet> ShpProps(xShp, uno::UNO_QUERY_THROW);
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:SetAnchorAtChar", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(
text::TextContentAnchorType::TextContentAnchorType_AT_CHARACTER,
@ -1995,11 +1912,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725)
CPPUNIT_ASSERT_EQUAL(OUString("AA"), getParagraph(1)->getString());
dispatchCommand(mxComponent, ".uno:GoToEndOfPara", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:SwBackspace", {});
dispatchCommand(mxComponent, ".uno:SwBackspace", {});
Scheduler::ProcessEventsToIdle();
// tdf#137587 fly is no longer deleted by backspace
CPPUNIT_ASSERT_EQUAL(1, getShapes());
@ -2007,14 +1922,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725)
dispatchCommand(mxComponent, ".uno:Undo", {});
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(OUString("AA"), getParagraph(1)->getString());
dispatchCommand(mxComponent, ".uno:Redo", {});
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
// tdf#137587 fly is no longer deleted by backspace
CPPUNIT_ASSERT_EQUAL(1, getShapes());
@ -2022,7 +1935,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725)
//Without the fix in place, it would crash here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
CPPUNIT_ASSERT_EQUAL(OUString("A"), getParagraph(1)->getString());
@ -2202,13 +2114,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134021)
dispatchCommand(mxComponent, ".uno:JumpToNextTable", {});
dispatchCommand(mxComponent, ".uno:DeleteTable", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Without the fix in place, it would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(12, getPages());
@ -2227,13 +2137,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf136778)
dispatchCommand(mxComponent, ".uno:JumpToNextTable", {});
dispatchCommand(mxComponent, ".uno:DeleteTable", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Without the fix in place, it would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(1, getPages());
@ -2250,7 +2158,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf123285)
". Here is a short sentence demonstrating this very peculiar bug."));
dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {});
Scheduler::ProcessEventsToIdle();
pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN);
Scheduler::ProcessEventsToIdle();
@ -2342,11 +2249,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130685)
dispatchCommand(mxComponent, ".uno:Undo", {});
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
@ -2358,11 +2263,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132944)
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:Delete", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getPages());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, the document would have had 2 pages
CPPUNIT_ASSERT_EQUAL(1, getPages());
@ -2376,12 +2279,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf104649)
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:Delete", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getPages());
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("Test"), getParagraph(1)->getString());
}

10
sw/qa/extras/uiwriter/uiwriter4.cxx
View file

@ -137,10 +137,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf146449)
CPPUNIT_ASSERT(pShell->SelectObj(Point(), 0, pObject));
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
uno::Reference<beans::XPropertySet> xShapeProps(xTextBox, uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xFrameProps(xShapeProps->getPropertyValue("TextBoxContent"),
@ -1286,7 +1284,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRedlineParam)
uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
{ { "NextTrackedChange", uno::Any(o3tl::narrowing<sal_uInt16>(rTable[0]->GetId())) } }));
dispatchCommand(mxComponent, ".uno:NextTrackedChange", aPropertyValues);
Scheduler::ProcessEventsToIdle();
SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
// This failed: the parameter wasn't handled so the next change (zzz) was
// selected, not the first one (aaa).
@ -1297,7 +1294,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRedlineParam)
aPropertyValues = comphelper::InitPropertySequence(
{ { "NextTrackedChange", uno::Any(o3tl::narrowing<sal_uInt16>(rTable[1]->GetId())) } });
dispatchCommand(mxComponent, ".uno:NextTrackedChange", aPropertyValues);
Scheduler::ProcessEventsToIdle();
pShellCursor = pWrtShell->getShellCursor(false);
CPPUNIT_ASSERT_EQUAL(OUString("zzz"), pShellCursor->GetText());
@ -1306,7 +1302,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRedlineParam)
aPropertyValues = comphelper::InitPropertySequence(
{ { "RejectTrackedChange", uno::Any(o3tl::narrowing<sal_uInt16>(rTable[1]->GetId())) } });
dispatchCommand(mxComponent, ".uno:RejectTrackedChange", aPropertyValues);
Scheduler::ProcessEventsToIdle();
pShellCursor = pWrtShell->getShellCursor(false);
// This was 'middlezzz', the uno command rejected the redline under the
@ -1460,7 +1455,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testLandscape)
uno::Sequence<beans::PropertyValue> aPropertyValues(
comphelper::InitPropertySequence({ { "AttributePage.Landscape", uno::Any(true) } }));
dispatchCommand(mxComponent, ".uno:AttributePage", aPropertyValues);
Scheduler::ProcessEventsToIdle();
// Assert that the document model was modified.
SwDocShell* pDocShell = pDoc->GetDocShell();
@ -1769,7 +1763,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTableRemoveHasTextChangesOnly2)
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, /*bBasicCall=*/false);
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:AcceptTrackedChange", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
// Accepting tracked insertion results still 4 rows, but less redlines
@ -1786,7 +1779,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTableRemoveHasTextChangesOnly2)
// To check Undo of HasTextChangesOnly reject the same row results 3 rows
dispatchCommand(mxComponent, ".uno:Escape", {});
dispatchCommand(mxComponent, ".uno:RejectTrackedChange", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
// This was 4 (lost HasTextChangesOnly)
@ -1820,7 +1812,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf147182_AcceptAllChangesInTableSelec
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:AcceptTrackedChange", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
// Accepting tracked changes in the selected table results 3 rows
@ -1840,7 +1831,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf147182_AcceptAllChangesInTableSelec
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:RejectTrackedChange", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
// This was 4 (only text changes of the first selected cell were rejected)

14
sw/qa/extras/uiwriter/uiwriter5.cxx
View file

@ -1972,7 +1972,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf151657)
// accept all tracked changes
dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
@ -1994,10 +1993,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testSelectRowWithNestedTable)
// select table row
dispatchCommand(mxComponent, ".uno:EntireRow", {});
Scheduler::ProcessEventsToIdle();
// convert selected text content to uppercase
dispatchCommand(mxComponent, ".uno:ChangeCaseToUpper", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
@ -2029,7 +2026,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf47979_row)
// convert selected text content to uppercase
dispatchCommand(mxComponent, ".uno:ChangeCaseToUpper", {});
Scheduler::ProcessEventsToIdle();
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
assertXPathContent(pXmlDoc, "//page[1]//body/tab/row[1]/cell[1]/txt[1]", "a1");
@ -2066,7 +2062,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf47979_column)
// convert selected text content to uppercase
dispatchCommand(mxComponent, ".uno:ChangeCaseToUpper", {});
Scheduler::ProcessEventsToIdle();
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
@ -3102,7 +3097,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf93747)
{ { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
pWrtSh->Insert("Col1");
@ -3162,7 +3156,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf93747)
getProperty<OUString>(getParagraphOfText(1, xCellB1->getText()), "ParaStyleName"));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(
OUString("Table Contents"),
@ -3173,7 +3166,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf93747)
getProperty<OUString>(getParagraphOfText(1, xCellB1->getText()), "ParaStyleName"));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(
OUString("Table Contents"),
@ -3194,7 +3186,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151)
{ { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
pWrtSh->Insert("Col1");
@ -3224,7 +3215,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151)
pWrtSh->Right(SwCursorSkipMode::Chars, /*bSelect=*/true, 1, /*bBasicCall=*/false);
dispatchCommand(mxComponent, ".uno:DefaultNumbering", {});
Scheduler::ProcessEventsToIdle();
// B1 should now have a numbering style, but A1 should not be affected.
OUString sNumStyleB1
@ -3237,7 +3227,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151)
// Toggle it back off
dispatchCommand(mxComponent, ".uno:DefaultNumbering", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_MESSAGE(
"Cell B1 must be able to toggle numbering on and off.",
@ -3250,7 +3239,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151)
// Toggle on bullet numbering
dispatchCommand(mxComponent, ".uno:DefaultBullet", {});
Scheduler::ProcessEventsToIdle();
// sanity check - both cells have bullets turned on.
OUString sNumStyleA1
@ -3266,7 +3254,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151)
// Toggle off bullet numbering
dispatchCommand(mxComponent, ".uno:DefaultBullet", {});
Scheduler::ProcessEventsToIdle();
// B1 should now have removed all numbering, while A1 should still have the bullet.
CPPUNIT_ASSERT(
@ -3279,7 +3266,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf145151)
// Toggle it back on
dispatchCommand(mxComponent, ".uno:DefaultBullet", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(
!getProperty<OUString>(getParagraphOfText(1, xCellB1->getText()), "NumberingStyleName")

16
sw/qa/extras/uiwriter/uiwriter6.cxx
View file

@ -120,7 +120,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf116640)
comphelper::InitPropertySequence({ { "Columns", uno::Any(sal_Int32(2)) } }));
dispatchCommand(mxComponent, ".uno:InsertSection", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Reference<text::XTextSectionsSupplier> xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xSections(xTextSectionsSupplier->getTextSections(),
@ -134,17 +133,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf116640)
CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xTextColumns->getColumnCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSections->getCount());
}
@ -919,7 +915,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf147181_TrackedMovingOfMultipleTable
// accept changes results 1 table (removing moved table)
dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {});
Scheduler::ProcessEventsToIdle();
uno::Reference<container::XIndexAccess> xTables2(xTablesSupplier->getTextTables(),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables2->getCount());
@ -2248,15 +2243,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testNestedGroupTextBoxCopyCrash)
createSwDoc("tdf149550.docx");
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
// This crashed here before the fix.
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_ESCAPE);
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_MESSAGE("Where is the doc, it crashed, isn't it?!", mxComponent);
@ -2289,13 +2281,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testCrashOnExit)
// Remove the textbox
dispatchCommand(mxComponent, ".uno:RemoveTextBox", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(false, xProperties->getPropertyValue("TextBox").get<bool>());
// Readd the textbox (to run the textboxhelper::create() method)
dispatchCommand(mxComponent, ".uno:AddTextBox", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(true, xProperties->getPropertyValue("TextBox").get<bool>());
@ -2335,7 +2325,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf151828_Comment2)
uno::Sequence<beans::PropertyValue> aArgs(
comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1) } }));
dispatchCommand(mxComponent, ".uno:BasicShapes", aArgs);
Scheduler::ProcessEventsToIdle();
auto xBasicShape = getShape(1);
auto pObject = SdrObject::getSdrObjectFromXShape(xBasicShape);
@ -2347,12 +2336,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf151828_Comment2)
// cut and paste it
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
@ -2385,11 +2372,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf151828)
// cut and paste the table
dispatchCommand(mxComponent, ".uno:SelectTable", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
// move cursor into the pasted table
CPPUNIT_ASSERT(pWrtShell->MoveTable(GotoPrevTable, fnTableStart));

3
sw/qa/extras/uiwriter/uiwriter7.cxx
View file

@ -2469,7 +2469,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf138873)
CPPUNIT_ASSERT_EQUAL(OUString("A DDD C"), getParagraph(1)->getString());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("A B C"), getParagraph(1)->getString());
@ -2477,10 +2476,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf138873)
pWrtShell->Right(SwCursorSkipMode::Chars, /*bSelect=*/true, 2, /*bBasicCall=*/false);
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have failed with
// - Expected: A B C

96
sw/qa/extras/uiwriter/uiwriter8.cxx
View file

@ -111,14 +111,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf132420)
CPPUNIT_ASSERT_EQUAL(12, getShapes());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
//Without the fix in place, 1 frame and 1 image would be gone and getShapes would return 10
CPPUNIT_ASSERT_EQUAL(12, getShapes());
@ -140,7 +137,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf132744)
CPPUNIT_ASSERT_EQUAL(1, getShapes());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
rtl::Reference<SwTransferable> xTransfer = new SwTransferable(*pWrtShell);
xTransfer->Cut();
@ -183,14 +179,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf146622)
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:DeleteRows", {});
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xTable1->getRows()->getCount());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:DeleteRows", {});
// This was 2 (deleting the already deleted table with change tracking)
@ -391,7 +385,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf141391)
// remove the selection and positionate the cursor at beginning of A2
pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, /*bBasicCall=*/false);
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
// 3-row, overwriting cells of the second row and inserting a new row
@ -427,7 +420,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf141391)
// insert the table, as a nested one in cell "A2"
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "/root/page[1]/body/tab/row", 2);
@ -437,7 +429,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf141391)
// Undo
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
// 2 rows again, no copied text content
@ -451,7 +442,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf141391)
pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, /*bBasicCall=*/false);
pWrtShell->Insert("and some text again in the first paragraph to be sure...");
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
@ -485,7 +475,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148791)
pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 1, /*bBasicCall=*/false);
pWrtShell->Up(/*bSelect=*/false);
dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {});
Scheduler::ProcessEventsToIdle();
xmlDocUniquePtr pXmlDoc = parseLayoutDump();
// Paste as Rows Above results 4-row table with default table alignment
@ -523,7 +512,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148791)
pWrtShell->Up(/*bSelect=*/false);
pWrtShell->Up(/*bSelect=*/false);
dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
@ -551,7 +539,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148791)
for (int i = 0; i < 7 + 4; ++i)
pWrtShell->Up(/*bSelect=*/false);
dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
@ -576,7 +563,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf148791)
for (int i = 0; i < 15 + 4 * 2; ++i)
pWrtShell->Up(/*bSelect=*/false);
dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pXmlDoc = parseLayoutDump();
@ -595,7 +581,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf135014)
// Toggle Numbering List
dispatchCommand(mxComponent, ".uno:DefaultBullet", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Sequence<beans::PropertyValue> aArgs2(comphelper::InitPropertySequence(
{ { "Param", uno::Any(OUString("NewNumberingStyle")) },
@ -603,7 +588,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf135014)
// New Style from selection
dispatchCommand(mxComponent, ".uno:StyleNewByExample", aArgs2);
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have failed here
reload("Office Open XML Text", "tdf135014.docx");
@ -621,7 +605,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf130629)
comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1) } }));
dispatchCommand(mxComponent, ".uno:BasicShapes.diamond", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
@ -637,7 +620,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf130629)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:BasicShapes.diamond", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
}
@ -702,32 +684,25 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf140731)
for (sal_Int32 i = 0; i < 8; ++i)
{
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
}
dispatchCommand(mxComponent, ".uno:GoToStartOfDoc", {});
Scheduler::ProcessEventsToIdle();
// Format->Text operations on small selections (which would generate <~500 redlines)
// changetracking still working
dispatchCommand(mxComponent, ".uno:TrackChanges", {});
Scheduler::ProcessEventsToIdle();
SwCursorShell* pShell(pDoc->GetEditShell());
pShell->SelectTextModel(1, 500);
dispatchCommand(mxComponent, ".uno:ChangeCaseToTitleCase", {});
Scheduler::ProcessEventsToIdle();
SwEditShell* const pEditShell(pDoc->GetEditShell());
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(120),
@ -735,15 +710,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf140731)
//Removing all the redlines.
dispatchCommand(mxComponent, ".uno:RejectAllTrackedChanges", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(0), pEditShell->GetRedlineCount());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:ChangeCaseToTitleCase", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, on big selections writer would freeze. Now it ignores change tracking.
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(0), pEditShell->GetRedlineCount());
@ -752,7 +724,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf140731)
CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Lorem Ipsum Dolor Sit Amet"));
dispatchCommand(mxComponent, ".uno:ChangeCaseToUpper", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("LOREM IPSUM DOLOR SIT AMET"));
}
@ -837,7 +808,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf146248)
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xPageStyle, "HeaderIsOn"));
}
@ -847,15 +817,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf152964)
createSwDoc();
dispatchCommand(mxComponent, ".uno:TrackChanges", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
Scheduler::ProcessEventsToIdle();
uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
{ { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(),
@ -871,27 +838,22 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf152964)
dispatchCommand(mxComponent, ".uno:GoDown", {});
dispatchCommand(mxComponent, ".uno:DeleteRows", {});
dispatchCommand(mxComponent, ".uno:DeleteRows", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(2), pEditShell->GetRedlineCount());
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(1), pEditShell->GetRedlineCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(0), pEditShell->GetRedlineCount());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(1), pEditShell->GetRedlineCount());
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(2), pEditShell->GetRedlineCount());
}
@ -907,7 +869,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf107427)
{ { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
xmlDocUniquePtr pLayout = parseLayoutDump();
assertXPath(pLayout, "/root/page[1]/header/tab/row", 2);
@ -922,7 +883,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf107427)
assertXPath(pLayout, "/root/page[1]/header", 0);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
discardDumpedLayout();
pLayout = parseLayoutDump();
@ -1044,7 +1004,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf131771)
{ { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(),
@ -1087,7 +1046,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf80663)
{ { "Rows", uno::Any(sal_Int32(2)) }, { "Columns", uno::Any(sal_Int32(2)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(),
@ -1098,14 +1056,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf80663)
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getColumns()->getCount());
dispatchCommand(mxComponent, ".uno:DeleteRows", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTextTable->getRows()->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getColumns()->getCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getRows()->getCount());
@ -1171,7 +1127,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121031)
{ { "Rows", uno::Any(sal_Int32(3)) }, { "Columns", uno::Any(sal_Int32(3)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(),
@ -1179,11 +1134,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121031)
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
dispatchCommand(mxComponent, ".uno:DeleteTable", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
// Without the fix in place, the table would be hidden
@ -1224,10 +1177,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121546)
CPPUNIT_ASSERT_EQUAL(OUString("xxxxxxxxxxxxxxxxxxxx"), getParagraph(2)->getString());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
@ -1235,25 +1186,20 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf121546)
createSwDoc();
dispatchCommand(mxComponent, ".uno:Paste", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("xxxxxxxxxxxxxxxxxxxx"), getParagraph(2)->getString());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Cut", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("xxxxxxxxxxxxxxxxxxxx"), getParagraph(2)->getString());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
@ -1317,12 +1263,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf134626)
CPPUNIT_ASSERT_EQUAL(OUString("AppleApple"), getParagraph(1)->getString());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString("Apple"), getParagraph(1)->getString());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString());
}
@ -1338,7 +1282,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf139566)
{ { "Rows", uno::Any(sal_Int32(1)) }, { "Columns", uno::Any(sal_Int32(1)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
// Move the cursor outside the table
pWrtSh->Down(/*bSelect=*/false);
@ -1348,19 +1291,16 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf139566)
CPPUNIT_ASSERT_EQUAL(OUString("Test"), getParagraph(2)->getString());
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
uno::Reference<frame::XFrames> xFrames = mxDesktop->getFrames();
sal_Int32 nFrames = xFrames->getCount();
// Create a second window so the first window looses focus
dispatchCommand(mxComponent, ".uno:NewWindow", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(nFrames + 1, xFrames->getCount());
dispatchCommand(mxComponent, ".uno:CloseWin", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(nFrames, xFrames->getCount());
@ -1380,7 +1320,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf96067)
{ { "Rows", uno::Any(sal_Int32(3)) }, { "Columns", uno::Any(sal_Int32(3)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(),
@ -1392,14 +1331,12 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf96067)
dispatchCommand(mxComponent, ".uno:SelectTable", {});
dispatchCommand(mxComponent, ".uno:InsertRowsBefore", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xTextTable->getRows()->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTextTable->getColumns()->getCount());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTextTable->getRows()->getCount());
@ -1431,7 +1368,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf87199)
dispatchCommand(mxComponent, ".uno:EntireColumn", {});
dispatchCommand(mxComponent, ".uno:MergeCells", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTextTable->getRows()->getCount());
@ -1440,7 +1376,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf87199)
CPPUNIT_ASSERT(xCellA1->getString().endsWith("test2"));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getRows()->getCount());
@ -1492,7 +1427,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf146573)
// remove redlines, add a footnote, and change the value
// of the cell with the footnote
dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {});
Scheduler::ProcessEventsToIdle();
pWrtShell->Right(SwCursorSkipMode::Cells, /*bSelect=*/false, /*nCount=*/1,
/*bBasicCall=*/false);
dispatchCommand(mxComponent, ".uno:InsertFootnote", {});
@ -1671,7 +1605,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf150576)
// restore deleted rows
dispatchCommand(mxComponent, ".uno:Undo", {});
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
SwNode& rNode5 = pWrtShell->GetCursor()->GetPoint()->GetNode();
CPPUNIT_ASSERT_EQUAL(OUString("Row 2"), rNode5.GetTextNode()->GetText());
@ -1698,14 +1631,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf132603)
= comphelper::InitPropertySequence({ { "Text", uno::Any(OUString("Comment")) } });
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aPropertyValues);
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:SelectAll", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, it would crash here
dispatchCommand(mxComponent, ".uno:Copy", {});
Scheduler::ProcessEventsToIdle();
tools::JsonWriter aJsonWriter;
pTextDoc->getPostIts(aJsonWriter);
@ -1731,7 +1661,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf117601)
{ { "Rows", uno::Any(sal_Int32(5)) }, { "Columns", uno::Any(sal_Int32(3)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(),
@ -1754,7 +1683,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf117601)
dispatchCommand(mxComponent, ".uno:EntireColumn", {});
dispatchCommand(mxComponent, ".uno:MergeCells", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xTextTable->getRows()->getCount());
@ -1763,7 +1691,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf117601)
CPPUNIT_ASSERT(xCellB1->getString().endsWith("test2"));
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xTextTable->getRows()->getCount());
@ -1783,18 +1710,15 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf138130)
//select shape and change the anchor
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, this test would have crashed here
dispatchCommand(mxComponent, ".uno:SetAnchorToPage", {});
Scheduler::ProcessEventsToIdle();
//position has changed
CPPUNIT_ASSERT(aPos.X < xShape->getPosition().X);
CPPUNIT_ASSERT(aPos.Y < xShape->getPosition().Y);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(aPos.X, xShape->getPosition().X);
CPPUNIT_ASSERT_EQUAL(aPos.Y, xShape->getPosition().Y);
@ -1811,17 +1735,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf136385)
//select shape and change the anchor
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:SetAnchorToPage", {});
Scheduler::ProcessEventsToIdle();
//position has changed
CPPUNIT_ASSERT(aPos.X < xShape->getPosition().X);
CPPUNIT_ASSERT(aPos.Y < xShape->getPosition().Y);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
//Without the fix in place, this test would have failed with
//- Expected: 2447
@ -1840,7 +1761,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf145207)
//select one shape and use the TAB key to iterate over the different shapes
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
Scheduler::ProcessEventsToIdle();
for (sal_Int32 i = 0; i < 10; ++i)
{
@ -1866,7 +1786,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf128782)
//select shape 2 and move it down
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
Scheduler::ProcessEventsToIdle();
pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_DOWN);
Scheduler::ProcessEventsToIdle();
@ -1878,7 +1797,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf128782)
CPPUNIT_ASSERT(aPos[1].Y < xShape2->getPosition().Y);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(aPos[0].X, xShape1->getPosition().X);
CPPUNIT_ASSERT_EQUAL(aPos[0].Y, xShape1->getPosition().Y);
@ -1905,7 +1823,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf135623)
//select shape 1 and move it down
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
Scheduler::ProcessEventsToIdle();
pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_DOWN);
Scheduler::ProcessEventsToIdle();
@ -1917,7 +1834,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf135623)
CPPUNIT_ASSERT_EQUAL(aPos[1].Y, xShape2->getPosition().Y);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(aPos[0].X, xShape1->getPosition().X);
CPPUNIT_ASSERT_EQUAL(aPos[0].Y, xShape1->getPosition().Y);
@ -1969,7 +1885,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf133490)
//select shape 2 and move it to the right
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
Scheduler::ProcessEventsToIdle();
for (sal_Int32 i = 0; i < 5; ++i)
{
@ -1986,7 +1901,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf133490)
for (sal_Int32 i = 0; i < 4; ++i)
{
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
// Without the fix in place, undo action would have changed shape1's position
// and this test would have failed with
@ -1999,7 +1913,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf133490)
}
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(aPos[0].X, xShape1->getPosition().X);
CPPUNIT_ASSERT_EQUAL(aPos[0].Y, xShape1->getPosition().Y);
@ -2008,17 +1921,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf133490)
CPPUNIT_ASSERT_EQUAL(aPos[1].Y, xShape2->getPosition().Y);
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(0, getShapes());
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getShapes());
}
@ -2243,7 +2153,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf143244)
for (sal_Int32 i = 0; i < 5; ++i)
{
dispatchCommand(mxComponent, ".uno:Undo", {});
Scheduler::ProcessEventsToIdle();
}
xTextTable.set(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
@ -2253,7 +2162,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf143244)
for (sal_Int32 i = 0; i < 5; ++i)
{
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
}
xTextTable.set(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
@ -2394,7 +2302,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf138897)
dispatchCommand(mxComponent, ".uno:Redo", {});
dispatchCommand(mxComponent, ".uno:Undo", {});
dispatchCommand(mxComponent, ".uno:Redo", {});
Scheduler::ProcessEventsToIdle();
}
CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf136740)
@ -2430,7 +2337,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf136740)
{ { "SelectedFormat",
css::uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
CPPUNIT_ASSERT_EQUAL(OUString("FooFoo"), xParagraph->getString());
@ -2450,7 +2356,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf128106)
const auto aPropertyValues
= comphelper::InitPropertySequence({ { "FileName", css::uno::Any(maTempFile.GetURL()) } });
dispatchCommand(mxComponent, ".uno:NewGlobalDoc", aPropertyValues);
Scheduler::ProcessEventsToIdle();
mxComponent = loadFromDesktop(maTempFile.GetURL());
@ -2585,7 +2490,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf151462)
createSwDoc("tdf151462.odt");
// xmlDocUniquePtr pLayout = parseLayoutDump();
dispatchCommand(mxComponent, ".uno:UpdateAllIndexes", {});
Scheduler::ProcessEventsToIdle();
xmlDocUniquePtr pLayout = parseLayoutDump();
// tdf#151462 - without the fix in place, there would be just the first index entry

1
unotest/Library_unotest.mk
View file

@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_libraries,unotest,\
sb \
tl \
utl \
vcl \
))
$(eval $(call gb_Library_use_externals,unotest,\

6
unotest/source/cpp/macros_test.cxx
View file

@ -30,6 +30,7 @@
#include <tools/datetime.hxx>
#include <unotools/tempfile.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/scheduler.hxx>
using namespace css;
@ -90,7 +91,10 @@ MacrosTest::dispatchCommand(const uno::Reference<lang::XComponent>& xComponent,
uno::Reference<frame::XDispatchHelper> xDispatchHelper(frame::DispatchHelper::create(xContext));
CPPUNIT_ASSERT(xDispatchHelper.is());
return xDispatchHelper->executeDispatch(xFrame, rCommand, OUString(), 0, rPropertyValues);
auto ret = xDispatchHelper->executeDispatch(xFrame, rCommand, OUString(), 0, rPropertyValues);
Scheduler::ProcessEventsToIdle();
return ret;
}
std::unique_ptr<SvStream> MacrosTest::parseExportStream(const OUString& url,