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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Fri Aug 28 20:43:34 UTC 2020


 sw/source/core/text/possiz.hxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 326d435760e3e3b74413fb96d8753681cd9434fe
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Aug 28 21:40:39 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Aug 28 22:42:56 2020 +0200

    -Werror,-Wdeprecated-copy-dtor
    
    > core/sw/source/core/text/possiz.hxx:44:13: error: definition of implicit copy constructor for 'SwPosSize' is deprecated because it has a user-declared destructor [-Werror,-Wdeprecated-copy-dtor]
    >     virtual ~SwPosSize() {}
    >             ^
    > sw/source/core/text/porlin.hxx:186:5: note: in implicit copy constructor for 'SwPosSize' first required here
    >     SwPosSize( rPortion ),
    >     ^
    
    apparently since d336e6c26012255015d3fc0caf8e7fafe14bd8f2 "tdf#69647 sw layout:
    fix line spacing with inline pictures" made the SwPosSize dtor virtual
    
    Change-Id: Iabd1eb4c4ceb7e45c86bdd0cac6ded82bc79c015
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101566
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx
index c2ae3aabe2e6..63782e4c91e8 100644
--- a/sw/source/core/text/possiz.hxx
+++ b/sw/source/core/text/possiz.hxx
@@ -43,6 +43,10 @@ public:
 #else
     virtual ~SwPosSize() {}
 #endif
+    SwPosSize(SwPosSize const &) = default;
+    SwPosSize(SwPosSize &&) = default;
+    SwPosSize & operator =(SwPosSize const &) = default;
+    SwPosSize & operator =(SwPosSize &&) = default;
     sal_uInt16 Height() const { return nHeight; }
     virtual void Height(const sal_uInt16 nNew, const bool = true) { nHeight = nNew; }
     sal_uInt16 Width() const { return nWidth; }


More information about the Libreoffice-commits mailing list