From 0f33526ec27a3abcfa1ca9348a46238b1432e5e4 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Wed, 14 Sep 2016 19:33:42 +0200 Subject: put all SfxShell feature flags in one typed_flags class make values unique across modules. check if flag used in correct module. Change-Id: I656ffd3d527dd895777e14e1cc933c8b9b3f6e46 Reviewed-on: https://gerrit.libreoffice.org/28906 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- sw/inc/view.hxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sw/inc/view.hxx') diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 6222b6a48bc8..46ade150256a 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -95,9 +95,6 @@ const long nScrollY = 30; #define MAX_MARKS 5 -#define CHILDWIN_LABEL 1 -#define CHILDWIN_MAILMERGE 2 - enum ShellModes { SHELL_MODE_TEXT, @@ -378,7 +375,7 @@ public: void GotFocus() const; virtual SdrView* GetDrawView() const override; - virtual bool HasUIFeature( sal_uInt32 nFeature ) override; + virtual bool HasUIFeature(SfxShellFeature nFeature) const override; virtual void ShowCursor( bool bOn = true ) override; virtual ErrCode DoVerb( long nVerb ) override; @@ -613,7 +610,7 @@ public: // store MailMerge data while "Back to Mail Merge Wizard" FloatingWindow is active // or to support printing void SetMailMergeConfigItem(std::shared_ptr& rConfigItem, sal_uInt16 nRestart); - std::shared_ptr GetMailMergeConfigItem(); + std::shared_ptr GetMailMergeConfigItem() const; std::shared_ptr EnsureMailMergeConfigItem(const SfxItemSet* pArgs = nullptr, sal_uInt16 nWizardRestartPage = 0); void ExecFormatPaintbrush(SfxRequest &); -- cgit