Skip to content

C
core
Kaydet (Commit) 720ee909 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Point and Rectangle coordinates are long, not sal_Int32 

Change-Id: I0f97d12f55e506af699976bf81f4dcf956195aab
üst 53ce805b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
svx/source/customshapes/EnhancedCustomShape2d.cxx
Dosyayı görüntüle @ 720ee909
...@@ -963,7 +963,7 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu ...@@ -963,7 +963,7 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu
if ( nFlags & DFF_CUSTOMSHAPE_FLIP_H ) if ( nFlags & DFF_CUSTOMSHAPE_FLIP_H )
fVal = aLogicRect.GetWidth() - fVal; fVal = aLogicRect.GetWidth() - fVal;
} }
aRetValue.X() = (sal_Int32)fVal; aRetValue.X() = static_cast<long>(fVal);
} }
} }
while ( ++nPass < 2 ); while ( ++nPass < 2 );
......
svx/source/svdraw/svdobj.cxx
Dosyayı görüntüle @ 720ee909
...@@ -972,8 +972,10 @@ void SdrObject::RecalcBoundRect() ...@@ -972,8 +972,10 @@ void SdrObject::RecalcBoundRect()
if(!aRange.isEmpty()) if(!aRange.isEmpty())
{ {
aOutRect = Rectangle( aOutRect = Rectangle(
(sal_Int32)floor(aRange.getMinX()), (sal_Int32)floor(aRange.getMinY()), static_cast<long>(floor(aRange.getMinX())),
(sal_Int32)ceil(aRange.getMaxX()), (sal_Int32)ceil(aRange.getMaxY())); 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 aOutRect -= GetGridOffset(); // don't include grid offset
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment