[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/window/window.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9dea39c177e61385770311077cf082aa581671fd
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 19 16:29:46 2013 +0200

    Fix sal_Int32/int mismatch
    
    Change-Id: I4775d1f9bef9c658c2f94d8310ddf544126bb973

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e689668..1bd234b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1713,7 +1713,7 @@ void Window::ImplInitResolutionSettings()
         mnDPIY = (mpWindowImpl->mpFrameData->mnDPIY*nScreenZoom)/100;
 
         // setup the scale factor for Hi-DPI displays
-        mnDPIScaleFactor = std::max(1, (mpWindowImpl->mpFrameData->mnDPIY + 48) / 96);
+        mnDPIScaleFactor = std::max((sal_Int32)1, (mpWindowImpl->mpFrameData->mnDPIY + 48) / 96);
 
         SetPointFont( rStyleSettings.GetAppFont() );
     }