From 9782438a5887c40246016c1f2b5fe12401d2c68d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 13 Apr 2015 11:28:49 +0200 Subject: convert SFX_VIEW constants to scoped enum Change-Id: I327dc1ec722fa9445f13fc5168ad646e272ba9d4 Reviewed-on: https://gerrit.libreoffice.org/15300 Tested-by: Noel Grandin Reviewed-by: Noel Grandin --- sw/source/uibase/uiview/pview.cxx | 2 +- sw/source/uibase/uiview/srcview.cxx | 3 +-- sw/source/uibase/uiview/view.cxx | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'sw') diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index fa80f75052a0..973cc9114358 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -101,7 +101,7 @@ void SwPagePreview::InitInterface_Impl() TYPEINIT1(SwPagePreview,SfxViewShell) -#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT|SFX_VIEW_HAS_PRINTOPTIONS ) +#define SWVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::HAS_PRINTOPTIONS ) #define MIN_PREVIEW_ZOOM 25 #define MAX_PREVIEW_ZOOM 600 diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 558210728968..48989d5b3ce0 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -98,8 +98,7 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::sfx2; using ::com::sun::star::util::SearchOptions; -#define SWSRCVIEWFLAGS ( SFX_VIEW_CAN_PRINT|\ - SFX_VIEW_NO_NEWWINDOW ) +#define SWSRCVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::NO_NEWWINDOW ) #define SRC_SEARCHOPTIONS (0xFFFF & ~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL)) diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index bc929053961c..16e497b5c848 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -119,8 +119,7 @@ using namespace ::com::sun::star::scanner; extern bool g_bNoInterrupt; // in swmodule.cxx -#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \ - SFX_VIEW_HAS_PRINTOPTIONS) +#define SWVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::HAS_PRINTOPTIONS) // Statics. OMG. -- cgit