diff options
20 files changed, 31 insertions, 34 deletions
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 5ac8fc31e1f7..5e1a96429ff3 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -29,14 +29,12 @@ #include <cppuhelper/basemutex.hxx> #include <basegfx/range/b2drange.hxx> -/** defines for DeclPrimitive2DIDBlock and ImplPrimitive2DIDBlock +/** defines ImplPrimitive2DIDBlock Added to be able to simply change identification stuff later, e.g. add an identification string and/or ID to the interface and to the implementation ATM used to delclare implement getPrimitive2DID() */ -#define DeclPrimitive2DIDBlock() virtual sal_uInt32 getPrimitive2DID() const override; - #define ImplPrimitive2DIDBlock(TheClass, TheID) \ sal_uInt32 TheClass::getPrimitive2DID() const { return TheID; } @@ -148,7 +146,6 @@ public: /** provide unique ID for fast identifying of known primitive implementations in renderers. These use the defines from drawinglayer_primitivetypes2d.hxx to define unique IDs. - This method is normally defined using DeclPrimitive2DIDBlock() */ virtual sal_uInt32 getPrimitive2DID() const = 0; diff --git a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx index ed41e9b79ddf..b89a89952465 100644 --- a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx @@ -122,7 +122,7 @@ namespace drawinglayer bool doForceToSingleDiscreteUnit() const { return mbForceToSingleDiscreteUnit; } // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx index e394381da758..5d0f07006e60 100644 --- a/svx/inc/sdr/overlay/overlaytools.hxx +++ b/svx/inc/sdr/overlay/overlaytools.hxx @@ -54,7 +54,7 @@ public: // compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; }} // end of namespace drawinglayer::primitive2d @@ -107,7 +107,7 @@ namespace drawinglayer // compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -147,7 +147,7 @@ namespace drawinglayer // compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -198,7 +198,7 @@ namespace drawinglayer // compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -251,7 +251,7 @@ namespace drawinglayer // compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -293,7 +293,7 @@ namespace drawinglayer // compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override; - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx index bd235e917287..23e180129384 100644 --- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -64,7 +64,7 @@ namespace drawinglayer double getCornerRadiusY() const { return mfCornerRadiusY; } // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 99970f58c9d1..16f08c23c9cd 100644 --- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 285185684f15..910673c705cf 100644 --- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -70,7 +70,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx index ef5cd2184783..58ae7579d0bd 100644 --- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -89,7 +89,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx index d60fc2c457b4..cc815806734a 100644 --- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -62,7 +62,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 88149d811370..2854750d8dbf 100644 --- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -110,7 +110,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx index 13b1e1d1ec8d..aab22d94fac4 100644 --- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx @@ -57,7 +57,7 @@ namespace drawinglayer virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& aViewInformation) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx index a88d0c2de7ad..b2f3f940bec1 100644 --- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -65,7 +65,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; } // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx index d5e28a3314c5..af0e44acf4dc 100644 --- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -74,7 +74,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 19eb1978e198..ae7414c0b5c4 100644 --- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -65,7 +65,7 @@ namespace drawinglayer virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index e9e534a8f640..ea95065b17b3 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -135,7 +135,7 @@ namespace drawinglayer virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -175,7 +175,7 @@ namespace drawinglayer virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -231,7 +231,7 @@ namespace drawinglayer virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -270,7 +270,7 @@ namespace drawinglayer virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -308,7 +308,7 @@ namespace drawinglayer virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer @@ -344,7 +344,7 @@ namespace drawinglayer virtual std::unique_ptr<SdrTextPrimitive2D> createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 54c5f857fedf..43c3e2476dd3 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -817,7 +817,7 @@ namespace sdr::contact { virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // declare unique ID for this primitive class - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; static void getTransformation( const ViewContactOfUnoControl& _rVOC, ::basegfx::B2DHomMatrix& _out_Transformation ); diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index ba06383b6860..bdbb580d3382 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -82,7 +82,7 @@ namespace drawinglayer::primitive2d virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; // provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 282fc1a91119..86e316af53f9 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -181,7 +181,7 @@ namespace drawinglayer::primitive2d const basegfx::B2DRange& getOuterRange() const { return maOuterRange; } /// provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index b0763d99f6d4..a065eb0fbaea 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -4560,7 +4560,7 @@ namespace drawinglayer::primitive2d virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; /// provide unique ID - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index b5a216330587..70bfe9927120 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -80,7 +80,7 @@ public: virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const override; - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx index dd47f70bb9d7..d0242dfb8707 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx @@ -66,7 +66,7 @@ public: virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const override; - DeclPrimitive2DIDBlock() + virtual sal_uInt32 getPrimitive2DID() const override; }; } |