diff options
Diffstat (limited to 'embeddedobj/source/commonembedding/embedobj.cxx')
-rw-r--r-- | embeddedobj/source/commonembedding/embedobj.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 60020a4ab86f..32c5085232dc 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -58,8 +58,8 @@ awt::Rectangle GetRectangleInterception( const awt::Rectangle& aRect1, const awt OSL_ENSURE( aRect1.Width >= 0 && aRect2.Width >= 0 && aRect1.Height >= 0 && aRect2.Height >= 0, "Offset must not be less then zero!" ); - aResult.X = aRect1.X > aRect2.X ? aRect1.X : aRect2.X; - aResult.Y = aRect1.Y > aRect2.Y ? aRect1.Y : aRect2.Y; + aResult.X = std::max(aRect1.X, aRect2.X); + aResult.Y = std::max(aRect1.Y, aRect2.Y); sal_Int32 nRight1 = aRect1.X + aRect1.Width; sal_Int32 nBottom1 = aRect1.Y + aRect1.Height; |