summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-10 11:48:47 +0000
committerMichael Stahl <mstahl@redhat.com>2015-12-10 15:25:48 +0000
commitb00a3b67cc6774deb8b8d9d488b6f7b331114137 (patch)
tree8dc06a74a8c3982d01e27c07906eaf36bcd754e4
parentc023d5deb783e1e463f60e02cfabd045bfdda4c9 (diff)
guard against missing geometry
Change-Id: I6b2945f1d5a1654f6b5d6a5f5287b4cb9514d97c (cherry picked from commit d4d247866eac108162f43dae2c6ddbd9c12382a6) (cherry picked from commit 6a9f91915afbcff71121b3485376ab6f1fdcecee) Reviewed-on: https://gerrit.libreoffice.org/20597 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--lotuswordpro/source/filter/lwplayout.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 38634586e8ea..27f9d5c9065e 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1033,10 +1033,10 @@ sal_Int32 LwpMiddleLayout::DetermineWidth()
{
assert(false);
}
- else
+ else if (LwpLayoutGeometry* pGeo = GetGeometry())
{
m_nAttributes3 |= STYLE3_WIDTHVALID;
- return GetGeometry()->GetWidth();
+ return pGeo->GetWidth();
}
return 0;
}