svx/source/unodraw/unoshap4.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit a81d95bbee794757176e811e2e37fc8ce7291450
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 12 14:15:29 2015 +0200
tdf#93382: Make HACK more targeted to avoid collateral damage
Change-Id: Ieecad5f244703c4d2436e22a3ab50f719843eef4
(cherry picked from commit 68c6408b1725a8f506a8adb8c9af67a65e667f1c)
Reviewed-on: https://gerrit.libreoffice.org/17672
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 9f07d79..9b9d750 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -429,13 +429,17 @@ bool SvxOle2Shape::createObject( const SvGlobalName
&aClassName )
{}
pOle2Obj->SetLogicRect( aRect );
}
- else if (!aRect.IsEmpty()) //HACK: can aRect legally be empty?
+ else
{
awt::Size aSz;
Size aSize = aRect.GetSize();
aSz.Width = aSize.Width();
aSz.Height = aSize.Height();
- xObj->setVisualAreaSize( pOle2Obj->GetAspect(), aSz );
+ if (aSz.Width != 0 || aSz.Height != 0)
+ {
+ //HACK: can aSz legally be empty?
+ xObj->setVisualAreaSize( pOle2Obj->GetAspect(), aSz );
+ }
}
// connect the object after the visual area is set
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
