[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/core/layout/paintfrm.cxx |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit ea7d9105456537d2e0a6b7dcf051fee1fa259954
Author:     Armin Le Grand <Armin.Le.Grand at cib.de>
AuthorDate: Sat Oct 27 23:20:06 2018 +0200
Commit:     Armin Le Grand <Armin.Le.Grand at cib.de>
CommitDate: Mon Oct 29 11:02:28 2018 +0100

    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: Armin Le Grand <Armin.Le.Grand at cib.de>
    (cherry picked from commit e89e8941e114d4d1adf76df995a3f1a8d1bff4b1)
    Reviewed-on: https://gerrit.libreoffice.org/62475

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index b684c5ac1b2c..b684232ba78d 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5103,14 +5103,30 @@ void SwFrame::PaintSwFrameShadowAndBorder(
         // if ContentFrame and joined Prev/Next, reset top/bottom as needed
         if(IsContentFrame())
         {
+            const SwFrame* pDirRefFrame(IsCellFrame() ? FindTabFrame() : this);
+            const SwRectFnSet aRectFnSet(pDirRefFrame);
+            const SwRectFn& _rRectFn(aRectFnSet.FnRect());
+
             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))
             {
-                    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;
             }
         }