7 files changed, 35 insertions, 1 deletions
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index a9e44ba6a9f8..3648e200e7c2 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -38,6 +38,8 @@
 namespace svt
 {
 
+namespace {
+
 class AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEventListener>
 {
     private:
@@ -77,6 +79,7 @@ class AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEventListener>
         DECL_LINK(impl_ts_asyncCallback, LinkParamNone*, void);
 };
 
+}
 
 AcceleratorExecute::AcceleratorExecute()
     : TMutexInit()
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 3e270f0e8d60..2319485a65bd 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -58,6 +58,8 @@ using namespace com::sun::star;
 
 namespace svt {
 
+namespace {
+
 class EmbedEventListener_Impl : public ::cppu::WeakImplHelper < embed::XStateChangeListener,
                                                                  document::XEventListener,
                                                                  util::XModifyListener,
@@ -83,6 +85,8 @@ public:
     virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 };
 
+}
+
 rtl::Reference<EmbedEventListener_Impl> EmbedEventListener_Impl::Create( EmbeddedObjectRef* p )
 {
     rtl::Reference<EmbedEventListener_Impl> pRet(new EmbedEventListener_Impl( p ));
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 5fc3456d0bbd..0a36573bb9b5 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -43,6 +43,8 @@
 #define NO_INDEX        (-1)
 #define CONTENT_HELPER  ::utl::UCBContentHelper
 
+namespace {
+
 struct SvtExtensionResIdMapping_Impl
 {
     const char* _pExt;
@@ -51,6 +53,8 @@ struct SvtExtensionResIdMapping_Impl
     SvImageId const   _nImgId;
 };
 
+}
+
 static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
 {
     { "awk",   true,  STR_DESCRIPTION_SOURCEFILE,            SvImageId::NONE },
@@ -166,12 +170,16 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
     { nullptr, false, nullptr, SvImageId::NONE }
 };
 
+namespace {
+
 struct SvtFactory2ExtensionMapping_Impl
 {
     const char*   _pFactory;
     const char*   _pExtension;
 };
 
+}
+
 // mapping from "private:factory" url to extension
 
 static SvtFactory2ExtensionMapping_Impl const Fac2ExtMap_Impl[] =
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 829ffdb5feb5..8f07e59b999b 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -40,6 +40,8 @@ using namespace css;
 
 typedef ::cppu::WeakImplHelper<io::XStream, io::XSeekable> StreamSupplier_Base;
 
+namespace {
+
 class StreamSupplier : public StreamSupplier_Base
 {
 private:
@@ -61,6 +63,8 @@ protected:
     virtual sal_Int64 SAL_CALL getLength() override;
 };
 
+}
+
 StreamSupplier::StreamSupplier(uno::Reference<io::XInputStream> const & rxInput, uno::Reference<io::XOutputStream> const & rxOutput)
     : m_xInput(rxInput)
     , m_xOutput(rxOutput)
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index bedd8d1205c5..b3df64fce1a1 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -64,6 +64,8 @@ OUString getInstalledLocaleForLanguage(css::uno::Sequence<OUString> const & inst
 
 static std::unique_ptr<Idle> xLangpackInstaller;
 
+namespace {
+
 class InstallLangpack : public Idle
 {
     std::vector<OUString> const m_aPackages;
@@ -99,6 +101,8 @@ public:
     }
 };
 
+}
+
 OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString>& rLocaleElementNames, bool bRequestInstallIfMissing, const OUString& rPreferredLocale)
 {
     OUString wantedLocale(rPreferredLocale);
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 2b4311cde7f6..7c655b1f04f6 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -37,6 +37,8 @@
 
 using namespace ::com::sun::star;
 
+namespace {
+
 class SvtLanguageTableImpl
 {
 private:
@@ -71,7 +73,6 @@ public:
     }
 };
 
-namespace {
 struct theLanguageTable : public rtl::Static< SvtLanguageTableImpl, theLanguageTable > {};
 }
 
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 7048441ecf8a..36761da02577 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -93,11 +93,18 @@ namespace svt
 
     //= TemplateContent
 
+    namespace {
+
     struct TemplateContent;
+
+    }
+
     typedef ::std::vector< ::rtl::Reference< TemplateContent > >    TemplateFolderContent;
     typedef TemplateFolderContent::const_iterator           ConstFolderIterator;
     typedef TemplateFolderContent::iterator                 FolderIterator;
 
+    namespace {
+
     /** a struct describing one content in one of the template dirs (or at least it's relevant aspects)
     */
     struct TemplateContent : public ::salhelper::SimpleReferenceObject
@@ -138,6 +145,7 @@ namespace svt
                                                         { m_aSubContents.push_back( _rxNewElement ); }
     };
 
+    }
 
     TemplateContent::TemplateContent( const INetURLObject& _rURL )
         :m_aURL( _rURL )
@@ -154,6 +162,7 @@ namespace svt
 
     //= stl helpers
 
+    namespace {
 
     /// compares two TemplateContent by URL
     struct TemplateContentURLLess
@@ -365,6 +374,7 @@ namespace svt
         }
     };
 
+    }
 
     //= TemplateFolderCacheImpl