[Libreoffice-commits] core.git: lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptablelayout.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 5dfe9e93fa4ea8e41dfedf1e8f168c54d28ae2d9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 7 15:40:53 2018 +0000

    ofz#6092 Null-dereference
    
    Change-Id: Ic9a31b4819c07e82f6b90c4db1903ec5e27044be
    Reviewed-on: https://gerrit.libreoffice.org/49364
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 924da8b7ab08..f8793328cd9b 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -330,9 +330,8 @@ void LwpSuperTableLayout::ApplyWatermark(XFTableStyle *pTableStyle)
 void LwpSuperTableLayout::ApplyAlignment(XFTableStyle * pTableStyle)
 {
     LwpPoint aPoint;
-    if (GetGeometry())
-        aPoint = GetGeometry()->GetOrigin();
-    //LwpPoint aPoint = GetOrigin();
+    if (LwpLayoutGeometry* pGeometry = GetGeometry())
+        aPoint = pGeometry->GetOrigin();
     double dXOffset = LwpTools::ConvertFromUnitsToMetric(aPoint.GetX());
 
     // add left padding to alignment distance