diff options
Diffstat (limited to 'sw/source/core/frmedt/feshview.cxx')
| -rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 286 |
1 files changed, 143 insertions, 143 deletions
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 0f8a61134595..eb2f5062b773 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -98,7 +98,7 @@ using namespace com::sun::star; //Tattergrenze fuer Drawing-SS -#define MINMOVE ((USHORT)GetOut()->PixelToLogic(Size(Imp()->GetDrawView()->GetMarkHdlSizePixel()/2,0)).Width()) +#define MINMOVE ((sal_uInt16)GetOut()->PixelToLogic(Size(Imp()->GetDrawView()->GetMarkHdlSizePixel()/2,0)).Width()) SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, ViewShell *pSh ) { @@ -122,12 +122,12 @@ void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm* pOldSelFly) { // dann das evt. gesetzte Macro rufen pSh->GetFlyMacroLnk().Call( (void*)pFlyFmt ); -extern BOOL bNoInterrupt; // in swapp.cxx +extern sal_Bool bNoInterrupt; // in swapp.cxx // wir in dem Makro ein Dialog gestartet, dann kommt das // MouseButtonUp zu diesem und nicht zu uns. Dadurch ist // Flag bei uns immer gesetzt und schaltet nie die auf die // entsp. Shell um !!!!!!! - bNoInterrupt = FALSE; + bNoInterrupt = sal_False; } else if( !pFlyFmt || RES_DRAWFRMFMT == pFlyFmt->Which() ) { @@ -136,7 +136,7 @@ extern BOOL bNoInterrupt; // in swapp.cxx pSh->KillPams(); pSh->ClearMark(); // <-- - pSh->SetCrsr( pSh->Imp()->GetDrawView()->GetAllMarkedRect().TopLeft(), TRUE); + pSh->SetCrsr( pSh->Imp()->GetDrawView()->GetAllMarkedRect().TopLeft(), sal_True); } } @@ -149,7 +149,7 @@ extern BOOL bNoInterrupt; // in swapp.cxx |* *************************************************************************/ -BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj ) +sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj ) { SwDrawView *pDView = Imp()->GetDrawView(); if(!pDView) @@ -160,16 +160,16 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj ) //durchkommen const SdrMarkList &rMrkList = pDView->GetMarkedObjectList(); - const BOOL bHadSelection = rMrkList.GetMarkCount() ? TRUE : FALSE; - const BOOL bAddSelect = 0 != (SW_ADD_SELECT & nFlag); - const BOOL bEnterGroup = 0 != (SW_ENTER_GROUP & nFlag); + const sal_Bool bHadSelection = rMrkList.GetMarkCount() ? sal_True : sal_False; + const sal_Bool bAddSelect = 0 != (SW_ADD_SELECT & nFlag); + const sal_Bool bEnterGroup = 0 != (SW_ENTER_GROUP & nFlag); SwFlyFrm* pOldSelFly = 0; const Point aOldPos( pDView->GetAllMarkedRect().TopLeft() ); if( bHadSelection ) { //Unmark rufen wenn !bAddSelect oder wenn ein Fly selektiert ist. - BOOL bUnmark = !bAddSelect; + sal_Bool bUnmark = !bAddSelect; if ( rMrkList.GetMarkCount() == 1 ) { @@ -177,7 +177,7 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj ) pOldSelFly = ::GetFlyFromMarked( &rMrkList, this ); if ( pOldSelFly ) { - const USHORT nType = GetCntType(); + const sal_uInt16 nType = GetCntType(); if( nType != CNT_TXT || (SW_LEAVE_FRAME & nFlag) || ( pOldSelFly->GetFmt()->GetProtect().IsCntntProtected() && !IsReadOnlyAvailable() )) @@ -189,18 +189,18 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj ) //linke obere Ecke gesetzt. Point aPt( pOldSelFly->Frm().Pos() ); aPt.X() -= 1; - BOOL bUnLockView = !IsViewLocked(); - LockView( TRUE ); - SetCrsr( aPt, TRUE ); + sal_Bool bUnLockView = !IsViewLocked(); + LockView( sal_True ); + SetCrsr( aPt, sal_True ); if( bUnLockView ) - LockView( FALSE ); + LockView( sal_False ); } if ( nType & CNT_GRF && ((SwNoTxtFrm*)pOldSelFly->Lower())->HasAnimation() ) { GetWin()->Invalidate( pOldSelFly->Frm().SVRect() ); } - bUnmark = TRUE; + bUnmark = sal_True; } } if ( bUnmark ) @@ -222,16 +222,16 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj ) pDView->MarkObj( rPt, MINMOVE, bAddSelect, bEnterGroup ); } - const BOOL bRet = 0 != rMrkList.GetMarkCount(); + const sal_Bool bRet = 0 != rMrkList.GetMarkCount(); if ( rMrkList.GetMarkCount() > 1 ) { //Ganz dumm ist es, wenn Zeichenobjekte Selektiert waren und //nun ein Fly hinzuselektiert wird. - for ( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i ) + for ( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i ) { SdrObject *pTmpObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); - BOOL bForget = pTmpObj->ISA(SwVirtFlyDrawObj); + sal_Bool bForget = pTmpObj->ISA(SwVirtFlyDrawObj); if( bForget ) { pDView->UnmarkAll(); @@ -253,7 +253,7 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj ) } } else if ( !pOldSelFly && bHadSelection ) - SetCrsr( aOldPos, TRUE); + SetCrsr( aOldPos, sal_True); if( bRet || !bHadSelection ) CallChgLnk(); @@ -267,7 +267,7 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj ) /************************************************************************* |* -|* sal_Bool SwFEShell::MoveAnchor( USHORT nDir ) +|* sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir ) |* |* Created AMA 05/28/2002 |* Last modify AMA 05/30/2002 @@ -294,7 +294,7 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj ) ( aPt1.Y() == aPt2.Y() && ( aPt1.X() < aPt2.X() || \ ( aPt1.X() == aPt2.X() && bOld ) ) ) ) -sal_Bool SwFEShell::MoveAnchor( USHORT nDir ) +sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir ) { const SdrMarkList* pMrkList; if( !Imp()->GetDrawView() || @@ -429,7 +429,7 @@ sal_Bool SwFEShell::MoveAnchor( USHORT nDir ) Point aCenter( pOld->Frm().Left() + pOld->Frm().Width()/2, pOld->Frm().Top() + pOld->Frm().Height()/2 ); Point aBest; - for( i = 0; (USHORT)i<pPage->GetSortedObjs()->Count(); ++i ) + for( i = 0; (sal_uInt16)i<pPage->GetSortedObjs()->Count(); ++i ) { SwAnchoredObject* pAnchObj = (*pPage->GetSortedObjs())[i]; @@ -556,9 +556,9 @@ const SdrMarkList* SwFEShell::_GetMarkList() const return pMarkList; } -USHORT SwFEShell::GetSelFrmType() const +sal_uInt16 SwFEShell::GetSelFrmType() const { - USHORT eType; + sal_uInt16 eType; // get marked frame list, and check if anything is selected const SdrMarkList* pMarkList = _GetMarkList(); @@ -636,7 +636,7 @@ void SwFEShell::ScrollTo( const Point &rPt ) |* *************************************************************************/ -void SwFEShell::SetDragMode( UINT16 eDragMode ) +void SwFEShell::SetDragMode( sal_uInt16 eDragMode ) { if ( Imp()->HasDrawView() ) Imp()->GetDrawView()->SetDragMode( (SdrDragMode)eDragMode ); @@ -651,7 +651,7 @@ void SwFEShell::SetDragMode( UINT16 eDragMode ) |* *************************************************************************/ -long SwFEShell::BeginDrag( const Point* pPt, BOOL ) +long SwFEShell::BeginDrag( const Point* pPt, sal_Bool ) { SdrView *pView = Imp()->GetDrawView(); if ( pView && pView->AreObjectsMarked() ) @@ -673,7 +673,7 @@ long SwFEShell::BeginDrag( const Point* pPt, BOOL ) |* *************************************************************************/ -long SwFEShell::Drag( const Point *pPt, BOOL ) +long SwFEShell::Drag( const Point *pPt, sal_Bool ) { ASSERT( Imp()->HasDrawView(), "Drag without DrawView?" ); if ( Imp()->GetDrawView()->IsDragObj() ) @@ -696,7 +696,7 @@ long SwFEShell::Drag( const Point *pPt, BOOL ) |* *************************************************************************/ -long SwFEShell::EndDrag( const Point *, BOOL ) +long SwFEShell::EndDrag( const Point *, sal_Bool ) { ASSERT( Imp()->HasDrawView(), "EndDrag without DrawView?" ); SdrView *pView = Imp()->GetDrawView(); @@ -722,8 +722,8 @@ long SwFEShell::EndDrag( const Point *, BOOL ) pView->EndDragObj(); // JP 18.08.95: DrawUndo-Action auf FlyFrames werden nicht gespeichert // Die Fly aendern das Flag - GetDoc()->SetNoDrawUndoObj( FALSE ); - ChgAnchor( 0, TRUE ); + GetDoc()->SetNoDrawUndoObj( sal_False ); + ChgAnchor( 0, sal_True ); EndUndo( UNDO_END ); @@ -825,10 +825,10 @@ void lcl_NotifyNeighbours( const SdrMarkList *pLst ) //3. Rahmen die dem Rahmen ausweichen bzw. wichen muessen benachrichtigt werden. //4. Auch Zeichenobjekte koennen Rahmen verdraengen - for( USHORT j = 0; j < pLst->GetMarkCount(); ++j ) + for( sal_uInt16 j = 0; j < pLst->GetMarkCount(); ++j ) { SwPageFrm *pPage; - BOOL bCheckNeighbours = FALSE; + sal_Bool bCheckNeighbours = sal_False; sal_Int16 aHori = text::HoriOrientation::NONE; SwRect aRect; SdrObject *pO = pLst->GetMark( 0 )->GetMarkedSdrObj(); @@ -841,7 +841,7 @@ void lcl_NotifyNeighbours( const SdrMarkList *pLst ) if( text::HoriOrientation::NONE != aHori && text::HoriOrientation::CENTER != aHori && pFly->IsFlyAtCntFrm() ) { - bCheckNeighbours = TRUE; + bCheckNeighbours = sal_True; pFly->InvalidatePos(); pFly->Frm().Pos().Y() += 1; } @@ -897,7 +897,7 @@ void lcl_NotifyNeighbours( const SdrMarkList *pLst ) } } -void SwFEShell::SelectionToTop( BOOL bTop ) +void SwFEShell::SelectionToTop( sal_Bool bTop ) { ASSERT( Imp()->HasDrawView(), "SelectionToTop without DrawView?" ); const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); @@ -917,7 +917,7 @@ void SwFEShell::SelectionToTop( BOOL bTop ) EndAllAction(); } -void SwFEShell::SelectionToBottom( BOOL bBottom ) +void SwFEShell::SelectionToBottom( sal_Bool bBottom ) { ASSERT( Imp()->HasDrawView(), "SelectionToBottom without DrawView?" ); const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); @@ -954,7 +954,7 @@ short SwFEShell::GetLayerId() const if ( Imp()->HasDrawView() ) { const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); - for ( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i ) + for ( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i ) { const SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); if ( nRet == SHRT_MAX ) @@ -991,7 +991,7 @@ void SwFEShell::ChangeOpaque( SdrLayerID nLayerId ) const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); const IDocumentDrawModelAccess* pIDDMA = getIDocumentDrawModelAccess(); // OD 25.06.2003 #108784# - correct type of <nControls> - for ( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i ) + for ( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i ) { SdrObject* pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); // OD 21.08.2003 #i18447# - no change of layer for controls @@ -1040,18 +1040,18 @@ void SwFEShell::SelectionToHell() |* *************************************************************************/ -USHORT SwFEShell::IsObjSelected() const +sal_uInt16 SwFEShell::IsObjSelected() const { if ( IsFrmSelected() || !Imp()->HasDrawView() ) return 0; else - return USHORT( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() ); + return sal_uInt16( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() ); } -BOOL SwFEShell::IsFrmSelected() const +sal_Bool SwFEShell::IsFrmSelected() const { if ( !Imp()->HasDrawView() ) - return FALSE; + return sal_False; else return 0 != ::GetFlyFromMarked( &Imp()->GetDrawView()->GetMarkedObjectList(), (ViewShell*)this ); @@ -1112,7 +1112,7 @@ void SwFEShell::EndTextEdit() DelSelectedObj(); if ( aSave.GetMarkCount() ) { - for ( USHORT i = 0; i < aSave.GetMarkCount(); ++i ) + for ( sal_uInt16 i = 0; i < aSave.GetMarkCount(); ++i ) pView->MarkObj( aSave.GetMark( i )->GetMarkedSdrObj(), Imp()->GetPageView() ); } @@ -1174,7 +1174,7 @@ bool SwFEShell::IsObjSelectable( const Point& rPt ) { SdrObject* pObj; SdrPageView* pPV; - USHORT nOld = pDView->GetHitTolerancePixel(); + sal_uInt16 nOld = pDView->GetHitTolerancePixel(); pDView->SetHitTolerancePixel( pDView->GetMarkHdlSizePixel()/2 ); bRet = 0 != pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMARKABLE ); @@ -1297,18 +1297,18 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) * Beinhaltet das Objekt ein Control oder Gruppen, * die nur aus Controls bestehen * --------------------------------------------------*/ -BOOL lcl_IsControlGroup( const SdrObject *pObj ) +sal_Bool lcl_IsControlGroup( const SdrObject *pObj ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if(pObj->ISA(SdrUnoObj)) - bRet = TRUE; + bRet = sal_True; else if( pObj->ISA( SdrObjGroup ) ) { - bRet = TRUE; + bRet = sal_True; const SdrObjList *pLst = ((SdrObjGroup*)pObj)->GetSubList(); - for ( USHORT i = 0; i < pLst->GetObjCount(); ++i ) + for ( sal_uInt16 i = 0; i < pLst->GetObjCount(); ++i ) if( !::lcl_IsControlGroup( pLst->GetObj( i ) ) ) - return FALSE; + return sal_False; } return bRet; } @@ -1333,7 +1333,7 @@ namespace }; } -const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType, BOOL bFlat, const ::svx::ISdrObjectFilter* pFilter ) +const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType, sal_Bool bFlat, const ::svx::ISdrObjectFilter* pFilter ) { if( !Imp()->HasDrawView() ) return NULL; @@ -1346,12 +1346,12 @@ const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT /*GOTOOBJ_...*/ eT Point aTopPos( nTmp, nTmp ); Point aCurPos; Point aPos; - BOOL bNoDraw = 0 == (GOTOOBJ_DRAW_ANY & eType); - BOOL bNoFly = 0 == (GOTOOBJ_FLY_ANY & eType); + sal_Bool bNoDraw = 0 == (GOTOOBJ_DRAW_ANY & eType); + sal_Bool bNoFly = 0 == (GOTOOBJ_FLY_ANY & eType); if( !bNoFly && bNoDraw ) { - SwFlyFrm *pFly = GetCurrFrm( FALSE )->FindFlyFrm(); + SwFlyFrm *pFly = GetCurrFrm( sal_False )->FindFlyFrm(); if( pFly ) pBest = pFly->GetVirtDrawObj(); } @@ -1404,7 +1404,7 @@ const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT /*GOTOOBJ_...*/ eT while ( aObjIter.IsMore() ) { SdrObject* pObj = aObjIter.Next(); - BOOL bFlyFrm = pObj->ISA(SwVirtFlyDrawObj); + sal_Bool bFlyFrm = pObj->ISA(SwVirtFlyDrawObj); if( ( bNoFly && bFlyFrm ) || ( bNoDraw && !bFlyFrm ) || ( eType == GOTOOBJ_DRAW_SIMPLE && lcl_IsControlGroup( pObj ) ) || @@ -1510,14 +1510,14 @@ const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT /*GOTOOBJ_...*/ eT return pBest; } -BOOL SwFEShell::GotoObj( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType ) +sal_Bool SwFEShell::GotoObj( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType ) { const SdrObject* pBest = GetBestObject( bNext, eType ); if ( !pBest ) - return FALSE; + return sal_False; - BOOL bFlyFrm = pBest->ISA(SwVirtFlyDrawObj); + sal_Bool bFlyFrm = pBest->ISA(SwVirtFlyDrawObj); if( bFlyFrm ) { SwVirtFlyDrawObj *pO = (SwVirtFlyDrawObj*)pBest; @@ -1533,7 +1533,7 @@ BOOL SwFEShell::GotoObj( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType ) MakeVisible( pBest->GetCurrentBoundRect() ); } CallChgLnk(); - return TRUE; + return sal_True; } /************************************************************************* @@ -1545,9 +1545,9 @@ BOOL SwFEShell::GotoObj( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType ) |* *************************************************************************/ -BOOL SwFEShell::BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos ) +sal_Bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( !Imp()->HasDrawView() ) Imp()->MakeDrawView(); @@ -1569,10 +1569,10 @@ BOOL SwFEShell::BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Poin return bRet; } -BOOL SwFEShell::BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, UINT32 eObjInventor, +sal_Bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, sal_uInt32 eObjInventor, const Point &rPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( !Imp()->HasDrawView() ) Imp()->MakeDrawView(); @@ -1616,34 +1616,34 @@ void SwFEShell::MoveCreate( const Point &rPos ) |* *************************************************************************/ -BOOL SwFEShell::EndCreate( UINT16 eSdrCreateCmd ) +sal_Bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd ) { // JP 18.08.95: Damit das Undo-Object aus der DrawEngine nicht bei uns // gespeichert wird, (wir erzeugen ein eigenes Undo-Object!) hier kurz // das Undo abschalten ASSERT( Imp()->HasDrawView(), "EndCreate without DrawView?" ); if( !Imp()->GetDrawView()->IsGroupEntered() ) - GetDoc()->SetNoDrawUndoObj( TRUE ); - BOOL bCreate = Imp()->GetDrawView()->EndCreateObj( + GetDoc()->SetNoDrawUndoObj( sal_True ); + sal_Bool bCreate = Imp()->GetDrawView()->EndCreateObj( SdrCreateCmd( eSdrCreateCmd ) ); - GetDoc()->SetNoDrawUndoObj( FALSE ); + GetDoc()->SetNoDrawUndoObj( sal_False ); if ( !bCreate ) { ::FrameNotify( this, FLY_DRAG_END ); - return FALSE; + return sal_False; } if ( (SdrCreateCmd)eSdrCreateCmd == SDRCREATE_NEXTPOINT ) { ::FrameNotify( this, FLY_DRAG ); - return TRUE; + return sal_True; } return ImpEndCreate(); } -BOOL SwFEShell::ImpEndCreate() +sal_Bool SwFEShell::ImpEndCreate() { ASSERT( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 1, "Neues Object nicht selektiert." ); @@ -1657,7 +1657,7 @@ BOOL SwFEShell::ImpEndCreate() Imp()->GetDrawView()->DeleteMarked(); Imp()->GetDrawView()->UnmarkAll(); ::FrameNotify( this, FLY_DRAG_END ); - return FALSE; + return sal_False; } if( rSdrObj.GetUpGroup() ) @@ -1668,7 +1668,7 @@ BOOL SwFEShell::ImpEndCreate() rSdrObj.NbcSetRelativePos( aTmpPos - aNewAnchor ); rSdrObj.NbcSetAnchorPos( aNewAnchor ); ::FrameNotify( this, FLY_DRAG ); - return TRUE; + return sal_True; } LockPaint(); @@ -1681,14 +1681,14 @@ BOOL SwFEShell::ImpEndCreate() //Fremde Identifier sollen in den Default laufen. //Ueberschneidungen sind moeglich!! - UINT16 nIdent = SdrInventor == rSdrObj.GetObjInventor() + sal_uInt16 nIdent = SdrInventor == rSdrObj.GetObjInventor() ? rSdrObj.GetObjIdentifier() : 0xFFFF; //Default fuer Controls ist Zeichengebunden, Absatzgebunden sonst. SwFmtAnchor aAnch; const SwFrm *pAnch = 0; - BOOL bCharBound = FALSE; + sal_Bool bCharBound = sal_False; if( rSdrObj.ISA( SdrUnoObj ) ) { SwPosition aPos( GetDoc()->GetNodes() ); @@ -1704,7 +1704,7 @@ BOOL SwFEShell::ImpEndCreate() pAnch->GetCharRect( aTmp, aPos ); //Der Crsr darf nicht zu weit entfernt sein. - bCharBound = TRUE; + bCharBound = sal_True; Rectangle aRect( aTmp.SVRect() ); aRect.Left() -= MM50*2; aRect.Top() -= MM50*2; @@ -1712,7 +1712,7 @@ BOOL SwFEShell::ImpEndCreate() aRect.Bottom()+= MM50*2; if( !aRect.IsOver( rBound ) && !::GetHtmlMode( GetDoc()->GetDocShell() )) - bCharBound = FALSE; + bCharBound = sal_False; //Bindung in Kopf-/Fusszeilen ist ebenfalls nicht erlaubt. if( bCharBound ) @@ -1747,7 +1747,7 @@ BOOL SwFEShell::ImpEndCreate() // die naechste nicht READONLY Position suchen? bAtPage = true; - pAnch = aPos.nNode.GetNode().GetCntntNode()->GetFrm( &aPoint, 0, FALSE ); + pAnch = aPos.nNode.GetNode().GetCntntNode()->GetFrm( &aPoint, 0, sal_False ); if( !bAtPage ) { @@ -1852,29 +1852,29 @@ BOOL SwFEShell::ImpEndCreate() //Erzeugtes Object wegwerfen, so kann der Fly am elegentesten //ueber vorhandene SS erzeugt werden. - GetDoc()->SetNoDrawUndoObj( TRUE ); // siehe oben + GetDoc()->SetNoDrawUndoObj( sal_True ); // siehe oben // --> OD 2005-08-08 #i52858# - method name changed SdrPage *pPg = getIDocumentDrawModelAccess()->GetOrCreateDrawModel()->GetPage( 0 ); // <-- if( !pPg ) { SdrModel* pTmpSdrModel = getIDocumentDrawModelAccess()->GetDrawModel(); - pPg = pTmpSdrModel->AllocPage( FALSE ); + pPg = pTmpSdrModel->AllocPage( sal_False ); pTmpSdrModel->InsertPage( pPg ); } pPg->RecalcObjOrdNums(); SdrObject* pRemovedObject = pPg->RemoveObject( rSdrObj.GetOrdNumDirect() ); SdrObject::Free( pRemovedObject ); - GetDoc()->SetNoDrawUndoObj( FALSE ); + GetDoc()->SetNoDrawUndoObj( sal_False ); SwFlyFrm* pFlyFrm; - if( NewFlyFrm( aSet, TRUE ) && + if( NewFlyFrm( aSet, sal_True ) && ::GetHtmlMode( GetDoc()->GetDocShell() ) && 0 != ( pFlyFrm = FindFlyFrm() )) { SfxItemSet aHtmlSet( GetDoc()->GetAttrPool(), RES_VERT_ORIENT, RES_HORI_ORIENT ); //Horizontale Ausrichtung: - const BOOL bLeftFrm = aFlyRect.Left() < + const sal_Bool bLeftFrm = aFlyRect.Left() < pAnch->Frm().Left() + pAnch->Prt().Left(), bLeftPrt = aFlyRect.Left() + aFlyRect.Width() < pAnch->Frm().Left() + pAnch->Prt().Width()/2; @@ -1885,7 +1885,7 @@ BOOL SwFEShell::ImpEndCreate() } else { - const BOOL bRightFrm = aFlyRect.Left() > + const sal_Bool bRightFrm = aFlyRect.Left() > pAnch->Frm().Left() + pAnch->Prt().Width(); aHori.SetHoriOrient( text::HoriOrientation::RIGHT ); aHori.SetRelationOrient( bRightFrm ? text::RelOrientation::FRAME : text::RelOrientation::PRINT_AREA ); @@ -1966,12 +1966,12 @@ BOOL SwFEShell::ImpEndCreate() if ( pMarkObj ) { Imp()->GetDrawView()->MarkObj( pMarkObj, Imp()->GetPageView(), - FALSE, FALSE ); + sal_False, sal_False ); } else { Imp()->GetDrawView()->MarkObj( &rSdrObj, Imp()->GetPageView(), - FALSE, FALSE ); + sal_False, sal_False ); } } } @@ -1981,7 +1981,7 @@ BOOL SwFEShell::ImpEndCreate() KillPams(); EndAllActionAndCall(); UnlockPaint(); - return TRUE; + return sal_True; } @@ -2010,9 +2010,9 @@ void SwFEShell::BreakCreate() |* *************************************************************************/ -BOOL SwFEShell::IsDrawCreate() const +sal_Bool SwFEShell::IsDrawCreate() const { - return Imp()->HasDrawView() ? Imp()->GetDrawView()->IsCreateObj() : FALSE; + return Imp()->HasDrawView() ? Imp()->GetDrawView()->IsCreateObj() : sal_False; } /************************************************************************* @@ -2024,7 +2024,7 @@ BOOL SwFEShell::IsDrawCreate() const |* *************************************************************************/ -BOOL SwFEShell::BeginMark( const Point &rPos ) +sal_Bool SwFEShell::BeginMark( const Point &rPos ) { if ( !Imp()->HasDrawView() ) Imp()->MakeDrawView(); @@ -2039,7 +2039,7 @@ BOOL SwFEShell::BeginMark( const Point &rPos ) return pDView->BegMarkObj( rPos ); } else - return FALSE; + return sal_False; } /************************************************************************* @@ -2079,9 +2079,9 @@ void SwFEShell::MoveMark( const Point &rPos ) |* *************************************************************************/ -BOOL SwFEShell::EndMark() +sal_Bool SwFEShell::EndMark() { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; ASSERT( Imp()->HasDrawView(), "EndMark without DrawView?" ); if (Imp()->GetDrawView()->IsMarkObj()) @@ -2090,7 +2090,7 @@ BOOL SwFEShell::EndMark() if ( bRet ) { - BOOL bShowHdl = FALSE; + sal_Bool bShowHdl = sal_False; SwDrawView* pDView = Imp()->GetDrawView(); //Rahmen werden auf diese Art nicht Selektiert, es sein denn es //ist nur ein Rahmen. @@ -2098,7 +2098,7 @@ BOOL SwFEShell::EndMark() SwFlyFrm* pOldSelFly = ::GetFlyFromMarked( &rMrkList, this ); if ( rMrkList.GetMarkCount() > 1 ) - for ( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i ) + for ( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i ) { SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); if( pObj->ISA(SwVirtFlyDrawObj) ) @@ -2106,7 +2106,7 @@ BOOL SwFEShell::EndMark() if ( !bShowHdl ) { //HMHpDView->HideMarkHdl(); - bShowHdl = TRUE; + bShowHdl = sal_True; } rMrkList.DeleteMark( i ); --i; //keinen auslassen. @@ -2123,7 +2123,7 @@ BOOL SwFEShell::EndMark() if ( rMrkList.GetMarkCount() ) ::lcl_GrabCursor(this, pOldSelFly); else - bRet = FALSE; + bRet = sal_False; } if ( bRet ) ::FrameNotify( this, FLY_DRAG_START ); @@ -2168,7 +2168,7 @@ short SwFEShell::GetAnchorId() const if ( Imp()->HasDrawView() ) { 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(); if ( pObj->ISA(SwVirtFlyDrawObj) ) @@ -2201,7 +2201,7 @@ short SwFEShell::GetAnchorId() const |* *************************************************************************/ -void SwFEShell::ChgAnchor( int eAnchorId, BOOL bSameOnly, BOOL bPosCorr ) +void SwFEShell::ChgAnchor( int eAnchorId, sal_Bool bSameOnly, sal_Bool bPosCorr ) { ASSERT( Imp()->HasDrawView(), "ChgAnchor without DrawView?" ); const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); @@ -2310,12 +2310,12 @@ Point SwFEShell::GetObjAbsPos() const |* *************************************************************************/ -BOOL SwFEShell::IsGroupSelected() +sal_Bool SwFEShell::IsGroupSelected() { if ( IsObjSelected() ) { 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(); // OD 30.06.2003 #108784# - consider 'virtual' drawing objects. @@ -2327,11 +2327,11 @@ BOOL SwFEShell::IsGroupSelected() FLY_AS_CHAR != ((SwDrawContact*)GetUserCall(pObj))-> GetFmt()->GetAnchor().GetAnchorId() ) { - return TRUE; + return sal_True; } } } - return FALSE; + return sal_False; } // OD 27.06.2003 #108784# - change return type. @@ -2347,7 +2347,7 @@ bool SwFEShell::IsGroupAllowed() const const SdrObject* pUpGroup = 0L; const SwFrm* pHeaderFooterFrm = 0L; const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); - for ( USHORT i = 0; bIsGroupAllowed && i < rMrkList.GetMarkCount(); ++i ) + for ( sal_uInt16 i = 0; bIsGroupAllowed && i < rMrkList.GetMarkCount(); ++i ) { const SdrObject* pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); if ( i ) @@ -2471,7 +2471,7 @@ void SwFEShell::UnGroupSelection() |* *************************************************************************/ -void SwFEShell::MirrorSelection( BOOL bHorizontal ) +void SwFEShell::MirrorSelection( sal_Bool bHorizontal ) { SdrView *pView = Imp()->GetDrawView(); if ( IsObjSelected() && pView->IsMirrorAllowed() ) @@ -2485,10 +2485,10 @@ void SwFEShell::MirrorSelection( BOOL bHorizontal ) // springe zum benannten Rahmen (Grafik/OLE) -BOOL SwFEShell::GotoFly( const String& rName, FlyCntType eType, BOOL bSelFrm ) +sal_Bool SwFEShell::GotoFly( const String& rName, FlyCntType eType, sal_Bool bSelFrm ) { - BOOL bRet = FALSE; -static BYTE __READONLY_DATA aChkArr[ 4 ] = { + sal_Bool bRet = sal_False; +static sal_uInt8 __READONLY_DATA aChkArr[ 4 ] = { /* FLYCNTTYPE_ALL */ 0, /* FLYCNTTYPE_FRM */ ND_TEXTNODE, /* FLYCNTTYPE_GRF */ ND_GRFNODE, @@ -2531,19 +2531,19 @@ static BYTE __READONLY_DATA aChkArr[ 4 ] = { GetCrsrDocPos() = rChrRect.Pos(); } } - bRet = TRUE; + bRet = sal_True; } } return bRet; } -USHORT SwFEShell::GetFlyCount( FlyCntType eType ) const +sal_uInt16 SwFEShell::GetFlyCount( FlyCntType eType ) const { return GetDoc()->GetFlyCount(eType); } -const SwFrmFmt* SwFEShell::GetFlyNum(USHORT nIdx, FlyCntType eType ) const +const SwFrmFmt* SwFEShell::GetFlyNum(sal_uInt16 nIdx, FlyCntType eType ) const { return GetDoc()->GetFlyNum(nIdx, eType ); } @@ -2562,14 +2562,14 @@ void SwFEShell::MakeSelVisible() //Welcher Schutz ist am selektierten Objekt gesetzt? -BYTE SwFEShell::IsSelObjProtected( USHORT eType ) const +sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 eType ) const { int nChk = 0; const bool bParent = (eType & FLYPROTECT_PARENT); if( Imp()->HasDrawView() ) { const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList(); - for( ULONG i = rMrkList.GetMarkCount(); i; ) + for( sal_uLong i = rMrkList.GetMarkCount(); i; ) { SdrObject *pObj = rMrkList.GetMark( --i )->GetMarkedSdrObj(); if( !bParent ) @@ -2608,7 +2608,7 @@ BYTE SwFEShell::IsSelObjProtected( USHORT eType ) const } nChk &= eType; if( nChk == eType ) - return static_cast<BYTE>(eType); + return static_cast<sal_uInt8>(eType); } const SwFrm* pAnch; if( pObj->ISA(SwVirtFlyDrawObj) ) @@ -2619,19 +2619,19 @@ BYTE SwFEShell::IsSelObjProtected( USHORT eType ) const pAnch = pTmp ? pTmp->GetAnchorFrm( pObj ) : NULL; } if( pAnch && pAnch->IsProtected() ) - return static_cast<BYTE>(eType); + return static_cast<sal_uInt8>(eType); } } - return static_cast<BYTE>(nChk); + return static_cast<sal_uInt8>(nChk); } -BOOL SwFEShell::GetObjAttr( SfxItemSet &rSet ) const +sal_Bool SwFEShell::GetObjAttr( SfxItemSet &rSet ) const { if ( !IsObjSelected() ) - return FALSE; + return sal_False; 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(); SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj); @@ -2646,23 +2646,23 @@ BOOL SwFEShell::GetObjAttr( SfxItemSet &rSet ) const } // <-- } - return TRUE; + return sal_True; } -BOOL SwFEShell::SetObjAttr( const SfxItemSet& rSet ) +sal_Bool SwFEShell::SetObjAttr( const SfxItemSet& rSet ) { SET_CURR_SHELL( this ); if ( !rSet.Count() ) { ASSERT( !this, "SetObjAttr, empty set." ); - return FALSE; + return sal_False; } StartAllAction(); StartUndo( UNDO_INSATTR ); 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(); SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj); @@ -2672,15 +2672,15 @@ BOOL SwFEShell::SetObjAttr( const SfxItemSet& rSet ) EndUndo( UNDO_INSATTR ); EndAllActionAndCall(); GetDoc()->SetModified(); - return TRUE; + return sal_True; } -BOOL SwFEShell::IsAlignPossible() const +sal_Bool SwFEShell::IsAlignPossible() const { - USHORT nCnt; + sal_uInt16 nCnt; if ( 0 < (nCnt = IsObjSelected()) ) { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if ( nCnt == 1 ) { SdrObject *pO = Imp()->GetDrawView()->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(); @@ -2691,7 +2691,7 @@ BOOL SwFEShell::IsAlignPossible() const if ( bRet ) return Imp()->GetDrawView()->IsAlignPossible(); } - return FALSE; + return sal_False; } @@ -2701,7 +2701,7 @@ void SwFEShell::CheckUnboundObjects() SET_CURR_SHELL( this ); 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(); if ( !GetUserCall(pObj) ) @@ -2722,14 +2722,14 @@ void SwFEShell::CheckUnboundObjects() //Fremde Identifier sollen in den Default laufen. //Ueberschneidungen sind moeglich!! - UINT16 nIdent = + sal_uInt16 nIdent = Imp()->GetDrawView()->GetCurrentObjInventor() == SdrInventor ? Imp()->GetDrawView()->GetCurrentObjIdentifier() : 0xFFFF; SwFmtAnchor aAnch; const SwFrm *pAnch = 0; { - pAnch = ::FindAnchor( pPage, aPt, TRUE ); + pAnch = ::FindAnchor( pPage, aPt, sal_True ); SwPosition aPos( *((SwCntntFrm*)pAnch)->GetNode() ); aAnch.SetType( FLY_AT_PARA ); aAnch.SetAnchor( &aPos ); @@ -2789,7 +2789,7 @@ int SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource, SdrObject* pObj; SdrPageView* pPView; SwDrawView *pDView = (SwDrawView*)Imp()->GetDrawView(); - const USHORT nOld = pDView->GetHitTolerancePixel(); + const sal_uInt16 nOld = pDView->GetHitTolerancePixel(); pDView->SetHitTolerancePixel( 0 ); if( pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPView, SDRSEARCH_PICKMARKABLE ) && pObj->ISA(SwVirtFlyDrawObj) ) @@ -2824,7 +2824,7 @@ int SwFEShell::Chain( SwFrmFmt &rSource, const Point &rPt ) SdrObject* pObj; SdrPageView* pPView; SwDrawView *pDView = (SwDrawView*)Imp()->GetDrawView(); - const USHORT nOld = pDView->GetHitTolerancePixel(); + const sal_uInt16 nOld = pDView->GetHitTolerancePixel(); pDView->SetHitTolerancePixel( 0 ); pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPView, SDRSEARCH_PICKMARKABLE ); pDView->SetHitTolerancePixel( nOld ); @@ -2862,15 +2862,15 @@ void SwFEShell::HideChainMarker() void SwFEShell::SetChainMarker() { - BOOL bDelFrom = TRUE, - bDelTo = TRUE; + sal_Bool bDelFrom = sal_True, + bDelTo = sal_True; if ( IsFrmSelected() ) { SwFlyFrm *pFly = FindFlyFrm(); if ( pFly->GetPrevLink() ) { - bDelFrom = FALSE; + bDelFrom = sal_False; const SwFrm *pPre = pFly->GetPrevLink(); Point aStart( pPre->Frm().Right(), pPre->Frm().Bottom()); @@ -2883,7 +2883,7 @@ void SwFEShell::SetChainMarker() } if ( pFly->GetNextLink() ) { - bDelTo = FALSE; + bDelTo = sal_False; const SwFlyFrm *pNxt = pFly->GetNextLink(); Point aStart( pFly->Frm().Right(), pFly->Frm().Bottom()); @@ -2941,8 +2941,8 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const /* -----------------------------2002/06/24 15:07------------------------------ ---------------------------------------------------------------------------*/ -void SwFEShell::CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, - USHORT nSlotId) +void SwFEShell::CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, + sal_uInt16 nSlotId) { SdrView* pDrawView = GetDrawView(); SdrModel* pDrawModel = pDrawView->GetModel(); @@ -3070,7 +3070,7 @@ void SwFEShell::CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, cons } else if(pObj->ISA(SdrCaptionObj)) { - BOOL bVerticalText = ( SID_DRAW_TEXT_VERTICAL == nSlotId || + sal_Bool bVerticalText = ( SID_DRAW_TEXT_VERTICAL == nSlotId || SID_DRAW_CAPTION_VERTICAL == nSlotId ); ((SdrTextObj*)pObj)->SetVerticalWriting(bVerticalText); if(bVerticalText) @@ -3098,8 +3098,8 @@ void SwFEShell::CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, cons if(bVertical) { SfxItemSet aSet(pDrawModel->GetItemPool()); - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP)); aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); pText->SetMergedItemSet(aSet); @@ -3108,12 +3108,12 @@ void SwFEShell::CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, cons if(bMarquee) { SfxItemSet aSet(pDrawModel->GetItemPool(), SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST); - aSet.Put( SdrTextAutoGrowWidthItem( FALSE ) ); - aSet.Put( SdrTextAutoGrowHeightItem( FALSE ) ); + aSet.Put( SdrTextAutoGrowWidthItem( sal_False ) ); + aSet.Put( SdrTextAutoGrowHeightItem( sal_False ) ); aSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) ); aSet.Put( SdrTextAniDirectionItem( SDRTEXTANI_LEFT ) ); aSet.Put( SdrTextAniCountItem( 1 ) ); - aSet.Put( SdrTextAniAmountItem( (INT16)GetWin()->PixelToLogic(Size(2,1)).Width()) ); + aSet.Put( SdrTextAniAmountItem( (sal_Int16)GetWin()->PixelToLogic(Size(2,1)).Width()) ); pObj->SetMergedItemSetAndBroadcast(aSet); } } |