5 files changed, 20 insertions, 0 deletions
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index 348ffb5f0297..2659f4a7e9c1 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -39,6 +39,8 @@
 
 SFX_IMPL_STATUSBAR_CONTROL( SwBookmarkControl, SfxStringItem );
 
+namespace {
+
 class BookmarkPopup_Impl : public PopupMenu
 {
 public:
@@ -52,6 +54,8 @@ private:
     virtual void    Select() override;
 };
 
+}
+
 BookmarkPopup_Impl::BookmarkPopup_Impl() :
     PopupMenu(),
     nCurId(USHRT_MAX)
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 468ba6cbfa16..c651a86df0f3 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3808,6 +3808,8 @@ bool NaviContentBookmark::Paste( TransferableDataHelper& rData )
     return bRet;
 }
 
+namespace {
+
 class SwContentLBoxString : public SvLBoxString
 {
 public:
@@ -3817,6 +3819,8 @@ public:
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
 };
 
+}
+
 void SwContentTree::InitEntry(SvTreeListEntry* pEntry,
         const OUString& rStr ,const Image& rImg1,const Image& rImg2)
 {
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 1859e70579dd..788d999f21f6 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -114,6 +114,8 @@ static const char* aHelpForMenu[] =
     HID_GLBLTREEUPD_ALL         //CTX_UPDATE_ALL
 };
 
+namespace {
+
 class SwGlobalFrameListener_Impl : public SfxListener
 {
     bool bValid;
@@ -129,6 +131,8 @@ public:
     bool                IsValid() const {return bValid;}
 };
 
+}
+
 void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if( rHint.GetId() == SfxHintId::Dying)
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 9dd2a26a2a03..444babfcbc36 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -37,6 +37,8 @@
 #define GLOS_TIMEOUT 30000   // update every 30 seconds
 #define FIND_MAX_GLOS 20
 
+namespace {
+
 struct TripleString
 {
     OUString sGroup;
@@ -58,6 +60,8 @@ public:
     weld::TreeView& GetTreeView() {return *m_xListLB;}
 };
 
+}
+
 SwGlossDecideDlg::SwGlossDecideDlg(weld::Window* pParent)
     : GenericDialogController(pParent, "modules/swriter/ui/selectautotextdialog.ui", "SelectAutoTextDialog")
     , m_xOk(m_xBuilder->weld_button("ok"))
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx
index 2ab9883d231f..c944f01c2602 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -37,6 +37,8 @@
 
 SFX_IMPL_STATUSBAR_CONTROL( SwTemplateControl, SfxStringItem );
 
+namespace {
+
 class SwTemplatePopup_Impl : public PopupMenu
 {
 public:
@@ -50,6 +52,8 @@ private:
     virtual void    Select() override;
 };
 
+}
+
 SwTemplatePopup_Impl::SwTemplatePopup_Impl() :
     PopupMenu(),
     nCurId(USHRT_MAX)