diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-11 13:01:32 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-11 14:32:40 +0200 |
commit | e588aa4d347875eb4c52bd2b51c5c917f807ba6d (patch) | |
tree | 449516f28c32cc3ae6adf1a822e46fa60a949e9c /sd/qa/unit | |
parent | 4caacff9f25498c07d9b99fe0b5db82baa58a22c (diff) |
convert PageKind to scoped enum
Change-Id: I7f90cf2e96b72031bcfff558794e6cb42ea408e8
Diffstat (limited to 'sd/qa/unit')
-rw-r--r-- | sd/qa/unit/dialogs-test.cxx | 8 | ||||
-rw-r--r-- | sd/qa/unit/misc-tests.cxx | 8 | ||||
-rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index 9c6789ada794..b74ec922fa20 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -188,7 +188,7 @@ const SfxItemSet& SdDialogsTest::getSfxItemSetFromSdrObject() { SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); - SdPage* pSdPage = pDrawDoc->GetSdPage(0, PK_STANDARD); + SdPage* pSdPage = pDrawDoc->GetSdPage(0, PageKind::Standard); CPPUNIT_ASSERT(pSdPage); SdrObject* pSdrObj = pSdPage->GetObj(0); CPPUNIT_ASSERT(pSdrObj); @@ -401,7 +401,7 @@ VclAbstractDialog* SdDialogsTest::createDialogByID(sal_uInt32 nID) // CreateMorphDlg(vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) override; SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); - SdPage* pSdPage = pDrawDoc->GetSdPage(0, PK_STANDARD); + SdPage* pSdPage = pDrawDoc->GetSdPage(0, PageKind::Standard); CPPUNIT_ASSERT(pSdPage); SdrObject* pSdrObj = pSdPage->GetObj(0); // using one SdrObject is okay, none crashes @@ -566,7 +566,7 @@ VclAbstractDialog* SdDialogsTest::createDialogByID(sal_uInt32 nID) // CreateMasterLayoutDialog(vcl::Window* pParent, SdDrawDocument* pDoc, SdPage*) override; SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); - SdPage* pSdPage = pDrawDoc->GetSdPage(0, PK_STANDARD); + SdPage* pSdPage = pDrawDoc->GetSdPage(0, PageKind::Standard); CPPUNIT_ASSERT(pSdPage); pRetval = getSdAbstractDialogFactory()->CreateMasterLayoutDialog( Application::GetDefDialogParent(), @@ -585,7 +585,7 @@ VclAbstractDialog* SdDialogsTest::createDialogByID(sal_uInt32 nID) // cases SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); - SdPage* pSdPage = pDrawDoc->GetSdPage(0, PK_STANDARD); + SdPage* pSdPage = pDrawDoc->GetSdPage(0, PageKind::Standard); CPPUNIT_ASSERT(pSdPage); pRetval = getSdAbstractDialogFactory()->CreateHeaderFooterDialog( getViewShell(), diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index c25abc6ac6c4..b926c0dc562f 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -112,11 +112,11 @@ void SdMiscTest::testTdf96206() auto pSSVS = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase()); auto& rSSController = pSSVS->GetSlideSorter().GetController(); - const sal_uInt16 nMasterPageCnt1 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); + const sal_uInt16 nMasterPageCnt1 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::Standard); CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), nMasterPageCnt1); rSSController.GetClipboard().DoCopy(); rSSController.GetClipboard().DoPaste(); - const sal_uInt16 nMasterPageCnt2 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); + const sal_uInt16 nMasterPageCnt2 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::Standard); CPPUNIT_ASSERT_EQUAL(nMasterPageCnt1, nMasterPageCnt2); xDocSh->DoClose(); @@ -130,7 +130,7 @@ void SdMiscTest::testTdf96708() auto& rSSController = pSSVS->GetSlideSorter().GetController(); auto& rPageSelector = rSSController.GetPageSelector(); - const sal_uInt16 nMasterPageCnt1 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); + const sal_uInt16 nMasterPageCnt1 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::Standard); CPPUNIT_ASSERT_EQUAL(sal_uInt16(4), nMasterPageCnt1); rPageSelector.SelectAllPages(); rSSController.GetClipboard().DoCopy(); @@ -140,7 +140,7 @@ void SdMiscTest::testTdf96708() Scheduler::ProcessTaskScheduling(true); rSSController.GetClipboard().DoPaste(); - const sal_uInt16 nMasterPageCnt2 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); + const sal_uInt16 nMasterPageCnt2 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::Standard); CPPUNIT_ASSERT_EQUAL(nMasterPageCnt1, nMasterPageCnt2); xDocSh->DoClose(); diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 14dfb2a64244..c156615227f3 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -645,7 +645,7 @@ void SdTiledRenderingTest::testInsertDeletePage() }; // the document has 1 slide - CPPUNIT_ASSERT(pDoc->GetSdPageCount(PK_STANDARD) == 1); + CPPUNIT_ASSERT(pDoc->GetSdPageCount(PageKind::Standard) == 1); uno::Sequence<beans::PropertyValue> aArgs; @@ -716,7 +716,7 @@ void SdTiledRenderingTest::testInsertDeletePage() } // the document has 1 slide - CPPUNIT_ASSERT(pDoc->GetSdPageCount(PK_STANDARD) == 1); + CPPUNIT_ASSERT(pDoc->GetSdPageCount(PageKind::Standard) == 1); comphelper::LibreOfficeKit::setActive(false); } |