diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-07 17:20:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-07 17:20:01 +0000 |
| commit | 18c89ae6ff01f3d555a7cb030eb4572d504e8de7 (patch) | |
| tree | ca3aeaf8b37569dde6656293548223d1477c6103 /sw | |
| parent | 31d608a87bb28a81bd5c129d473c8b7211d67098 (diff) | |
got to love the sal_Int32 as long/int
Change-Id: Ia843288d6a1739c8f75dbb512d9f3571ac2c8027
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index f251813bebf8..b875631dcd60 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 |