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 <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 8 insertions, 5 deletions

diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 39121e85b426..da999bd04e25 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -555,17 +555,20 @@ void SwView::GetDrawState(SfxItemSet &rSet)
         }
 }
 
-bool SwView::HasUIFeature( sal_uInt32 nFeature )
+bool SwView::HasUIFeature(SfxShellFeature nFeature) const
 {
-    bool bRet = false;
+    assert((nFeature & ~SfxShellFeature::SwMask) == SfxShellFeature::NONE);
     switch(nFeature)
     {
-        case CHILDWIN_LABEL     : bRet = m_pWrtShell->IsLabelDoc(); break;
+    case SfxShellFeature::SwChildWindowLabel:
+        return m_pWrtShell->IsLabelDoc();
 #if HAVE_FEATURE_DBCONNECTIVITY
-        case CHILDWIN_MAILMERGE : bRet = nullptr != GetMailMergeConfigItem(); break;
+    case SfxShellFeature::SwChildWindowMailmerge:
+        return (nullptr != GetMailMergeConfigItem());
 #endif
+    default:
+        return false;
     }
-    return bRet;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */