[Libreoffice-commits] core.git: include/vcl

[Stephan Bergmann]

 include/vcl/vclptr.hxx |   29 -----------------------------
 1 file changed, 29 deletions(-)

New commits:
commit deaeae4d9571d2a1d4c49fc51435139e7a051f3b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 6 15:11:29 2016 +0100

    Make VclPtr move assignment operator actually move
    
    071e23fee07b92b8f07800cda3ca7e66afe818ae "add move operators for VclPtr" added
    (among other things) a move assignment operator that rather copied m_rInnerRef.
    But if b72c6feba87bd8707f39902a3066ba476188cb1d "manage VCL widgets using
    rtl::Reference" had not pointlessly introduced a user-declared copy constructor
    in the first place, all the copy/move special member functions would be
    implicitly declared (as VclPtr does not have a user-declared destructor).
    
    Change-Id: I1bec05a7a1b5b48a7b7d74e64a88f118454f8cb2

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index ab57dfa..c022d8b 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -95,19 +95,6 @@ public:
         : m_rInnerRef(pBody, SAL_NO_ACQUIRE)
     {}
 
-    /** Copy constructor...
-     */
-    inline VclPtr (const VclPtr<reference_type> & handle)
-        : m_rInnerRef (handle.m_rInnerRef)
-    {}
-
-    /** Move constructor...
-     */
-    inline VclPtr (VclPtr<reference_type> && handle)
-        : m_rInnerRef ( std::move(handle.m_rInnerRef) )
-    {
-    }
-
     /** Up-casting conversion constructor: Copies interface reference.
 
         Does not work for up-casts to ambiguous bases.  For the special case of
@@ -180,22 +167,6 @@ public:
         return *this;
     }
 
-    /** move assignment operator.
-    */
-    VclPtr & operator =(VclPtr<reference_type> && rRef)
-    {
-        m_rInnerRef = std::move(rRef);
-        return *this;
-    }
-
-    /** copy assignment operator.
-    */
-    VclPtr & operator =(const VclPtr<reference_type> & rRef)
-    {
-        m_rInnerRef = rRef;
-        return *this;
-    }
-
     VclPtr & operator =(reference_type * pBody)
     {
         m_rInnerRef.set(pBody);