svn commit: r1482717 - /openoffice/trunk/main/sw/source/core/edit/eddel.cxx

[zhengfan]

Author: zhengfan
Date: Wed May 15 08:14:07 2013
New Revision: 1482717

URL: http://svn.apache.org/r1482717
Log:
i117395, for avoiding the cases of hidden or invisible node, which lead no 
frame of node exist

Modified:
    openoffice/trunk/main/sw/source/core/edit/eddel.cxx

Modified: openoffice/trunk/main/sw/source/core/edit/eddel.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/edit/eddel.cxx?rev=1482717&r1=1482716&r2=1482717&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/edit/eddel.cxx (original)
+++ openoffice/trunk/main/sw/source/core/edit/eddel.cxx Wed May 15 08:14:07 2013
@@ -92,8 +92,11 @@ void SwEditShell::DeleteSel( SwPaM& rPam
                                aDelPam.Move( fnMoveBackward, fnGoCntnt );
                        }
                                // geschuetze Boxen ueberspringen !
+                       //For i117395, in some situation, the node would be 
hidden or invisible, which makes the frame of it unavailable
+                       //So verify it before use it.
+                       SwCntntFrm* pFrm = NULL;
                        if( !pNd->IsCntntNode() ||
-                               !((SwCntntNode*)pNd)->getLayoutFrm( GetLayout() 
)->IsProtected() )
+                               !((pFrm=((SwCntntNode*)pNd)->getLayoutFrm( 
GetLayout() ))!=NULL && pFrm->IsProtected()) )
                        {
                                // alles loeschen
                                GetDoc()->DeleteAndJoin( aDelPam );