diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-10-31 04:37:25 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-10-31 04:53:52 +0200 |
| commit | ebe3fd529195ae1edf5daeab197bbb3cfec4143c (patch) | |
| tree | 9b0546a7ef713dc9ff1396ec24e953706a36ac87 /vcl/win | |
| parent | 1011f99ed63b61d9f9a469388729fa7d1b5bf960 (diff) | |
Reduce number of arguments
The font is already a member of the class, and the EM height is unused.
Change-Id: Ice2eb2bb3e4b491bcb93123e1c3a08170cdaa50b
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 658641e40643..50f6602db6ac 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -3455,7 +3455,7 @@ bool D2DWriteTextOutRenderer::operator ()(SalLayout const &rLayout, HDC hDC, } Rectangle bounds; - bool succeeded = GetDWriteInkBox(*mpFontFace, rLayout, mlfEmHeight, bounds); + bool succeeded = GetDWriteInkBox(rLayout, bounds); succeeded &= BindDC(hDC, bounds); // Update the bounding rect. ID2D1SolidColorBrush* pBrush = nullptr; @@ -3652,12 +3652,12 @@ bool D2DWriteTextOutRenderer::GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** p return succeeded; } -bool D2DWriteTextOutRenderer::GetDWriteInkBox(IDWriteFontFace & rFontFace, SalLayout const &rLayout, float const /*lfEmHeight*/, Rectangle & rOut) const +bool D2DWriteTextOutRenderer::GetDWriteInkBox(SalLayout const &rLayout, Rectangle & rOut) const { rOut.SetEmpty(); DWRITE_FONT_METRICS aFontMetrics; - rFontFace.GetMetrics(&aFontMetrics); + mpFontFace->GetMetrics(&aFontMetrics); Point aPos; sal_GlyphId nLGlyph; @@ -3685,7 +3685,7 @@ bool D2DWriteTextOutRenderer::GetDWriteInkBox(IDWriteFontFace & rFontFace, SalLa if (bVertical) { DWRITE_FONT_METRICS aFM; - rFontFace.GetMetrics(&aFM); + mpFontFace->GetMetrics(&aFM); nYDiff = (aFM.ascent - aFM.descent) * mlfEmHeight / aFM.designUnitsPerEm; } |