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/source/ui/app | |
parent | 4caacff9f25498c07d9b99fe0b5db82baa58a22c (diff) |
convert PageKind to scoped enum
Change-Id: I7f90cf2e96b72031bcfff558794e6cb42ea408e8
Diffstat (limited to 'sd/source/ui/app')
-rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/app/tmplctrl.cxx | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 3d0dbb846061..1dcaae801405 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -638,10 +638,10 @@ void OutlineToImpressFinalizer::operator() (bool) // Call UpdatePreview once for every slide to resync the // document with the outliner of the OutlineViewShell. - sal_uInt16 nPageCount (mrDocument.GetSdPageCount(PK_STANDARD)); + sal_uInt16 nPageCount (mrDocument.GetSdPageCount(PageKind::Standard)); for (sal_uInt16 nIndex=0; nIndex<nPageCount; nIndex++) { - SdPage* pPage = mrDocument.GetSdPage(nIndex, PK_STANDARD); + SdPage* pPage = mrDocument.GetSdPage(nIndex, PageKind::Standard); // Make the page the actual page so that the // following UpdatePreview() call accesses the // correct paragraphs. @@ -649,7 +649,7 @@ void OutlineToImpressFinalizer::operator() (bool) pOutlineShell->UpdatePreview(pPage, true); } // Select the first slide. - SdPage* pPage = mrDocument.GetSdPage(0, PK_STANDARD); + SdPage* pPage = mrDocument.GetSdPage(0, PageKind::Standard); pView->SetActualPage(pPage); pOutlineShell->UpdatePreview(pPage, true); } diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index ff7a727b5994..ebdbcd5c2c10 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -104,7 +104,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo nPgNum++; } - pPage = pViewSh->GetDoc()->GetSdPage( (sal_uInt16)nPgNum, PK_STANDARD ); + pPage = pViewSh->GetDoc()->GetSdPage( (sal_uInt16)nPgNum, PageKind::Standard ); } else { @@ -232,7 +232,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) { int nPgNum; - if( (pPage->GetPageKind() == PK_HANDOUT) && pViewSh ) + if( (pPage->GetPageKind() == PageKind::Handout) && pViewSh ) { nPgNum = pViewSh->GetPrintedHandoutPageNum(); } @@ -300,7 +300,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) if( !bMasterView ) { - if( pPage && (pPage->GetPageKind() == PK_HANDOUT) && pViewSh ) + if( pPage && (pPage->GetPageKind() == PageKind::Handout) && pViewSh ) { nPageCount = pViewSh->GetPrintedHandoutPageCount(); } @@ -499,7 +499,7 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) sal_Int32 nY; if( pDocSh ) { - SdrPage* pPage = static_cast<SdrPage*>(pDoc->GetSdPage(0, PK_STANDARD)); + SdrPage* pPage = static_cast<SdrPage*>(pDoc->GetSdPage(0, PageKind::Standard)); Size aSize(pPage->GetSize()); nW = aSize.Width(); nH = aSize.Height(); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index f84bf489ccc4..40a423ae2924 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -261,7 +261,7 @@ void SdTransferable::CreateData() { mbOwnView = true; - SdPage* pPage = mpSdDrawDocument->GetSdPage(0, PK_STANDARD); + SdPage* pPage = mpSdDrawDocument->GetSdPage(0, PageKind::Standard); if( 1 == pPage->GetObjCount() ) CreateObjectReplacement( pPage->GetObj( 0 ) ); @@ -302,7 +302,7 @@ void SdTransferable::CreateData() SdrModel* pOldModel = mpSdView->GetModel(); SdStyleSheetPool* pOldStylePool = static_cast<SdStyleSheetPool*>( pOldModel->GetStyleSheetPool() ); SdStyleSheetPool* pNewStylePool = static_cast<SdStyleSheetPool*>( mpSdDrawDocumentIntern->GetStyleSheetPool() ); - SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); + SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PageKind::Standard ); OUString aOldLayoutName( pOldPage->GetLayoutName() ); pPage->SetSize( pOldPage->GetSize() ); @@ -322,7 +322,7 @@ void SdTransferable::CreateData() mpSdDrawDocumentIntern && mpSdViewIntern && mpSdDrawDocumentIntern->GetPageCount() ) { - SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD ); + SdPage* pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PageKind::Standard ); if( 1 == mpSdDrawDocumentIntern->GetPageCount() ) { @@ -723,7 +723,7 @@ void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmar if( mpSdViewIntern ) { - SdPage* pPage = mpSdDrawDocument->GetSdPage( 0, PK_STANDARD ); + SdPage* pPage = mpSdDrawDocument->GetSdPage( 0, PageKind::Standard ); if( pPage ) { diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index c44eb1b69a83..ea5db97a6d64 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -106,12 +106,12 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) ScopedVclPtrInstance<SdTemplatePopup_Impl> aPop; { - const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD); + const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PageKind::Standard); sal_uInt16 nCount = 0; for( sal_uInt16 nPage = 0; nPage < nMasterCount; ++nPage ) { - SdPage* pMaster = pDoc->GetMasterSdPage(nPage, PK_STANDARD); + SdPage* pMaster = pDoc->GetMasterSdPage(nPage, PageKind::Standard); if( pMaster ) aPop->InsertItem( ++nCount, pMaster->GetName() ); } @@ -120,7 +120,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt ) sal_uInt16 nCurrId = aPop->GetCurId()-1; if( nCurrId < nMasterCount ) { - SdPage* pMaster = pDoc->GetMasterSdPage(nCurrId, PK_STANDARD); + SdPage* pMaster = pDoc->GetMasterSdPage(nCurrId, PageKind::Standard); SfxStringItem aStyle( ATTR_PRESLAYOUT_NAME, pMaster->GetName() ); pViewFrame->GetDispatcher()->ExecuteList( SID_PRESENTATION_LAYOUT, SfxCallMode::SLOT, { &aStyle }); |