diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-17 19:11:35 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-17 19:43:05 -0400 |
| commit | 1c6fb266567c8e397e3c65663b21f0fa50696aa5 (patch) | |
| tree | 234c589d6d469d65e1f34e2033f0acd7558802a7 | |
| parent | 374efa7253703b054e4603c66aeba862e4e98574 (diff) | |
fdo#75260: These old hacks no longer make sense.
The clip region in fact cuts off the lower part of the bottom border, both
on screen and when printing / exporting to PDF.
Change-Id: Id350531f09b3ded66fd05ea7ebeefe8771260b62
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 120634e351a8..41aadc1115f0 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2420,9 +2420,6 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) const // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, rDev ); - const SwFrm* pTmpFrm = &mrTabFrm; - const bool bVert = pTmpFrm->IsVertical(); - SwLineEntryMapConstIter aIter = maHoriLines.begin(); bool bHori = true; @@ -2440,17 +2437,6 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) const rDev.SetDrawMode( 0 ); } - // set clip region: - rDev.Push( PUSH_CLIPREGION ); - Size aSize( rRect.SSize() ); - // Hack! Necessary, because the layout is not pixel aligned! - aSize.Width() += nPixelSzW; aSize.Height() += nPixelSzH; - rDev.SetClipRegion(Region(Rectangle(rRect.Pos(), aSize))); - - // The following stuff is necessary to have the new table borders fit - // into a ::SwAlignRect adjusted world. - const SwTwips nTwipXCorr = bVert ? 0 : std::max( 0L, nHalfPixelSzW - 2 ); // 1 < 2 < 3 ;-) - const SwTwips nTwipYCorr = !bVert ? 0 : std::max( 0L, nHalfPixelSzW - 2 ); // 1 < 2 < 3 ;-) const SwFrm* pUpper = mrTabFrm.GetUpper(); SwRect aUpper( pUpper->Prt() ); aUpper.Pos() += pUpper->Frm().Pos(); @@ -2636,12 +2622,6 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) const aPaintEnd.Y() += static_cast<long>(offsetEnd + 0.5); } - aPaintStart.X() -= nTwipXCorr; // nHalfPixelSzW - 2 to assure that we do not leave the pixel - aPaintEnd.X() -= nTwipXCorr; - aPaintStart.Y() -= nTwipYCorr; - aPaintEnd.Y() -= nTwipYCorr; - - // Here comes the painting stuff: Thank you, DR, great job!!! if (bHori) { mrTabFrm.ProcessPrimitives( svx::frame::CreateBorderPrimitives( @@ -2678,7 +2658,6 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) const } // restore output device: - rDev.Pop(); rDev.SetDrawMode( nOldDrawMode ); } |