Kaydet (Commit) 97035c95 authored tarafından Miklos Vajna's avatar Miklos Vajna

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.
üst 3aeffe1c
......@@ -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; }
......
......@@ -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;
......
......@@ -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.
......
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