[Libreoffice-commits] core.git: sw/source

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Thu Dec 22 23:54:42 UTC 2016


 sw/source/core/text/porfly.hxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 7a1add76d542e9929c1feab9e06949990e236616
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 19 05:38:09 2016 +0100

    IsDraw() isnt called anymore
    
    Change-Id: I6b2fc84886f7812e4f84cd994b1335dcf37576c1
    Reviewed-on: https://gerrit.libreoffice.org/32150
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 0e3d6fd..fdedd26 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -62,7 +62,6 @@ public:
     void SetBase(const SwTextFrame& rFrame, const Point& rBase, long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent, AsCharFlags nFlags);
     virtual bool Format(SwTextFormatInfo& rInf) override;
     OUTPUT_OPERATOR_OVERRIDE
-    virtual bool IsDraw() const =0;
     virtual ~SwFlyCntPortion() override {};
 };
 
@@ -78,7 +77,6 @@ namespace sw
             inline SwFlyInContentFrame *GetFlyFrame() { return m_pFly; }
             inline const SwFlyInContentFrame *GetFlyFrame() const { return m_pFly; }
             void GetFlyCursorOfst(Point& rPoint, SwPosition& rPos, SwCursorMoveState* pCMS) const { m_pFly->GetCursorOfst(&rPos, rPoint, pCMS); };
-            virtual bool IsDraw() const override { return false; }
             virtual void Paint(const SwTextPaintInfo& rInf) const override;
             virtual ~FlyContentPortion() override;
     };
@@ -91,7 +89,6 @@ namespace sw
             static DrawFlyCntPortion* Create(const SwTextFrame& rFrame, SwDrawContact* pDrawContact, const Point& rBase, long nAsc, long nDescent, long nFlyAsc, long nFlyDesc, AsCharFlags nFlags);
             inline SwDrawContact* GetDrawContact() { return m_pContact; }
             inline const SwDrawContact* GetDrawContact() const { return m_pContact; }
-            virtual bool IsDraw() const override { return true; }
             virtual void Paint(const SwTextPaintInfo& rInf) const override;
             virtual ~DrawFlyCntPortion() override;
     };


More information about the Libreoffice-commits mailing list