Kaydet (Commit) ae181f92 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen Kaydeden (comit) Björn Michaelsen

remove const code duplication

Change-Id: If8330d3f1ce0c92122dcecfc22c32b005deffeb3
Reviewed-on: https://gerrit.libreoffice.org/34702Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
üst ad85c123
......@@ -202,7 +202,8 @@ public:
virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const override;
virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) override;
virtual const SdrObject* GetMaster() const override;
virtual const SdrObject* GetMaster() const override
{ return const_cast<SwFlyDrawContact*>(this)->GetMaster(); };
virtual SdrObject* GetMaster() override;
/** override methods to control Writer fly frames,
......@@ -385,7 +386,8 @@ class SwDrawContact final : public SwContact
virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const override;
virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) override;
virtual const SdrObject* GetMaster() const override;
virtual const SdrObject* GetMaster() const override
{ return const_cast<SwDrawContact*>(this)->GetMaster(); };
virtual SdrObject* GetMaster() override;
const SwFrame* GetAnchorFrame( const SdrObject* _pDrawObj = nullptr ) const;
......
......@@ -481,11 +481,6 @@ SwAnchoredObject* SwFlyDrawContact::GetAnchoredObj(SdrObject *const pSdrObj)
return const_cast<SwAnchoredObject *>(const_cast<SwFlyDrawContact const*>(this)->GetAnchoredObj(pSdrObj));
}
const SdrObject* SwFlyDrawContact::GetMaster() const
{
return mpMasterObj.get();
}
SdrObject* SwFlyDrawContact::GetMaster()
{
return mpMasterObj.get();
......@@ -723,13 +718,6 @@ SwAnchoredObject* SwDrawContact::GetAnchoredObj(SdrObject *const pSdrObj)
return const_cast<SwAnchoredObject*>(const_cast<SwDrawContact const*>(this)->GetAnchoredObj(pSdrObj));
}
const SdrObject* SwDrawContact::GetMaster() const
{
return !mbMasterObjCleared
? maAnchoredDrawObj.GetDrawObj()
: nullptr;
}
SdrObject* SwDrawContact::GetMaster()
{
return !mbMasterObjCleared
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment