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

Fix 32bit build.

Browse Source 
Change-Id: Idb4f91ffc89a3a7857ee36bfa977e37b37211c5f
This commit is contained in:
Jan Holesovsky
2014-12-17 10:12:34 +01:00
parent dd230388d6
commit 02a88ffea5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/source/window/layout.cxx
View File

@@ -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;