[ooo-build-commit] patches/dev300

[Cédric Bosdonnat]

 patches/dev300/sw-collapse-empty-table-par-like-html.diff |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit d5220f8a9fe18adf2e680c61bba39dd1f0660435
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Oct 13 16:46:03 2009 +0200

    Fixed crash / loop in Writer
    
    * patches/dev300/sw-collapse-empty-table-par-like-html.diff:
        Many thanks to Tor's quick debugging

diff --git a/patches/dev300/sw-collapse-empty-table-par-like-html.diff b/patches/dev300/sw-collapse-empty-table-par-like-html.diff
index f7010d3..8ec5eef 100644
--- a/patches/dev300/sw-collapse-empty-table-par-like-html.diff
+++ b/patches/dev300/sw-collapse-empty-table-par-like-html.diff
@@ -55,7 +55,7 @@ index 8aaa93c..410b70e 100644
  
  SwCallLink::SwCallLink( SwCrsrShell & rSh, ULONG nAktNode, xub_StrLen nAktCntnt,
                          BYTE nAktNdTyp, long nLRPos, bool bAktSelection )
-@@ -100,6 +105,47 @@ SwCallLink::~SwCallLink()
+@@ -100,6 +105,51 @@ SwCallLink::~SwCallLink()
      if( !pCNd )
          return;
  
@@ -77,7 +77,11 @@ index 8aaa93c..410b70e 100644
 +    }
 + 
 +    const SwDoc *pDoc=rShell.GetDoc();
-+    const SwCntntNode *pNode=(pDoc!=NULL?pDoc->GetNodes()[nNode]->GetCntntNode():NULL);
++    const SwCntntNode *pNode = NULL;
++    if ( ( pDoc != NULL && nNode < pDoc->GetNodes( ).Count( ) ) )
++    {
++        pNode = pDoc->GetNodes()[nNode]->GetCntntNode();
++    }
 +    if ( pNode != NULL )
 +    {
 +        SwFrm *myFrm2=pNode->GetFrm();