5 files changed, 11 insertions, 26 deletions
diff --git a/store/source/object.hxx b/store/source/object.hxx
index 72381d05155b..40bc287652ad 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -64,7 +64,7 @@ class OStoreObject : public store::IStoreHandle
 public:
     /** Construction.
      */
-    OStoreObject() : m_nRefCount(0) {}
+    OStoreObject() {}
 
     /** IStoreHandle.
      */
@@ -79,15 +79,8 @@ private:
     /** The IStoreHandle TypeId.
      */
     static const sal_uInt32 m_nTypeId;
-
-    /** Representation.
-     */
-    oslInterlockedCount m_nRefCount;
-
-    /** Not implemented.
-     */
-    OStoreObject (const OStoreObject&);
-    OStoreObject& operator= (const OStoreObject&);
+    OStoreObject (const OStoreObject&) SAL_DELETED_FUNCTION;
+    OStoreObject& operator= (const OStoreObject&) SAL_DELETED_FUNCTION;
 };
 
 /** Template function specialization as dynamic_cast replacement.
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 5102c40b87fb..ceffce7e4ebc 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -219,10 +219,8 @@ private:
     storeError saveObjectAt_Impl (
         OStorePageObject & rPage, sal_uInt32 nAddr);
 
-    /** Not implemented.
-     */
-    OStorePageBIOS (const OStorePageBIOS&);
-    OStorePageBIOS& operator= (const OStorePageBIOS&);
+    OStorePageBIOS (const OStorePageBIOS&) SAL_DELETED_FUNCTION;
+    OStorePageBIOS& operator= (const OStorePageBIOS&) SAL_DELETED_FUNCTION;
 };
 
 inline OStorePageBIOS::operator osl::Mutex& (void) const
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 722ab86470c9..58764784918f 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -98,10 +98,8 @@ private:
     sal_uInt32                 m_nPath;
     rtl_TextToUnicodeConverter m_hTextCvt;
 
-    /** Not implemented.
-     */
-    OStoreDirectory_Impl (const OStoreDirectory_Impl&);
-    OStoreDirectory_Impl& operator= (const OStoreDirectory_Impl&);
+    OStoreDirectory_Impl (const OStoreDirectory_Impl&) SAL_DELETED_FUNCTION;
+    OStoreDirectory_Impl& operator= (const OStoreDirectory_Impl&) SAL_DELETED_FUNCTION;
 };
 
 template<> inline OStoreDirectory_Impl*
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index 1aaf7cd820ef..2b1b1c680e1c 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -134,10 +134,8 @@ private:
 
     bool m_bWriteable;
 
-    /** Not implemented.
-     */
-    OStoreLockBytes (const OStoreLockBytes&);
-    OStoreLockBytes& operator= (const OStoreLockBytes&);
+    OStoreLockBytes (const OStoreLockBytes&) SAL_DELETED_FUNCTION;
+    OStoreLockBytes& operator= (const OStoreLockBytes&) SAL_DELETED_FUNCTION;
 };
 
 template<> inline OStoreLockBytes*
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 1f8652bc4ce6..1ff3f9f00b25 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -184,10 +184,8 @@ private:
     */
     storeError remove_Impl (entry & rEntry);
 
-    /** Not implemented.
-    */
-    OStorePageManager (const OStorePageManager&);
-    OStorePageManager& operator= (const OStorePageManager&);
+    OStorePageManager (const OStorePageManager&) SAL_DELETED_FUNCTION;
+    OStorePageManager& operator= (const OStorePageManager&) SAL_DELETED_FUNCTION;
 };
 
 inline bool OStorePageManager::isValid (void) const