summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-11 13:01:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-11 14:32:40 +0200
commite588aa4d347875eb4c52bd2b51c5c917f807ba6d (patch)
tree449516f28c32cc3ae6adf1a822e46fa60a949e9c /sd/source/ui/func
parent4caacff9f25498c07d9b99fe0b5db82baa58a22c (diff)
convert PageKind to scoped enum
Change-Id: I7f90cf2e96b72031bcfff558794e6cb42ea408e8
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/fuconstr.cxx2
-rw-r--r--sd/source/ui/func/fuexpand.cxx8
-rw-r--r--sd/source/ui/func/fuinsfil.cxx6
-rw-r--r--sd/source/ui/func/fupage.cxx4
-rw-r--r--sd/source/ui/func/fuprlout.cxx8
-rw-r--r--sd/source/ui/func/fusldlg.cxx6
-rw-r--r--sd/source/ui/func/fusumry.cxx10
-rw-r--r--sd/source/ui/func/futempl.cxx2
8 files changed, 23 insertions, 23 deletions
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index c6d40c0ca0b4..77ffeb147903 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -317,7 +317,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
const bool bForceFillStyle, const bool bForceNoFillStyle )
{
SdPage* pPage = static_cast<SdPage*>(mpView->GetSdrPageView()->GetPage());
- if ( pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD &&
+ if ( pPage->IsMasterPage() && pPage->GetPageKind() == PageKind::Standard &&
mpDoc->GetDocumentType() == DocumentType::Impress )
{
/**********************************************
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index cc163dd7c8f8..29fecb25c25f 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -73,13 +73,13 @@ void FuExpandPage::DoExecute( SfxRequest& )
// find selected page (only standard pages)
SdPage* pActualPage = nullptr;
sal_uInt16 i = 0;
- sal_uInt16 nCount = mpDoc->GetSdPageCount(PK_STANDARD);
+ sal_uInt16 nCount = mpDoc->GetSdPageCount(PageKind::Standard);
while (!pActualPage && i < nCount)
{
- if (mpDoc->GetSdPage(i, PK_STANDARD)->IsSelected())
+ if (mpDoc->GetSdPage(i, PageKind::Standard)->IsSelected())
{
- pActualPage = mpDoc->GetSdPage(i, PK_STANDARD);
+ pActualPage = mpDoc->GetSdPage(i, PageKind::Standard);
}
i++;
@@ -162,7 +162,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
pActualNotesPage->GetUppBorder(),
pActualNotesPage->GetRgtBorder(),
pActualNotesPage->GetLwrBorder() );
- pNotesPage->SetPageKind(PK_NOTES);
+ pNotesPage->SetPageKind(PageKind::Notes);
pNotesPage->SetName(OUString());
// insert page after current page
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 00da1d6d9e1b..e634c9224383 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -363,11 +363,11 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
if (pPage && !pPage->IsMasterPage())
{
- if (pPage->GetPageKind() == PK_STANDARD)
+ if (pPage->GetPageKind() == PageKind::Standard)
{
nPos = pPage->GetPageNum() + 2;
}
- else if (pPage->GetPageKind() == PK_NOTES)
+ else if (pPage->GetPageKind() == PageKind::Notes)
{
nPos = pPage->GetPageNum() + 1;
}
@@ -577,7 +577,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
nPage++;
pPara = rDocliner.GetParagraph( nPos - 1 );
}
- SdPage* pPage = mpDoc->GetSdPage(nPage, PK_STANDARD);
+ SdPage* pPage = mpDoc->GetSdPage(nPage, PageKind::Standard);
aLayoutName = pPage->GetLayoutName();
sal_Int32 nIndex = aLayoutName.indexOf(SD_LT_SEPARATOR);
if( nIndex != -1 )
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 2ed902540658..611067403186 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -135,7 +135,7 @@ void FuPage::DoExecute( SfxRequest& )
{
mbMasterPage = mpDrawViewShell->GetEditMode() == EditMode::MasterPage;
// we don't really want to format page background with SID_ATTR_PAGE[_SIZE] slots
- mbDisplayBackgroundTabPage = ( mpDrawViewShell->GetPageKind() == PK_STANDARD) &&
+ mbDisplayBackgroundTabPage = ( mpDrawViewShell->GetPageKind() == PageKind::Standard) &&
( nSlotId != SID_ATTR_PAGE_SIZE) && ( nSlotId != SID_ATTR_PAGE );
mpPage = mpDrawViewShell->getCurrentPage();
}
@@ -375,7 +375,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
{
// But don't ask in notice-view, because we can't change the background of
// notice-masterpage (at the moment)
- if( ePageKind != PK_NOTES )
+ if( ePageKind != PageKind::Notes )
{
ScopedVclPtrInstance<MessageDialog> aQuestionBox(
pParent, SD_RESSTR(STR_PAGE_BACKGROUND_TXT),
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index edb39f5b8961..d3d78f3c8991 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -114,7 +114,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
for (auto it = xSelection->begin(); it != xSelection->end(); ++it)
{
SdPage *pPage = *it;
- if (pPage->IsSelected() || pPage->GetPageKind() != PK_STANDARD)
+ if (pPage->IsSelected() || pPage->GetPageKind() != PageKind::Standard)
continue;
mpDoc->SetSelected(pPage, true);
aUnselect.push_back(pPage);
@@ -126,9 +126,9 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
std::vector<SdPage*> aSelectedPages;
std::vector<sal_uInt16> aSelectedPageNums;
// determine the active pages
- for (sal_uInt16 nPage = 0; nPage < mpDoc->GetSdPageCount(PK_STANDARD); nPage++)
+ for (sal_uInt16 nPage = 0; nPage < mpDoc->GetSdPageCount(PageKind::Standard); nPage++)
{
- SdPage* pPage = mpDoc->GetSdPage(nPage, PK_STANDARD);
+ SdPage* pPage = mpDoc->GetSdPage(nPage, PageKind::Standard);
if (pPage->IsSelected())
{
aSelectedPages.push_back(pPage);
@@ -251,7 +251,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
{
sal_uInt16 nPgNum = pSelectedPage->TRG_GetMasterPage().GetPageNum();
- if (static_cast<DrawViewShell*>(mpViewShell)->GetPageKind() == PK_NOTES)
+ if (static_cast<DrawViewShell*>(mpViewShell)->GetPageKind() == PageKind::Notes)
nPgNum++;
pView->HideSdrPage();
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index cc4a6a347dee..07322ac2d3cf 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -61,15 +61,15 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
PresentationSettings& rPresentationSettings = mpDoc->getPresentationSettings();
SfxItemSet aDlgSet( mpDoc->GetPool(), ATTR_PRESENT_START, ATTR_PRESENT_END );
- std::vector<OUString> aPageNameList(mpDoc->GetSdPageCount( PK_STANDARD ));
+ std::vector<OUString> aPageNameList(mpDoc->GetSdPageCount( PageKind::Standard ));
const OUString& rPresPage = rPresentationSettings.maPresPage;
OUString aFirstPage;
SdPage* pPage = nullptr;
long nPage;
- for( nPage = mpDoc->GetSdPageCount( PK_STANDARD ) - 1L; nPage >= 0L; nPage-- )
+ for( nPage = mpDoc->GetSdPageCount( PageKind::Standard ) - 1L; nPage >= 0L; nPage-- )
{
- pPage = mpDoc->GetSdPage( (sal_uInt16) nPage, PK_STANDARD );
+ pPage = mpDoc->GetSdPage( (sal_uInt16) nPage, PageKind::Standard );
OUString aStr( pPage->GetName() );
if ( aStr.isEmpty() )
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index 072d34c67bab..9951ed9cb43e 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -67,14 +67,14 @@ void FuSummaryPage::DoExecute( SfxRequest& )
sal_uInt16 i = 0;
sal_uInt16 nFirstPage = SDRPAGE_NOTFOUND;
sal_uInt16 nSelectedPages = 0;
- sal_uInt16 nCount = mpDoc->GetSdPageCount(PK_STANDARD);
+ sal_uInt16 nCount = mpDoc->GetSdPageCount(PageKind::Standard);
while (i < nCount && nSelectedPages <= 1)
{
/* How many pages are selected?
exactly one: pool everything from this page
otherwise: only pool the selected pages */
- SdPage* pActualPage = mpDoc->GetSdPage(i, PK_STANDARD);
+ SdPage* pActualPage = mpDoc->GetSdPage(i, PageKind::Standard);
if (pActualPage->IsSelected())
{
@@ -95,11 +95,11 @@ void FuSummaryPage::DoExecute( SfxRequest& )
for (i = nFirstPage; i < nCount; i++)
{
- SdPage* pActualPage = mpDoc->GetSdPage(i, PK_STANDARD);
+ SdPage* pActualPage = mpDoc->GetSdPage(i, PageKind::Standard);
if (nSelectedPages <= 1 || pActualPage->IsSelected())
{
- SdPage* pActualNotesPage = mpDoc->GetSdPage(i, PK_NOTES);
+ SdPage* pActualNotesPage = mpDoc->GetSdPage(i, PageKind::Notes);
SdrTextObj* pTextObj = static_cast<SdrTextObj*>( pActualPage->GetPresObj(PRESOBJ_TITLE) );
if (pTextObj && !pTextObj->IsEmptyPresObj())
@@ -144,7 +144,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
pActualNotesPage->GetUppBorder(),
pActualNotesPage->GetRgtBorder(),
pActualNotesPage->GetLwrBorder() );
- pNotesPage->SetPageKind(PK_NOTES);
+ pNotesPage->SetPageKind(PageKind::Notes);
// insert page at the back
mpDoc->InsertPage(pNotesPage, nCount * 2 + 2);
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 02f8adcbf817..7c2ae80248e4 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -513,7 +513,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if( pDrawViewShell )
{
PageKind ePageKind = pDrawViewShell->GetPageKind();
- if( ePageKind == PK_NOTES || ePageKind == PK_HANDOUT )
+ if( ePageKind == PageKind::Notes || ePageKind == PageKind::Handout )
{
SdPage* pPage = mpViewShell->GetActualPage();