diff options
Diffstat (limited to 'sw/source/core/undo/SwUndoPageDesc.cxx')
-rw-r--r-- | sw/source/core/undo/SwUndoPageDesc.cxx | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx index b6eb8797ec..e71d365b8c 100644 --- a/sw/source/core/undo/SwUndoPageDesc.cxx +++ b/sw/source/core/undo/SwUndoPageDesc.cxx @@ -48,10 +48,10 @@ // Pure debug help function to have a quick look at the header/footer attributes. void DebugHeaderFooterContent( const SwPageDesc& rPageDesc ) { - ULONG nHeaderMaster = ULONG_MAX; - ULONG nHeaderLeft = ULONG_MAX; - ULONG nFooterMaster = ULONG_MAX; - ULONG nFooterLeft = ULONG_MAX; + sal_uLong nHeaderMaster = ULONG_MAX; + sal_uLong nHeaderLeft = ULONG_MAX; + sal_uLong nFooterMaster = ULONG_MAX; + sal_uLong nFooterLeft = ULONG_MAX; int nHeaderCount = 0; int nLeftHeaderCount = 0; int nFooterCount = 0; @@ -235,7 +235,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes // Let the destination page descrition point to the source node position, // from now on this descriptor is responsible for the content nodes! const SfxPoolItem* pItem; - rDest.GetMaster().GetAttrSet().GetItemState( RES_HEADER, FALSE, &pItem ); + rDest.GetMaster().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); SfxPoolItem *pNewItem = pItem->Clone(); SwFrmFmt* pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); #ifdef DEBUG @@ -249,7 +249,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes // Let the source page description point to zero node position, // it loses the responsible and can be destroyed without removing the content nodes. - rSource.GetMaster().GetAttrSet().GetItemState( RES_HEADER, FALSE, &pItem ); + rSource.GetMaster().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); @@ -259,7 +259,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes { // Same procedure for unshared header.. const SwFmtHeader& rSourceLeftHead = rSource.GetLeft().GetHeader(); - rDest.GetLeft().GetAttrSet().GetItemState( RES_HEADER, FALSE, &pItem ); + rDest.GetLeft().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); #ifdef DEBUG @@ -270,7 +270,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes #endif pNewFmt->SetFmtAttr( rSourceLeftHead.GetHeaderFmt()->GetCntnt() ); delete pNewItem; - rSource.GetLeft().GetAttrSet().GetItemState( RES_HEADER, FALSE, &pItem ); + rSource.GetLeft().GetAttrSet().GetItemState( RES_HEADER, sal_False, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtHeader*)pNewItem)->GetHeaderFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); @@ -283,7 +283,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes if( rDestFoot.IsActive() ) { const SfxPoolItem* pItem; - rDest.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, FALSE, &pItem ); + rDest.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); SfxPoolItem *pNewItem = pItem->Clone(); SwFrmFmt *pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( rSourceFoot.GetFooterFmt()->GetCntnt() ); @@ -295,7 +295,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes const SwFmtCntnt& rFooterDestCntnt = rDestFoot.GetFooterFmt()->GetCntnt(); (void)rFooterDestCntnt; #endif - rSource.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, FALSE, &pItem ); + rSource.GetMaster().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); @@ -311,12 +311,12 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes (void)rFooterSourceCntnt2; (void)rFooterDestCntnt2; #endif - rDest.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, FALSE, &pItem ); + rDest.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( rSourceLeftFoot.GetFooterFmt()->GetCntnt() ); delete pNewItem; - rSource.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, FALSE, &pItem ); + rSource.GetLeft().GetAttrSet().GetItemState( RES_FOOTER, sal_False, &pItem ); pNewItem = pItem->Clone(); pNewFmt = ((SwFmtFooter*)pNewItem)->GetFooterFmt(); pNewFmt->SetFmtAttr( SwFmtCntnt() ); @@ -327,9 +327,9 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes void SwUndoPageDesc::Undo(SwUndoIter &) { - BOOL bUndo = pDoc->DoesUndo(); + sal_Bool bUndo = pDoc->DoesUndo(); - pDoc->DoUndo(FALSE); + pDoc->DoUndo(sal_False); // Move (header/footer)content node responsibility from new page descriptor to old one again. if( bExchange ) @@ -340,9 +340,9 @@ void SwUndoPageDesc::Undo(SwUndoIter &) void SwUndoPageDesc::Redo(SwUndoIter &) { - BOOL bUndo = pDoc->DoesUndo(); + sal_Bool bUndo = pDoc->DoesUndo(); - pDoc->DoUndo(FALSE); + pDoc->DoUndo(sal_False); // Move (header/footer)content node responsibility from old page descriptor to new one again. if( bExchange ) @@ -381,9 +381,9 @@ SwUndoPageDescCreate::~SwUndoPageDescCreate() void SwUndoPageDescCreate::Undo(SwUndoIter &) { - BOOL bUndo = pDoc->DoesUndo(); + sal_Bool bUndo = pDoc->DoesUndo(); - pDoc->DoUndo(FALSE); + pDoc->DoUndo(sal_False); // -> #116530# if (pDesc) @@ -393,19 +393,19 @@ void SwUndoPageDescCreate::Undo(SwUndoIter &) } // <- #116530# - pDoc->DelPageDesc(aNew.GetName(), TRUE); + pDoc->DelPageDesc(aNew.GetName(), sal_True); pDoc->DoUndo(bUndo); } void SwUndoPageDescCreate::Redo(SwUndoIter &) { - BOOL bUndo = pDoc->DoesUndo(); + sal_Bool bUndo = pDoc->DoesUndo(); - pDoc->DoUndo(FALSE); + pDoc->DoUndo(sal_False); SwPageDesc aPageDesc = aNew; - pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, FALSE, TRUE); // #116530# + pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, sal_False, sal_True); // #116530# pDoc->DoUndo(bUndo); } @@ -441,21 +441,21 @@ SwUndoPageDescDelete::~SwUndoPageDescDelete() void SwUndoPageDescDelete::Undo(SwUndoIter &) { - BOOL bUndo = pDoc->DoesUndo(); + sal_Bool bUndo = pDoc->DoesUndo(); - pDoc->DoUndo(FALSE); + pDoc->DoUndo(sal_False); SwPageDesc aPageDesc = aOld; - pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, FALSE, TRUE); // #116530# + pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, sal_False, sal_True); // #116530# pDoc->DoUndo(bUndo); } void SwUndoPageDescDelete::Redo(SwUndoIter &) { - BOOL bUndo = pDoc->DoesUndo(); + sal_Bool bUndo = pDoc->DoesUndo(); - pDoc->DoUndo(FALSE); - pDoc->DelPageDesc(aOld.GetName(), TRUE); // #116530# + pDoc->DoUndo(sal_False); + pDoc->DelPageDesc(aOld.GetName(), sal_True); // #116530# pDoc->DoUndo(bUndo); } |