[Libreoffice-commits] core.git: sd/inc sd/source

[Jochen Nitschke]

 sd/inc/OutlinerIterator.hxx               |    2 +-
 sd/source/ui/inc/OutlinerIteratorImpl.hxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ab5d6166beca20503cd57b8707b814305f92267a
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Wed Dec 27 13:16:22 2017 +0100

    delete operators properly
    
    Change-Id: Ia917b70712717387aa8d7a17334efd41931bdb88
    Reviewed-on: https://gerrit.libreoffice.org/47087
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index 0696fbffc265..8271916d8b0a 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -274,7 +274,7 @@ private:
 
     // Do not allow default constructor and copying of outliner containers.
     OutlinerContainer (const OutlinerContainer&) = delete;
-    OutlinerContainer& operator= (const OutlinerContainer&) {return *this;};
+    OutlinerContainer& operator= (const OutlinerContainer&) = delete;
 };
 
 /** Data collection specifying a <type>SdrObject</type> and its position in
diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index e09950899f1b..82d9432e79db 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -206,7 +206,7 @@ private:
     SdrObjListIter* mpObjectIterator;
 
     // Don't use this operator.
-    ViewIteratorImpl& operator= (const ViewIteratorImpl&){return *this;};
+    ViewIteratorImpl& operator= (const ViewIteratorImpl&) = delete;
 };
 
 /** Iterator for iteration over all objects in all views.  It automatically
@@ -235,7 +235,7 @@ private:
     sal_Int32 mnPageCount;
 
     // Don't use this operator.
-    DocumentIteratorImpl& operator= (const DocumentIteratorImpl& ){return *this;};
+    DocumentIteratorImpl& operator= (const DocumentIteratorImpl& ) = delete;
 };
 
 } } // end of namespace ::sd::outliner