sw/source/core/layout/tabfrm.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e1f4022b9ea7ae99a31773c445d8229ba3bdea93
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 13 09:50:15 2015 +0000
Resolves: tdf#76636 crash on merging certain cells imported from a .doc
Change-Id: I61d5088a6f2e0b444b2943a2f9ce9feeb2e09c11
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index a0699f0..4b25ce7 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4974,7 +4974,7 @@ long SwCellFrm::GetLayoutRowSpan() const
if ( nRet < 1 )
{
const SwFrm* pRow = GetUpper();
- const SwTabFrm* pTab = static_cast<const SwTabFrm*>(pRow->GetUpper());
+ const SwTabFrm* pTab = pRow ? static_cast<const
SwTabFrm*>(pRow->GetUpper()) : NULL;
if ( pTab && pTab->IsFollow() && pRow ==
pTab->GetFirstNonHeadlineRow() )
nRet = -nRet;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
