sw/qa/extras/tiledrendering/tiledrendering.cxx | 42 +++++++++++++------------
1 file changed, 23 insertions(+), 19 deletions(-)
New commits:
commit cb5746a45ef6b0f209395fea9ce3e7801a574697
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue May 30 09:44:19 2017 +0200
lambda -> function in anonymous namespace.
Change-Id: Id2243d445bed35a1561c03d84cfb7162b6b90cdf
Reviewed-on: https://gerrit.libreoffice.org/38189
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 38e131f0b8b8..ecd84826233f 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1726,6 +1726,27 @@ void SwTiledRenderingTest::testRedoRepairResult()
comphelper::LibreOfficeKit::setActive(false);
}
+namespace {
+
+void checkUndoRepairStates(SwXTextDocument* pXTextDocument, SwView* pView1,
SwView* pView2)
+{
+ SfxItemSet
aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
+ SfxItemSet
aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
+ // first view, undo enabled
+ pView1->GetState(aItemSet1);
+ CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet1.GetItemState(SID_UNDO));
+ const SfxUInt32Item *pUnsetItem = dynamic_cast<const
SfxUInt32Item*>(aItemSet1.GetItem(SID_UNDO));
+ CPPUNIT_ASSERT(!pUnsetItem);
+ // 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());
+};
+
+}
+
void SwTiledRenderingTest::testDisableUndoRepair()
{
comphelper::LibreOfficeKit::setActive();
@@ -1751,29 +1772,12 @@ void SwTiledRenderingTest::testDisableUndoRepair()
CPPUNIT_ASSERT_EQUAL(SfxItemState::DISABLED,
aItemSet2.GetItemState(SID_UNDO));
}
- auto fnCheckStates = [pXTextDocument, pView1, pView2]()
- {
- SfxItemSet
aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
- SfxItemSet
aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
- // first view, undo enabled
- pView1->GetState(aItemSet1);
- CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet1.GetItemState(SID_UNDO));
- const SfxUInt32Item *pUnsetItem = dynamic_cast<const
SfxUInt32Item*>(aItemSet1.GetItem(SID_UNDO));
- CPPUNIT_ASSERT(!pUnsetItem);
- // 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());
- };
-
// Insert a character in the first view.
SfxLokHelper::setView(nView1);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'k', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'k', 0);
Scheduler::ProcessEventsToIdle();
- fnCheckStates();
+ checkUndoRepairStates(pXTextDocument, pView1, pView2);
// Insert a character in the second view.
SfxLokHelper::setView(nView2);
@@ -1801,7 +1805,7 @@ void SwTiledRenderingTest::testDisableUndoRepair()
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'l', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'l', 0);
Scheduler::ProcessEventsToIdle();
- fnCheckStates();
+ checkUndoRepairStates(pXTextDocument, pView1, pView2);
mxComponent->dispose();
mxComponent.clear();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
