[Libreoffice-commits] core.git: sw/source

[Jan Holesovsky]

 sw/source/core/text/porrst.cxx |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit c8aa8226962db6ddbca6bfec8e415dfd5ecdda6f
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Jul 24 12:06:11 2014 +0200

    fdo#80721: Use the old way of drawing the pilcrow (but with changed color).
    
    This fixes the reported problem (that the pilcrow stopped showning for
    centered paragraphs), and additionally makes the pilcrow large for large
    paragraphs (like titles) again.
    
    Change-Id: I78d9986c0da6abfb9936984bb8b72d5eba88c9d7

diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 56280f3..5c80ebd 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -59,9 +59,18 @@ SwTmpEndPortion::SwTmpEndPortion( const SwLinePortion &rPortion )
 
 void SwTmpEndPortion::Paint( const SwTxtPaintInfo &rInf ) const
 {
-    if( rInf.OnWin() && rInf.GetOpt().IsParagraph() )
+    if (rInf.OnWin() && rInf.GetOpt().IsParagraph())
     {
-        rInf.DrawSpecial( *this, CH_PAR, Color(NON_PRINTING_CHARACTER_COLOR) );
+        const SwFont* pOldFnt = rInf.GetFont();
+
+        SwFont aFont(*pOldFnt);
+        aFont.SetColor(NON_PRINTING_CHARACTER_COLOR);
+        const_cast<SwTxtPaintInfo&>(rInf).SetFont(&aFont);
+
+        // draw the pilcrow
+        rInf.DrawText(OUString(CH_PAR), *this);
+
+        const_cast<SwTxtPaintInfo&>(rInf).SetFont(const_cast<SwFont*>(pOldFnt));
     }
 }