Kaydet (Commit) e89e8941 authored tarafından Armin Le Grand's avatar Armin Le Grand

tdf#115296 extend vertical FrameBorders for joined Frames

This feature was lost on my changes for FrameBorder primitive
creation. It was calculated/applied formally in
lcl_PaintLeftRightLine

Change-Id: Ie44619a4c4e44ff4584533685cb21882c323742e
Reviewed-on: https://gerrit.libreoffice.org/62451
Tested-by: Jenkins
Reviewed-by: 's avatarArmin Le Grand <Armin.Le.Grand@cib.de>
üst 36880d76
...@@ -5071,14 +5071,30 @@ void SwFrame::PaintSwFrameShadowAndBorder( ...@@ -5071,14 +5071,30 @@ void SwFrame::PaintSwFrameShadowAndBorder(
// if ContentFrame and joined Prev/Next, reset top/bottom as needed // if ContentFrame and joined Prev/Next, reset top/bottom as needed
if(IsContentFrame()) if(IsContentFrame())
{ {
const SwFrame* pDirRefFrame(IsCellFrame() ? FindTabFrame() : this);
const SwRectFnSet aRectFnSet(pDirRefFrame);
const SwRectFn& _rRectFn(aRectFnSet.FnRect());
if(rAttrs.JoinedWithPrev(*this)) if(rAttrs.JoinedWithPrev(*this))
{ {
pTopBorder = nullptr; // tdf#115296 re-add adaption of vert distance to clos ethe evtl.
// existing gap to previous frame
const SwFrame* pPrevFrame(GetPrev());
(aRect.*_rRectFn->fnSetTop)( (pPrevFrame->*_rRectFn->fnGetPrtBottom)() );
// ...and disable top border paint/creation
pTopBorder = nullptr;
} }
if(rAttrs.JoinedWithNext(*this)) if(rAttrs.JoinedWithNext(*this))
{ {
pBottomBorder = nullptr; // tdf#115296 re-add adaption of vert distance to clos ethe evtl.
// existing gap to next frame
const SwFrame* pNextFrame(GetNext());
(aRect.*_rRectFn->fnSetBottom)( (pNextFrame->*_rRectFn->fnGetPrtTop)() );
// ...and disable bottom border paint/creation
pBottomBorder = nullptr;
} }
} }
......
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