sw/source/core/layout/trvlfrm.cxx | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ece13b024a34ffe46ee8d8fca4eadfec86bf2bf7
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Mon Dec 3 22:08:26 2012 +0100
Related: fdo#57515 Crash when creating a Table of Contents
Change-Id: Idfdb62e495987a15bc5fc36548074ced7426e21c
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index cbcdc52..a70b08d 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -294,10 +294,13 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
&rPoint,
// FIXME There are still cases were we don't have the proper
node here.
SwCntntFrm* pBackFrm = pBackNd->getLayoutFrm( getRootFrm( ) );
SwRect rBackRect;
- pBackFrm->GetCharRect( rBackRect, aBackPos );
+ if (pBackFrm)
+ {
+ pBackFrm->GetCharRect( rBackRect, aBackPos );
- nBackDistance = lcl_getDistance( rBackRect, rPoint );
- bValidBackDistance = true;
+ nBackDistance = lcl_getDistance( rBackRect, rPoint );
+ bValidBackDistance = true;
+ }
}
if ( bValidTextDistance && bValidBackDistance &&
basegfx::fTools::more( nTextDistance, nBackDistance ) )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
