summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-11 12:21:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-11 14:32:40 +0200
commitd58c604eb35a84b849079d3a690d0a4f428d3121 (patch)
treee856015a5405cdea664ff8d4e5a75db3b7504898 /sd/source/ui/func
parent1ddbbe3e0aebfa86f284ac2712c0d1b36b36fe54 (diff)
convert DocumentType to scoped enum
Change-Id: I5a66d71db075df4680c54676dd1420e94c1a90b2
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/fuconstr.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx2
-rw-r--r--sd/source/ui/func/fuinsfil.cxx4
-rw-r--r--sd/source/ui/func/fupage.cxx2
-rw-r--r--sd/source/ui/func/fusldlg.cxx2
-rw-r--r--sd/source/ui/func/futempl.cxx2
-rw-r--r--sd/source/ui/func/futext.cxx4
7 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 770355a79f9b..c6d40c0ca0b4 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -318,7 +318,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
{
SdPage* pPage = static_cast<SdPage*>(mpView->GetSdrPageView()->GetPage());
if ( pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD &&
- mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS )
+ mpDoc->GetDocumentType() == DocumentType::Impress )
{
/**********************************************
* Objects was created on the slide master page
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 68a6f320218c..f605a5bfa25f 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -482,7 +482,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
case SID_INSERT_OBJECT :
{
aServerLst.FillInsertObjects();
- if (mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW)
+ if (mpDoc->GetDocumentType() == DocumentType::Draw)
{
aServerLst.Remove( GraphicDocShell::Factory().GetClassId() );
}
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 4deb00e9ac14..23cca70afc76 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -147,7 +147,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
aFileDialog.SetTitle( SD_RESSTR(STR_DLG_INSERT_PAGES_FROM_FILE) );
- if( mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS )
+ if( mpDoc->GetDocumentType() == DocumentType::Impress )
{
aOwnCont = "simpress";
aOtherCont = "sdraw";
@@ -170,7 +170,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
lcl_AddFilter( aFilterVector, pFilter );
// get template filter
- if( mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS )
+ if( mpDoc->GetDocumentType() == DocumentType::Impress )
pFilter = DrawDocShell::Factory().GetTemplateFilter();
else
pFilter = GraphicDocShell::Factory().GetTemplateFilter();
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 5b669d32646c..fd80f93c3b9e 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -263,7 +263,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
aNewAttr.Put( aULSpaceItem );
// Applikation
- bool bScale = mpDoc->GetDocumentType() != DOCUMENT_TYPE_DRAW;
+ bool bScale = mpDoc->GetDocumentType() != DocumentType::Draw;
aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ) );
bool bFullSize = mpPage->IsMasterPage() ?
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 8cf501bcb826..cc4a6a347dee 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -104,7 +104,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
aDlgSet.Put( SfxUInt32Item( ATTR_PRESENT_PAUSE_TIMEOUT, rPresentationSettings.mnPauseTimeout ) );
aDlgSet.Put( SfxBoolItem( ATTR_PRESENT_SHOW_PAUSELOGO, rPresentationSettings.mbShowPauseLogo ) );
- SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
+ SdOptions* pOptions = SD_MOD()->GetSdOptions(DocumentType::Impress);
aDlgSet.Put( SfxInt32Item( ATTR_PRESENT_DISPLAY, pOptions->GetDisplay() ) );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index a7a657239064..95dbd29d475d 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -241,7 +241,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
(pStyleSheet->GetFamily() == SD_STYLE_FAMILY_GRAPHICS && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS) ||
// allow if old was presentation and we are a drawing document
- (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) )
+ (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DocumentType::Draw) )
{
mpView->SetStyleSheet( static_cast<SfxStyleSheet*>(pStyleSheet));
mpDoc->SetChanged();
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 6ae69e7843b4..097f7727be4d 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -476,7 +476,7 @@ bool FuText::MouseMove(const MouseEvent& rMEvt)
void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
{
- if(mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS)
+ if(mpDoc->GetDocumentType() == DocumentType::Impress)
{
if( nSlotId == SID_ATTR_CHAR )
{
@@ -556,7 +556,7 @@ void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj)
void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
{
// Normal Textobject
- if (mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS)
+ if (mpDoc->GetDocumentType() == DocumentType::Impress)
{
if( nSlotId == SID_ATTR_CHAR )
{