2 files changed, 30 insertions, 0 deletions
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index b799e8b30ef2..501ad3096804 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -52,6 +52,8 @@ const sal_uInt16 majorVersion = 0x0001;
 
 **************************************************************************/
 
+namespace {
+
 class BlopObject
 {
 public:
@@ -148,6 +150,8 @@ public:
     }
 };
 
+}
+
 BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len)
     : m_bufferLen(len)
 {
@@ -160,6 +164,8 @@ BlopObject::BlopObject(const sal_uInt8* buffer, sal_uInt32 len)
 
 **************************************************************************/
 
+namespace {
+
 class StringCache
 {
 public:
@@ -172,6 +178,8 @@ public:
     sal_uInt16 createString(const sal_uInt8* buffer); // throws std::bad_alloc
 };
 
+}
+
 StringCache::StringCache(sal_uInt16 size)
     : m_stringTable(size)
     , m_stringsCopied(0)
@@ -208,6 +216,8 @@ sal_uInt16 StringCache::createString(const sal_uInt8* buffer)
 
 **************************************************************************/
 
+namespace {
+
 class ConstantPool : public BlopObject
 {
 public:
@@ -242,6 +252,8 @@ public:
         // throws std::bad_alloc
 };
 
+}
+
 sal_uInt32 ConstantPool::parseIndex()
 {
     m_pIndex.reset();
@@ -524,6 +536,8 @@ const sal_Unicode* ConstantPool::readStringConstant(sal_uInt16 index) const
 
 **************************************************************************/
 
+namespace {
+
 class FieldList : public BlopObject
 {
 public:
@@ -558,6 +572,7 @@ public:
     const sal_Char* getFieldFileName(sal_uInt16 index) const;
 };
 
+}
 
 const sal_Char* FieldList::getFieldName(sal_uInt16 index) const
 {
@@ -708,6 +723,8 @@ const sal_Char* FieldList::getFieldFileName(sal_uInt16 index) const
 
 **************************************************************************/
 
+namespace {
+
 class ReferenceList : public BlopObject
 {
 public:
@@ -737,6 +754,7 @@ public:
     RTFieldAccess   getReferenceAccess(sal_uInt16 index) const;
 };
 
+}
 
 const sal_Char* ReferenceList::getReferenceName(sal_uInt16 index) const
 {
@@ -808,6 +826,8 @@ RTFieldAccess ReferenceList::getReferenceAccess(sal_uInt16 index) const
 
 **************************************************************************/
 
+namespace {
+
 class MethodList : public BlopObject
 {
 public:
@@ -850,6 +870,8 @@ private:
     sal_uInt16 calcMethodParamIndex( const sal_uInt16 index ) const;
 };
 
+}
+
 sal_uInt16 MethodList::calcMethodParamIndex( const sal_uInt16 index ) const
 {
     return (METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (index * m_PARAM_ENTRY_SIZE));
@@ -1069,6 +1091,8 @@ const sal_Char* MethodList::getMethodDoku(sal_uInt16 index) const
 
 **************************************************************************/
 
+namespace {
+
 class TypeRegistryEntry: public BlopObject {
 public:
     std::unique_ptr<ConstantPool> m_pCP;
@@ -1086,6 +1110,8 @@ public:
     typereg_Version getVersion() const;
 };
 
+}
+
 TypeRegistryEntry::TypeRegistryEntry(
     const sal_uInt8* buffer, sal_uInt32 len):
     BlopObject(buffer, len), m_refCount(1), m_nSuperTypes(0),
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 6b29fab9e448..409773a7017d 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -30,6 +30,8 @@
 
 using namespace registry::tools;
 
+namespace {
+
 class Options_Impl : public Options
 {
     bool m_bVerbose;
@@ -45,6 +47,8 @@ protected:
     virtual bool initOptions_Impl(std::vector< std::string > & rArgs) override;
 };
 
+}
+
 void Options_Impl::printUsage_Impl() const
 {
     fprintf(stderr, "using: regmerge [-v|--verbose] mergefile mergeKeyName regfile_1 ... regfile_n\n");