[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8f2cfef6bc3d876cae6718f31cc45fde499c0a52
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Dec 10 11:48:47 2015 +0000

    guard against missing geometry
    
    Change-Id: I6b2945f1d5a1654f6b5d6a5f5287b4cb9514d97c
    (cherry picked from commit d4d247866eac108162f43dae2c6ddbd9c12382a6)
    (cherry picked from commit 6a9f91915afbcff71121b3485376ab6f1fdcecee)
    Reviewed-on: https://gerrit.libreoffice.org/20596
    Reviewed-by: David Tardon <dtar...@redhat.com>
    Tested-by: David Tardon <dtar...@redhat.com>

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 8d0cce5..871e886 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1044,10 +1044,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;
 }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits