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

Reduce number of arguments

Browse Source 
The font is already a member of the class, and the EM height is unused.

Change-Id: Ice2eb2bb3e4b491bcb93123e1c3a08170cdaa50b
This commit is contained in:
Khaled Hosny
2016-10-31 04:37:25 +02:00
parent 1011f99ed6
commit ebe3fd5291
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/inc/win/winlayout.hxx
View File

@@ -501,7 +501,7 @@ private:
D2DWriteTextOutRenderer & operator = (const D2DWriteTextOutRenderer &) = delete; D2DWriteTextOutRenderer & operator = (const D2DWriteTextOutRenderer &) = delete;
bool GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** ppFontFace, float * lfSize) const; bool GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** ppFontFace, float * lfSize) const;
bool GetDWriteInkBox(IDWriteFontFace & rFontFace, SalLayout const &rLayout, float const lfEmHeight, Rectangle &) const; bool GetDWriteInkBox(SalLayout const &rLayout, Rectangle &) const;
ID2D1Factory * mpD2DFactory; ID2D1Factory * mpD2DFactory;
IDWriteFactory * mpDWriteFactory; IDWriteFactory * mpDWriteFactory;

8
vcl/win/gdi/winlayout.cxx
View File

@@ -3455,7 +3455,7 @@ bool D2DWriteTextOutRenderer::operator ()(SalLayout const &rLayout, HDC hDC,
} }
Rectangle bounds; Rectangle bounds;
bool succeeded = GetDWriteInkBox(*mpFontFace, rLayout, mlfEmHeight, bounds); bool succeeded = GetDWriteInkBox(rLayout, bounds);
succeeded &= BindDC(hDC, bounds); // Update the bounding rect. succeeded &= BindDC(hDC, bounds); // Update the bounding rect.
ID2D1SolidColorBrush* pBrush = nullptr; ID2D1SolidColorBrush* pBrush = nullptr;
@@ -3652,12 +3652,12 @@ bool D2DWriteTextOutRenderer::GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** p
return succeeded; 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(); rOut.SetEmpty();
DWRITE_FONT_METRICS aFontMetrics; DWRITE_FONT_METRICS aFontMetrics;
rFontFace.GetMetrics(&aFontMetrics); mpFontFace->GetMetrics(&aFontMetrics);
Point aPos; Point aPos;
sal_GlyphId nLGlyph; sal_GlyphId nLGlyph;
@@ -3685,7 +3685,7 @@ bool D2DWriteTextOutRenderer::GetDWriteInkBox(IDWriteFontFace & rFontFace, SalLa
if (bVertical) if (bVertical)
{ {
DWRITE_FONT_METRICS aFM; DWRITE_FONT_METRICS aFM;
rFontFace.GetMetrics(&aFM); mpFontFace->GetMetrics(&aFM);
nYDiff = (aFM.ascent - aFM.descent) * mlfEmHeight / aFM.designUnitsPerEm; nYDiff = (aFM.ascent - aFM.descent) * mlfEmHeight / aFM.designUnitsPerEm;
} }