sw: rename SwFrm::Remove to something unique

Change-Id: I4daf01450a4aa8f1d2bc6eae731a735d0d38a074

11 files changed, 26 insertions, 26 deletions

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 95f99c403397..a8bae4a1534f 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -464,7 +464,7 @@ public:
     // insert before pBehind or at the end of the chain while considering
     // the siblings of pSct
     void InsertGroupBefore( SwFrm* pParent, SwFrm* pWhere, SwFrm* pSct );
-    void Remove();
+    void RemoveFromLayout();
 
     // For internal use only - who ignores this will be put in a sack and has
     // to stay there for two days
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index b7ea89823797..d7bb1d375f04 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1798,7 +1798,7 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace,
                              (SwFrm*)pFrm->FindFtnFrm() : pFrm;
             SwLayoutFrm *pUp = pTmpFrm->GetUpper();
             SwFrm *pOldNext = pTmpFrm->GetNext();
-            pTmpFrm->Remove();
+            pTmpFrm->RemoveFromLayout();
             pTmpFrm->InsertBefore( pNewUpper, 0 );
             if ( pFrm->IsTxtFrm() &&
                  ( bTstMove ||
@@ -1815,7 +1815,7 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace,
             else
                 bRet = pFrm->WouldFit( nSpace, bSplit, false );
 
-            pTmpFrm->Remove();
+            pTmpFrm->RemoveFromLayout();
             pTmpFrm->InsertBefore( pUp, pOldNext );
         }
         else
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 9c618e6e8b37..220061049631 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -321,7 +321,7 @@ void SwFlyFrm::DeleteCnt()
             }
         }
 
-        pFrm->Remove();
+        pFrm->RemoveFromLayout();
         delete pFrm;
         pFrm = m_pLower;
     }
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index c6ba7c896cf0..352dadd3c937 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1505,7 +1505,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
                     SwFrm *pTmpFrm = pLay;
                     pLay = pTmpFrm->GetUpper();
                     pPrv = pTmpFrm->GetPrev();
-                    pTmpFrm->Remove();
+                    pTmpFrm->RemoveFromLayout();
                     delete pTmpFrm;
                 }
                 else
@@ -1583,7 +1583,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
         // Might happen that an empty (Follow-)Section is left over.
         if ( !(pLay = pActualSection->GetSectionFrm())->ContainsCntnt() )
         {
-            pLay->Remove();
+            pLay->RemoveFromLayout();
             delete pLay;
         }
         delete pActualSection;
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index a69534bf0cfe..8f9f8c8b0576 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -504,7 +504,7 @@ void SwFtnFrm::Cut()
     pFtn->SetMaster( 0 );
 
     // cut all connections
-    Remove();
+    RemoveFromLayout();
 
     if ( pUp )
     {
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 40ea8204293f..c9374ba1cf68 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -818,7 +818,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                             while ( pRow )
                             {
                                 SwFrm* pNxt = pRow->GetNext();
-                                pRow->Remove();
+                                pRow->RemoveFromLayout();
                                 pRow->InsertBehind( pFoll, pPrv );
                                 pPrv = pRow;
                                 pRow = pNxt;
@@ -859,7 +859,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
                     if ( !rpActualSection->GetSectionFrm()->ContainsCntnt())
                     {
                         pSct = rpActualSection->GetSectionFrm();
-                        pSct->Remove();
+                        pSct->RemoveFromLayout();
                     }
                     else
                     {
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 02c523bfcd0b..cd1314bcb87e 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -838,7 +838,7 @@ void SwPageFrm::Cut()
     SwFrm* pRootFrm = GetUpper();
 
     // cut all connections
-    Remove();
+    RemoveFromLayout();
 
     if ( pRootFrm )
         static_cast<SwRootFrm*>(pRootFrm)->CheckViewLayout( 0, 0 );
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index dc148230e2bc..53a50b8bd6ce 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -257,7 +257,7 @@ void SwSectionFrm::_Cut( bool bRemove )
     SwLayoutFrm *pUp = GetUpper();
     if( bRemove )
     {
-        Remove();
+        RemoveFromLayout();
         if( pUp && !pUp->Lower() && pUp->IsFtnFrm() && !pUp->IsColLocked() &&
             pUp->GetUpper() )
         {
@@ -2563,7 +2563,7 @@ void SwRootFrm::_DeleteEmptySct()
         if( !pSect->Frm().HasArea() && !pSect->ContainsCntnt() )
         {
             SwLayoutFrm* pUp = pSect->GetUpper();
-            pSect->Remove();
+            pSect->RemoveFromLayout();
             delete pSect;
             if( pUp && !pUp->Lower() )
             {
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 06f6ee294248..a4a90c004693 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -486,7 +486,7 @@ void SwLayoutFrm::Destroy()
                     }
                 }
             }
-            pFrm->Remove();
+            pFrm->RemoveFromLayout();
             delete pFrm;
             pFrm = m_pLower;
         }
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index e3c410268491..dffb17867715 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -401,13 +401,13 @@ static void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine )
 
                     lcl_MoveRowContent( *pTmpSourceRow, *pTmpDestRow );
                     pTmpDestRow->SetFollowRow( pTmpSourceRow->GetFollowRow() );
-                    pTmpSourceRow->Remove();
+                    pTmpSourceRow->RemoveFromLayout();
                     delete pTmpSourceRow;
                 }
                 else
                 {
                     // move complete row:
-                    pTmpSourceRow->Remove();
+                    pTmpSourceRow->RemoveFromLayout();
                     pTmpSourceRow->InsertBefore( pCurrDestCell, 0 );
                 }
 
@@ -538,7 +538,7 @@ static void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine,
             {
                 SwRowFrm* pTmp = static_cast<SwRowFrm*>(pTmpLastLineRow->GetNext());
                 lcl_MoveFootnotes( rTab, *rTab.GetFollow(), *pTmpLastLineRow );
-                pTmpLastLineRow->Remove();
+                pTmpLastLineRow->RemoveFromLayout();
                 pTmpLastLineRow->InsertBefore( pCurrFollowFlowLineCell, 0 );
                 pTmpLastLineRow->Shrink( ( pTmpLastLineRow->Frm().*fnRect->fnGetHeight)() );
                 pCurrFollowFlowLineCell->Grow( ( pTmpLastLineRow->Frm().*fnRect->fnGetHeight)() );
@@ -822,7 +822,7 @@ bool SwTabFrm::RemoveFollowFlowLine()
             // The footnotes have to be moved:
             lcl_MoveFootnotes( *GetFollow(), *this, static_cast<SwRowFrm&>(*pRow) );
 
-            pRow->Remove();
+            pRow->RemoveFromLayout();
             pRow->InsertBehind( this, pInsertBehind );
             pRow->_InvalidateAll();
             pRow->CheckDirChange();
@@ -1156,7 +1156,7 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee
             nRet += (pRow->Frm().*fnRect->fnGetHeight)();
             // The footnotes do not have to be moved, this is done in the
             // MoveFwd of the follow table!!!
-            pRow->Remove();
+            pRow->RemoveFromLayout();
             pRow->InsertBehind( pFoll, pInsertBehind );
             pRow->_InvalidateAll();
             pInsertBehind = pRow;
@@ -1178,7 +1178,7 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee
             // The footnotes have to be moved:
             lcl_MoveFootnotes( *this, *GetFollow(), *pRow );
 
-            pRow->Remove();
+            pRow->RemoveFromLayout();
             pRow->Paste( pFoll, pPasteBefore );
 
             pRow->CheckDirChange();
@@ -1231,7 +1231,7 @@ bool SwTabFrm::Join()
         {
             pNxt = pRow->GetNext();
             nHeight += (pRow->Frm().*fnRect->fnGetHeight)();
-            pRow->Remove();
+            pRow->RemoveFromLayout();
             pRow->_InvalidateAll();
             pRow->InsertBehind( this, pPrv );
             pRow->CheckDirChange();
@@ -3384,7 +3384,7 @@ void SwTabFrm::Cut()
     //First remove, then shrink the upper.
     SwLayoutFrm *pUp = GetUpper();
     SWRECTFN( this )
-    Remove();
+    RemoveFromLayout();
     if ( pUp )
     {
         OSL_ENSURE( !pUp->IsFtnFrm(), "Table in Footnote." );
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index bc98ddfc4821..a6e3cbfc1dce 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -695,7 +695,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
     }
 }
 
-void SwFrm::Remove()
+void SwFrm::RemoveFromLayout()
 {
     OSL_ENSURE( mpUpper, "Remove without upper?" );
 
@@ -932,7 +932,7 @@ void SwCntntFrm::Cut()
     }
     //Remove first, then shrink the upper.
     SwLayoutFrm *pUp = GetUpper();
-    Remove();
+    RemoveFromLayout();
     if ( pUp )
     {
         SwSectionFrm *pSct = 0;
@@ -1130,16 +1130,16 @@ void SwLayoutFrm::Cut()
                 if( NA_GROW_ADJUST == nAdjust && nReal < nShrink )
                     AdjustNeighbourhood( nReal - nShrink );
             }
-            Remove();
+            RemoveFromLayout();
         }
         else
         {
-            Remove();
+            RemoveFromLayout();
             pUp->Shrink( nShrink );
         }
     }
     else
-        Remove();
+        RemoveFromLayout();
 
     if( pUp && !pUp->Lower() )
     {