[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

[Caolán McNamara]

 sw/source/ui/chrdlg/drpcps.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 90f381f02336126e850c657dc62ae0d2cc7b33ca
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 19 13:55:23 2013 +0100

    Resolves: fdo#65931 why are we futzing with leading on the preview anyway
    
    Change-Id: I0eff88f165a737dfd9a2f348f04b17b6a6212e6f
    (cherry picked from commit cb1ec05a72d54d55c8a98778c56ee01197cf45f4)
    Reviewed-on: https://gerrit.libreoffice.org/4363
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 1a11874..afb51f1 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -71,7 +71,6 @@ class SwDropCapsPict : public Control
     long            mnLineH;
     long            mnTextH;
     sal_uInt16          mnDistance;
-    sal_Int32       mnLeading;
     Printer*        mpPrinter;
     bool            mbDelPrinter;
     /// The _ScriptInfo structure holds information on where we change from one
@@ -243,7 +242,6 @@ void SwDropCapsPict::UpdatePaintSettings( void )
     // gray lines
     mnTotLineH = (GetOutputSizePixel().Height() - 2 * BORDER) / LINES;
     mnLineH = mnTotLineH - 2;
-    mnLeading = GetFontMetric().GetIntLeading();
 
     Font aFont;
     {
@@ -302,11 +300,11 @@ void SwDropCapsPict::UpdatePaintSettings( void )
     maCJKFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
     maCTLFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
 
-    maCJKFont.SetSize(Size(0, maCJKFont.GetSize().Height() + mnLeading));
-    maCTLFont.SetSize(Size(0, maCTLFont.GetSize().Height() + mnLeading));
+    maCJKFont.SetSize(Size(0, maCJKFont.GetSize().Height()));
+    maCTLFont.SetSize(Size(0, maCTLFont.GetSize().Height()));
 
     SetFont(aFont);
-    aFont.SetSize(Size(0, aFont.GetSize().Height() + mnLeading));
+    aFont.SetSize(Size(0, aFont.GetSize().Height()));
     SetFont(aFont);
     maFont = aFont;
 
@@ -356,7 +354,7 @@ void  SwDropCapsPict::Paint(const Rectangle &/*rRect*/)
         DrawRect( Rectangle( Point( BORDER, nY0 ), aTextSize ) );
 
         // draw Text
-        DrawPrev( Point( BORDER, nY0 - mnLeading ) );
+        DrawPrev( Point( BORDER, nY0 ) );
     }
 
     SetClipRegion();