[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

[Julien Nabet]

 sw/source/core/layout/frmtool.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 213f32fc9839fce3b01af938293eca331b544dd3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Jun 26 22:31:11 2013 +0200

    fdo#66101: lowriter crashed when trying to open .docx file
    
    Change-Id: I516bcb4bc18806d5a83f94c0776bd0f918a1e927
    Reviewed-on: https://gerrit.libreoffice.org/4550
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-on: https://gerrit.libreoffice.org/4611

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 73d891b..56fd4dd 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1931,7 +1931,7 @@ static bool lcl_hasTabFrm(const SwTxtFrm* pTxtFrm)
             if (pObject->IsA(TYPE(SwFlyFrm)))
             {
                 SwFlyFrm* pFly = (SwFlyFrm*)pObject;
-                if (pFly->Lower()->IsTabFrm())
+                if (pFly->Lower() && pFly->Lower()->IsTabFrm())
                     return true;
             }
         }