diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-08-22 17:17:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-08-22 17:17:52 +0200 |
| commit | 720ee909292db389606511d6fac75ad03d72d695 (patch) | |
| tree | 8c722decf6655c7cdaa5307734bcca7ba1abc16f | |
| parent | 53ce805b436d65f35c815ca5355aa5e7dd579e64 (diff) | |
Point and Rectangle coordinates are long, not sal_Int32
Change-Id: I0f97d12f55e506af699976bf81f4dcf956195aab
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 175b2a0be804..df29afce2a0e 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -963,7 +963,7 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu if ( nFlags & DFF_CUSTOMSHAPE_FLIP_H ) fVal = aLogicRect.GetWidth() - fVal; } - aRetValue.X() = (sal_Int32)fVal; + aRetValue.X() = static_cast<long>(fVal); } } while ( ++nPass < 2 ); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 8f02887371df..dc2d8d8da08a 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -972,8 +972,10 @@ void SdrObject::RecalcBoundRect() if(!aRange.isEmpty()) { aOutRect = Rectangle( - (sal_Int32)floor(aRange.getMinX()), (sal_Int32)floor(aRange.getMinY()), - (sal_Int32)ceil(aRange.getMaxX()), (sal_Int32)ceil(aRange.getMaxY())); + static_cast<long>(floor(aRange.getMinX())), + static_cast<long>(floor(aRange.getMinY())), + static_cast<long>(ceil(aRange.getMaxX())), + static_cast<long>(ceil(aRange.getMaxY()))); aOutRect -= GetGridOffset(); // don't include grid offset return; } |