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

[Takeshi Abe]

 vcl/source/edit/textdat2.hxx |    5 +++--
 vcl/source/edit/textdoc.hxx  |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit fa94cdc7fae33987b49985405d84a483010421f0
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Apr 7 18:35:00 2016 +0900

    vcl: Make it noncopyable by deleting copy ctor & co
    
    Change-Id: Ia141d1d48d915f1ecc0351e47d7b9700891ebad2
    Reviewed-on: https://gerrit.libreoffice.org/23891
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 076d955..2788d36 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -174,12 +174,13 @@ private:
     bool                    mbInvalid;
     bool                    mbSimple;   // only type linearly
 
-                        TEParaPortion( const TEParaPortion& ) {;}
-
 public:
                         TEParaPortion( TextNode* pNode );
                         ~TEParaPortion();
 
+    TEParaPortion( const TEParaPortion& ) = delete;
+    void operator=( const TEParaPortion& ) = delete;
+
     bool                IsInvalid() const           { return mbInvalid; }
     bool                IsSimpleInvalid() const     { return mbSimple; }
     void                SetNotSimpleInvalid()       { mbSimple = false; }
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index 4e7097c..91ff2ac 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -67,7 +67,6 @@ private:
     OUString            maText;
     TextCharAttribList  maCharAttribs;
 
-                        TextNode( const TextNode& ) {;}
 protected:
     void                ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNewChars );
     void                CollapsAttribs( sal_Int32 nIndex, sal_Int32 nDelChars );
@@ -75,6 +74,9 @@ protected:
 public:
                         TextNode( const OUString& rText );
 
+    TextNode( const TextNode& ) = delete;
+    void operator=( const TextNode& ) = delete;
+
     const OUString&     GetText() const         { return maText; }
 
     const TextCharAttrib&   GetCharAttrib(sal_uInt16 nPos) const  { return maCharAttribs.GetAttrib(nPos); }