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

[Caolán McNamara]

 sw/source/core/layout/atrfrm.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 18c89ae6ff01f3d555a7cb030eb4572d504e8de7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 7 17:20:01 2014 +0000

    got to love the sal_Int32 as long/int
    
    Change-Id: Ia843288d6a1739c8f75dbb512d9f3571ac2c8027

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index f251813..b875631 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2276,12 +2276,12 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 #define MIN_TEXTGRID_SIZE 100
                 if( (nMemberId & ~CONVERT_TWIPS) == MID_GRID_BASEHEIGHT )
                 {
-                    nTmp = std::max(nTmp, MIN_TEXTGRID_SIZE);
+                    nTmp = std::max<sal_Int32>(nTmp, MIN_TEXTGRID_SIZE);
                     SetBaseHeight( (sal_uInt16)nTmp );
                 }
                 else if( (nMemberId & ~CONVERT_TWIPS) == MID_GRID_BASEWIDTH )
                 {
-                    nTmp = std::max(nTmp, MIN_TEXTGRID_SIZE);
+                    nTmp = std::max<sal_Int32>(nTmp, MIN_TEXTGRID_SIZE);
                     SetBaseWidth( (sal_uInt16)nTmp );
                 }
                 else