Kaydet (Commit) cb1ec05a authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#65931 why are we futzing with leading on the preview anyway

Change-Id: I0eff88f165a737dfd9a2f348f04b17b6a6212e6f
üst a1936e41
...@@ -71,7 +71,6 @@ class SwDropCapsPict : public Control ...@@ -71,7 +71,6 @@ class SwDropCapsPict : public Control
long mnLineH; long mnLineH;
long mnTextH; long mnTextH;
sal_uInt16 mnDistance; sal_uInt16 mnDistance;
sal_Int32 mnLeading;
Printer* mpPrinter; Printer* mpPrinter;
bool mbDelPrinter; bool mbDelPrinter;
/// The _ScriptInfo structure holds information on where we change from one /// The _ScriptInfo structure holds information on where we change from one
...@@ -243,7 +242,6 @@ void SwDropCapsPict::UpdatePaintSettings( void ) ...@@ -243,7 +242,6 @@ void SwDropCapsPict::UpdatePaintSettings( void )
// gray lines // gray lines
mnTotLineH = (GetOutputSizePixel().Height() - 2 * BORDER) / LINES; mnTotLineH = (GetOutputSizePixel().Height() - 2 * BORDER) / LINES;
mnLineH = mnTotLineH - 2; mnLineH = mnTotLineH - 2;
mnLeading = GetFontMetric().GetIntLeading();
Font aFont; Font aFont;
{ {
...@@ -302,11 +300,11 @@ void SwDropCapsPict::UpdatePaintSettings( void ) ...@@ -302,11 +300,11 @@ void SwDropCapsPict::UpdatePaintSettings( void )
maCJKFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor()); maCJKFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
maCTLFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor()); maCTLFont.SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
maCJKFont.SetSize(Size(0, maCJKFont.GetSize().Height() + mnLeading)); maCJKFont.SetSize(Size(0, maCJKFont.GetSize().Height()));
maCTLFont.SetSize(Size(0, maCTLFont.GetSize().Height() + mnLeading)); maCTLFont.SetSize(Size(0, maCTLFont.GetSize().Height()));
SetFont(aFont); SetFont(aFont);
aFont.SetSize(Size(0, aFont.GetSize().Height() + mnLeading)); aFont.SetSize(Size(0, aFont.GetSize().Height()));
SetFont(aFont); SetFont(aFont);
maFont = aFont; maFont = aFont;
...@@ -356,7 +354,7 @@ void SwDropCapsPict::Paint(const Rectangle &/*rRect*/) ...@@ -356,7 +354,7 @@ void SwDropCapsPict::Paint(const Rectangle &/*rRect*/)
DrawRect( Rectangle( Point( BORDER, nY0 ), aTextSize ) ); DrawRect( Rectangle( Point( BORDER, nY0 ), aTextSize ) );
// draw Text // draw Text
DrawPrev( Point( BORDER, nY0 - mnLeading ) ); DrawPrev( Point( BORDER, nY0 ) );
} }
SetClipRegion(); SetClipRegion();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment