[Libreoffice-commits] core.git: drawinglayer/source include/drawinglayer

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Sat Jan 30 16:31:28 UTC 2021


 drawinglayer/source/primitive2d/baseprimitive2d.cxx  |    6 ------
 include/drawinglayer/primitive2d/baseprimitive2d.hxx |    9 ++++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit d77a644a1a4af8b2c7eb3b524ba6ac24d58b67fb
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jan 30 13:23:15 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Jan 30 17:30:36 2021 +0100

    this method should be pure virtual
    
    otherwise there is no point in subclassing this helper class
    
    Change-Id: I141d32ec84e782003cb41c6ca7abc27fd9a16860
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110167
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index a3650a57807d..752bc3063a3b 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -104,12 +104,6 @@ sal_Int64 SAL_CALL BasePrimitive2D::estimateUsage()
     return 0; // for now ignore the objects themselves
 }
 
-void BufferedDecompositionPrimitive2D::create2DDecomposition(
-    Primitive2DContainer& /*rContainer*/,
-    const geometry::ViewInformation2D& /*rViewInformation*/) const
-{
-}
-
 BufferedDecompositionPrimitive2D::BufferedDecompositionPrimitive2D()
     : BasePrimitive2D()
     , maBuffered2DDecomposition()
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 45d0e3519c40..7619e04e5279 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -218,11 +218,10 @@ protected:
         maBuffered2DDecomposition = rNew;
     }
 
-    /** method which is to be used to implement the local decomposition of a 2D primitive. The default
-                implementation will just return an empty decomposition
-             */
-    virtual void create2DDecomposition(Primitive2DContainer& rContainer,
-                                       const geometry::ViewInformation2D& rViewInformation) const;
+    /** method which is to be used to implement the local decomposition of a 2D primitive. */
+    virtual void
+    create2DDecomposition(Primitive2DContainer& rContainer,
+                          const geometry::ViewInformation2D& rViewInformation) const = 0;
 
 public:
     // constructor/destructor


More information about the Libreoffice-commits mailing list