diff options
| author | Henry Castro <hcastro@collabora.com> | 2017-06-28 11:40:06 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2017-06-28 19:20:02 +0200 |
| commit | 6c6c3e9ea7255d411fbf950d6c5712b094f69436 (patch) | |
| tree | ebbb74a04a24e0d43c1bf8a85dc266a697e0cf83 /sw/qa | |
| parent | 0016602d20da3c60fb35dfaf0e6639cadbe64428 (diff) | |
sw lok: rename return values UNDO_CONFLICT to SID_REPAIRPACKAGE
To be consistent with sc, sd and sw
Change-Id: I273101de6e59be08eb61b1a77647bc1dd26ff387
Reviewed-on: https://gerrit.libreoffice.org/39369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/tiledrendering/tiledrendering.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index e719a368558e..8bf0f359c288 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -1684,7 +1684,7 @@ void SwTiledRenderingTest::testUndoRepairResult() SfxLokHelper::setView(nView2); comphelper::dispatchCommand(".uno:Undo", {}, xListener); Scheduler::ProcessEventsToIdle(); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SwUndoId::CONFLICT), pResult2->m_nDocRepair); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SID_REPAIRPACKAGE), pResult2->m_nDocRepair); mxComponent->dispose(); mxComponent.clear(); @@ -1719,7 +1719,7 @@ void SwTiledRenderingTest::testRedoRepairResult() SfxLokHelper::setView(nView2); comphelper::dispatchCommand(".uno:Redo", {}, xListener); Scheduler::ProcessEventsToIdle(); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SwUndoId::CONFLICT), pResult2->m_nDocRepair); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SID_REPAIRPACKAGE), pResult2->m_nDocRepair); mxComponent->dispose(); mxComponent.clear(); @@ -1740,9 +1740,8 @@ void checkUndoRepairStates(SwXTextDocument* pXTextDocument, SwView* pView1, SwVi // second view, undo conflict pView2->GetState(aItemSet2); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet2.GetItemState(SID_UNDO)); - const SfxUInt32Item *pSetItem = dynamic_cast<const SfxUInt32Item*>(aItemSet2.GetItem(SID_UNDO)); - CPPUNIT_ASSERT(pSetItem); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SwUndoId::CONFLICT), pSetItem->GetValue()); + CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item * >(aItemSet2.GetItem(SID_UNDO))); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SID_REPAIRPACKAGE), dynamic_cast< const SfxUInt32Item * >(aItemSet2.GetItem(SID_UNDO))->GetValue()); }; } @@ -1795,9 +1794,8 @@ void SwTiledRenderingTest::testDisableUndoRepair() // first view, undo conflict pView1->GetState(aItemSet1); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet1.GetItemState(SID_UNDO)); - const SfxUInt32Item *pSetItem = dynamic_cast<const SfxUInt32Item*>(aItemSet1.GetItem(SID_UNDO)); - CPPUNIT_ASSERT(pSetItem); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SwUndoId::CONFLICT), pSetItem->GetValue()); + CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item * >(aItemSet1.GetItem(SID_UNDO))); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SID_REPAIRPACKAGE), dynamic_cast< const SfxUInt32Item * >(aItemSet1.GetItem(SID_UNDO))->GetValue()); } // Insert a character in the first view. |