[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source
Caolán McNamara
caolanm at redhat.com
Tue Aug 2 12:10:57 UTC 2016
sw/source/core/layout/paintfrm.cxx | 18 ------------------
1 file changed, 18 deletions(-)
New commits:
commit 832d359930c86c7bfe5547e580d1bfadd9177642
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 2 11:18:25 2016 +0100
Resolves: tdf#101241 Revert "fix paint table border in DOUBLE_THIN style"
because of the never-ending invalidate and paint of tdf#101241
there was no bug or route to reproduce the original problem so can't
try to solve it a different way.
This reverts commit 9a95520948de1d92c55252aa5f90606b01d6ac9e.
(cherry picked from commit 772191616a0cceebf91a9674ce7417d5cad0050f)
Change-Id: Ib3c0421247a20f047d396b13ec17dbfe27cb780c
Reviewed-on: https://gerrit.libreoffice.org/27789
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 4d6c784..b973507 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2742,24 +2742,6 @@ void SwTabFramePainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) cons
aPaintEnd.Y() += static_cast<long>(offsetEnd + 0.5);
}
- if( rEntryStyle.Type() == table::BorderLineStyle::DOUBLE_THIN )
- {
- long aPixel = rDev.PixelToLogic( Point(1, 1) ).getX();
- SwRect aPaintEx( aPaintStart, aPaintEnd );
- if( bHori )
- {
- aPaintEx.Pos().Y() -= aPixel;
- aPaintEx.SSize().Height() += aPixel * 2;
- }
- else
- {
- aPaintEx.Pos().X() -= aPixel;
- aPaintEx.SSize().Width() += aPixel * 2;
- }
-
- gProp.pSGlobalShell->InvalidateWindows( aPaintEx );
- }
-
if (bHori)
{
mrTabFrame.ProcessPrimitives( svx::frame::CreateBorderPrimitives(
More information about the Libreoffice-commits
mailing list