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

[Jan Holesovsky]

 vcl/source/window/layout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 02a88ffea593481620993781cb318d52252b8cfc
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Dec 17 10:12:34 2014 +0100

    Fix 32bit build.
    
    Change-Id: Idb4f91ffc89a3a7857ee36bfa977e37b37211c5f

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index be1e060..1fc5e1f 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -755,11 +755,11 @@ VclGrid::array_type VclGrid::assembleGrid() const
     for (vcl::Window* pChild = GetWindow(WINDOW_FIRSTCHILD); pChild;
         pChild = pChild->GetWindow(WINDOW_NEXT))
     {
-        sal_Int32 nLeftAttach = std::max(pChild->get_grid_left_attach(), 0);
+        sal_Int32 nLeftAttach = std::max<sal_Int32>(pChild->get_grid_left_attach(), 0);
         sal_Int32 nWidth = pChild->get_grid_width();
         sal_Int32 nMaxXPos = nLeftAttach+nWidth-1;
 
-        sal_Int32 nTopAttach = std::max(pChild->get_grid_top_attach(), 0);
+        sal_Int32 nTopAttach = std::max<sal_Int32>(pChild->get_grid_top_attach(), 0);
         sal_Int32 nHeight = pChild->get_grid_height();
         sal_Int32 nMaxYPos = nTopAttach+nHeight-1;