diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-02-06 21:14:44 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-02-07 08:25:41 +0100 |
| commit | bfb08ca517b6854b5c78b0b29c7a4d6dce473adb (patch) | |
| tree | 5a9a02ee7e9dcf083513ffec6e8c05c1a15245f6 /include | |
| parent | aa72601c8ce40c5e3bb3caae54522afaa83f0684 (diff) | |
remove use of macro DeclPrimitive2DIDBlock in everywhere
Change-Id: I3fcba604ee3bc95274700ae7406f27e292cd09ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88154
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/drawinglayer/primitive2d/baseprimitive2d.hxx | 5 | ||||
| -rw-r--r-- | include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx | 2 |
2 files changed, 2 insertions, 5 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 |