diff options
Diffstat (limited to 'sw/source/core/doc/docnew.cxx')
-rw-r--r-- | sw/source/core/doc/docnew.cxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 484b5119d9e5..b17e718ea3cf 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -202,7 +202,7 @@ void StartGrammarChecking( SwDoc &rDoc ) -BOOL lcl_DelFmtIndizes( const SwFrmFmtPtr& rpFmt, void* ) +sal_Bool lcl_DelFmtIndizes( const SwFrmFmtPtr& rpFmt, void* ) { SwFmtCntnt &rFmtCntnt = (SwFmtCntnt&)rpFmt->GetCntnt(); if ( rFmtCntnt.GetCntntIdx() ) @@ -210,7 +210,7 @@ BOOL lcl_DelFmtIndizes( const SwFrmFmtPtr& rpFmt, void* ) SwFmtAnchor &rFmtAnchor = (SwFmtAnchor&)rpFmt->GetAnchor(); if ( rFmtAnchor.GetCntntAnchor() ) rFmtAnchor.SetAnchor( 0 ); - return TRUE; + return sal_True; } /* @@ -523,9 +523,9 @@ SwDoc::~SwDoc() delete pPgPViewPrtData; - mbUndo = FALSE; // immer das Undo abschalten !! + mbUndo = sal_False; // immer das Undo abschalten !! // damit die Fussnotenattribute die Fussnotennodes in Frieden lassen. - mbDtor = TRUE; + mbDtor = sal_True; DELETEZ( pLayout ); @@ -541,7 +541,7 @@ SwDoc::~SwDoc() // die BaseLinks freigeben. { - for( USHORT n = pLinkMgr->GetServers().Count(); n; ) + for( sal_uInt16 n = pLinkMgr->GetServers().Count(); n; ) pLinkMgr->GetServers()[ --n ]->Closed(); if( pLinkMgr->GetLinks().Count() ) @@ -550,10 +550,10 @@ SwDoc::~SwDoc() // die KapitelNummern / Nummern muessen vor den Vorlage geloescht werden // ansonsten wird noch staendig geupdatet !!! - aNodes.pOutlineNds->Remove( USHORT(0), aNodes.pOutlineNds->Count() ); - aUndoNodes.pOutlineNds->Remove( USHORT(0), aUndoNodes.pOutlineNds->Count() ); + aNodes.pOutlineNds->Remove( sal_uInt16(0), aNodes.pOutlineNds->Count() ); + aUndoNodes.pOutlineNds->Remove( sal_uInt16(0), aUndoNodes.pOutlineNds->Count() ); - pFtnIdxs->Remove( USHORT(0), pFtnIdxs->Count() ); + pFtnIdxs->Remove( sal_uInt16(0), pFtnIdxs->Count() ); pUndos->DeleteAndDestroy( 0, pUndos->Count() ); //Es koennen in den Attributen noch //noch indizes angemeldet sein. @@ -575,7 +575,7 @@ SwDoc::~SwDoc() //JP: alt - loeschen ohne Flag ist teuer; Modify wird verschickt! // aTOXTypes.DeleteAndDestroy( 0, aTOXTypes.Count() ); { - for( USHORT n = pTOXTypes->Count(); n; ) + for( sal_uInt16 n = pTOXTypes->Count(); n; ) { (*pTOXTypes)[ --n ]->SetInDocDTOR(); delete (*pTOXTypes)[ n ]; @@ -794,9 +794,9 @@ SfxObjectShell* SwDoc::GetPersist() const void SwDoc::ClearDoc() { - BOOL bOldUndo = mbUndo; + sal_Bool bOldUndo = mbUndo; DelAllUndoObj(); - mbUndo = FALSE; // immer das Undo abschalten !! + mbUndo = sal_False; // immer das Undo abschalten !! // Undo-Benachrichtigung vom Draw abschalten if( pDrawModel ) @@ -806,7 +806,7 @@ void SwDoc::ClearDoc() } // stehen noch FlyFrames rum, loesche auch diese - USHORT n; + sal_uInt16 n; while ( 0 != (n = GetSpzFrmFmts()->Count()) ) DelLayoutFmt((*pSpzFrmFmtTbl)[n-1]); ASSERT( !pDrawModel || !pDrawModel->GetPage(0)->GetObjCount(), @@ -964,11 +964,11 @@ IGrammarContact* getGrammarContact( const SwTxtNode& rTxtNode ) // --> FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and // SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks(): -void SwDoc::UpdateLinks( BOOL bUI ) +void SwDoc::UpdateLinks( sal_Bool bUI ) { SfxObjectCreateMode eMode; - USHORT nLinkMode = getLinkUpdateMode( true ); - USHORT nUpdateDocMode = GetDocShell()->GetUpdateDocMode(); + sal_uInt16 nLinkMode = getLinkUpdateMode( true ); + sal_uInt16 nUpdateDocMode = GetDocShell()->GetUpdateDocMode(); if( GetDocShell() && (nLinkMode != NEVER || document::UpdateDocMode::FULL_UPDATE == nUpdateDocMode) && GetLinkManager().GetLinks().Count() && @@ -979,13 +979,13 @@ void SwDoc::UpdateLinks( BOOL bUI ) !GetDocShell()->IsPreview() ) { ViewShell* pVSh = 0; - BOOL bAskUpdate = nLinkMode == MANUAL; - BOOL bUpdate = TRUE; + sal_Bool bAskUpdate = nLinkMode == MANUAL; + sal_Bool bUpdate = sal_True; switch(nUpdateDocMode) { - case document::UpdateDocMode::NO_UPDATE: bUpdate = FALSE;break; - case document::UpdateDocMode::QUIET_UPDATE:bAskUpdate = FALSE; break; - case document::UpdateDocMode::FULL_UPDATE: bAskUpdate = TRUE; break; + case document::UpdateDocMode::NO_UPDATE: bUpdate = sal_False;break; + case document::UpdateDocMode::QUIET_UPDATE:bAskUpdate = sal_False; break; + case document::UpdateDocMode::FULL_UPDATE: bAskUpdate = sal_True; break; } if( bUpdate && (bUI || !bAskUpdate) ) { @@ -997,10 +997,10 @@ void SwDoc::UpdateLinks( BOOL bUI ) ViewShell aVSh( *this, 0, 0 ); SET_CURR_SHELL( &aVSh ); - GetLinkManager().UpdateAllLinks( bAskUpdate , TRUE, FALSE, pDlgParent ); + GetLinkManager().UpdateAllLinks( bAskUpdate , sal_True, sal_False, pDlgParent ); } else - GetLinkManager().UpdateAllLinks( bAskUpdate, TRUE, FALSE, pDlgParent ); + GetLinkManager().UpdateAllLinks( bAskUpdate, sal_True, sal_False, pDlgParent ); } } @@ -1089,7 +1089,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const { SwDoc* pRet = new SwDoc; //copy settings - USHORT __FAR_DATA aRangeOfDefaults[] = { + sal_uInt16 __FAR_DATA aRangeOfDefaults[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_PARATR_BEGIN, RES_PARATR_END-1, @@ -1102,8 +1102,8 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const SfxItemSet aNewDefaults( pRet->GetAttrPool(), aRangeOfDefaults ); - USHORT nWhich; - USHORT nRange = 0; + sal_uInt16 nWhich; + sal_uInt16 nRange = 0; while( aRangeOfDefaults[nRange] != 0) { for( nWhich = aRangeOfDefaults[nRange]; nWhich < aRangeOfDefaults[nRange + 1]; ++nWhich ) @@ -1160,11 +1160,11 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const return xRetShell; } /*-- 08.05.2009 10:52:40--------------------------------------------------- - copy document content - code from SwFEShell::Paste( SwDoc* , BOOL ) + copy document content - code from SwFEShell::Paste( SwDoc* , sal_Bool ) -----------------------------------------------------------------------*/ void SwDoc::Paste( const SwDoc& rSource ) { -// this has to be empty const USHORT nStartPageNumber = GetPhyPageNum(); +// this has to be empty const sal_uInt16 nStartPageNumber = GetPhyPageNum(); // until the end of the NodesArray SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 2 ); SwPaM aCpyPam( aSourceIdx ); //DocStart @@ -1210,9 +1210,9 @@ void SwDoc::Paste( const SwDoc& rSource ) //additionally copy page bound frames if( /*bIncludingPageFrames && */rSource.GetSpzFrmFmts()->Count() ) { - for ( USHORT i = 0; i < rSource.GetSpzFrmFmts()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < rSource.GetSpzFrmFmts()->Count(); ++i ) { - BOOL bInsWithFmt = TRUE; + sal_Bool bInsWithFmt = sal_True; const SwFrmFmt& rCpyFmt = *(*rSource.GetSpzFrmFmts())[i]; if( bInsWithFmt ) { |