summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
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/view
parent1ddbbe3e0aebfa86f284ac2712c0d1b36b36fe54 (diff)
convert DocumentType to scoped enum
Change-Id: I5a66d71db075df4680c54676dd1420e94c1a90b2
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx4
-rw-r--r--sd/source/ui/view/Outliner.cxx2
-rw-r--r--sd/source/ui/view/drawview.cxx2
-rw-r--r--sd/source/ui/view/drviewsa.cxx2
-rw-r--r--sd/source/ui/view/frmview.cxx2
-rw-r--r--sd/source/ui/view/sdview3.cxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 359906e911f3..ffe12df25b60 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -165,7 +165,7 @@ namespace {
bool IsPrinterPreferred(DocumentType eDocType) const
{
- bool bIsDraw = eDocType == DOCUMENT_TYPE_DRAW;
+ bool bIsDraw = eDocType == DocumentType::Draw;
return IsTilePage() || IsPageSize() || IsBooklet() || (!bIsDraw && !IsNotes());
}
@@ -1163,7 +1163,7 @@ public:
, mpPrintView()
, mbHasOrientationWarningBeenShown(false)
{
- DialogCreator aCreator( mrBase, mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_IMPRESS, GetCurrentPageIndex() );
+ DialogCreator aCreator( mrBase, mrBase.GetDocShell()->GetDocumentType() == DocumentType::Impress, GetCurrentPageIndex() );
m_aUIProperties = aCreator.GetDialogControls();
maSlidesPerPage = aCreator.GetSlidesPerPage();
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 53c7f98a817a..930925c3b5f6 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1220,7 +1220,7 @@ bool Outliner::ShowWrapArroundDialog()
return false;
// The question text depends on the search direction.
- bool bImpress = mpDrawDocument && mpDrawDocument->GetDocumentType() == DOCUMENT_TYPE_IMPRESS;
+ bool bImpress = mpDrawDocument && mpDrawDocument->GetDocumentType() == DocumentType::Impress;
sal_uInt16 nStringId;
if (mbDirectionIsForward)
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index c170ee5e97df..f3da2e75ce24 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -464,7 +464,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sd
bool bStandardPaint = true;
SdDrawDocument* pDoc = mpDocShell->GetDoc();
- if( pDoc && pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS)
+ if( pDoc && pDoc->GetDocumentType() == DocumentType::Impress)
{
rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( pDoc ) );
if(xSlideshow.is() && xSlideshow->isRunning())
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 1d7c6d895142..3ce557923a26 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -277,7 +277,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
// Use configuration of FrameView
ReadFrameViewData(mpFrameView);
- if( eDocType == DOCUMENT_TYPE_DRAW )
+ if( eDocType == DocumentType::Draw )
{
SetHelpId( SD_IF_SDGRAPHICVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDGRAPHICVIEWSHELL );
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index b148ccffbbbb..52cfe4f277f7 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -529,7 +529,7 @@ void FrameView::ReadUserDataSequence ( const css::uno::Sequence < css::beans::Pr
if (nLength)
{
SdDrawDocument* pDrawDocument = dynamic_cast<SdDrawDocument*>(GetModel());
- const bool bImpress = pDrawDocument && pDrawDocument->GetDocumentType() == DOCUMENT_TYPE_IMPRESS;
+ const bool bImpress = pDrawDocument && pDrawDocument->GetDocumentType() == DocumentType::Impress;
bool bBool = false;
sal_Int32 nInt32 = 0;
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index e15d320cc6f2..29512e501254 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1521,7 +1521,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
bool View::PasteRTFTable( const ::tools::SvRef<SotStorageStream>& xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions )
{
- std::unique_ptr<SdDrawDocument> pModel(new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh ));
+ std::unique_ptr<SdDrawDocument> pModel(new SdDrawDocument( DocumentType::Impress, mpDocSh ));
pModel->NewOrLoadCompleted(NEW_DOC);
pModel->GetItemPool().SetDefaultMetric(MapUnit::Map100thMM);
pModel->InsertPage(pModel->AllocPage(false));