2 files changed, 58 insertions, 10 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 13813ccef2b4..0edb051d2770 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -111,6 +111,7 @@ using namespace ::editeng;
 using namespace ::com::sun::star;
 using ::drawinglayer::primitive2d::BorderLinePrimitive2D;
 using ::drawinglayer::primitive2d::BorderLine;
+using ::drawinglayer::primitive2d::BorderLineExtend;
 using std::pair;
 using std::make_pair;
 
@@ -526,7 +527,14 @@ lcl_MergeBorderLines(
         return new BorderLinePrimitive2D(
             rStart,
             rEnd,
-            BorderLine(rLineLeft.getWidth(), rLineLeft.getRGBColor(), rLineLeft.getExtendStart(), rOtherLeft.getExtendEnd()),
+            BorderLine(
+                rLineLeft.getWidth(),
+                rLineLeft.getRGBColor(),
+                BorderLineExtend(
+                    rLineLeft.getBorderLineExtend().getStartLeft(),
+                    rLineLeft.getBorderLineExtend().getStartRight(),
+                    rOtherLeft.getBorderLineExtend().getEndLeft(),
+                    rOtherLeft.getBorderLineExtend().getEndRight())),
             rLine.getStyle());
     }
     else
@@ -539,9 +547,25 @@ lcl_MergeBorderLines(
         return new BorderLinePrimitive2D(
             rStart,
             rEnd,
-            BorderLine(rLineLeft.getWidth(), rLineLeft.getRGBColor(), rLineLeft.getExtendStart(), rOtherLeft.getExtendEnd()),
-            BorderLine(rLineGap.getWidth(), rLineGap.getRGBColor()),
-            BorderLine(rLineRight.getWidth(), rLineRight.getRGBColor(), rLineRight.getExtendStart(), rOtherRight.getExtendEnd()),
+            BorderLine(
+                rLineLeft.getWidth(),
+                rLineLeft.getRGBColor(),
+                BorderLineExtend(
+                    rLineLeft.getBorderLineExtend().getStartLeft(),
+                    rLineLeft.getBorderLineExtend().getStartRight(),
+                    rOtherLeft.getBorderLineExtend().getEndLeft(),
+                    rOtherLeft.getBorderLineExtend().getEndRight())),
+            BorderLine(
+                rLineGap.getWidth(),
+                rLineGap.getRGBColor()),
+            BorderLine(
+                rLineRight.getWidth(),
+                rLineRight.getRGBColor(),
+                BorderLineExtend(
+                    rLineRight.getBorderLineExtend().getStartLeft(),
+                    rLineRight.getBorderLineExtend().getStartRight(),
+                    rOtherRight.getBorderLineExtend().getEndLeft(),
+                    rOtherRight.getBorderLineExtend().getEndRight())),
             rLine.hasGapColor(),
             rLine.getStyle());
     }
@@ -4862,7 +4886,12 @@ static void lcl_MakeBorderLine(SwRect const& rRect,
         xLine = new BorderLinePrimitive2D(
             aStart,
             aEnd,
-            BorderLine(nLeftWidth, aLeftColor.getBColor(), nExtentLeftStart, nExtentLeftEnd),
+            BorderLine(
+                nLeftWidth,
+                aLeftColor.getBColor(),
+                BorderLineExtend(
+                    nExtentLeftStart,
+                    nExtentLeftEnd)),
             rBorder.GetBorderLineStyle());
     }
     else
@@ -4870,9 +4899,21 @@ static void lcl_MakeBorderLine(SwRect const& rRect,
         xLine = new BorderLinePrimitive2D(
             aStart,
             aEnd,
-            BorderLine(nLeftWidth, aLeftColor.getBColor(), nExtentLeftStart, nExtentLeftEnd),
-            BorderLine(rBorder.GetDistance(), rBorder.GetColorGap().getBColor()),
-            BorderLine(nRightWidth, aRightColor.getBColor(), nExtentRightStart, nExtentRightEnd),
+            BorderLine(
+                nLeftWidth,
+                aLeftColor.getBColor(),
+                BorderLineExtend(
+                    nExtentLeftStart,
+                    nExtentLeftEnd)),
+            BorderLine(
+                rBorder.GetDistance(),
+                rBorder.GetColorGap().getBColor()),
+            BorderLine(
+                nRightWidth,
+                aRightColor.getBColor(),
+                BorderLineExtend(
+                    nExtentRightStart,
+                    nExtentRightEnd)),
             rBorder.HasGapColor(),
             rBorder.GetBorderLineStyle());
     }
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 0793190c75b3..ab2650d8587f 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -709,7 +709,10 @@ MAKENUMSTR:
         SvtScriptedTextHelper aScriptedText(rRenderContext);
         Size aStrSize;
         sal_uInt8 nFormatIndex = GetFormatIndex( nCol, nRow );
-        tools::Rectangle cellRect = maArray.GetCellRect( nCol, nRow );
+        const basegfx::B2DRange aCellRange(maArray.GetCellRange( nCol, nRow ));
+        const tools::Rectangle cellRect(
+            basegfx::fround(aCellRange.getMinX()), basegfx::fround(aCellRange.getMinY()),
+            basegfx::fround(aCellRange.getMaxX()), basegfx::fround(aCellRange.getMaxY()));
         Point aPos = cellRect.TopLeft();
         long nRightX = 0;
 
@@ -801,7 +804,11 @@ void AutoFormatPreview::DrawBackground(vcl::RenderContext& rRenderContext)
             rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR);
             rRenderContext.SetLineColor();
             rRenderContext.SetFillColor(aBrushItem.GetColor());
-            rRenderContext.DrawRect(maArray.GetCellRect(nCol, nRow));
+            const basegfx::B2DRange aCellRange(maArray.GetCellRange( nCol, nRow ));
+            rRenderContext.DrawRect(
+                tools::Rectangle(
+                    basegfx::fround(aCellRange.getMinX()), basegfx::fround(aCellRange.getMinY()),
+                    basegfx::fround(aCellRange.getMaxX()), basegfx::fround(aCellRange.getMaxY())));
             rRenderContext.Pop();
         }
     }