vcl/win/gdi/winlayout.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 6a737c942b1a4f5c3a99c625793fcd4422b64784 Author: lbenes <[email protected]> Date: Sun Oct 30 23:44:11 2016 -0400 fix MSVC 2015 build Error C2397 Change-Id: I4810aa8b0b7d28bcd41b4aa19d40f41757d540cd Reviewed-on: https://gerrit.libreoffice.org/30411 Tested-by: Jenkins <[email protected]> Reviewed-by: Khaled Hosny <[email protected]> diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 5655785..3aed82d 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -3474,7 +3474,7 @@ bool D2DWriteTextOutRenderer::operator ()(SalLayout const &rLayout, HDC hDC, DWRITE_GLYPH_OFFSET glyphOffsets[MAX_GLYPHS] = { { 0.0f, 0.0f }, }; bool bVertical = false; - double nYDiff = 0.0f; + float nYDiff = 0.0f; const CommonSalLayout* pCSL = dynamic_cast<const CommonSalLayout*>(&rLayout); if (pCSL) bVertical = pCSL->getFontSelData().mbVertical; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
