drawinglayer: remove ImplPrimitive2DIDBlock macro

We can just implement the simple getPrimitive2DID method in all
primitives. The ImplPrimitive2DIDBlock macro doesn't save us
anything.

Change-Id: I02f44d4891d7b340220890bf52a7ebfc8e41850a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117509
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

15 files changed, 105 insertions, 28 deletions

diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 681ce37ac7da..4d14e9359864 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -1568,8 +1568,10 @@ namespace sdr::contact {
             m_aTransformation, xControlModel, rControl.getControl() ) );
     }
 
-
-    ImplPrimitive2DIDBlock( LazyControlCreationPrimitive2D, PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D )
+    sal_uInt32 LazyControlCreationPrimitive2D::getPrimitive2DID() const
+    {
+        return PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D;
+    }
 
     ViewObjectContactOfUnoControl::ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact )
         :ViewObjectContactOfSdrObj( _rObjectContact, _rViewContact )
diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx
index 31e520d3b419..6d77add6652c 100644
--- a/svx/source/sdr/overlay/overlaytools.cxx
+++ b/svx/source/sdr/overlay/overlaytools.cxx
@@ -120,7 +120,10 @@ bool OverlayStaticRectanglePrimitive::operator==(const BasePrimitive2D& rPrimiti
     return false;
 }
 
-ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE)
+sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const
+{
+    return PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE;
+}
 
 
 
@@ -203,7 +206,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE
             return false;
         }
 
-        ImplPrimitive2DIDBlock(OverlayBitmapExPrimitive, PRIMITIVE2D_ID_OVERLAYBITMAPEXPRIMITIVE)
+        sal_uInt32 OverlayBitmapExPrimitive::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_OVERLAYBITMAPEXPRIMITIVE;
+        }
 
 
 
@@ -265,7 +271,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE
             return false;
         }
 
-        ImplPrimitive2DIDBlock(OverlayCrosshairPrimitive, PRIMITIVE2D_ID_OVERLAYCROSSHAIRPRIMITIVE)
+        sal_uInt32 OverlayCrosshairPrimitive::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_OVERLAYCROSSHAIRPRIMITIVE;
+        }
 
 
 
@@ -392,7 +401,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE
             return false;
         }
 
-        ImplPrimitive2DIDBlock(OverlayRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE)
+        sal_uInt32 OverlayRectanglePrimitive::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_OVERLAYRECTANGLEPRIMITIVE;
+        }
 
 
 
@@ -497,7 +509,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE
             return false;
         }
 
-        ImplPrimitive2DIDBlock(OverlayHelplineStripedPrimitive, PRIMITIVE2D_ID_OVERLAYHELPLINESTRIPEDPRIMITIVE)
+        sal_uInt32 OverlayHelplineStripedPrimitive::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_OVERLAYHELPLINESTRIPEDPRIMITIVE;
+        }
 
 
 
@@ -582,7 +597,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE
             return false;
         }
 
-        ImplPrimitive2DIDBlock(OverlayRollingRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE)
+        sal_uInt32 OverlayRollingRectanglePrimitive::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
index 5abce7edef3a..2b5b424b426d 100644
--- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
@@ -159,7 +159,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrCaptionPrimitive2D, PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D)
+        sal_uInt32 SdrCaptionPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
index 8b5c8413ccdf..315640e8f2d7 100644
--- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
@@ -98,7 +98,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrConnectorPrimitive2D, PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D)
+        sal_uInt32 SdrConnectorPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index 0a352071500e..0781f2329d84 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -121,7 +121,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrCustomShapePrimitive2D, PRIMITIVE2D_ID_SDRCUSTOMSHAPEPRIMITIVE2D)
+        sal_uInt32 SdrCustomShapePrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRCUSTOMSHAPEPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index 1a341b8ff3fc..a49f52c73091 100644
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
@@ -131,7 +131,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrEllipsePrimitive2D, PRIMITIVE2D_ID_SDRELLIPSEPRIMITIVE2D)
+        sal_uInt32 SdrEllipsePrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRELLIPSEPRIMITIVE2D;
+        }
 
 
 
@@ -254,7 +257,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrEllipseSegmentPrimitive2D, PRIMITIVE2D_ID_SDRELLIPSESEGMENTPRIMITIVE2D)
+        sal_uInt32 SdrEllipseSegmentPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRELLIPSESEGMENTPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
index b87cfcd9342c..cd20f177a9f0 100644
--- a/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx
@@ -923,7 +923,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrFrameBorderPrimitive2D, PRIMITIVE2D_ID_SDRFRAMEBORDERTPRIMITIVE2D)
+        sal_uInt32 SdrFrameBorderPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRFRAMEBORDERTPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index b0683ad2fd9e..564970251bb7 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -158,7 +158,10 @@ bool SdrGrafPrimitive2D::isTransparent() const
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(SdrGrafPrimitive2D, PRIMITIVE2D_ID_SDRGRAFPRIMITIVE2D)
+sal_uInt32 SdrGrafPrimitive2D::getPrimitive2DID() const
+{
+    return PRIMITIVE2D_ID_SDRGRAFPRIMITIVE2D;
+}
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index 894b9a941ceb..7a5f3f96ad73 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
@@ -488,7 +488,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrMeasurePrimitive2D, PRIMITIVE2D_ID_SDRMEASUREPRIMITIVE2D)
+        sal_uInt32 SdrMeasurePrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRMEASUREPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index 0c4dafcd7930..8cb5d1445273 100644
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
@@ -167,7 +167,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrOle2Primitive2D, PRIMITIVE2D_ID_SDROLE2PRIMITIVE2D)
+        sal_uInt32 SdrOle2Primitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDROLE2PRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index dd02d5348cc0..528cce8fae59 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -170,7 +170,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrOleContentPrimitive2D, PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D)
+        sal_uInt32 SdrOleContentPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
index 721eff0ce364..cf22caa52020 100644
--- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
@@ -147,7 +147,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrPathPrimitive2D, PRIMITIVE2D_ID_SDRPATHPRIMITIVE2D)
+        sal_uInt32 SdrPathPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRPATHPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
index 0d3387f2ff4f..3323f5c07f73 100644
--- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
@@ -143,7 +143,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrRectanglePrimitive2D, PRIMITIVE2D_ID_SDRRECTANGLEPRIMITIVE2D)
+        sal_uInt32 SdrRectanglePrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRRECTANGLEPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 59a1551d9ca8..778eeeac2170 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -281,7 +281,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrContourTextPrimitive2D, PRIMITIVE2D_ID_SDRCONTOURTEXTPRIMITIVE2D)
+        sal_uInt32 SdrContourTextPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRCONTOURTEXTPRIMITIVE2D;
+        }
 
 
 
@@ -330,7 +333,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrPathTextPrimitive2D, PRIMITIVE2D_ID_SDRPATHTEXTPRIMITIVE2D)
+        sal_uInt32 SdrPathTextPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRPATHTEXTPRIMITIVE2D;
+        }
 
 
 
@@ -396,7 +402,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrBlockTextPrimitive2D, PRIMITIVE2D_ID_SDRBLOCKTEXTPRIMITIVE2D)
+        sal_uInt32 SdrBlockTextPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRBLOCKTEXTPRIMITIVE2D;
+        }
 
 
 
@@ -437,8 +446,11 @@ namespace drawinglayer::primitive2d
              return new SdrAutoFitTextPrimitive2D(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap());
          }
 
-         // provide unique ID
-         ImplPrimitive2DIDBlock(SdrAutoFitTextPrimitive2D, PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D)
+        // provide unique ID
+        sal_uInt32 SdrAutoFitTextPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D;
+        }
 
 
 
@@ -477,7 +489,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrChainedTextPrimitive2D, PRIMITIVE2D_ID_SDRCHAINEDTEXTPRIMITIVE2D)
+        sal_uInt32 SdrChainedTextPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRCHAINEDTEXTPRIMITIVE2D;
+        }
 
 
         void SdrStretchTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const
@@ -522,7 +537,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrStretchTextPrimitive2D, PRIMITIVE2D_ID_SDRSTRETCHTEXTPRIMITIVE2D)
+        sal_uInt32 SdrStretchTextPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRSTRETCHTEXTPRIMITIVE2D;
+        }
 
 } // end of namespace
 
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 967bfe820738..14c38e773481 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -140,7 +140,10 @@ namespace drawinglayer::primitive2d
         }
 
         // provide unique ID
-        ImplPrimitive2DIDBlock(SdrCellPrimitive2D, PRIMITIVE2D_ID_SDRCELLPRIMITIVE2D)
+        sal_uInt32 SdrCellPrimitive2D::getPrimitive2DID() const
+        {
+            return PRIMITIVE2D_ID_SDRCELLPRIMITIVE2D;
+        }
 
 } // end of namespace