mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I0eff88f165a737dfd9a2f348f04b17b6a6212e6f
This commit is contained in:
Caolán McNamara
2013-06-19 13:55:23 +01:00
parent a1936e4183
commit cb1ec05a72
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sw/source/ui/chrdlg/drpcps.cxx
View File

@@ -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 )
// 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 )
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*/)
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();