summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-05-25 19:57:55 (GMT)
committerMichael Stahl <mstahl@redhat.com>2012-05-25 21:24:14 (GMT)
commitb6db1e0683c8fac594a606297f16b1fe163ed15b (patch)
tree894643293c1cccd166e475487618a5b55046c10f
parent1171a1375825785c9da40fd4e043d445c562c4aa (diff)
rhbz#810644: CalcClipRect: add band-aid
No idea what the problem is, perhaps it'll just crash elsewhere now...
-rw-r--r--sw/source/core/layout/flylay.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index b2a9296..c1ae0be 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -1027,6 +1027,12 @@ sal_Bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, sal_Bool bMove )
if ( !bFollowTextFlow || bConsiderWrapOnObjPos )
{
const SwLayoutFrm* pClipFrm = pVertPosOrientFrm->FindPageFrm();
+ if (!pClipFrm)
+ {
+ OSL_FAIL("!pClipFrm: "
+ "if you can reproduce this please file a bug");
+ return false;
+ }
rRect = bMove ? pClipFrm->GetUpper()->Frm()
: pClipFrm->Frm();
// #i26945# - consider that a table, during