Kaydet (Commit) 5e4c3d0e authored tarafından Zheng Fan's avatar Zheng Fan

i117395, for avoiding the cases of hidden or invisible node, which lead no frame of node exist

üst 9d54c035
...@@ -92,8 +92,11 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo ) ...@@ -92,8 +92,11 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
aDelPam.Move( fnMoveBackward, fnGoCntnt ); aDelPam.Move( fnMoveBackward, fnGoCntnt );
} }
// geschuetze Boxen ueberspringen ! // 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() || if( !pNd->IsCntntNode() ||
!((SwCntntNode*)pNd)->getLayoutFrm( GetLayout() )->IsProtected() ) !((pFrm=((SwCntntNode*)pNd)->getLayoutFrm( GetLayout() ))!=NULL && pFrm->IsProtected()) )
{ {
// alles loeschen // alles loeschen
GetDoc()->DeleteAndJoin( aDelPam ); GetDoc()->DeleteAndJoin( aDelPam );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment