filter/source/msfilter/msdffimp.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4f490b86c782f609dabf1355c8db4d654af4c9c4
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 13 21:16:56 2018 +0000
ofz: Abrt
Change-Id: I814b0e4255894d909d29a9a301488a23acf418a0
Reviewed-on: https://gerrit.libreoffice.org/49686
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index dc26bc4a6c57..8291b7ccc0d0 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1107,7 +1107,8 @@ void ApplyRectangularGradientAsBitmap( const
SvxMSDffManager& rManager, SvStream
{
Size aBitmapSizePixel( static_cast< sal_Int32 >( (
rObjData.aBoundRect.GetWidth() / 2540.0 ) * 90.0 ), // we will create a
bitmap with 90 dpi
static_cast< sal_Int32 >( (
rObjData.aBoundRect.GetHeight() / 2540.0 ) * 90.0 ) );
- if ( aBitmapSizePixel.Width() && aBitmapSizePixel.Height() && (
aBitmapSizePixel.Width() <= 1024 ) && ( aBitmapSizePixel.Height() <= 1024 ) )
+ if (aBitmapSizePixel.Width() > 0 && aBitmapSizePixel.Height() > 0 &&
+ aBitmapSizePixel.Width() <= 1024 && aBitmapSizePixel.Height() <= 1024)
{
double fFocusX = rManager.GetPropertyValue( DFF_Prop_fillToRight, 0 )
/ 65536.0;
double fFocusY = rManager.GetPropertyValue( DFF_Prop_fillToBottom, 0 )
/ 65536.0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
