include/svx/svdobj.hxx | 2 --
include/svx/svdoedge.hxx | 2 --
svx/source/svdraw/svdpage.cxx | 2 +-
3 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 61c97e941b1d73bf94293f05fdd26636b55a4bce
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Aug 27 14:45:13 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 27 21:19:16 2019 +0200
no need to add a new virtual method (tdf#119388 related)
we can re-use the existing GetObjIdentifier infrastructure
Change-Id: Ie604d643186a925da41a1e67ccd5f2461ceb20f1
Reviewed-on: https://gerrit.libreoffice.org/78193
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 2d3dd91f90c0..0b1e5c3a832b 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -911,8 +911,6 @@ public:
void setSuitableOutlinerBg(Outliner& rOutliner) const;
- virtual bool IsSdrEdgeObj() const { return false; }
-
protected:
tools::Rectangle aOutRect; // surrounding rectangle for
Paint (incl. LineWidth, ...)
Point aAnchor; // anchor position (Writer)
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index f2b707f7fbe2..16127d914ec8 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -168,8 +168,6 @@ public:
void SetSuppressDefaultConnect(bool bNew) { mbSuppressDefaultConnect =
bNew; }
bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; }
- virtual bool IsSdrEdgeObj() const override { return true; }
-
protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 0d38249b2d04..ae0a0c3cc1e3 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -613,7 +613,7 @@ void SdrObjList::ReformatAllEdgeObjects()
while(aIter.IsMore())
{
SdrObject* pObj = aIter.Next();
- if (!pObj->IsSdrEdgeObj())
+ if (pObj->GetObjIdentifier() != OBJ_EDGE)
continue;
SdrEdgeObj* pSdrEdgeObj = static_cast< SdrEdgeObj* >(pObj);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
