summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-08-12 14:15:29 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-08-12 14:16:10 +0200
commit68c6408b1725a8f506a8adb8c9af67a65e667f1c (patch)
treeba60b150404eede44cca7d282756a3507b6ccd0d
parent2e23b6b9fc31de8177d72028f4d9441c76015903 (diff)
tdf#93382: Make HACK more targeted to avoid collateral damage
Change-Id: Ieecad5f244703c4d2436e22a3ab50f719843eef4
-rw-r--r--svx/source/unodraw/unoshap4.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index a6ad98ae6743..e087d61e475d 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -428,13 +428,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