diff options
| author | Henry Castro <hcastro@collabora.com> | 2018-01-09 22:17:23 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2018-01-18 20:55:56 +0100 |
| commit | 252ce90e39648c47bcfdb39547d0ac82bacdbae6 (patch) | |
| tree | e3cd98634c37a73859eb4e8839310f10c6345e0d /sw/qa | |
| parent | 494297afe3a14d9aeef6b54515b7dceff5e1cc5f (diff) | |
sw lokit: add page syles to header & footer
Change-Id: I3c0b0603d1e03f1cc19af4324dd2b909320d9d4a
Reviewed-on: https://gerrit.libreoffice.org/47687
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 | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 3dd1335e50f9..3a9c1c6f9985 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -23,6 +23,7 @@ #include <editeng/editview.hxx> #include <editeng/outliner.hxx> #include <svl/srchitem.hxx> +#include <svl/slstitm.hxx> #include <drawdoc.hxx> #include <ndtxt.hxx> #include <wrtsh.hxx> @@ -1944,11 +1945,19 @@ namespace { void checkPageHeaderOrFooter(const SfxViewShell* pViewShell, sal_uInt16 nWhich, bool bValue) { + uno::Sequence<OUString> aSeq; const SfxPoolItem* pState = nullptr; pViewShell->GetDispatcher()->QueryState(nWhich, pState); - const SfxBoolItem* pBoolItem = dynamic_cast<const SfxBoolItem*>(pState); - CPPUNIT_ASSERT(pBoolItem); - CPPUNIT_ASSERT_EQUAL(bValue, pBoolItem->GetValue()); + const SfxStringListItem* pListItem = dynamic_cast<const SfxStringListItem*>(pState); + CPPUNIT_ASSERT(pListItem); + pListItem->GetStringList(aSeq); + if (bValue) + { + CPPUNIT_ASSERT_EQUAL(1, aSeq.getLength()); + CPPUNIT_ASSERT_EQUAL(OUString("Default Style"), aSeq[0]); + } + else + CPPUNIT_ASSERT_EQUAL(0, aSeq.getLength()); }; } @@ -1963,16 +1972,18 @@ void SwTiledRenderingTest::testPageHeader() checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEHEADER, false); // Insert Page Header { + SfxStringItem aStyle(FN_INSERT_PAGEHEADER, "Default Style"); SfxBoolItem aItem(FN_PARAM_1, true); - pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEHEADER, SfxCallMode::SYNCHRON, {&aItem}); + pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEHEADER, SfxCallMode::API | SfxCallMode::SYNCHRON, {&aStyle, &aItem}); } // Check Page Header State checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEHEADER, true); // Remove Page Header { + SfxStringItem aStyle(FN_INSERT_PAGEHEADER, "Default Style"); SfxBoolItem aItem(FN_PARAM_1, false); - pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEHEADER, SfxCallMode::SYNCHRON, {&aItem}); + pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEHEADER, SfxCallMode::API | SfxCallMode::SYNCHRON, {&aStyle, &aItem}); } // Check Page Header State checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEHEADER, false); @@ -1992,16 +2003,18 @@ void SwTiledRenderingTest::testPageFooter() checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEFOOTER, false); // Insert Page Footer { + SfxStringItem aPageStyle(FN_INSERT_PAGEFOOTER, "Default Style"); SfxBoolItem aItem(FN_PARAM_1, true); - pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEFOOTER, SfxCallMode::SYNCHRON, {&aItem}); + pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEFOOTER, SfxCallMode::API | SfxCallMode::SYNCHRON, {&aPageStyle, &aItem}); } // Check Page Footer State checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEFOOTER, true); // Remove Page Footer { + SfxStringItem aPageStyle(FN_INSERT_PAGEFOOTER, "Default Style"); SfxBoolItem aItem(FN_PARAM_1, false); - pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEFOOTER, SfxCallMode::SYNCHRON, {&aItem}); + pViewShell->GetDispatcher()->ExecuteList(FN_INSERT_PAGEFOOTER, SfxCallMode::API | SfxCallMode::SYNCHRON, {&aPageStyle, &aItem}); } // Check Footer State checkPageHeaderOrFooter(pViewShell, FN_INSERT_PAGEFOOTER, false); |