From 342a588f9898442e34bc699607b759d877b7f381 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 5 Dec 2017 15:28:08 +0100 Subject: SwFrameBorder: Use enhanced FrameBorders for Character Adapted PaintCharacterBorder to also use new, enhanced FrameBorders. Adapted some places, cleaned up old code, enhanced tooling method CreateBorderLinePrimitivesForRectangle, tested including PDF, Pint, PrintPreview. Change-Id: If7b793b6520e899bde6f4211c993847af21ce7b9 --- sw/source/core/inc/frame.hxx | 6 ++++-- sw/source/core/inc/ftnfrm.hxx | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'sw/source/core/inc') diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index aaff5532ee09..684a9e13a3d0 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -529,8 +529,10 @@ public: // #i28701# - change purpose of method and adjust its name void InvalidateObjs( const bool _bNoInvaOfAsCharAnchoredObjs = true ); - virtual void PaintSwFrameShadowAndBorder( const SwRect&, const SwPageFrame *pPage, - const SwBorderAttrs & ) const; + virtual void PaintSwFrameShadowAndBorder( + const SwRect&, + const SwPageFrame* pPage, + const SwBorderAttrs&) const; void PaintBaBo( const SwRect&, const SwPageFrame *pPage, const bool bOnlyTextBackground = false) const; void PaintSwFrameBackground( const SwRect&, const SwPageFrame *pPage, diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index 6ba563cd3f31..7f964d654d4d 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -43,8 +43,10 @@ public: virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; - virtual void PaintSwFrameShadowAndBorder( const SwRect &, const SwPageFrame *pPage, - const SwBorderAttrs & ) const override; + virtual void PaintSwFrameShadowAndBorder( + const SwRect&, + const SwPageFrame* pPage, + const SwBorderAttrs&) const override; virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; void PaintLine( const SwRect &, const SwPageFrame * ) const; }; -- cgit