diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-06 20:12:56 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-06 21:32:15 +0200 |
commit | 97035c95c27b34313eadd09692804045f67f440a (patch) | |
tree | 16b81a964cd9e134d35d5359da4daee15fc1bad5 | |
parent | 3aeffe1c16f6592d60681c4241054991d0d6a0e8 (diff) |
Revert "bnc#382137 SwFrm::CheckPageDescs: notify clients about deleted SwPageFrm"
I can't reprodue this in a product build and I'm not sure this was the
right fix for the problem.
This reverts commit bb4d5d96f4daf1dc1b92f823171ac567f6cf95a8.
-rw-r--r-- | sw/source/core/inc/frame.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/layact.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/pagechg.cxx | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 7d91e7992a08..f93ae6771f18 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -588,7 +588,7 @@ public: inline void SetFixSize( sal_Bool bNew ) { mbFixSize = bNew; } // check all pages (starting from the given) and correct them if needed - static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = sal_True, SwPageFrm** ppPrev = 0); + static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = sal_True ); // might return 0, with and without const SwFrm *GetNext() { return mpNext; } diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 37c77f43a7dc..71659ce4ab95 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -562,7 +562,7 @@ void SwLayAction::InternalAction() SwPageFrm *pTmp = pPage->GetPrev() ? (SwPageFrm*)pPage->GetPrev() : pPage; SetCheckPages( sal_True ); - SwFrm::CheckPageDescs( pPage, sal_True, &pTmp ); + SwFrm::CheckPageDescs( pPage ); SetCheckPages( sal_False ); nCheckPageNum = USHRT_MAX; pPage = pTmp; diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 1bf4522b8547..304bbcbece10 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -1061,7 +1061,7 @@ void SwPageFrm::PrepareRegisterChg() |* einfache zu bereinigen. |* |*************************************************************************/ -void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields, SwPageFrm** ppPrev ) +void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields ) { OSL_ENSURE( pStart, "Keine Startpage." ); @@ -1136,15 +1136,10 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields, SwPageFrm { SwPageFrm *pTmp = (SwPageFrm*)pPage->GetNext(); pPage->Cut(); - bool bUpdatePrev = false; - if (ppPrev && *ppPrev == pPage) - bUpdatePrev = true; delete pPage; if ( pStart == pPage ) pStart = pTmp; pPage = pTmp; - if (bUpdatePrev) - *ppPrev = pTmp; continue; } else if ( pPage->IsEmptyPage() && !pFmtWish && //2. |