diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-19 21:46:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-20 00:52:22 +0100 |
| commit | 128d3d51c208ec5c37a105ea5c751530bd017d4b (patch) | |
| tree | 52df39ed24ec826424704b4df512c64c3a9e1f74 | |
| parent | 3c84fa61570113d1dfb2523ab88f268eeeb46c3c (diff) | |
fdo#75118: sw: do not paint zero-width lines
Since commit 6a3fb868b2b8af21f7b6140424b6f8377599a786 zero-width
BorderLinePrimitive2D will actually be painted as hairlines by
VclPixelProcessor2D::tryDrawBorderLinePrimitive2DDirect(), so don't
create such pointless primitives.
Change-Id: I4c2404b73f106156b83a6d72efa3c8991e5d659e
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 3d6aa4f16fa4..81d7cbc0a3d9 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2459,8 +2459,8 @@ void SwTabFrmPainter::PaintLines( OutputDevice& rDev, const SwRect& rRect ) cons break; const SwLineEntrySet& rEntrySet = (*aIter).second; - SwLineEntrySetConstIter aSetIter = rEntrySet.begin(); - while ( aSetIter != rEntrySet.end() ) + for (SwLineEntrySetConstIter aSetIter = rEntrySet.begin(); + aSetIter != rEntrySet.end(); ++aSetIter) { const SwLineEntry& rEntry = *aSetIter; const svx::frame::Style& rEntryStyle( (*aSetIter).maAttribute ); @@ -2593,6 +2593,11 @@ void SwTabFrmPainter::PaintLines( OutputDevice& rDev, const SwRect& rRect ) cons aPaintStart.Y() -= nTwipYCorr; aPaintEnd.Y() -= nTwipYCorr; + if (aStyles[0].Prim() <= 0 && aStyles[0].Secn() <= 0) + { + continue; // fdo#75118 do not paint zero-width lines + } + // Here comes the painting stuff: Thank you, DR, great job!!! if ( bHori ) { @@ -2627,8 +2632,6 @@ void SwTabFrmPainter::PaintLines( OutputDevice& rDev, const SwRect& rRect ) cons ); } } - - ++aSetIter; } ++aIter; |