summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-11 12:45:47 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-11 14:32:40 +0200
commit4caacff9f25498c07d9b99fe0b5db82baa58a22c (patch)
treef828aba3333c82e5becb56706cdfeb7ce7d0461a /sd/source/ui/func
parentd58c604eb35a84b849079d3a690d0a4f428d3121 (diff)
convert EditMode to scoped enum
Change-Id: I7c48978f3e2c173a2ec53eb6559745deeee9b93b
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/fuinsfil.cxx2
-rw-r--r--sd/source/ui/func/fuolbull.cxx2
-rw-r--r--sd/source/ui/func/fupage.cxx2
-rw-r--r--sd/source/ui/func/fuprlout.cxx2
-rw-r--r--sd/source/ui/func/futempl.cxx2
5 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 23cca70afc76..00da1d6d9e1b 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -466,7 +466,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
else
{
// is it a master page?
- if (static_cast<DrawViewShell*>(mpViewShell)->GetEditMode() == EM_MASTERPAGE &&
+ if (static_cast<DrawViewShell*>(mpViewShell)->GetEditMode() == EditMode::MasterPage &&
!pPage->IsMasterPage())
{
pPage = static_cast<SdPage*>(&(pPage->TRG_GetMasterPage()));
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index b4f250d958d1..8906e7a82fb3 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -158,7 +158,7 @@ void FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
const DrawViewShell* pDrawViewShell = dynamic_cast< DrawViewShell* >(mpViewShell);
//Init bullet level in "Customize" tab page in bullet dialog in master page view
- const bool bInMasterView = pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE;
+ const bool bInMasterView = pDrawViewShell && pDrawViewShell->GetEditMode() == EditMode::MasterPage;
if ( bInMasterView )
{
SdrObject* pObj = mpView->GetTextEditObject();
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index fd80f93c3b9e..2ed902540658 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -133,7 +133,7 @@ void FuPage::DoExecute( SfxRequest& )
if( mpDrawViewShell )
{
- mbMasterPage = mpDrawViewShell->GetEditMode() == EM_MASTERPAGE;
+ 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) &&
( nSlotId != SID_ATTR_PAGE_SIZE) && ( nSlotId != SID_ATTR_PAGE );
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index b10fb9882170..edb39f5b8961 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -94,7 +94,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
if (DrawViewShell *pShell = dynamic_cast<DrawViewShell*>(mpViewShell))
{
EditMode eEditMode = pShell->GetEditMode();
- if (eEditMode == EM_MASTERPAGE)
+ if (eEditMode == EditMode::MasterPage)
bOnMaster = true;
}
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 95dbd29d475d..02f8adcbf817 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -517,7 +517,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
{
SdPage* pPage = mpViewShell->GetActualPage();
- if(pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
+ if(pDrawViewShell->GetEditMode() == EditMode::MasterPage)
{
pPage = static_cast<SdPage*>((&(pPage->TRG_GetMasterPage())));
}