From 6a737c942b1a4f5c3a99c625793fcd4422b64784 Mon Sep 17 00:00:00 2001
From: lbenes <lukebenes@hotmail.com>
Date: Sun, 30 Oct 2016 23:44:11 -0400
Subject: fix MSVC 2015 build Error C2397

Change-Id: I4810aa8b0b7d28bcd41b4aa19d40f41757d540cd
Reviewed-on: https://gerrit.libreoffice.org/30411
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
---
 vcl/win/gdi/winlayout.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vcl')

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 5655785345f7..3aed82d2e6ac 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;
-- 
cgit