diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-26 09:50:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-03 10:37:51 +0200 |
| commit | 8bc951daf79decbd8a599a409c6d33c5456710e0 (patch) | |
| tree | 61d220d83e90a176fbcbe667827eee4b9631a4ca /svtools/source/brwbox/brwbox2.cxx | |
| parent | 10eefdfa6c0250c6069e641e404f34e5a91fe993 (diff) | |
long->sal_Int32 in tools/gen.hxx
which triggered a lot of changes in sw/
Change-Id: Ia2aa22ea3f76463a85ea077a411246fcfed00bf6
Reviewed-on: https://gerrit.libreoffice.org/48806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools/source/brwbox/brwbox2.cxx')
| -rw-r--r-- | svtools/source/brwbox/brwbox2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 89c3babea3c7..a26159073aac 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -941,7 +941,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec if (nY <= aOverallAreaBRPos.Y()) _rOut.DrawLine( Point( nHLineX, nY ), Point( bVLines - ? std::min(long(aPos.X() - 1), aOverallAreaBRPos.X()) + ? std::min<sal_Int32>(aPos.X() - 1, aOverallAreaBRPos.X()) : aOverallAreaBRPos.X(), nY ) ); _rOut.Pop(); @@ -1357,7 +1357,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) // event occurred out of data area if ( rEvt.IsRight() ) pDataWin->Command( - CommandEvent( Point( 1, LONG_MAX ), CommandEventId::ContextMenu, true ) ); + CommandEvent( Point( 1, RECT_MAX ), CommandEventId::ContextMenu, true ) ); else SetNoSelection(); } @@ -1392,7 +1392,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt ) pDataWin->HideTracking() ; // check allowed width and new delta - nDragX = std::max( rEvt.GetPosPixel().X(), nMinResizeX ); + nDragX = std::max<sal_Int32>( rEvt.GetPosPixel().X(), nMinResizeX ); long nDeltaX = nDragX - nResizeX; sal_uInt16 nId = GetColumnId(nResizeCol); sal_uLong nOldWidth = GetColumnWidth(nId); @@ -1422,7 +1422,7 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) pDataWin->HideTracking(); // width changed? - nDragX = std::max( rEvt.GetPosPixel().X(), nMinResizeX ); + nDragX = std::max<sal_Int32>( rEvt.GetPosPixel().X(), nMinResizeX ); if ( (nDragX - nResizeX) != static_cast<long>(pCols[ nResizeCol ]->Width()) ) { // resize column |