1 files changed, 4 insertions, 77 deletions

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 5ef2df851e17..cce5bcb586f1 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -373,7 +373,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                                 SwPtrMsgPoolItem aMsgHint( nDelMsg,
                                                     (void*)&pAttr->GetAttr() );
                                 rNds.GetDoc()->GetUnoCallBack()->
-                                            Modify( &aMsgHint, &aMsgHint );
+                                            ModifyNotification( &aMsgHint, &aMsgHint );
                             }
                         }
                     }
@@ -402,7 +402,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
 
     if( bNewFrms )
         bNewFrms = &GetDoc()->GetNodes() == (const SwNodes*)&rNds &&
-                    GetDoc()->GetRootFrm();
+                    GetDoc()->GetCurrentViewShell();    //swmod 071108//swmod 071225
     if( bNewFrms )
     {
         // Frames besorgen:
@@ -671,7 +671,7 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                             SwFrmFmt* pTblFmt = pTblNd->GetTable().GetFrmFmt();
                             SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT,
                                                         pTblFmt );
-                            pTblFmt->Modify( &aMsgHint, &aMsgHint );
+                            pTblFmt->ModifyNotification( &aMsgHint, &aMsgHint );
                         }
                     }
                     if( bNewFrms )
@@ -1532,79 +1532,6 @@ SwCntntNode* SwNodes::GoPrevious(SwNodeIndex *pIdx) const
     return (SwCntntNode*)pNd;
 }
 
-SwNode* SwNodes::GoNextWithFrm(SwNodeIndex *pIdx) const
-{
-    if( pIdx->GetIndex() >= Count() - 1 )
-        return 0;
-
-    SwNodeIndex aTmp(*pIdx, +1);
-    SwNode* pNd = 0;
-    while( aTmp < Count()-1 )
-    {
-        pNd = &aTmp.GetNode();
-        SwModify *pMod = 0;
-        if ( pNd->IsCntntNode() )
-            pMod = (SwCntntNode*)pNd;
-        else if ( pNd->IsTableNode() )
-            pMod = ((SwTableNode*)pNd)->GetTable().GetFrmFmt();
-        else if( pNd->IsEndNode() && !pNd->StartOfSectionNode()->IsSectionNode() )
-        {
-            pNd = 0;
-            break;
-        }
-        if ( pMod && pMod->GetDepends() )
-        {
-            SwClientIter aIter( *pMod );
-            if( aIter.First( TYPE(SwFrm) ) )
-                break;
-        }
-        aTmp++;
-    }
-    if( aTmp == Count()-1 )
-        pNd = 0;
-    else if( pNd )
-        (*pIdx) = aTmp;
-    return pNd;
-}
-
-SwNode* SwNodes::GoPreviousWithFrm(SwNodeIndex *pIdx) const
-{
-    if( !pIdx->GetIndex() )
-        return 0;
-
-    SwNodeIndex aTmp( *pIdx, -1 );
-    SwNode* pNd(0);
-    while( aTmp.GetIndex() )
-    {
-        pNd = &aTmp.GetNode();
-        SwModify *pMod = 0;
-        if ( pNd->IsCntntNode() )
-            pMod = (SwCntntNode*)pNd;
-        else if ( pNd->IsTableNode() )
-            pMod = ((SwTableNode*)pNd)->GetTable().GetFrmFmt();
-        else if( pNd->IsStartNode() && !pNd->IsSectionNode() )
-        {
-            pNd = 0;
-            break;
-        }
-        if ( pMod && pMod->GetDepends() )
-        {
-            SwClientIter aIter( *pMod );
-            if( aIter.First( TYPE(SwFrm) ) )
-                break;
-        }
-        aTmp--;
-    }
-
-    if( !aTmp.GetIndex() )
-        pNd = 0;
-    else if( pNd )
-        (*pIdx) = aTmp;
-    return pNd;
-}
-
-
-
 /*************************************************************************
 |*
 |*    sal_Bool SwNodes::CheckNodesRange()
@@ -2407,7 +2334,7 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
     SwNode* pFrmNd = 0;
 
     // habe wir gar kein Layout, vergiss es
-    if( GetDoc()->GetRootFrm() )
+    if( GetDoc()->GetCurrentViewShell() )   //swmod 071108//swmod 071225
     {
         SwNode* pSttNd = &rFrmIdx.GetNode();