9 files changed, 44 insertions, 0 deletions
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 006ad51069a2..7aefbfcaf799 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -359,6 +359,8 @@ void SwRevisionConfig::Load()
     }
 }
 
+namespace {
+
 enum InsertConfigProp
 {
     INS_PROP_TABLE_HEADER = 0,
@@ -456,6 +458,9 @@ enum InsertConfigProp
     INS_PROP_CAP_OBJECT_OLEMISC_CHARACTERSTYLE,         //92
     INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES        //93
 };
+
+}
+
 const Sequence<OUString>& SwInsertConfig::GetPropertyNames() const
 {
     static Sequence<OUString> aNames
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 8d11292d9e52..c899b6cbd70b 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -169,10 +169,20 @@ void lcl_emitEvent(SfxEventHintId nEventId, sal_Int32 nStrId, SfxObjectShell* pD
 
 std::vector<std::pair<SwDocShell*, OUString>> SwDBManager::m_aUncommittedRegistrations;
 
+namespace {
+
 enum class SwDBNextRecord { NEXT, FIRST };
+
+}
+
 static bool lcl_ToNextRecord( SwDSParam* pParam, const SwDBNextRecord action = SwDBNextRecord::NEXT );
 
+namespace {
+
 enum class WorkingDocType { SOURCE, TARGET, COPY };
+
+}
+
 static SfxObjectShell* lcl_CreateWorkingDocument(
     const WorkingDocType aType, const SwWrtShell &rSourceWrtShell,
     const vcl::Window *pSourceWindow,
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 025a38f3e6bc..70595db3eb37 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -44,6 +44,8 @@ using namespace ::com::sun::star;
 
 namespace sw { namespace sidebar{
 
+namespace {
+
 enum eFillStyle
 {
     NONE,
@@ -54,6 +56,8 @@ enum eFillStyle
     PATTERN
 };
 
+}
+
 const SvxPageUsage aArr[] =
 {
     SvxPageUsage::All,
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 93dc022cd9be..ebe65c360b2b 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -64,6 +64,8 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::i18n;
 
+namespace {
+
 enum SwDocumentSettingsPropertyHandles
 {
     HANDLE_FORBIDDEN_CHARS,
@@ -146,6 +148,8 @@ enum SwDocumentSettingsPropertyHandles
     HANDLE_CONTINUOUS_ENDNOTES,
 };
 
+}
+
 static MasterPropertySetInfo * lcl_createSettingsInfo()
 {
     static PropertyInfo const aWriterSettingsInfoMap[] =
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 388d59ce9dd7..83682dbb9b95 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -87,12 +87,17 @@ static osl::Mutex &    GetMailMergeMutex()
     return aMutex;
 }
 
+namespace {
+
 enum CloseResult
 {
     eSuccess,       // successfully closed
     eVetoed,        // vetoed, ownership transferred to the vetoing instance
     eFailed         // failed for some unknown reason
 };
+
+}
+
 static CloseResult CloseModelAndDocSh(
        Reference< frame::XModel > const &rxModel,
        SfxObjectShellRef &rxDocSh )
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 5df0c5af9d89..07ce19ea7bcc 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -49,6 +49,8 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::comphelper;
 
+namespace {
+
 enum SwViewSettingsPropertyHandles
 {
     HANDLE_VIEWSET_ANNOTATIONS,
@@ -119,6 +121,8 @@ enum SwPrintSettingsPropertyHandles
     HANDLE_PRINTSET_HIDDEN_TEXT
 };
 
+}
+
 static ChainablePropertySetInfo * lcl_createViewSettingsInfo()
 {
     static PropertyInfo const aViewSettingsMap_Impl[] =
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 21b72b3a9bcd..468ba6cbfa16 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -821,6 +821,8 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
     m_bDataValid = true;
 }
 
+namespace {
+
 enum STR_CONTEXT_IDX
 {
     IDX_STR_OUTLINE_LEVEL = 0,
@@ -838,6 +840,8 @@ enum STR_CONTEXT_IDX
     IDX_STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY = 12
 };
 
+}
+
 static const char* STR_CONTEXT_ARY[] =
 {
     STR_OUTLINE_LEVEL,
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 2b056fca6ffe..1859e70579dd 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -135,6 +135,8 @@ void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint&
         bValid = false;
 }
 
+namespace {
+
 enum GLOBAL_CONTEXT_IDX
 {
     IDX_STR_UPDATE = 0,
@@ -153,6 +155,8 @@ enum GLOBAL_CONTEXT_IDX
     IDX_STR_EDIT_LINK = 13
 };
 
+}
+
 static const char* GLOBAL_CONTEXT_ARY[] =
 {
     STR_UPDATE,
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index e016ab69910f..fa97463ef822 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -585,6 +585,8 @@ void SwNavigationPI::ZoomIn()
     m_aContentToolBox->CheckItem(m_aContentToolBox->GetItemId("listbox"), false);
 }
 
+namespace {
+
 enum StatusIndex
 {
     IDX_STR_HIDDEN = 0,
@@ -592,6 +594,8 @@ enum StatusIndex
     IDX_STR_INACTIVE = 2
 };
 
+}
+
 SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
                                vcl::Window* pParent)
     : PanelLayout(pParent, "NavigatorPanel", "modules/swriter/ui/navigatorpanel.ui", nullptr)