summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2020-02-06 21:14:44 +0100
committerTomaž Vajngerl <quikee@gmail.com>2020-02-07 08:25:41 +0100
commitbfb08ca517b6854b5c78b0b29c7a4d6dce473adb (patch)
tree5a9a02ee7e9dcf083513ffec6e8c05c1a15245f6 /sw
parentaa72601c8ce40c5e3bb3caae54522afaa83f0684 (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 'sw')
-rw-r--r--sw/source/core/draw/dflyobj.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx2
-rw-r--r--sw/source/uibase/docvw/AnchorOverlayObject.cxx2
-rw-r--r--sw/source/uibase/docvw/ShadowOverlayObject.cxx2
4 files changed, 4 insertions, 4 deletions
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;
};
}