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

Stephan Bergmann sbergman at redhat.com
Wed Jul 4 16:06:00 UTC 2018


 slideshow/source/inc/shapesubset.hxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit efa1d0df9a108b585bddd0a7e8ba5a4f64df3489
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jul 4 13:12:12 2018 +0200

    -Werror=deprecated-copy (GCC trunk towards GCC 9)
    
    Change-Id: I12d5cfafab17e02dc041eff8af207ba36df9bb5a
    Reviewed-on: https://gerrit.libreoffice.org/56938
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx
index 7f0a8a747148..0929658b0f30 100644
--- a/slideshow/source/inc/shapesubset.hxx
+++ b/slideshow/source/inc/shapesubset.hxx
@@ -91,6 +91,12 @@ namespace slideshow
 
             ~ShapeSubset();
 
+            // For a rationale for this hacky combination of user-provided dtor, defaulted copy
+            // ctor, and deleted copy assignment op, see the "TODO(Q1)" comment in
+            // CloningNodeCreator (slideshow/source/engine/animationnodes/animationnodefactory.cxx):
+            ShapeSubset(ShapeSubset const &) = default;
+            void operator =(ShapeSubset) = delete;
+
             /** Get the actual subset shape.
 
                 If the subset is currently revoked, this method


More information about the Libreoffice-commits mailing list