diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-01-17 15:06:54 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-01-17 15:06:54 +0100 |
commit | 7f33ed417b2e29e5470724ea76967f64699a2662 (patch) | |
tree | abfa1432c5ffffe4c7502d4ddcaee918c584c69c /sw/source/core/frmedt/fecopy.cxx | |
parent | 80731dbfcb48a2ffec30a4b2abe1ba8ada8f0169 (diff) |
removetooltypes01: #i112600# Remove tools types from sw
Diffstat (limited to 'sw/source/core/frmedt/fecopy.cxx')
-rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 79a2b64433d9..e0ac3b203a56 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -100,11 +100,11 @@ using namespace ::com::sun::star; | |*************************************************************************/ -BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) +sal_Bool SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) { ASSERT( pClpDoc, "kein Clipboard-Dokument" ); - pClpDoc->DoUndo( FALSE ); // immer auf FALSE !! + pClpDoc->DoUndo( sal_False ); // immer auf sal_False !! // steht noch Inhalt im ClpDocument, dann muss dieser geloescht werden SwNodeIndex aSttIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 ); @@ -120,7 +120,7 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) } // stehen noch FlyFrames rum, loesche auch diese - for( USHORT n = 0; n < pClpDoc->GetSpzFrmFmts()->Count(); ++n ) + for( sal_uInt16 n = 0; n < pClpDoc->GetSpzFrmFmts()->Count(); ++n ) { SwFlyFrmFmt* pFly = (SwFlyFrmFmt*)(*pClpDoc->GetSpzFrmFmts())[n]; pClpDoc->DelLayoutFmt( pFly ); @@ -133,12 +133,12 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) if( pNewClpTxt ) { pTxtNd->InsertText( *pNewClpTxt, SwIndex( pTxtNd ) ); - return TRUE; // das wars. + return sal_True; // das wars. } pClpDoc->LockExpFlds(); pClpDoc->SetRedlineMode_intern( nsRedlineMode_t::REDLINE_DELETE_REDLINES ); - BOOL bRet; + sal_Bool bRet; // soll ein FlyFrame kopiert werden ? if( IsFrmSelected() ) @@ -167,7 +167,7 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) SwSpzFrmFmts& rSpzFrmFmts = *(SwSpzFrmFmts*)pClpDoc->GetSpzFrmFmts(); if( rSpzFrmFmts[ 0 ] != pFlyFmt ) { - USHORT nPos = rSpzFrmFmts.GetPos( pFlyFmt ); + sal_uInt16 nPos = rSpzFrmFmts.GetPos( pFlyFmt ); ASSERT( nPos != USHRT_MAX, "Fly steht nicht im Spz-Array" ); rSpzFrmFmts.Remove( nPos ); @@ -191,13 +191,13 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) pTxtNd->EraseText( rIdx, 1 ); } } - bRet = TRUE; + bRet = sal_True; } else if ( IsObjSelected() ) { SwPosition aPos( aSttIdx, SwIndex( pTxtNd, 0 )); const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); - for ( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i ) + for ( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i ) { SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); @@ -211,7 +211,7 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) aSet.Put( aAnchor ); SdrObject *const pNew = - pClpDoc->CloneSdrObj( *pObj, FALSE, TRUE ); + pClpDoc->CloneSdrObj( *pObj, sal_False, sal_True ); SwPaM aTemp(aPos); pClpDoc->Insert(aTemp, *pNew, &aSet, NULL); @@ -232,7 +232,7 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) pClpDoc->CopyLayoutFmt( *pFmt, aAnchor, true, true ); } } - bRet = TRUE; + bRet = sal_True; } else bRet = _CopySelToDoc( pClpDoc, 0 ); // kopiere die Selectionen @@ -261,17 +261,17 @@ const Point &lcl_FindBasePos( const SwFrm *pFrm, const Point &rPt ) return pFrm->Frm().Pos(); } -BOOL lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly, +sal_Bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly, const Point& rInsPt, SwFEShell& rDestShell, SwFmtAnchor& rAnchor, - Point& rNewPos, BOOL bCheckFlyRecur ) + Point& rNewPos, sal_Bool bCheckFlyRecur ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; rAnchor.SetAnchor( &rPos ); - SwCntntFrm* pTmpFrm = rNd.GetCntntNode()->GetFrm( &rInsPt, 0, FALSE ); + SwCntntFrm* pTmpFrm = rNd.GetCntntNode()->GetFrm( &rInsPt, 0, sal_False ); SwFlyFrm *pTmpFly = pTmpFrm->FindFlyFrm(); if( pTmpFly && bCheckFlyRecur && pFly->IsUpperOf( *pTmpFly ) ) { - bRet = FALSE; + bRet = sal_False; } else if ( FLY_AT_FLY == rAnchor.GetAnchorId() ) { @@ -295,15 +295,15 @@ BOOL lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFly, return bRet; } -BOOL SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, - const Point& rInsPt, BOOL bIsMove, BOOL bSelectInsert ) +sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, + const Point& rInsPt, sal_Bool bIsMove, sal_Bool bSelectInsert ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; //Die Liste muss kopiert werden, weil unten die neuen Objekte //selektiert werden. const SdrMarkList aMrkList( Imp()->GetDrawView()->GetMarkedObjectList() ); - ULONG nMarkCount = aMrkList.GetMarkCount(); + sal_uLong nMarkCount = aMrkList.GetMarkCount(); if( !pDestShell->Imp()->GetDrawView() ) // sollte mal eine erzeugt werden pDestShell->MakeDrawView(); @@ -317,7 +317,7 @@ BOOL SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, SwDoc* pDestDoc = pDestShell->GetDoc(); Size aSiz( rInsPt.X() - rSttPt.X(), rInsPt.Y() - rSttPt.Y() ); - for( USHORT i = 0; i < nMarkCount; ++i ) + for( sal_uInt16 i = 0; i < nMarkCount; ++i ) { SdrObject *pObj = aMrkList.GetMark( i )->GetMarkedSdrObj(); @@ -325,7 +325,7 @@ BOOL SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, SwFrmFmt *pFmt = pContact->GetFmt(); const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); - BOOL bInsWithFmt = TRUE; + sal_Bool bInsWithFmt = sal_True; if( pDestDrwView->IsGroupEntered() ) { @@ -336,10 +336,10 @@ BOOL SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, { SdrObject* pNew = pDestDoc->CloneSdrObj( *pObj, bIsMove && - GetDoc() == pDestDoc, FALSE ); + GetDoc() == pDestDoc, sal_False ); pNew->NbcMove( aSiz ); pDestDrwView->InsertObjectAtView( pNew, *pDestPgView ); - bInsWithFmt = FALSE; + bInsWithFmt = sal_False; } } @@ -364,21 +364,21 @@ BOOL SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, GetLayout()->GetCrsrOfst( &aPos, aPt, &aState ); const SwNode *pNd; if( (pNd = &aPos.nNode.GetNode())->IsNoTxtNode() ) - bRet = FALSE; + bRet = sal_False; else bRet = ::lcl_SetAnchor( aPos, *pNd, 0, rInsPt, - *pDestShell, aAnchor, aNewAnch, FALSE ); + *pDestShell, aAnchor, aNewAnch, sal_False ); } else { SwPaM *pCrsr = pDestShell->GetCrsr(); if( pCrsr->GetNode()->IsNoTxtNode() ) - bRet = FALSE; + bRet = sal_False; else bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(), *pCrsr->GetNode(), 0, rInsPt, *pDestShell, aAnchor, - aNewAnch, FALSE ); + aNewAnch, sal_False ); } } else if ( FLY_AT_PAGE == aAnchor.GetAnchorId() ) @@ -398,7 +398,7 @@ BOOL SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, SfxItemSet aSet( pDestDoc->GetAttrPool(),aFrmFmtSetRange); aSet.Put( aAnchor ); SdrObject* pNew = pDestDoc->CloneSdrObj( *pObj, bIsMove && - GetDoc() == pDestDoc, TRUE ); + GetDoc() == pDestDoc, sal_True ); pFmt = pDestDoc->Insert( *pDestShell->GetCrsr(), *pNew, &aSet, NULL ); } @@ -440,8 +440,8 @@ BOOL SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, const SdrMarkList aList( pSrcDrwView->GetMarkedObjectList() ); pSrcDrwView->UnmarkAll(); - ULONG nMrkCnt = aMrkList.GetMarkCount(); - USHORT i; + sal_uLong nMrkCnt = aMrkList.GetMarkCount(); + sal_uInt16 i; for ( i = 0; i < nMrkCnt; ++i ) { SdrObject *pObj = aMrkList.GetMark( i )->GetMarkedSdrObj(); @@ -462,10 +462,10 @@ BOOL SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt, return bRet; } -BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, - const Point& rInsPt, BOOL bIsMove, BOOL bSelectInsert ) +sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, + const Point& rInsPt, sal_Bool bIsMove, sal_Bool bSelectInsert ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; ASSERT( pDestShell, "Copy ohne DestShell." ); ASSERT( this == pDestShell || !pDestShell->IsObjSelected(), @@ -477,10 +477,10 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, pDestShell->GetDoc()->LockExpFlds(); // Referenzen sollen verschoben werden. - BOOL bCopyIsMove = pDoc->IsCopyIsMove(); + sal_Bool bCopyIsMove = pDoc->IsCopyIsMove(); if( bIsMove ) // am Doc ein Flag setzen, damit in den TextNodes - pDoc->SetCopyIsMove( TRUE ); + pDoc->SetCopyIsMove( sal_True ); RedlineMode_t eOldRedlMode = pDestShell->GetDoc()->GetRedlineMode(); pDestShell->GetDoc()->SetRedlineMode_intern( (RedlineMode_t)(eOldRedlMode | nsRedlineMode_t::REDLINE_DELETE_REDLINES)); @@ -496,7 +496,7 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, SwFlyFrm* pFly = FindFlyFrm(); SwFrmFmt* pFlyFmt = pFly->GetFmt(); SwFmtAnchor aAnchor( pFlyFmt->GetAnchor() ); - bRet = TRUE; + bRet = sal_True; Point aNewAnch; if ((FLY_AT_PARA == aAnchor.GetAnchorId()) || @@ -515,25 +515,25 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, GetLayout()->GetCrsrOfst( &aPos, aPt, &aState ); const SwNode *pNd; if( (pNd = &aPos.nNode.GetNode())->IsNoTxtNode() ) - bRet = FALSE; + bRet = sal_False; else { //Nicht in sich selbst kopieren const SwNodeIndex *pTmp = pFlyFmt->GetCntnt().GetCntntIdx(); if ( aPos.nNode > *pTmp && aPos.nNode < pTmp->GetNode().EndOfSectionIndex() ) { - bRet = FALSE; + bRet = sal_False; } else bRet = ::lcl_SetAnchor( aPos, *pNd, pFly, rInsPt, - *pDestShell, aAnchor, aNewAnch, TRUE ); + *pDestShell, aAnchor, aNewAnch, sal_True ); } } else { const SwPaM *pCrsr = pDestShell->GetCrsr(); if( pCrsr->GetNode()->IsNoTxtNode() ) - bRet = FALSE; + bRet = sal_False; else bRet = ::lcl_SetAnchor( *pCrsr->GetPoint(), *pCrsr->GetNode(), pFly, rInsPt, *pDestShell, aAnchor, @@ -575,12 +575,12 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, // kopiert wird if( bSelectInsert ) { - SwFlyFrm* pFlyFrm = ((SwFlyFrmFmt*)pFlyFmt)->GetFrm( &aPt, FALSE ); + SwFlyFrm* pFlyFrm = ((SwFlyFrmFmt*)pFlyFmt)->GetFrm( &aPt, sal_False ); if( pFlyFrm ) { //JP 12.05.98: sollte das nicht im SelectFlyFrm stehen??? pDestShell->Imp()->GetDrawView()->UnmarkAll(); - pDestShell->SelectFlyFrm( *pFlyFrm, TRUE ); + pDestShell->SelectFlyFrm( *pFlyFrm, sal_True ); } } @@ -612,12 +612,12 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, Point aPt( rInsPt ); GetLayout()->GetCrsrOfst( pDstPos, aPt ); if( !pDstPos->nNode.GetNode().IsNoTxtNode() ) - bRet = TRUE; + bRet = sal_True; } else if( !pDestShell->GetCrsr()->GetNode()->IsNoTxtNode() ) { pDstPos = new SwPosition( *pDestShell->GetCrsr()->GetPoint() ); - bRet = TRUE; + bRet = sal_True; } if( bRet ) @@ -648,7 +648,7 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, } else { - bRet = TRUE; + bRet = sal_True; if( this == pDestShell ) { // gleiche Shell? Dann erfrage die Position an der @@ -659,7 +659,7 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, bRet = !aPos.nNode.GetNode().IsNoTxtNode(); } else if( pDestShell->GetCrsr()->GetNode()->IsNoTxtNode() ) - bRet = FALSE; + bRet = sal_False; if( bRet ) bRet = 0 != SwEditShell::Copy( pDestShell ); @@ -673,7 +673,7 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, { // alte Actions beenden; die Tabellen-Frames werden angelegt und // eine SSelection kann erzeugt werden - USHORT nActCnt; + sal_uInt16 nActCnt; for( nActCnt = 0; pDestShell->ActionPend(); ++nActCnt ) pDestShell->EndAllAction(); @@ -703,11 +703,11 @@ namespace { typedef std::pair< PaMPtr, PositionPtr > Insertion; } -BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) +sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames ) { SET_CURR_SHELL( this ); ASSERT( pClpDoc, "kein Clipboard-Dokument" ); - const USHORT nStartPageNumber = GetPhyPageNum(); + const sal_uInt16 nStartPageNumber = GetPhyPageNum(); // dann bis zum Ende vom Nodes Array SwNodeIndex aIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 ); SwPaM aCpyPam( aIdx ); //DocStart @@ -731,7 +731,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) aCpyPam.SetMark(); aCpyPam.Move( fnMoveForward, fnGoDoc ); - BOOL bRet = TRUE, bDelTbl = TRUE; + sal_Bool bRet = sal_True, bDelTbl = sal_True; StartAllAction(); GetDoc()->StartUndo( UNDO_INSGLOSSARY, NULL ); GetDoc()->LockExpFlds(); @@ -768,7 +768,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) SwPosition aStartPos( *pStartCursor->GetPoint() ); SwPosition aInsertPos( aStartPos ); // first insertion position bool bCompletePara = false; - USHORT nMove = 0; + sal_uInt16 nMove = 0; while( nCount ) { --nCount; @@ -786,7 +786,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) SwCursor aCrsr( aStartPos, 0, false); // Check if we find another insert position by moving // down the last given position - if( aCrsr.UpDown( FALSE, ++nMove, 0, 0 ) ) + if( aCrsr.UpDown( sal_False, ++nMove, 0, 0 ) ) aInsertPos = *aCrsr.GetPoint(); else // if there is no paragraph we have to create it bCompletePara = nCount > 0; @@ -854,7 +854,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) { SwPosition aDestPos( *PCURCRSR->GetPoint() ); - BOOL bParkTblCrsr = FALSE; + sal_Bool bParkTblCrsr = sal_False; const SwStartNode* pSttNd = PCURCRSR->GetNode()->FindTableBoxStartNode(); // TABLE IN TABLE: Tabelle in Tabelle kopieren @@ -864,7 +864,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) { GetTblSel( *this, aBoxes ); ParkTblCrsr(); - bParkTblCrsr = TRUE; + bParkTblCrsr = sal_True; } else if( !PCURCRSR->HasMark() && PCURCRSR->GetNext() == PCURCRSR && ( !pSrcNd->GetTable().IsTblComplex() || @@ -890,7 +890,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) } bRet = GetDoc()->InsCopyOfTbl( aDestPos, aBoxes, &pSrcNd->GetTable(), - FALSE, FALSE ); + sal_False, sal_False ); if( bParkTblCrsr ) GetCrsr(); @@ -917,9 +917,9 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) if( !Imp()->GetDrawView() ) MakeDrawView(); - for ( USHORT i = 0; i < pClpDoc->GetSpzFrmFmts()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pClpDoc->GetSpzFrmFmts()->Count(); ++i ) { - BOOL bInsWithFmt = TRUE; + sal_Bool bInsWithFmt = sal_True; const SwFrmFmt& rCpyFmt = *(*pClpDoc->GetSpzFrmFmts())[i]; if( Imp()->GetDrawView()->IsGroupEntered() && @@ -930,7 +930,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) if( pSdrObj ) { SdrObject* pNew = GetDoc()->CloneSdrObj( *pSdrObj, - FALSE, FALSE ); + sal_False, sal_False ); // Insert object sets any anchor position to 0. // Therefore we calculate the absolute position here @@ -965,7 +965,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) pNew->NbcSetAnchorPos( aGrpAnchor ); pNew->SetSnapRect( aSnapRect ); - bInsWithFmt = FALSE; + bInsWithFmt = sal_False; } } @@ -993,7 +993,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) { Point aPt; lcl_SetAnchor( *PCURCRSR->GetPoint(), *PCURCRSR->GetNode(), - 0, aPt, *this, aAnchor, aPt, FALSE ); + 0, aPt, *this, aAnchor, aPt, sal_False ); } SwFrmFmt * pNew = GetDoc()->CopyLayoutFmt( rCpyFmt, aAnchor, true, true ); @@ -1004,9 +1004,9 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) { const Point aPt( GetCrsrDocPos() ); SwFlyFrm* pFlyFrm = ((SwFlyFrmFmt*)pNew)-> - GetFrm( &aPt, FALSE ); + GetFrm( &aPt, sal_False ); if( pFlyFrm ) - SelectFlyFrm( *pFlyFrm, TRUE ); + SelectFlyFrm( *pFlyFrm, sal_True ); // immer nur den ersten Fly-Frame nehmen; die anderen // wurden ueber Fly in Fly ins ClipBoard kopiert ! break; @@ -1042,7 +1042,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) if( bDelTbl && IsTableMode() ) { SwEditShell::Delete(); - bDelTbl = FALSE; + bDelTbl = sal_False; } SwPosition& rInsPos = *PCURCRSR->GetPoint(); @@ -1090,9 +1090,9 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) if( !Imp()->GetDrawView() ) MakeDrawView(); - for ( USHORT i = 0; i < pClpDoc->GetSpzFrmFmts()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pClpDoc->GetSpzFrmFmts()->Count(); ++i ) { - BOOL bInsWithFmt = TRUE; + sal_Bool bInsWithFmt = sal_True; const SwFrmFmt& rCpyFmt = *(*pClpDoc->GetSpzFrmFmts())[i]; if( bInsWithFmt ) { @@ -1119,7 +1119,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) { // alte Actions beenden; die Tabellen-Frames werden angelegt und // eine Selection kann erzeugt werden - USHORT nActCnt; + sal_uInt16 nActCnt; for( nActCnt = 0; ActionPend(); ++nActCnt ) EndAllAction(); @@ -1136,25 +1136,25 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames ) /*-- 14.06.2004 13:31:17--------------------------------------------------- -----------------------------------------------------------------------*/ -BOOL SwFEShell::PastePages( SwFEShell& rToFill, USHORT nStartPage, USHORT nEndPage) +sal_Bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage) { Push(); if(!GotoPage(nStartPage)) { Pop(sal_False); - return FALSE; + return sal_False; } MovePage( fnPageCurr, fnPageStart ); SwPaM aCpyPam( *GetCrsr()->GetPoint() ); String sStartingPageDesc = GetPageDesc( GetCurPageDesc()).GetName(); - SwPageDesc* pDesc = rToFill.FindPageDescByName( sStartingPageDesc, TRUE ); + SwPageDesc* pDesc = rToFill.FindPageDescByName( sStartingPageDesc, sal_True ); if( pDesc ) rToFill.ChgCurPageDesc( *pDesc ); if(!GotoPage(nEndPage)) { Pop(sal_False); - return FALSE; + return sal_False; } //if the page starts with a table a paragraph has to be inserted before SwNode* pTableNode = aCpyPam.GetNode()->FindTableNode(); @@ -1201,7 +1201,7 @@ BOOL SwFEShell::PastePages( SwFEShell& rToFill, USHORT nStartPage, USHORT nEndPa if( !rToFill.Imp()->GetDrawView() ) rToFill.MakeDrawView(); - for ( USHORT i = 0; i < GetDoc()->GetSpzFrmFmts()->Count(); ++i ) + for ( sal_uInt16 i = 0; i < GetDoc()->GetSpzFrmFmts()->Count(); ++i ) { const SwFrmFmt& rCpyFmt = *(*GetDoc()->GetSpzFrmFmts())[i]; SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() ); @@ -1220,14 +1220,14 @@ BOOL SwFEShell::PastePages( SwFEShell& rToFill, USHORT nStartPage, USHORT nEndPa Pop(sal_False); EndAllAction(); - return TRUE; + return sal_True; } -BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const +sal_Bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const { ASSERT( Imp()->HasDrawView(), "GetDrawObjGraphic without DrawView?" ); const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); - BOOL bConvert = TRUE; + sal_Bool bConvert = sal_True; if( rMrkList.GetMarkCount() ) { if( rMrkList.GetMarkCount() == 1 && @@ -1246,7 +1246,7 @@ BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const if( GRAPHIC_BITMAP != aGrf.GetType() ) { rGrf = aGrf; - bConvert = FALSE; + bConvert = sal_False; } else if( GetWin() ) { @@ -1255,7 +1255,7 @@ BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const GetGrfSize( aSz ); VirtualDevice aVirtDev; - aVirtDev.EnableOutput( FALSE ); + aVirtDev.EnableOutput( sal_False ); MapMode aTmp( GetWin()->GetMapMode() ); aTmp.SetOrigin( aPt ); @@ -1273,7 +1273,7 @@ BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const else if( GRAPHIC_BITMAP == aGrf.GetType() ) { rGrf = aGrf; - bConvert = FALSE; + bConvert = sal_False; } else { @@ -1293,7 +1293,7 @@ BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const else { rGrf = aGrf; - bConvert = FALSE; + bConvert = sal_False; } } } @@ -1347,7 +1347,7 @@ void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel* _pModel ) } } // <-- -void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt ) +void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt ) { SET_CURR_SHELL( this ); StartAllAction(); @@ -1462,7 +1462,7 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt ) pFmt = GetDoc()->Insert( *GetCrsr(), *pNewObj, &aFrmSet, NULL ); } else - pView->ReplaceObjectAtView( pOldObj, *Imp()->GetPageView(), pNewObj, TRUE ); + pView->ReplaceObjectAtView( pOldObj, *Imp()->GetPageView(), pNewObj, sal_True ); } break; @@ -1470,7 +1470,7 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt ) { SfxItemSet aSet( GetAttrPool() ); aSet.Put(pClpObj->GetMergedItemSet()); - pView->SetAttributes( aSet, FALSE ); + pView->SetAttributes( aSet, sal_False ); } break; @@ -1484,7 +1484,7 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt ) if( SW_PASTESDR_INSERT == nAction ) { - GetDoc()->SetNoDrawUndoObj( TRUE ); + GetDoc()->SetNoDrawUndoObj( sal_True ); sal_Bool bDesignMode = pView->IsDesignMode(); if( !bDesignMode ) @@ -1497,11 +1497,11 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt ) // <-- pView->Paste( *pModel, aPos ); - ULONG nCnt = pView->GetMarkedObjectList().GetMarkCount(); + sal_uLong nCnt = pView->GetMarkedObjectList().GetMarkCount(); if( nCnt ) { const Point aNull( 0, 0 ); - for( ULONG i=0; i < nCnt; ++i ) + for( sal_uLong i=0; i < nCnt; ++i ) { SdrObject *pObj = pView->GetMarkedObjectList().GetMark(i)->GetMarkedSdrObj(); pObj->ImpSetAnchorPos( aNull ); @@ -1525,20 +1525,20 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt ) if( !bDesignMode ) pView->SetDesignMode( sal_False ); } - GetDoc()->SetNoDrawUndoObj( FALSE ); + GetDoc()->SetNoDrawUndoObj( sal_False ); } EndUndo(); EndAllAction(); delete pModel; } -BOOL SwFEShell::Paste( const Graphic &rGrf ) +sal_Bool SwFEShell::Paste( const Graphic &rGrf ) { SET_CURR_SHELL( this ); SdrObject* pObj; SdrView *pView = Imp()->GetDrawView(); - BOOL bRet = 1 == pView->GetMarkedObjectList().GetMarkCount() && + sal_Bool bRet = 1 == pView->GetMarkedObjectList().GetMarkCount() && (pObj = pView->GetMarkedObjectList().GetMark( 0 )->GetMarkedSdrObj())->IsClosedObj() && !pObj->ISA( SdrOle2Obj ); @@ -1548,7 +1548,7 @@ BOOL SwFEShell::Paste( const Graphic &rGrf ) SfxItemSet aSet( GetAttrPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP ); aSet.Put( XFillStyleItem( XFILL_BITMAP )); aSet.Put( XFillBitmapItem( aEmptyStr, aXOBitmap )); - pView->SetAttributes( aSet, FALSE ); + pView->SetAttributes( aSet, sal_False ); } return bRet; } |