4 files changed, 13 insertions, 49 deletions
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index be7a4aaeb698..e875d1bdfa76 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -19,6 +19,7 @@
 
 #include "lockbyte.hxx"
 
+#include "boost/noncopyable.hpp"
 #include "sal/types.h"
 #include "osl/diagnose.h"
 #include "osl/file.h"
@@ -276,7 +277,8 @@ struct FileHandle
 
 class FileLockBytes :
     public store::OStoreObject,
-    public store::ILockBytes
+    public store::ILockBytes,
+    private boost::noncopyable
 {
     /** Representation.
      */
@@ -301,11 +303,6 @@ class FileLockBytes :
 
     virtual storeError flush_Impl() SAL_OVERRIDE;
 
-    /** Not implemented.
-     */
-    FileLockBytes (FileLockBytes const &);
-    FileLockBytes & operator= (FileLockBytes const &);
-
 public:
     /** Construction.
      */
@@ -516,7 +513,8 @@ struct FileMapping
 class MappedLockBytes :
     public store::OStoreObject,
     public store::PageData::Allocator,
-    public store::ILockBytes
+    public store::ILockBytes,
+    private boost::noncopyable
 {
     /** Representation.
      */
@@ -545,11 +543,6 @@ class MappedLockBytes :
 
     virtual storeError flush_Impl() SAL_OVERRIDE;
 
-    /** Not implemented.
-     */
-    MappedLockBytes (MappedLockBytes const &);
-    MappedLockBytes & operator= (MappedLockBytes const &);
-
 public:
     /** Construction.
      */
@@ -674,7 +667,8 @@ namespace store
 
 class MemoryLockBytes :
     public store::OStoreObject,
-    public store::ILockBytes
+    public store::ILockBytes,
+    private boost::noncopyable
 {
     /** Representation.
      */
@@ -697,11 +691,6 @@ class MemoryLockBytes :
 
     virtual storeError flush_Impl() SAL_OVERRIDE;
 
-    /** Not implemented.
-     */
-    MemoryLockBytes (MemoryLockBytes const &);
-    MemoryLockBytes& operator= (MemoryLockBytes const &);
-
 public:
     /** Construction.
      */
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index e6e8deb82e19..084309872052 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -19,6 +19,7 @@
 
 #include "storbase.hxx"
 
+#include "boost/noncopyable.hpp"
 #include "sal/types.h"
 #include "rtl/alloc.h"
 #include "rtl/ref.hxx"
@@ -73,7 +74,8 @@ namespace store
 
 class PageData::Allocator_Impl :
     public store::OStoreObject,
-    public store::PageData::Allocator
+    public store::PageData::Allocator,
+    private boost::noncopyable
 {
 public:
     /** Construction (two phase).
@@ -108,11 +110,6 @@ private:
      */
     virtual void allocate_Impl (void ** ppPage, sal_uInt16 * pnSize) SAL_OVERRIDE;
     virtual void deallocate_Impl (void * pPage) SAL_OVERRIDE;
-
-    /** Not implemented.
-     */
-    Allocator_Impl (Allocator_Impl const &);
-    Allocator_Impl & operator= (Allocator_Impl const &);
 };
 
 } // namespace store
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index 719b32ee2c32..3a4e37f24982 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -76,26 +76,6 @@ struct OStoreSuperBlock
           m_aUnused (0)
     {}
 
-    OStoreSuperBlock (const OStoreSuperBlock & rhs)
-        : m_aGuard  (rhs.m_aGuard),
-          m_aDescr  (rhs.m_aDescr),
-          m_nMarked (rhs.m_nMarked),
-          m_aMarked (rhs.m_aMarked),
-          m_nUnused (rhs.m_nUnused),
-          m_aUnused (rhs.m_aUnused)
-    {}
-
-    OStoreSuperBlock& operator= (const OStoreSuperBlock & rhs)
-    {
-        m_aGuard  = rhs.m_aGuard;
-        m_aDescr  = rhs.m_aDescr;
-        m_nMarked = rhs.m_nMarked;
-        m_aMarked = rhs.m_aMarked;
-        m_nUnused = rhs.m_nUnused;
-        m_aUnused = rhs.m_aUnused;
-        return *this;
-    }
-
     /** Comparison.
      */
     bool operator== (const OStoreSuperBlock & rhs) const
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index 8acb930872f7..f7738f1676c3 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -19,6 +19,7 @@
 
 #include "sal/config.h"
 
+#include "boost/noncopyable.hpp"
 #include "boost/static_assert.hpp"
 
 #include "storcach.hxx"
@@ -224,7 +225,8 @@ namespace store
 
 class PageCache_Impl :
     public store::OStoreObject,
-    public store::PageCache
+    public store::PageCache,
+    private boost::noncopyable
 {
     // Representation
     static size_t const theTableSize = 32;
@@ -268,10 +270,6 @@ class PageCache_Impl :
     virtual storeError removePageAt_Impl (
         sal_uInt32 nOffset) SAL_OVERRIDE;
 
-    // Not implemented
-    PageCache_Impl (PageCache_Impl const &);
-    PageCache_Impl & operator= (PageCache_Impl const &);
-
 public:
     // Construction
     explicit PageCache_Impl (sal_uInt16 nPageSize);