diff options
Diffstat (limited to 'sd/source/ui/func')
47 files changed, 956 insertions, 956 deletions
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 1a6e8992a10e..a7f7cbbfd017 100644..100755 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -65,16 +65,16 @@ void SdBulletMapper::PreMapNumBulletForDialog( SfxItemSet& rSet ) { - if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, FALSE ) ) + if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, sal_False ) ) { SvxNumRule* pRule = ((SvxNumBulletItem*)rSet.GetItem( EE_PARA_NUMBULLET ))->GetNumRule(); if(pRule && pRule->GetNumRuleType() == SVX_RULETYPE_PRESENTATION_NUMBERING) { // 10er Bullet Item auf 9er Item mappen - SvxNumRule aNewRule( pRule->GetFeatureFlags(), 9, FALSE, SVX_RULETYPE_PRESENTATION_NUMBERING ); + SvxNumRule aNewRule( pRule->GetFeatureFlags(), 9, sal_False, SVX_RULETYPE_PRESENTATION_NUMBERING ); - for( USHORT i = 0; i < 9; i++ ) + for( sal_uInt16 i = 0; i < 9; i++ ) aNewRule.SetLevel(i, pRule->GetLevel(i)); rSet.Put( SvxNumBulletItem( aNewRule, EE_PARA_NUMBULLET ) ); @@ -84,7 +84,7 @@ void SdBulletMapper::PreMapNumBulletForDialog( SfxItemSet& rSet ) void SdBulletMapper::PostMapNumBulletForDialog( SfxItemSet& rSet ) { - if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, FALSE ) ) + if( SFX_ITEM_SET == rSet.GetItemState( EE_PARA_NUMBULLET, sal_False ) ) { SvxNumRule* pRule = ((SvxNumBulletItem*)rSet.GetItem( EE_PARA_NUMBULLET ))->GetNumRule(); @@ -94,9 +94,9 @@ void SdBulletMapper::PostMapNumBulletForDialog( SfxItemSet& rSet ) if(pRule->GetNumRuleType() == SVX_RULETYPE_PRESENTATION_NUMBERING) { // 9er Bullet Item auf 10er Item mappen - SvxNumRule aNewRule( pRule->GetFeatureFlags(), 10, FALSE, SVX_RULETYPE_PRESENTATION_NUMBERING ); + SvxNumRule aNewRule( pRule->GetFeatureFlags(), 10, sal_False, SVX_RULETYPE_PRESENTATION_NUMBERING ); - for( USHORT i = 0; i < 9; i++ ) + for( sal_uInt16 i = 0; i < 9; i++ ) aNewRule.SetLevel(i, pRule->GetLevel(i)); rSet.Put( SvxNumBulletItem( aNewRule, EE_PARA_NUMBULLET ) ); @@ -108,8 +108,8 @@ void SdBulletMapper::PostMapNumBulletForDialog( SfxItemSet& rSet ) void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& rSet ) { - const USHORT nCount = aNumRule.GetLevelCount(); - for( USHORT nLevel = 0; nLevel < nCount; nLevel++ ) + const sal_uInt16 nCount = aNumRule.GetLevelCount(); + for( sal_uInt16 nLevel = 0; nLevel < nCount; nLevel++ ) { const SvxNumberFormat& rSrcLevel = aNumRule.GetLevel(nLevel); SvxNumberFormat aNewLevel( rSrcLevel ); @@ -143,22 +143,22 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet& Font aMyFont; const SvxFontItem& rFItem = - (SvxFontItem&)rSet.Get(GetWhich( (USHORT)nFontID )); + (SvxFontItem&)rSet.Get(GetWhich( (sal_uInt16)nFontID )); aMyFont.SetFamily(rFItem.GetFamily()); aMyFont.SetName(rFItem.GetFamilyName()); aMyFont.SetCharSet(rFItem.GetCharSet()); aMyFont.SetPitch(rFItem.GetPitch()); const SvxFontHeightItem& rFHItem = - (SvxFontHeightItem&)rSet.Get(GetWhich( (USHORT)nFontHeightID )); + (SvxFontHeightItem&)rSet.Get(GetWhich( (sal_uInt16)nFontHeightID )); aMyFont.SetSize(Size(0, rFHItem.GetHeight())); const SvxWeightItem& rWItem = - (SvxWeightItem&)rSet.Get(GetWhich( (USHORT)nWeightID )); + (SvxWeightItem&)rSet.Get(GetWhich( (sal_uInt16)nWeightID )); aMyFont.SetWeight(rWItem.GetWeight()); const SvxPostureItem& rPItem = - (SvxPostureItem&)rSet.Get(GetWhich( (USHORT)nPostureID )); + (SvxPostureItem&)rSet.Get(GetWhich( (sal_uInt16)nPostureID )); aMyFont.SetItalic(rPItem.GetPosture()); const SvxUnderlineItem& rUItem = (SvxUnderlineItem&)rSet.Get(GetWhich(SID_ATTR_CHAR_UNDERLINE)); diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 31c4c1358d3a..72596095fbae 100644..100755 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -89,7 +89,7 @@ void FuArea::DoExecute( SfxRequest& rReq ) } // Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_ATTR_FILL_STYLE, SID_ATTR_FILL_COLOR, SID_ATTR_FILL_GRADIENT, diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 92b1450624e1..8bf1b6509e60 100644..100755 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -140,7 +140,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) { // prevent flickering pOV->HideCursor(); - pOL->SetUpdateMode(FALSE); + pOL->SetUpdateMode(sal_False); // remove old selected text pOV->InsertText( aEmptyStr ); @@ -152,7 +152,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) // insert given text String aStr( cMark ); - pOV->InsertText( cMark, TRUE); + pOV->InsertText( cMark, sal_True); ESelection aSel = pOV->GetSelection(); aSel.nStartPara = aSel.nEndPara; @@ -162,7 +162,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) rUndoMgr.LeaveListAction(); // restart repainting - pOL->SetUpdateMode(TRUE); + pOL->SetUpdateMode(sal_True); pOV->ShowCursor(); } } @@ -172,7 +172,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; if( pArgs ) - pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem); + pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem); String aChars, aFontName; Font aFont; @@ -180,7 +180,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) { aChars = ((const SfxStringItem*)pItem)->GetValue(); const SfxPoolItem* pFtItem = NULL; - pArgs->GetItemState( mpDoc->GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem); + pArgs->GetItemState( mpDoc->GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem); const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem ); if ( pFontItem ) { @@ -200,7 +200,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) if (!aChars.Len() ) { SfxAllItemSet aSet( mpDoc->GetPool() ); - aSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) ); + aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); SfxItemSet aFontAttr( mpDoc->GetPool() ); mpView->GetAttributes( aFontAttr ); @@ -218,11 +218,11 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) // Wenn Zeichen selektiert ist kann es angezeigt werden // pDLg->SetFont( ); // pDlg->SetChar( ); - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, FALSE ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); if ( pFItem ) { aFont.SetName( pFItem->GetFamilyName() ); @@ -264,7 +264,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) { // nicht flackern pOV->HideCursor(); - pOL->SetUpdateMode(FALSE); + pOL->SetUpdateMode(sal_False); // alte Attributierung merken; // dazu vorher selektierten Bereich loeschen, denn der muss eh weg @@ -279,7 +279,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) SfxUndoManager& rUndoMgr = pOL->GetUndoManager(); rUndoMgr.EnterListAction(String(SdResId(STR_UNDO_INSERT_SPECCHAR)), aEmptyStr ); - pOV->InsertText(aChars, TRUE); + pOV->InsertText(aChars, sal_True); // attributieren (Font setzen) SfxItemSet aSet(pOL->GetEmptyItemSet()); @@ -303,7 +303,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) rUndoMgr.LeaveListAction(); // ab jetzt wieder anzeigen - pOL->SetUpdateMode(TRUE); + pOL->SetUpdateMode(sal_True); pOV->ShowCursor(); } } diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index f43b33c8318a..d9daa4e325b4 100644..100755 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -85,13 +85,13 @@ void FuChar::DoExecute( SfxRequest& rReq ) SfxItemSet aNewAttr( mpViewShell->GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - aNewAttr.Put( aEditAttr, FALSE ); + aNewAttr.Put( aEditAttr, sal_False ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0; if( pDlg ) { - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { @@ -110,7 +110,7 @@ void FuChar::DoExecute( SfxRequest& rReq ) mpView->SetAttributes(*pArgs); // invalidieren der Slots, die in der DrTxtObjBar auftauchen - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_POSTURE, SID_ATTR_CHAR_WEIGHT, @@ -126,9 +126,9 @@ void FuChar::DoExecute( SfxRequest& rReq ) if( mpDoc->GetOnlineSpell() ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE, FALSE, &pItem ) || - SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CJK, FALSE, &pItem ) || - SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CTL, FALSE, &pItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE, sal_False, &pItem ) || + SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CJK, sal_False, &pItem ) || + SFX_ITEM_SET == pArgs->GetItemState(EE_CHAR_LANGUAGE_CTL, sal_False, &pItem ) ) { mpDoc->StopOnlineSpelling(); mpDoc->StartOnlineSpelling(); diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index ef0827cc6efc..2b34ac183661 100644..100755 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -131,7 +131,7 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape() case SID_3D_SHELL: { - XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, FALSE); + XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, sal_False); aXPoly.Scale(5.0, 5.0); ::basegfx::B2DPolygon aB2DPolygon(aXPoly.getB2DPolygon()); @@ -143,13 +143,13 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape() // Dies ist ein offenes Objekt, muss daher defaultmaessig // doppelseitig behandelt werden - p3DObj->SetMergedItem(Svx3DDoubleSidedItem(TRUE)); + p3DObj->SetMergedItem(Svx3DDoubleSidedItem(sal_True)); break; } case SID_3D_HALF_SPHERE: { - XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, FALSE); + XPolygon aXPoly(Point (0, 1250), 2500, 2500, 0, 900, sal_False); aXPoly.Scale(5.0, 5.0); aXPoly.Insert(0, Point (2400*5, 1250*5), XPOLY_NORMAL); @@ -326,16 +326,16 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS pScene->SetMergedItemSetAndBroadcast(aAttr); } -BOOL FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); E3dCompoundObject* p3DObj = NULL; @@ -372,7 +372,7 @@ BOOL FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -383,15 +383,15 @@ BOOL FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = TRUE; + bReturn = sal_True; } bReturn = FuConstruct::MouseButtonUp(rMEvt) || bReturn; @@ -406,12 +406,12 @@ BOOL FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt) { return( FuConstruct::KeyInput(rKEvt) ); } @@ -468,7 +468,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const // copied code from E3dView::InitScene double fCamZ(aVolume.getMaxZ() + ((fW + fH) / 4.0)); Camera3D aCam(pScene->GetCamera()); - aCam.SetAutoAdjustProjection(FALSE); + aCam.SetAutoAdjustProjection(sal_False); aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH); ::basegfx::B3DPoint aLookAt; double fDefaultCamPosZ = mpView->GetDefaultCamPosZ(); diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 7a7ab2b9dc2e..3cb1a8c4ee0b 100644..100755 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -95,12 +95,12 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) if (pArgs) { - SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, FALSE); - SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, FALSE); - SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, FALSE); - SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, FALSE); - SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, FALSE); - SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, FALSE); + SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False); + SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False); + SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, sal_False); + SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, sal_False); + SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, sal_False); + SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, sal_False); Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, @@ -125,15 +125,15 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) +sal_Bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) { - BOOL bReturn = FuConstruct::MouseButtonDown( rMEvt ); + sal_Bool bReturn = FuConstruct::MouseButtonDown( rMEvt ); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); SdrObject* pObj = mpView->GetCreateObj(); @@ -143,11 +143,11 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) SfxItemSet aAttr(mpDoc->GetPool()); SetStyleSheet(aAttr, pObj); -//-/ pObj->NbcSetAttributes(aAttr, FALSE); +//-/ pObj->NbcSetAttributes(aAttr, sal_False); pObj->SetMergedItemSet(aAttr); } - bReturn = TRUE; + bReturn = sal_True; } return bReturn; } @@ -158,7 +158,7 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) |* \************************************************************************/ -BOOL FuConstructArc::MouseMove( const MouseEvent& rMEvt ) +sal_Bool FuConstructArc::MouseMove( const MouseEvent& rMEvt ) { return FuConstruct::MouseMove(rMEvt); } @@ -169,26 +169,26 @@ BOOL FuConstructArc::MouseMove( const MouseEvent& rMEvt ) |* \************************************************************************/ -BOOL FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) +sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) { - BOOL bReturn = FALSE; - BOOL bCreated = FALSE; + sal_Bool bReturn = sal_False; + sal_Bool bCreated = sal_False; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); - ULONG nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); + sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); if (mpView->EndCreateObj(SDRCREATE_NEXTPOINT) ) { if (nCount != mpView->GetSdrPageView()->GetObjList()->GetObjCount()) { - bCreated = TRUE; + bCreated = sal_True; } } - bReturn = TRUE; + bReturn = sal_True; } bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn; @@ -203,14 +203,14 @@ BOOL FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructArc::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructArc::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -258,7 +258,7 @@ void FuConstructArc::Activate() break; } - mpView->SetCurrentObj((UINT16)aObjKind); + mpView->SetCurrentObj((sal_uInt16)aObjKind); FuConstruct::Activate(); // FuDraw::Activate(); diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index e95a2377e4ee..69f2f5266389 100644..100755 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -98,7 +98,7 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq ) if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, sal_True, &pPoolItem ) ) maTargets = ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue(); } } @@ -109,9 +109,9 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); @@ -129,11 +129,11 @@ BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) { // Texteingabe hier nicht zulassen aVEvt.eEvent = SDREVENT_BEGDRAGOBJ; - mpView->EnableExtendedMouseEventDispatcher(FALSE); + mpView->EnableExtendedMouseEventDispatcher(sal_False); } else { - mpView->EnableExtendedMouseEventDispatcher(TRUE); + mpView->EnableExtendedMouseEventDispatcher(sal_True); } if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT) @@ -166,9 +166,9 @@ BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseMove(rMEvt); + sal_Bool bReturn = FuConstruct::MouseMove(rMEvt); return(bReturn); } @@ -178,15 +178,15 @@ BOOL FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) +sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) { - BOOL bReturn = FALSE; - BOOL bCreated = FALSE; + sal_Bool bReturn = sal_False; + sal_Bool bCreated = sal_False; SdrViewEvent aVEvt; mpView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt); - ULONG nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); + sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); if (mpView->IsInsObjPoint()) { @@ -199,15 +199,15 @@ BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) if (aVEvt.eEvent == SDREVENT_ENDCREATE) { - bReturn = TRUE; + bReturn = sal_True; if (nCount == (mpView->GetSdrPageView()->GetObjList()->GetObjCount() - 1)) { - bCreated = TRUE; + bCreated = sal_True; } // Trick, um FuDraw::DoubleClick nicht auszuloesen - bMBDown = FALSE; + bMBDown = sal_False; } @@ -260,14 +260,14 @@ BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -280,7 +280,7 @@ BOOL FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) void FuConstructBezierPolygon::Activate() { - mpView->EnableExtendedMouseEventDispatcher(TRUE); + mpView->EnableExtendedMouseEventDispatcher(sal_True); SdrObjKind eKind; @@ -331,7 +331,7 @@ void FuConstructBezierPolygon::Activate() break; } - mpView->SetCurrentObj((UINT16)eKind); + mpView->SetCurrentObj((sal_uInt16)eKind); FuConstruct::Activate(); } @@ -344,7 +344,7 @@ void FuConstructBezierPolygon::Activate() void FuConstructBezierPolygon::Deactivate() { - mpView->EnableExtendedMouseEventDispatcher(FALSE); + mpView->EnableExtendedMouseEventDispatcher(sal_False); FuConstruct::Deactivate(); } @@ -373,7 +373,7 @@ void FuConstructBezierPolygon::SelectionHasChanged() |* \************************************************************************/ -void FuConstructBezierPolygon::SetEditMode(USHORT nMode) +void FuConstructBezierPolygon::SetEditMode(sal_uInt16 nMode) { nEditMode = nMode; ForcePointer(); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 0627abdd62fc..5b65c8cbb902 100644..100755 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -133,16 +133,16 @@ void FuConstructCustomShape::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); @@ -172,7 +172,7 @@ BOOL FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -183,7 +183,7 @@ BOOL FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) { sal_Bool bReturn(sal_False); @@ -207,14 +207,14 @@ BOOL FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index ef7eaae17004..751e6f364bd1 100644..100755 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -122,10 +122,10 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) { case SID_DRAW_ELLIPSE : { - SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, FALSE); - SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, FALSE); - SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, FALSE); - SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, FALSE); + SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False); + SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False); + SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, sal_False); + SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, sal_False); Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, @@ -140,10 +140,10 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) case SID_DRAW_RECT : { - SFX_REQUEST_ARG (rReq, pMouseStartX, SfxUInt32Item, ID_VAL_MOUSESTART_X, FALSE); - SFX_REQUEST_ARG (rReq, pMouseStartY, SfxUInt32Item, ID_VAL_MOUSESTART_Y, FALSE); - SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, FALSE); - SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, FALSE); + SFX_REQUEST_ARG (rReq, pMouseStartX, SfxUInt32Item, ID_VAL_MOUSESTART_X, sal_False); + SFX_REQUEST_ARG (rReq, pMouseStartY, SfxUInt32Item, ID_VAL_MOUSESTART_Y, sal_False); + SFX_REQUEST_ARG (rReq, pMouseEndX, SfxUInt32Item, ID_VAL_MOUSEEND_X, sal_False); + SFX_REQUEST_ARG (rReq, pMouseEndY, SfxUInt32Item, ID_VAL_MOUSEEND_Y, sal_False); Rectangle aNewRectangle (pMouseStartX->GetValue (), pMouseStartY->GetValue (), @@ -204,16 +204,16 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if (mpView->GetCurrentObjIdentifier() == OBJ_CAPTION) { @@ -237,7 +237,7 @@ BOOL FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) pObj->SetMergedItemSet(aAttr); if( nSlotId == SID_DRAW_CAPTION_VERTICAL ) - ( (SdrTextObj*) pObj)->SetVerticalWriting( TRUE ); + ( (SdrTextObj*) pObj)->SetVerticalWriting( sal_True ); } } return bReturn; @@ -249,7 +249,7 @@ BOOL FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -260,7 +260,7 @@ BOOL FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) { sal_Bool bReturn(sal_False); @@ -274,7 +274,7 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) { SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin(); String aStr(SdResId(STR_LAYER_MEASURELINES)); - pObj->SetLayer(rAdmin.GetLayerID(aStr, FALSE)); + pObj->SetLayer(rAdmin.GetLayerID(aStr, sal_False)); } // #88751# init text position when vertica caption object is created @@ -311,14 +311,14 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructRectangle::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructRectangle::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -424,7 +424,7 @@ void FuConstructRectangle::Activate() break; } - mpView->SetCurrentObj((UINT16)aObjKind); + mpView->SetCurrentObj((sal_uInt16)aObjKind); FuConstruct::Activate(); } @@ -473,7 +473,7 @@ void FuConstructRectangle::Deactivate() nSlotId == SID_LINE_ARROW_SQUARE || nSlotId == SID_LINE_SQUARE_ARROW ) { - mpView->SetGlueVisible( FALSE ); + mpView->SetGlueVisible( sal_False ); } FuConstruct::Deactivate(); } @@ -544,8 +544,8 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) Size aSize(pObj->GetLogicRect().GetSize()); rAttr.Put( SdrTextMinFrameHeightItem( aSize.Height() ) ); rAttr.Put( SdrTextMinFrameWidthItem( aSize.Width() ) ); - rAttr.Put( SdrTextAutoGrowHeightItem( TRUE ) ); - rAttr.Put( SdrTextAutoGrowWidthItem( TRUE ) ); + rAttr.Put( SdrTextAutoGrowHeightItem( sal_True ) ); + rAttr.Put( SdrTextAutoGrowWidthItem( sal_True ) ); // #103516# Support full with for vertical caption objects, too if(SID_DRAW_CAPTION == nSlotId) @@ -573,12 +573,12 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) if (pSheet) { - pObj->SetStyleSheet(pSheet, FALSE); + pObj->SetStyleSheet(pSheet, sal_False); } SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin(); String aStr(SdResId(STR_LAYER_MEASURELINES)); - pObj->SetLayer(rAdmin.GetLayerID(aStr, FALSE)); + pObj->SetLayer(rAdmin.GetLayerID(aStr, sal_False)); } else if (nSlotId == OBJ_CUSTOMSHAPE ) { @@ -960,8 +960,8 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const { if(pObj->ISA(SdrEdgeObj)) { - ((SdrEdgeObj*)pObj)->SetTailPoint(FALSE, aStart); - ((SdrEdgeObj*)pObj)->SetTailPoint(TRUE, aEnd); + ((SdrEdgeObj*)pObj)->SetTailPoint(sal_False, aStart); + ((SdrEdgeObj*)pObj)->SetTailPoint(sal_True, aEnd); } else { diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index c0d8235e97fb..9f756ca0a9ce 100755 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -68,7 +68,7 @@ FuConstruct::FuConstruct ( SdDrawDocument* pDoc, SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq), - bSelectionChanged(FALSE) + bSelectionChanged(sal_False) { } @@ -83,12 +83,12 @@ void FuConstruct::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); - bMBDown = TRUE; - bSelectionChanged = FALSE; + bMBDown = sal_True; + bSelectionChanged = sal_False; if ( mpView->IsAction() ) { @@ -96,14 +96,14 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) // erasing the last two points when creating a polygon. // if ( rMEvt.IsRight() ) // mpView->BckAction(); - return TRUE; + return sal_True; } - bFirstMouseMove = TRUE; + bFirstMouseMove = sal_True; aDragTimer.Start(); aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); - USHORT nHitLog = USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()); + sal_uInt16 nHitLog = sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()); if (rMEvt.IsLeft() && mpView->IsExtendedMouseEventDispatcherEnabled()) { @@ -113,14 +113,14 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) if ( pHdl != NULL || mpView->IsMarkedHit(aMDPos, nHitLog) ) { - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); - bReturn = TRUE; + bReturn = sal_True; } else if ( mpView->AreObjectsMarked() ) { mpView->UnmarkAll(); - bReturn = TRUE; + bReturn = sal_True; } } @@ -133,14 +133,14 @@ BOOL FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt) { FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive() ) { if( bFirstMouseMove ) - bFirstMouseMove = FALSE; + bFirstMouseMove = sal_False; else aDragTimer.Stop(); } @@ -154,7 +154,7 @@ BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt) mpView->MovAction(aPnt); } - return TRUE; + return sal_True; } /************************************************************************* @@ -163,14 +163,14 @@ BOOL FuConstruct::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = TRUE; + sal_Bool bReturn = sal_True; if (aDragTimer.IsActive() ) { aDragTimer.Stop(); - bIsInDragMode = FALSE; + bIsInDragMode = sal_False; } FuDraw::MouseButtonUp(rMEvt); @@ -180,11 +180,11 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) if ( mpView && mpView->IsDragObj() ) { FrameView* pFrameView = mpViewShell->GetFrameView(); - BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE); + bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); } mpView->SetDragWithCopy(bDragWithCopy); @@ -196,19 +196,19 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) } else { - bReturn = FALSE; + bReturn = sal_False; } if ( mpView && !mpView->IsAction() ) { mpWindow->ReleaseMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if ( !mpView->AreObjectsMarked() ) { SdrObject* pObj; SdrPageView* pPV; - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); if (!mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV)) { @@ -226,7 +226,7 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) * Toggle zw. Selektion und Rotation **************************************************************/ SdrObject* pSingleObj = NULL; - ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); if (nMarkCount==1) { @@ -246,14 +246,14 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) } } - USHORT nClicks = rMEvt.GetClicks(); + sal_uInt16 nClicks = rMEvt.GetClicks(); if (nClicks == 2 && rMEvt.IsLeft() && bMBDown && !rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsShift() ) { DoubleClick(rMEvt); } - bMBDown = FALSE; + bMBDown = sal_False; return bReturn; } @@ -262,14 +262,14 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstruct::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if ( !bReturn ) bReturn = FuDraw::KeyInput(rKEvt); @@ -362,7 +362,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, ***********************************************/ String aName( pPage->GetLayoutName() ); String aSep = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) ); - USHORT n = aName.Search(aSep); + sal_uInt16 n = aName.Search(aSep); n = n + aSep.Len(); aName.Erase(n); aName.Append( String ( SdResId( STR_LAYOUT_BACKGROUNDOBJECTS ) ) ); @@ -373,7 +373,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, if (pSheet) { // applying style sheet for background objects - pObj->SetStyleSheet(pSheet, FALSE); + pObj->SetStyleSheet(pSheet, sal_False); SfxItemSet& rSet = pSheet->GetItemSet(); const XFillStyleItem& rFillStyle = (const XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE); if ( bForceFillStyle ) @@ -402,7 +402,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, DBG_ASSERT(pSheet, "Objektvorlage nicht gefunden"); if (pSheet) { - pObj->SetStyleSheet(pSheet, FALSE); + pObj->SetStyleSheet(pSheet, sal_False); SfxItemSet aAttr(*mpView->GetDefaultAttr().Clone()); aAttr.Put(pSheet->GetItemSet().Get(XATTR_FILLSTYLE)); pObj->SetMergedItemSet(aAttr); diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index fffcaf3c0b9f..25a045652906 100644..100755 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -89,8 +89,8 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq ) { FuConstruct::DoExecute( rReq ); - SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, FALSE ); - SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, FALSE ); + SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, sal_False ); + SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, sal_False ); if( pInventorItem ) nInventor = pInventorItem->GetValue(); if( pIdentifierItem ) @@ -106,17 +106,17 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq ) |* MouseButtonDown-event |* \************************************************************************/ -BOOL FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); - bReturn = TRUE; + bReturn = sal_True; } return bReturn; } @@ -126,7 +126,7 @@ BOOL FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) |* MouseMove-event |* \************************************************************************/ -BOOL FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } @@ -136,15 +136,15 @@ BOOL FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt) |* MouseButtonUp-event |* \************************************************************************/ -BOOL FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = TRUE; + bReturn = sal_True; } bReturn = (FuConstruct::MouseButtonUp(rMEvt) || bReturn); @@ -159,13 +159,13 @@ BOOL FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 0335ff9aa13c..c9ba73ce420b 100644..100755 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -100,12 +100,12 @@ void FuCopy::DoExecute( SfxRequest& rReq ) mpView->GetAttributes( aAttr ); const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLSTYLE, sal_True, &pPoolItem ) ) { XFillStyle eStyle = ( ( const XFillStyleItem* ) pPoolItem )->GetValue(); if( eStyle == XFILL_SOLID && - SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLCOLOR, TRUE, &pPoolItem ) ) + SFX_ITEM_SET == aAttr.GetItemState( XATTR_FILLCOLOR, sal_True, &pPoolItem ) ) { const XFillColorItem* pItem = ( const XFillColorItem* ) pPoolItem; XColorItem aXColorItem( ATTR_COPY_START_COLOR, pItem->GetName(), @@ -121,7 +121,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) AbstractCopyDlg* pDlg = pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorTable(), mpView ); if( pDlg ) { - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { @@ -144,50 +144,50 @@ void FuCopy::DoExecute( SfxRequest& rReq ) } Rectangle aRect; - INT32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; - UINT16 nNumber = 0; + sal_Int32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; + sal_uInt16 nNumber = 0; Color aStartColor, aEndColor; - BOOL bColor = FALSE; + sal_Bool bColor = sal_False; const SfxPoolItem* pPoolItem = NULL; // Anzahl - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_NUMBER, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_NUMBER, sal_True, &pPoolItem ) ) nNumber = ( ( const SfxUInt16Item* ) pPoolItem )->GetValue(); // Verschiebung - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_X, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_X, sal_True, &pPoolItem ) ) lSizeX = ( ( const SfxInt32Item* ) pPoolItem )->GetValue(); - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_Y, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_MOVE_Y, sal_True, &pPoolItem ) ) lSizeY = ( ( const SfxInt32Item* ) pPoolItem )->GetValue(); - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_ANGLE, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_ANGLE, sal_True, &pPoolItem ) ) lAngle = ( ( const SfxInt32Item* )pPoolItem )->GetValue(); // Verrgroesserung / Verkleinerung - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_WIDTH, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_WIDTH, sal_True, &pPoolItem ) ) lWidth = ( ( const SfxInt32Item* ) pPoolItem )->GetValue(); - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_HEIGHT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_HEIGHT, sal_True, &pPoolItem ) ) lHeight = ( ( const SfxInt32Item* ) pPoolItem )->GetValue(); // Startfarbe / Endfarbe - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_START_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) ) { aStartColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); - bColor = TRUE; + bColor = sal_True; } - if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_END_COLOR, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_END_COLOR, sal_True, &pPoolItem ) ) { aEndColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); if( aStartColor == aEndColor ) - bColor = FALSE; + bColor = sal_False; } else - bColor = FALSE; + bColor = sal_False; // Handles wegnehmen //HMHmpView->HideMarkHdl(); SfxProgress* pProgress = NULL; - BOOL bWaiting = FALSE; + sal_Bool bWaiting = sal_False; if( nNumber > 1 ) { @@ -196,12 +196,12 @@ void FuCopy::DoExecute( SfxRequest& rReq ) aStr.Append( String( SdResId( STR_UNDO_COPYOBJECTS ) ) ); pProgress = new SfxProgress( mpDocSh, aStr, nNumber ); - mpDocSh->SetWaitCursor( TRUE ); - bWaiting = TRUE; + mpDocSh->SetWaitCursor( sal_True ); + bWaiting = sal_True; } const SdrMarkList aMarkList( mpView->GetMarkedObjectList() ); - const ULONG nMarkCount = aMarkList.GetMarkCount(); + const sal_uLong nMarkCount = aMarkList.GetMarkCount(); SdrObject* pObj = NULL; // Anzahl moeglicher Kopien berechnen @@ -210,16 +210,16 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( lWidth < 0L ) { long nTmp = ( aRect.Right() - aRect.Left() ) / -lWidth; - nNumber = (UINT16) Min( nTmp, (long)nNumber ); + nNumber = (sal_uInt16) Min( nTmp, (long)nNumber ); } if( lHeight < 0L ) { long nTmp = ( aRect.Bottom() - aRect.Top() ) / -lHeight; - nNumber = (UINT16) Min( nTmp, (long)nNumber ); + nNumber = (sal_uInt16) Min( nTmp, (long)nNumber ); } - for( USHORT i = 1; i <= nNumber; i++ ) + for( sal_uInt16 i = 1; i <= nNumber; i++ ) { if( pProgress ) pProgress->SetState( i ); @@ -239,7 +239,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) // get newly selected objects SdrMarkList aCopyMarkList( mpView->GetMarkedObjectList() ); - ULONG j, nCopyMarkCount = aMarkList.GetMarkCount(); + sal_uLong j, nCopyMarkCount = aMarkList.GetMarkCount(); // set protection flags at marked copies to null for( j = 0; j < nCopyMarkCount; j++ ) @@ -248,8 +248,8 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( pObj ) { - pObj->SetMoveProtect( FALSE ); - pObj->SetResizeProtect( FALSE ); + pObj->SetMoveProtect( sal_False ); + pObj->SetResizeProtect( sal_False ); } } @@ -287,9 +287,9 @@ void FuCopy::DoExecute( SfxRequest& rReq ) { // Koennte man sicher noch optimieren, wuerde aber u.U. // zu Rundungsfehlern fuehren - BYTE nRed = aStartColor.GetRed() + (BYTE) ( ( (long) aEndColor.GetRed() - (long) aStartColor.GetRed() ) * (long) i / (long) nNumber ); - BYTE nGreen = aStartColor.GetGreen() + (BYTE) ( ( (long) aEndColor.GetGreen() - (long) aStartColor.GetGreen() ) * (long) i / (long) nNumber ); - BYTE nBlue = aStartColor.GetBlue() + (BYTE) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber ); + sal_uInt8 nRed = aStartColor.GetRed() + (sal_uInt8) ( ( (long) aEndColor.GetRed() - (long) aStartColor.GetRed() ) * (long) i / (long) nNumber ); + sal_uInt8 nGreen = aStartColor.GetGreen() + (sal_uInt8) ( ( (long) aEndColor.GetGreen() - (long) aStartColor.GetGreen() ) * (long) i / (long) nNumber ); + sal_uInt8 nBlue = aStartColor.GetBlue() + (sal_uInt8) ( ( (long) aEndColor.GetBlue() - (long) aStartColor.GetBlue() ) * (long) i / (long) nNumber ); Color aNewColor( nRed, nGreen, nBlue ); SfxItemSet aNewSet( mpViewShell->GetPool(), XATTR_FILLSTYLE, XATTR_FILLCOLOR, 0L ); aNewSet.Put( XFillStyleItem( XFILL_SOLID ) ); @@ -302,10 +302,10 @@ void FuCopy::DoExecute( SfxRequest& rReq ) delete pProgress; if ( bWaiting ) - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); // Handles zeigen - mpView->AdjustMarkHdl(); //HMH TRUE ); + mpView->AdjustMarkHdl(); //HMH sal_True ); //HMHpView->ShowMarkHdl(); mpView->EndUndo(); diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index 1ca6da60a713..0e2f1b4ca890 100644..100755 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -77,10 +77,10 @@ void FuCustomShowDlg::DoExecute( SfxRequest& ) AbstractSdCustomShowDlg* pDlg = pFact ? pFact->CreateSdCustomShowDlg( NULL, *mpDoc ) : 0; if( pDlg ) { - USHORT nRet = pDlg->Execute(); + sal_uInt16 nRet = pDlg->Execute(); if( pDlg->IsModified() ) { - mpDoc->SetChanged( TRUE ); + mpDoc->SetChanged( sal_True ); sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings(); rSettings.mbCustomShow = pDlg->IsCustomShow(); } diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 5cc3cc49ca88..ed7dffb8b4b4 100755 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -93,9 +93,9 @@ TYPEINIT1( FuDraw, FuPoor ); FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), - bMBDown(FALSE), - bDragHelpLine(FALSE), - bPermanent(FALSE) + bMBDown(sal_False), + bDragHelpLine(sal_False), + bPermanent(sal_False) { } @@ -116,14 +116,14 @@ FuDraw::~FuDraw() |* \************************************************************************/ -BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; - bDragHelpLine = FALSE; + bDragHelpLine = sal_False; aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); @@ -131,11 +131,11 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// sal_Bool bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); // bOrtho = bOrtho != rMEvt.IsShift(); - BOOL bOrtho = FALSE; + sal_Bool bOrtho = sal_False; - BOOL bRestricted = TRUE; + sal_Bool bRestricted = sal_True; if (mpView->IsDragObj()) { @@ -145,7 +145,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) if (!pHdl || (!pHdl->IsCornerHdl() && !pHdl->IsVertexHdl())) { // Move - bRestricted = FALSE; + bRestricted = sal_False; } } @@ -162,46 +162,46 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) } if (!mpView->IsSnapEnabled()) - mpView->SetSnapEnabled(TRUE); - BOOL bCntrl = rMEvt.IsMod1(); + mpView->SetSnapEnabled(sal_True); + sal_Bool bCntrl = rMEvt.IsMod1(); - BOOL bGridSnap = pFrameView->IsGridSnap(); + sal_Bool bGridSnap = pFrameView->IsGridSnap(); bGridSnap = (bCntrl != bGridSnap); if (mpView->IsGridSnap() != bGridSnap) mpView->SetGridSnap(bGridSnap); - BOOL bBordSnap = pFrameView->IsBordSnap(); + sal_Bool bBordSnap = pFrameView->IsBordSnap(); bBordSnap = (bCntrl != bBordSnap); if (mpView->IsBordSnap() != bBordSnap) mpView->SetBordSnap(bBordSnap); - BOOL bHlplSnap = pFrameView->IsHlplSnap(); + sal_Bool bHlplSnap = pFrameView->IsHlplSnap(); bHlplSnap = (bCntrl != bHlplSnap); if (mpView->IsHlplSnap() != bHlplSnap) mpView->SetHlplSnap(bHlplSnap); - BOOL bOFrmSnap = pFrameView->IsOFrmSnap(); + sal_Bool bOFrmSnap = pFrameView->IsOFrmSnap(); bOFrmSnap = (bCntrl != bOFrmSnap); if (mpView->IsOFrmSnap() != bOFrmSnap) mpView->SetOFrmSnap(bOFrmSnap); - BOOL bOPntSnap = pFrameView->IsOPntSnap(); + sal_Bool bOPntSnap = pFrameView->IsOPntSnap(); bOPntSnap = (bCntrl != bOPntSnap); if (mpView->IsOPntSnap() != bOPntSnap) mpView->SetOPntSnap(bOPntSnap); - BOOL bOConSnap = pFrameView->IsOConSnap(); + sal_Bool bOConSnap = pFrameView->IsOConSnap(); bOConSnap = (bCntrl != bOConSnap); if (mpView->IsOConSnap() != bOConSnap) mpView->SetOConSnap(bOConSnap); - BOOL bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled(); + sal_Bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled(); if (mpView->IsAngleSnapEnabled() != bAngleSnap) mpView->SetAngleSnapEnabled(bAngleSnap); @@ -209,7 +209,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) if (mpView->IsOrtho() != bOrtho) mpView->SetOrtho(bOrtho); - BOOL bCenter = rMEvt.IsMod2(); + sal_Bool bCenter = rMEvt.IsMod2(); if ( mpView->IsCreate1stPointAsCenter() != bCenter || mpView->IsResizeAtCenter() != bCenter ) @@ -219,13 +219,13 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) } SdrPageView* pPV = 0; - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); // #76572# look only for HelpLines when they are visible (!) - BOOL bHelpLine(FALSE); + sal_Bool bHelpLine(sal_False); if(mpView->IsHlplVisible()) bHelpLine = mpView->PickHelpLine(aMDPos, nHitLog, *mpWindow, nHelpLine, pPV); - BOOL bHitHdl = (mpView->PickHandle(aMDPos) != NULL); + sal_Bool bHitHdl = (mpView->PickHandle(aMDPos) != NULL); if ( bHelpLine && !mpView->IsCreateObj() @@ -234,7 +234,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->CaptureMouse(); mpView->BegDragHelpLine(nHelpLine, pPV); bDragHelpLine = mpView->IsDragHelpLine(); - bReturn = TRUE; + bReturn = sal_True; } } ForcePointer(&rMEvt); @@ -248,16 +248,16 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); -// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); +// sal_Bool bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho(); // bOrtho = bOrtho != rMEvt.IsShift(); - BOOL bOrtho = FALSE; + sal_Bool bOrtho = sal_False; - BOOL bRestricted = TRUE; + sal_Bool bRestricted = sal_True; if (mpView->IsDragObj()) { @@ -267,7 +267,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) if (!pHdl || (!pHdl->IsCornerHdl() && !pHdl->IsVertexHdl())) { // Move - bRestricted = FALSE; + bRestricted = sal_False; } } @@ -285,46 +285,46 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) bOrtho = rMEvt.IsShift() != pFrameView->IsOrtho(); } - BOOL bCntrl = rMEvt.IsMod1(); + sal_Bool bCntrl = rMEvt.IsMod1(); mpView->SetDragWithCopy(rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); - BOOL bGridSnap = pFrameView->IsGridSnap(); + sal_Bool bGridSnap = pFrameView->IsGridSnap(); bGridSnap = (bCntrl != bGridSnap); if (mpView->IsGridSnap() != bGridSnap) mpView->SetGridSnap(bGridSnap); - BOOL bBordSnap = pFrameView->IsBordSnap(); + sal_Bool bBordSnap = pFrameView->IsBordSnap(); bBordSnap = (bCntrl != bBordSnap); if (mpView->IsBordSnap() != bBordSnap) mpView->SetBordSnap(bBordSnap); - BOOL bHlplSnap = pFrameView->IsHlplSnap(); + sal_Bool bHlplSnap = pFrameView->IsHlplSnap(); bHlplSnap = (bCntrl != bHlplSnap); if (mpView->IsHlplSnap() != bHlplSnap) mpView->SetHlplSnap(bHlplSnap); - BOOL bOFrmSnap = pFrameView->IsOFrmSnap(); + sal_Bool bOFrmSnap = pFrameView->IsOFrmSnap(); bOFrmSnap = (bCntrl != bOFrmSnap); if (mpView->IsOFrmSnap() != bOFrmSnap) mpView->SetOFrmSnap(bOFrmSnap); - BOOL bOPntSnap = pFrameView->IsOPntSnap(); + sal_Bool bOPntSnap = pFrameView->IsOPntSnap(); bOPntSnap = (bCntrl != bOPntSnap); if (mpView->IsOPntSnap() != bOPntSnap) mpView->SetOPntSnap(bOPntSnap); - BOOL bOConSnap = pFrameView->IsOConSnap(); + sal_Bool bOConSnap = pFrameView->IsOConSnap(); bOConSnap = (bCntrl != bOConSnap); if (mpView->IsOConSnap() != bOConSnap) mpView->SetOConSnap(bOConSnap); - BOOL bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled(); + sal_Bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled(); if (mpView->IsAngleSnapEnabled() != bAngleSnap) mpView->SetAngleSnapEnabled(bAngleSnap); @@ -332,7 +332,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) if (mpView->IsOrtho() != bOrtho) mpView->SetOrtho(bOrtho); - BOOL bCenter = rMEvt.IsMod2(); + sal_Bool bCenter = rMEvt.IsMod2(); if ( mpView->IsCreate1stPointAsCenter() != bCenter || mpView->IsResizeAtCenter() != bCenter ) @@ -345,7 +345,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) mpView->MovDragHelpLine(aPos); } - BOOL bReturn = mpView->MouseMove(rMEvt, mpWindow); + sal_Bool bReturn = mpView->MouseMove(rMEvt, mpWindow); if (mpView->IsAction()) { @@ -365,7 +365,7 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) { if ( mpView->IsDragHelpLine() ) mpView->EndDragHelpLine(); @@ -383,9 +383,9 @@ BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt) FrameView* pFrameView = mpViewShell->GetFrameView(); mpView->SetOrtho( pFrameView->IsOrtho() ); mpView->SetAngleSnapEnabled( pFrameView->IsAngleSnapEnabled() ); - mpView->SetSnapEnabled(TRUE); - mpView->SetCreate1stPointAsCenter(FALSE); - mpView->SetResizeAtCenter(FALSE); + mpView->SetSnapEnabled(sal_True); + mpView->SetCreate1stPointAsCenter(sal_False); + mpView->SetResizeAtCenter(sal_False); mpView->SetDragWithCopy(pFrameView->IsDragWithCopy()); mpView->SetGridSnap(pFrameView->IsGridSnap()); mpView->SetBordSnap(pFrameView->IsBordSnap()); @@ -394,24 +394,24 @@ BOOL FuDraw::MouseButtonUp(const MouseEvent& rMEvt) mpView->SetOPntSnap(pFrameView->IsOPntSnap()); mpView->SetOConSnap(pFrameView->IsOConSnap()); - bIsInDragMode = FALSE; + bIsInDragMode = sal_False; ForcePointer(&rMEvt); FuPoor::MouseButtonUp(rMEvt); - return FALSE; + return sal_False; } /************************************************************************* |* |* Process keyboard-events |* -|* When processing a KeyEvent the returnvalue is TRUE, otherwise FALSE. +|* When processing a KeyEvent the returnvalue is sal_True, otherwise sal_False. |* \************************************************************************/ -BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; switch ( rKEvt.GetKeyCode().GetCode() ) { @@ -426,7 +426,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { if (!mpDocSh->IsReadOnly()) { - if ( mpView && mpView->IsPresObjSelected(FALSE, TRUE, FALSE, TRUE) ) + if ( mpView && mpView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) { InfoBox(mpWindow, String(SdResId(STR_ACTION_NOTPOSSIBLE) ) ).Execute(); } @@ -452,7 +452,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) mpView->DeleteMarked(); } } - bReturn = TRUE; + bReturn = sal_True; } break; @@ -484,7 +484,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) if(mpView->AreObjectsMarked()) mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -497,13 +497,13 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { // #97016# mark last object mpView->UnmarkAllObj(); - mpView->MarkNextObj(FALSE); + mpView->MarkNextObj(sal_False); // #97016# II if(mpView->AreObjectsMarked()) mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -516,13 +516,13 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt) { // #97016# mark first object mpView->UnmarkAllObj(); - mpView->MarkNextObj(TRUE); + mpView->MarkNextObj(sal_True); // #97016# II if(mpView->AreObjectsMarked()) mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -596,9 +596,9 @@ void FuDraw::Deactivate() void FuDraw::ForcePointer(const MouseEvent* pMEvt) { Point aPnt; - USHORT nModifier = 0; - BOOL bLeftDown = FALSE; - BOOL bDefPointer = TRUE; + sal_uInt16 nModifier = 0; + sal_Bool bLeftDown = sal_False; + sal_Bool bDefPointer = sal_True; if (pMEvt) { @@ -618,7 +618,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) /****************************************************************** * Giesskannenmodus ******************************************************************/ - bDefPointer = FALSE; + bDefPointer = sal_False; mpWindow->SetPointer(Pointer(POINTER_FILL)); } } @@ -631,7 +631,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) /****************************************************************** * Giesskannenmodus ******************************************************************/ - bDefPointer = FALSE; + bDefPointer = sal_False; mpWindow->SetPointer(Pointer(POINTER_FILL)); } else if (!pHdl && @@ -644,7 +644,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if (pMask && pMask->IsEyedropping()) { - bDefPointer = FALSE; + bDefPointer = sal_False; mpWindow->SetPointer(Pointer(POINTER_REFHAND)); } } @@ -672,7 +672,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ((pObject->ISA(E3dObject)) && (rMarkList.GetMarkCount() == 1)) { mpWindow->SetPointer(Pointer(POINTER_ROTATE)); - bDefPointer = FALSE; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again + bDefPointer = sal_False; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again } } @@ -687,7 +687,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) } else if (eHit == SDRHIT_TEXTEDITOBJ && this->ISA(FuSelection)) { - UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); + sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); if ( nSdrObjKind != OBJ_TEXT && nSdrObjKind != OBJ_TITLETEXT && @@ -695,7 +695,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) aVEvt.pObj->IsEmptyPresObj() ) { pObj = NULL; - bDefPointer = FALSE; + bDefPointer = sal_False; mpWindow->SetPointer(Pointer(POINTER_ARROW)); } } @@ -728,22 +728,22 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) |* \************************************************************************/ -BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) +sal_Bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) { - BOOL bSet = FALSE; + sal_Bool bSet = sal_False; - BOOL bAnimationInfo = (!mpDocSh->ISA(GraphicDocShell) && - mpDoc->GetAnimationInfo(pObj)) ? TRUE:FALSE; + sal_Bool bAnimationInfo = (!mpDocSh->ISA(GraphicDocShell) && + mpDoc->GetAnimationInfo(pObj)) ? sal_True:sal_False; - BOOL bImageMapInfo = FALSE; + sal_Bool bImageMapInfo = sal_False; if (!bAnimationInfo) - bImageMapInfo = mpDoc->GetIMapInfo(pObj) ? TRUE:FALSE; + bImageMapInfo = mpDoc->GetIMapInfo(pObj) ? sal_True:sal_False; if (bAnimationInfo || bImageMapInfo) { const SetOfByte* pVisiLayer = &mpView->GetSdrPageView()->GetVisibleLayers(); - USHORT nHitLog(USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width())); + sal_uInt16 nHitLog(sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width())); long n2HitLog(nHitLog * 2); Point aHitPosR(rPos); Point aHitPosL(rPos); @@ -794,7 +794,7 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) pInfo->meTextEffect != presentation::AnimationEffect_NONE ))))) { // Animations-Objekt - bSet = TRUE; + bSet = sal_True; mpWindow->SetPointer(Pointer(POINTER_REFHAND)); } } @@ -804,7 +804,7 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) /****************************************************** * ImageMap ******************************************************/ - bSet = TRUE; + bSet = sal_True; mpWindow->SetPointer(Pointer(POINTER_REFHAND)); } } @@ -823,7 +823,7 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) void FuDraw::DoubleClick(const MouseEvent& rMEvt) { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); if ( mpView->AreObjectsMarked() ) { @@ -834,8 +834,8 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObj = pMark->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nSdrObjKind = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); if (nInv == SdrInventor && nSdrObjKind == OBJ_OLE2) { @@ -870,7 +870,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) { // hit group -> select subobject mpView->UnMarkAll(); - mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), TRUE); + mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), sal_True); } } } @@ -884,9 +884,9 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDraw::RequestHelp(const HelpEvent& rHEvt) +sal_Bool FuDraw::RequestHelp(const HelpEvent& rHEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if (Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled()) { @@ -933,9 +933,9 @@ BOOL FuDraw::RequestHelp(const HelpEvent& rHEvt) |* \************************************************************************/ -BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt) +sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt) { - BOOL bSet = FALSE; + sal_Bool bSet = sal_False; String aHelpText; Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(rPosPixel))); @@ -1074,7 +1074,7 @@ BOOL FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE if (aHelpText.Len()) { - bSet = TRUE; + bSet = sal_True; Rectangle aLogicPix = mpWindow->LogicToPixel(pObj->GetLogicRect()); Rectangle aScreenRect(mpWindow->OutputToScreenPixel(aLogicPix.TopLeft()), mpWindow->OutputToScreenPixel(aLogicPix.BottomRight())); diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index 2e6ad66e11f1..50b014612c8d 100644..100755 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -93,12 +93,12 @@ FunctionReference FuDisplayOrder::Create( ViewShell* pViewSh, ::sd::Window* pWin |* \************************************************************************/ -BOOL FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return TRUE; + return sal_True; } /************************************************************************* @@ -107,7 +107,7 @@ BOOL FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) { SdrObject* pPickObj; SdrPageView* pPV; @@ -133,7 +133,7 @@ BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) implClearOverlay(); } - return TRUE; + return sal_True; } /************************************************************************* @@ -142,7 +142,7 @@ BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -164,7 +164,7 @@ BOOL FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) mpViewShell->Cancel(); - return TRUE; + return sal_True; } /************************************************************************* diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index ddae68d8b9ab..51d6c56f15b6 100644..100755 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -82,7 +82,7 @@ FunctionReference FuEditGluePoints::Create( ViewShell* pViewSh, ::sd::Window* pW void FuEditGluePoints::DoExecute( SfxRequest& rReq ) { FuDraw::DoExecute( rReq ); - mpView->SetInsGluePointMode(FALSE); + mpView->SetInsGluePointMode(sal_False); mpViewShell->GetViewShellBase().GetToolBarManager()->AddToolBar( ToolBarManager::TBG_FUNCTION, ToolBarManager::msGluePointsToolBar); @@ -98,7 +98,7 @@ FuEditGluePoints::~FuEditGluePoints() { mpView->BrkAction(); mpView->UnmarkAllGluePoints(); - mpView->SetInsGluePointMode(FALSE); + mpView->SetInsGluePointMode(sal_False); } /************************************************************************* @@ -107,25 +107,25 @@ FuEditGluePoints::~FuEditGluePoints() |* \************************************************************************/ -BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); if (mpView->IsAction()) { if (rMEvt.IsRight()) mpView->BckAction(); - return TRUE; + return sal_True; } if (rMEvt.IsLeft()) { - bReturn = TRUE; - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + bReturn = sal_True; + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpWindow->CaptureMouse(); SdrViewEvent aVEvt; @@ -200,7 +200,7 @@ BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) mpView->UnmarkAllObj(); } - BOOL bMarked = FALSE; + sal_Bool bMarked = sal_False; if (!rMEvt.IsMod1()) { @@ -251,7 +251,7 @@ BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); @@ -267,7 +267,7 @@ BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) ForcePointer(&rMEvt); - return TRUE; + return sal_True; } /************************************************************************* @@ -276,21 +276,21 @@ BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if (mpView->IsAction()) { - bReturn = TRUE; + bReturn = sal_True; mpView->EndAction(); } FuDraw::MouseButtonUp(rMEvt); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); if (Abs(aMDPos.X() - aPos.X()) < nDrgLog && @@ -316,16 +316,16 @@ BOOL FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) { mpView->SetActualWin( mpWindow ); - BOOL bReturn = FuDraw::KeyInput(rKEvt); + sal_Bool bReturn = FuDraw::KeyInput(rKEvt); return bReturn; } @@ -336,7 +336,7 @@ BOOL FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) |* \************************************************************************/ -BOOL FuEditGluePoints::Command(const CommandEvent& rCEvt) +sal_Bool FuEditGluePoints::Command(const CommandEvent& rCEvt) { mpView->SetActualWin( mpWindow ); return FuPoor::Command( rCEvt ); @@ -362,7 +362,7 @@ void FuEditGluePoints::Activate() void FuEditGluePoints::Deactivate() { - mpView->SetGluePointEditMode( FALSE ); + mpView->SetGluePointEditMode( sal_False ); FuDraw::Deactivate(); } @@ -414,44 +414,44 @@ void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq) { const SfxItemSet* pSet = rReq.GetArgs(); const SfxPoolItem& rItem = pSet->Get(SID_GLUE_PERCENT); - BOOL bPercent = ((const SfxBoolItem&) rItem).GetValue(); + sal_Bool bPercent = ((const SfxBoolItem&) rItem).GetValue(); mpView->SetMarkedGluePointsPercent(bPercent); } break; case SID_GLUE_HORZALIGN_CENTER: { - mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_CENTER); + mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_CENTER); } break; case SID_GLUE_HORZALIGN_LEFT: { - mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_LEFT); + mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_LEFT); } break; case SID_GLUE_HORZALIGN_RIGHT: { - mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_RIGHT); + mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_RIGHT); } break; case SID_GLUE_VERTALIGN_CENTER: { - mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_CENTER); + mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_CENTER); } break; case SID_GLUE_VERTALIGN_TOP: { - mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_TOP); + mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_TOP); } break; case SID_GLUE_VERTALIGN_BOTTOM: { - mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_BOTTOM); + mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_BOTTOM); } break; } diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index e45b8ce36673..ff4b3f512d2f 100755 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -89,8 +89,8 @@ void FuExpandPage::DoExecute( SfxRequest& ) // Selektierte Seite finden (nur Standard-Seiten) SdPage* pActualPage = NULL; - USHORT i = 0; - USHORT nCount = mpDoc->GetSdPageCount(PK_STANDARD); + sal_uInt16 i = 0; + sal_uInt16 nCount = mpDoc->GetSdPageCount(PK_STANDARD); while (!pActualPage && i < nCount) { @@ -106,8 +106,8 @@ void FuExpandPage::DoExecute( SfxRequest& ) { ::sd::Outliner* pOutl = new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT ); - pOutl->SetUpdateMode(FALSE); - pOutl->EnableUndo(FALSE); + pOutl->SetUpdateMode(sal_False); + pOutl->EnableUndo(sal_False); if (mpDocSh) pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) ); @@ -116,7 +116,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) pOutl->SetStyleSheetPool((SfxStyleSheetPool*) mpDoc->GetStyleSheetPool()); SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); - USHORT nActualPageNum = pActualPage->GetPageNum(); + sal_uInt16 nActualPageNum = pActualPage->GetPageNum(); SdPage* pActualNotesPage = (SdPage*) mpDoc->GetPage(nActualPageNum + 1); SdrTextObj* pActualOutline = (SdrTextObj*) pActualPage->GetPresObj(PRESOBJ_OUTLINE); @@ -133,25 +133,25 @@ void FuExpandPage::DoExecute( SfxRequest& ) // Harte Absatz- und Zeichenattribute entfernen SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), EE_ITEMS_START, EE_ITEMS_END); - ULONG nParaCount1 = pOutl->GetParagraphCount(); + sal_uLong nParaCount1 = pOutl->GetParagraphCount(); - for (USHORT nPara = 0; nPara < nParaCount1; nPara++) + for (sal_uInt16 nPara = 0; nPara < nParaCount1; nPara++) { pOutl->QuickRemoveCharAttribs(nPara); pOutl->SetParaAttribs(nPara, aEmptyEEAttr); } - USHORT nPos = 2; + sal_uInt16 nPos = 2; Paragraph* pPara = pOutl->GetParagraph( 0 ); while (pPara) { - ULONG nParaPos = pOutl->GetAbsPos( pPara ); - sal_Int16 nDepth = pOutl->GetDepth( (USHORT) nParaPos ); + sal_uLong nParaPos = pOutl->GetAbsPos( pPara ); + sal_Int16 nDepth = pOutl->GetDepth( (sal_uInt16) nParaPos ); if ( nDepth == 0 ) { // Seite mit Titel & Gliederung! - SdPage* pPage = (SdPage*) mpDoc->AllocPage(FALSE); + SdPage* pPage = (SdPage*) mpDoc->AllocPage(sal_False); pPage->SetSize(pActualPage->GetSize() ); pPage->SetBorder(pActualPage->GetLftBorder(), pActualPage->GetUppBorder(), @@ -169,11 +169,11 @@ void FuExpandPage::DoExecute( SfxRequest& ) // MasterPage der aktuellen Seite verwenden pPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage()); pPage->SetLayoutName(pActualPage->GetLayoutName()); - pPage->SetAutoLayout(AUTOLAYOUT_ENUM, TRUE); + pPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); // Notiz-Seite - SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(FALSE); + SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False); pNotesPage->SetSize(pActualNotesPage->GetSize()); pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(), pActualNotesPage->GetUppBorder(), @@ -192,14 +192,14 @@ void FuExpandPage::DoExecute( SfxRequest& ) // MasterPage der aktuellen Seite verwenden pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage()); pNotesPage->SetLayoutName(pActualNotesPage->GetLayoutName()); - pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), TRUE); + pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), sal_True); pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); // Title-Textobjekt erstellen SdrTextObj* pTextObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_TITLE); // - OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (USHORT) nParaPos, 1); + OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (sal_uInt16) nParaPos, 1); pOutlinerParaObject->SetOutlinerMode(OUTLINERMODE_TITLEOBJECT); if( pOutlinerParaObject->GetDepth(0) != -1 ) @@ -218,12 +218,12 @@ void FuExpandPage::DoExecute( SfxRequest& ) pTextObj->SetOutlinerParaObject(pOutlinerParaObject); - pTextObj->SetEmptyPresObj(FALSE); + pTextObj->SetEmptyPresObj(sal_False); SfxStyleSheet* pSheet = pPage->GetStyleSheetForPresObj(PRESOBJ_TITLE); - pTextObj->NbcSetStyleSheet(pSheet, FALSE); + pTextObj->NbcSetStyleSheet(pSheet, sal_False); - ULONG nChildCount = pOutl->GetChildCount(pPara); + sal_uLong nChildCount = pOutl->GetChildCount(pPara); if (nChildCount > 0) { @@ -231,19 +231,19 @@ void FuExpandPage::DoExecute( SfxRequest& ) SdrTextObj* pOutlineObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_OUTLINE); pPara = pOutl->GetParagraph( ++nParaPos ); - OutlinerParaObject* pOPO = pOutl->CreateParaObject( (USHORT) nParaPos, (USHORT) nChildCount); + OutlinerParaObject* pOPO = pOutl->CreateParaObject( (sal_uInt16) nParaPos, (sal_uInt16) nChildCount); // -- SdrOutliner* pTempOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc ); pTempOutl->SetText( *pOPO ); - ULONG nParaCount2 = pTempOutl->GetParagraphCount(); - ULONG nPara; + sal_uLong nParaCount2 = pTempOutl->GetParagraphCount(); + sal_uLong nPara; for( nPara = 0; nPara < nParaCount2; nPara++ ) { pTempOutl->SetDepth ( pTempOutl->GetParagraph( nPara ), - pTempOutl->GetDepth((USHORT) nPara ) - 1); + pTempOutl->GetDepth((sal_uInt16) nPara ) - 1); } delete pOPO; @@ -252,9 +252,9 @@ void FuExpandPage::DoExecute( SfxRequest& ) // -- pOutlineObj->SetOutlinerParaObject( pOPO ); - pOutlineObj->SetEmptyPresObj(FALSE); + pOutlineObj->SetEmptyPresObj(sal_False); - // Harte Attribute entfernen (Flag auf TRUE) + // Harte Attribute entfernen (Flag auf sal_True) SfxItemSet aAttr(mpDoc->GetPool()); aAttr.Put(XLineStyleItem(XLINE_NONE)); aAttr.Put(XFillStyleItem(XFILL_NONE)); diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 0d43ea73c964..ade6f3b52771 100644..100755 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -105,7 +105,7 @@ static void unmarkimpl( SdrView* pView ) pView->UnMarkAll(); } -BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) { if(mpView&&mpWindow) { @@ -116,7 +116,7 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) { SdrObject* pPickObj=0; SdrPageView* pPV=0; - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pPickObj, pPV, SDRSEARCH_PICKMARKABLE); if( (pPickObj != 0) && !pPickObj->IsEmptyPresObj() ) @@ -152,18 +152,18 @@ BOOL FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) if( aVEvt.pObj ) { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - BOOL bToggle = FALSE; - mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, FALSE); - return TRUE; + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_Bool bToggle = sal_False; + mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, sal_False); + return sal_True; } } - return FALSE; + return sal_False; } -BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if( mpWindow && mpView ) { if ( mpView->IsTextEdit() ) @@ -173,10 +173,10 @@ BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) } else { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); SdrObject* pObj=0; SdrPageView* pPV=0; - BOOL bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE); + sal_Bool bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE); if(bOverMarkableObject && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) mpWindow->SetPointer(Pointer(POINTER_FILL)); @@ -187,7 +187,7 @@ BOOL FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) return bReturn; } -BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) { if( mpItemSet.get() && mpView && mpView->AreObjectsMarked() ) { @@ -209,19 +209,19 @@ BOOL FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) mpViewShell->GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); if( mbPermanent ) - return TRUE; + return sal_True; } implcancel(); - return TRUE; + return sal_True; } -BOOL FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt) { if( (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) && mpViewShell ) { implcancel(); - return TRUE; + return sal_True; } return FuPoor::KeyInput(rKEvt); } @@ -231,8 +231,8 @@ void FuFormatPaintBrush::Activate() mbOldIsQuickTextEditMode = mpViewShell->GetFrameView()->IsQuickEdit(); if( !mbOldIsQuickTextEditMode ) { - mpViewShell->GetFrameView()->SetQuickEdit(TRUE); - mpView->SetQuickTextEditMode(TRUE); + mpViewShell->GetFrameView()->SetQuickEdit(sal_True); + mpView->SetQuickTextEditMode(sal_True); } } @@ -240,12 +240,12 @@ void FuFormatPaintBrush::Deactivate() { if( !mbOldIsQuickTextEditMode ) { - mpViewShell->GetFrameView()->SetQuickEdit(FALSE); - mpView->SetQuickTextEditMode(FALSE); + mpViewShell->GetFrameView()->SetQuickEdit(sal_False); + mpView->SetQuickTextEditMode(sal_False); } } -bool FuFormatPaintBrush::HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const +bool FuFormatPaintBrush::HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const { if( mpItemSet.get() == 0 ) return false; @@ -265,7 +265,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma { String sLabel( mpViewShell->GetViewShellBase().RetrieveLabelFromCommand( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ) ) ) ); mpDoc->BegUndo( sLabel ); - mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,TRUE)); + mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,sal_True)); } mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats ); @@ -280,7 +280,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma /* static */ void FuFormatPaintBrush::GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ) { const SdrMarkList& rMarkList = rDrawViewShell.GetDrawView()->GetMarkedObjectList(); - const ULONG nMarkCount = rMarkList.GetMarkCount(); + const sal_uLong nMarkCount = rMarkList.GetMarkCount(); if( nMarkCount == 1 ) { diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index a7f96a5b50d2..abe45670c100 100644..100755 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -79,16 +79,16 @@ FuHangulHanjaConversion::FuHangulHanjaConversion ( SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pView, pDocument, rReq), pSdOutliner(NULL), - bOwnOutliner(FALSE) + bOwnOutliner(sal_False) { if ( mpViewShell->ISA(DrawViewShell) ) { - bOwnOutliner = TRUE; + bOwnOutliner = sal_True; pSdOutliner = new Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); } else if ( mpViewShell->ISA(OutlineViewShell) ) { - bOwnOutliner = FALSE; + bOwnOutliner = sal_False; pSdOutliner = mpDoc->GetOutliner(); } @@ -125,8 +125,8 @@ FunctionReference FuHangulHanjaConversion::Create( ViewShell* pViewSh, ::sd::Win |* \************************************************************************/ -void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, - const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive ) +void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, + const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ) { String aString( SdResId(STR_UNDO_HANGULHANJACONVERSION) ); @@ -142,7 +142,7 @@ void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTar { pSdOutliner->EndConversion(); - bOwnOutliner = TRUE; + bOwnOutliner = sal_True; pSdOutliner = new Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); pSdOutliner->BeginConversion(); } @@ -151,7 +151,7 @@ void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTar pSdOutliner->EndConversion(); delete pSdOutliner; - bOwnOutliner = FALSE; + bOwnOutliner = sal_False; pSdOutliner = mpDoc->GetOutliner(); pSdOutliner->BeginConversion(); } @@ -179,7 +179,7 @@ void FuHangulHanjaConversion::StartConversion( INT16 nSourceLanguage, INT16 nTar } -void FuHangulHanjaConversion::ConvertStyles( INT16 nTargetLanguage, const Font *pTargetFont ) +void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const Font *pTargetFont ) { if( !mpDoc ) return; @@ -195,11 +195,11 @@ void FuHangulHanjaConversion::ConvertStyles( INT16 nTargetLanguage, const Font * const bool bHasParent = pStyle->GetParent().Len() != 0; - if( !bHasParent || rSet.GetItemState( EE_CHAR_LANGUAGE_CJK, FALSE ) == SFX_ITEM_SET ) + if( !bHasParent || rSet.GetItemState( EE_CHAR_LANGUAGE_CJK, sal_False ) == SFX_ITEM_SET ) rSet.Put( SvxLanguageItem( nTargetLanguage, EE_CHAR_LANGUAGE_CJK ) ); if( pTargetFont && - ( !bHasParent || rSet.GetItemState( EE_CHAR_FONTINFO_CJK, FALSE ) == SFX_ITEM_SET ) ) + ( !bHasParent || rSet.GetItemState( EE_CHAR_FONTINFO_CJK, sal_False ) == SFX_ITEM_SET ) ) { // set new font attribute SvxFontItem aFontItem( (SvxFontItem&) rSet.Get( EE_CHAR_FONTINFO_CJK ) ); diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index f29288ea2b03..0e1c346f1871 100755 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -165,7 +165,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) } else { - SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); + SdGRFFilter::HandleGraphicFilterError( (sal_uInt16)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); } } } @@ -200,7 +200,7 @@ FunctionReference FuInsertClipboard::Create( ViewShell* pViewSh, ::sd::Window* p void FuInsertClipboard::DoExecute( SfxRequest& ) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpWindow ) ); - ULONG nFormatId; + sal_uLong nFormatId; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( mpViewShell->GetActiveWindow() ); @@ -229,7 +229,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& ) if( !mpView->InsertData( aDataHelper, mpWindow->PixelToLogic( Rectangle( Point(), mpWindow->GetOutputSizePixel() ).Center() ), - nAction, FALSE, nFormatId ) && + nAction, sal_False, nFormatId ) && ( mpViewShell && mpViewShell->ISA( DrawViewShell ) ) ) { DrawViewShell* pDrViewSh = static_cast<DrawViewShell*>(mpViewShell); @@ -370,7 +370,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) bool bRet = true; if( pPickObj ) - mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, TRUE ); + mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, sal_True ); else bRet = mpView->InsertObjectAtView(pOleObj, *pPV, SDRINSERT_SETDEFLAYER); @@ -419,7 +419,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) * Objekt einfuegen **********************************************************************/ sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - BOOL bCreateNew = FALSE; + sal_Bool bCreateNew = sal_False; uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); SvObjectServerList aServerLst; @@ -527,9 +527,9 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { //TODO/LATER: needs status for RESIZEONPRINTERCHANGE //if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->getStatus( nAspect ) ) - // aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(FALSE) ); + // aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(sal_False) ); - BOOL bInsertNewObject = TRUE; + sal_Bool bInsertNewObject = sal_True; Size aSize; MapUnit aMapUnit = MAP_100TH_MM; @@ -584,8 +584,8 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) /************************************************** * Das leere OLE-Objekt bekommt ein neues IPObj **************************************************/ - bInsertNewObject = FALSE; - pObj->SetEmptyPresObj(FALSE); + bInsertNewObject = sal_False; + pObj->SetEmptyPresObj(sal_False); ( (SdrOle2Obj*) pObj)->SetOutlinerParaObject(NULL); ( (SdrOle2Obj*) pObj)->SetObjRef(xObj); ( (SdrOle2Obj*) pObj)->SetPersistName(aName); diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index d14a5859d47b..15508e20c0ca 100644..100755 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -86,9 +86,9 @@ namespace sd { TYPEINIT1( FuInsertFile, FuPoor ); -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (sal_uInt16)32768 +#define BASIC_BUFFER_SIZE (sal_uInt16)8192 +#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768 /************************************************************************* |* @@ -259,8 +259,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) } else { - SFX_REQUEST_ARG (rReq, pFileName, SfxStringItem, ID_VAL_DUMMY0, FALSE); - SFX_REQUEST_ARG (rReq, pFilterName, SfxStringItem, ID_VAL_DUMMY1, FALSE); + SFX_REQUEST_ARG (rReq, pFileName, SfxStringItem, ID_VAL_DUMMY0, sal_False); + SFX_REQUEST_ARG (rReq, pFilterName, SfxStringItem, ID_VAL_DUMMY1, sal_False); aFile = pFileName->GetValue (); @@ -268,15 +268,15 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) aFilterName = pFilterName->GetValue (); } - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); - SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, FALSE ); + SfxMedium* pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE, sal_False ); const SfxFilter* pFilter = NULL; SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); - BOOL bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); - BOOL bInserted = FALSE; + sal_Bool bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); + sal_Bool bInserted = sal_False; if( pFilter ) { @@ -296,19 +296,19 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) InsSDDinOlMode( pMedium ); // don't delete Medium here, ownership of pMedium has changed in this case - bInserted = TRUE; + bInserted = sal_True; } } else { - BOOL bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() ); + sal_Bool bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() ); if( !bFound && ( aFilterName.SearchAscii( "Text" ) != STRING_NOTFOUND || aFilterName.SearchAscii( "Rich" ) != STRING_NOTFOUND || aFilterName.SearchAscii( "RTF" ) != STRING_NOTFOUND || aFilterName.SearchAscii( "HTML" ) != STRING_NOTFOUND ) ) { - bFound = TRUE; + bFound = sal_True; } if( bFound ) @@ -318,13 +318,13 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) else InsTextOrRTFinOlMode(pMedium); - bInserted = TRUE; + bInserted = sal_True; delete pMedium; } } } - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); if( !bInserted ) { @@ -336,37 +336,37 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) // ----------------------------------------------------------------------------- -BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) +sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) { - BOOL bOK = FALSE; + sal_Bool bOK = sal_False; // Liste mit Seitennamen (wenn NULL, dann alle Seiten) List* pBookmarkList = NULL; - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractSdInsertPagesObjsDlg* pDlg = pFact ? pFact->CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0; if( !pDlg ) - return FALSE; + return sal_False; // Ev. wird eine QueryBox geoeffnet ("Links aktualisieren?"), // daher wird der Dialog der aktuelle DefModalDialogParent ::Window* pDefParent = GetpApp()->GetDefDialogParent(); GetpApp()->SetDefDialogParent(pDlg->GetWindow()); - USHORT nRet = pDlg->Execute(); + sal_uInt16 nRet = pDlg->Execute(); GetpApp()->SetDefDialogParent(pDefParent); - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); if( nRet == RET_OK ) { // Zuerst Seiten einfuegen pBookmarkList = pDlg->GetList( 1 ); // Seiten - BOOL bLink = pDlg->IsLink(); - BOOL bReplace = FALSE; + sal_Bool bLink = pDlg->IsLink(); + sal_Bool bReplace = sal_False; SdPage* pPage = NULL; ::sd::View* pView = mpViewShell->GetView(); @@ -379,7 +379,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) pPage = static_cast<SdPage*>(pView->GetSdrPageView()->GetPage()); } - USHORT nPos = 0xFFFF; + sal_uInt16 nPos = 0xFFFF; if (pPage && !pPage->IsMasterPage()) { @@ -393,7 +393,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) } } - BOOL bNameOK; + sal_Bool bNameOK; List* pObjectBookmarkList = pDlg->GetList( 2 ); // Objekte List* pExchangeList = NULL; @@ -404,13 +404,13 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) // Um zu gewaehrleisten, dass alle Seitennamen eindeutig sind, werden // die einzufuegenden geprueft und gegebenenfalls in einer Ersatzliste // aufgenommen - // bNameOK == FALSE -> Benutzer hat abgebrochen + // bNameOK == sal_False -> Benutzer hat abgebrochen bNameOK = mpView->GetExchangeList( pExchangeList, pBookmarkList, 0 ); if( bNameOK ) bOK = mpDoc->InsertBookmarkAsPage( pBookmarkList, pExchangeList, bLink, bReplace, nPos, - FALSE, NULL, TRUE, TRUE, FALSE ); + sal_False, NULL, sal_True, sal_True, sal_False ); // Loeschen der BookmarkList if( pBookmarkList ) @@ -491,15 +491,15 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) if( !pDlg ) return; - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); - USHORT nRet = pDlg->Execute(); - mpDocSh->SetWaitCursor( TRUE ); + sal_uInt16 nRet = pDlg->Execute(); + mpDocSh->SetWaitCursor( sal_True ); if( nRet == RET_OK ) { // gewaehltes Dateiformat: Text oder RTF oder HTML (Default ist Text) - USHORT nFormat = EE_FORMAT_TEXT; + sal_uInt16 nFormat = EE_FORMAT_TEXT; if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND ) nFormat = EE_FORMAT_RTF; @@ -532,7 +532,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) DBG_ASSERT( pStream, "Kein InStream!" ); pStream->Seek( 0 ); - ULONG nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() ); + sal_uLong nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() ); if (nErr || !pOutliner->GetEditEngine().GetText().Len()) { @@ -565,9 +565,9 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) while ( pOutliner->GetParagraphCount() > 1 ) { Paragraph* pPara = pOutliner->GetParagraph( 0 ); - ULONG nLen = pOutliner->GetText( pPara, 1 ).Len(); - pOutliner->QuickDelete( ESelection( 0, (USHORT) nLen, 1, 0 ) ); - pOutliner->QuickInsertLineBreak( ESelection( 0, (USHORT) nLen, 0, (USHORT) nLen ) ); + sal_uLong nLen = pOutliner->GetText( pPara, 1 ).Len(); + pOutliner->QuickDelete( ESelection( 0, (sal_uInt16) nLen, 1, 0 ) ); + pOutliner->QuickInsertLineBreak( ESelection( 0, (sal_uInt16) nLen, 0, (sal_uInt16) nLen ) ); } } } @@ -628,7 +628,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) { // gewaehltes Dateiformat: Text oder RTF oder HTML (Default ist Text) - USHORT nFormat = EE_FORMAT_TEXT; + sal_uInt16 nFormat = EE_FORMAT_TEXT; if( aFilterName.SearchAscii( "Rich") != STRING_NOTFOUND ) nFormat = EE_FORMAT_RTF; @@ -644,14 +644,14 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) { pPara = pDocliner->GetParent(pPara); } - ULONG nTargetPos = pDocliner->GetAbsPos(pPara) + 1; + sal_uLong nTargetPos = pDocliner->GetAbsPos(pPara) + 1; // Layout der Vorgaengerseite uebernehmen - USHORT nPage = 0; + sal_uInt16 nPage = 0; pPara = pDocliner->GetParagraph( pDocliner->GetAbsPos( pPara ) - 1 ); while (pPara) { - ULONG nPos = pDocliner->GetAbsPos( pPara ); + sal_uLong nPos = pDocliner->GetAbsPos( pPara ); if ( pDocliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) nPage++; pPara = pDocliner->GetParagraph( nPos - 1 ); @@ -678,7 +678,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) DBG_ASSERT( pStream, "Kein InStream!" ); pStream->Seek( 0 ); - ULONG nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes()); + sal_uLong nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes()); if (nErr || !pOutliner->GetEditEngine().GetText().Len()) { @@ -688,20 +688,20 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) } else { - ULONG nParaCount = pOutliner->GetParagraphCount(); + sal_uLong nParaCount = pOutliner->GetParagraphCount(); // fuer Fortschrittsanzeige: Anzahl der Ebene-0-Absaetze - USHORT nNewPages = 0; + sal_uInt16 nNewPages = 0; pPara = pOutliner->GetParagraph( 0 ); while (pPara) { - ULONG nPos = pOutliner->GetAbsPos( pPara ); + sal_uLong nPos = pOutliner->GetAbsPos( pPara ); if( pOutliner->HasParaFlag( pPara, PARAFLAG_ISPAGE ) ) nNewPages++; pPara = pOutliner->GetParagraph( ++nPos ); } - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); SfxProgress* pProgress = new SfxProgress( mpDocSh, String( SdResId(STR_CREATE_PAGES)), nNewPages); if( pProgress ) @@ -712,13 +712,13 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) pDocliner->GetUndoManager().EnterListAction( String(SdResId(STR_UNDO_INSERT_FILE)), String() ); - ULONG nSourcePos = 0; + sal_uLong nSourcePos = 0; SfxStyleSheet* pStyleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ); Paragraph* pSourcePara = pOutliner->GetParagraph( 0 ); while (pSourcePara) { - ULONG nPos = pOutliner->GetAbsPos( pSourcePara ); - sal_Int16 nDepth = pOutliner->GetDepth( (USHORT) nPos ); + sal_uLong nPos = pOutliner->GetAbsPos( pSourcePara ); + sal_Int16 nDepth = pOutliner->GetDepth( (sal_uInt16) nPos ); // den letzte Absatz nur uebernehmen, wenn er gefuellt ist if (nSourcePos < nParaCount - 1 || @@ -750,7 +750,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) if( pProgress ) delete pProgress; - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); } delete pOutliner; @@ -758,7 +758,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) // ----------------------------------------------------------------------------- -BOOL FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) +sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) { OutlineView* pOlView = static_cast<OutlineView*>(mpView); @@ -796,10 +796,10 @@ BOOL FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) pOutliner->SetEndMovingHdl(aOldEndMovingHdl); pOutliner->SetStatusEventHdl(aOldStatusEventHdl); - return TRUE; + return sal_True; } else - return FALSE; + return sal_False; } // ----------------------------------------------------------------------------- diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index b14d5f6acc08..c6135426a246 100644..100755 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -80,7 +80,7 @@ FunctionReference FuLine::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: void FuLine::DoExecute( SfxRequest& rReq ) { - BOOL bHasMarked = mpView->AreObjectsMarked(); + sal_Bool bHasMarked = mpView->AreObjectsMarked(); const SfxItemSet* pArgs = rReq.GetArgs(); @@ -102,7 +102,7 @@ void FuLine::DoExecute( SfxRequest& rReq ) } // Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_ATTR_LINE_STYLE, SID_ATTR_LINE_DASH, SID_ATTR_LINE_WIDTH, diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 9c53518507f3..30292667bc3e 100644..100755 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -95,10 +95,10 @@ void FuLineEnd::DoExecute( SfxRequest& ) if( aInfoRec.bCanConvToPath && pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() != OBJ_GRUP ) - // bCanConvToPath ist bei Gruppenobjekten TRUE, + // bCanConvToPath ist bei Gruppenobjekten sal_True, // stuerzt aber bei ConvertToPathObj() ab ! { - pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( TRUE, FALSE ); + pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( sal_True, sal_False ); if( !pNewObj || !pNewObj->ISA( SdrPathObj ) ) return; // Abbruch, zusaetzliche Sicherheit, die bei @@ -121,18 +121,18 @@ void FuLineEnd::DoExecute( SfxRequest& ) long nCount = pLineEndList->Count(); long j = 1; - BOOL bDifferent = FALSE; + sal_Bool bDifferent = sal_False; while( !bDifferent ) { aName = aNewName; aName.Append( sal_Unicode(' ') ); aName.Append( UniString::CreateFromInt32( j++ ) ); - bDifferent = TRUE; + bDifferent = sal_True; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = FALSE; + bDifferent = sal_False; } } @@ -146,12 +146,12 @@ void FuLineEnd::DoExecute( SfxRequest& ) if( pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = TRUE; + bDifferent = sal_True; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = FALSE; + bDifferent = sal_False; } if( bDifferent ) diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 1dc2d40fefd3..742c1d6db96b 100644..100755 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -99,8 +99,8 @@ void FuMorph::DoExecute( SfxRequest& ) pCloneObj2->SetOutlinerParaObject(NULL); // Path-Objekte erzeugen - SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(FALSE, FALSE); - SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(FALSE, FALSE); + SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(sal_False, sal_False); + SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(sal_False, sal_False); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractMorphDlg* pDlg = pFact ? pFact->CreateMorphDlg( static_cast< ::Window*>(mpWindow), pObj1, pObj2 ) : 0; if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK)) @@ -331,7 +331,7 @@ void FuMorph::ImpAddPolys(::basegfx::B2DPolyPolygon& rSmaller, const ::basegfx:: ////////////////////////////////////////////////////////////////////////////// // create group object with morphed polygons // -void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, +void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, sal_Bool bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2) { Color aStartFillCol; @@ -344,11 +344,11 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, SfxItemPool* pPool = pObj1->GetObjectItemPool(); SfxItemSet aSet1( *pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); SfxItemSet aSet2( aSet1 ); - BOOL bLineColor = FALSE; - BOOL bFillColor = FALSE; - BOOL bLineWidth = FALSE; - BOOL bIgnoreLine = FALSE; - BOOL bIgnoreFill = FALSE; + sal_Bool bLineColor = sal_False; + sal_Bool bFillColor = sal_False; + sal_Bool bLineWidth = sal_False; + sal_Bool bIgnoreLine = sal_False; + sal_Bool bIgnoreFill = sal_False; aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); @@ -362,7 +362,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, { if ( ( eLineStyle1 != XLINE_NONE ) && ( eLineStyle2 != XLINE_NONE ) ) { - bLineWidth = bLineColor = TRUE; + bLineWidth = bLineColor = sal_True; aStartLineCol = static_cast< XLineColorItem const & >( aSet1.Get(XATTR_LINECOLOR)).GetColorValue(); @@ -373,18 +373,18 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, nEndLineWidth = ITEMVALUE( aSet2, XATTR_LINEWIDTH, XLineWidthItem ); } else if ( ( eLineStyle1 == XLINE_NONE ) && ( eLineStyle2 == XLINE_NONE ) ) - bIgnoreLine = TRUE; + bIgnoreLine = sal_True; if ( ( eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_SOLID ) ) { - bFillColor = TRUE; + bFillColor = sal_True; aStartFillCol = static_cast< XFillColorItem const & >( aSet1.Get(XATTR_FILLCOLOR)).GetColorValue(); aEndFillCol = static_cast< XFillColorItem const & >( aSet2.Get(XATTR_FILLCOLOR)).GetColorValue(); } else if ( ( eFillStyle1 == XFILL_NONE ) && ( eFillStyle2 == XFILL_NONE ) ) - bIgnoreFill = TRUE; + bIgnoreFill = sal_True; } if ( pPageView ) @@ -392,7 +392,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, SfxItemSet aSet( aSet1 ); SdrObjGroup* pObjGroup = new SdrObjGroup; SdrObjList* pObjList = pObjGroup->GetSubList(); - const ULONG nCount = rPolyPolyList3D.Count(); + const sal_uLong nCount = rPolyPolyList3D.Count(); const double fStep = 1. / ( nCount + 1 ); const double fDelta = nEndLineWidth - nStartLineWidth; double fFactor = fStep; @@ -400,7 +400,7 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, aSet.Put( XLineStyleItem( XLINE_SOLID ) ); aSet.Put( XFillStyleItem( XFILL_SOLID ) ); - for ( ULONG i = 0; i < nCount; i++, fFactor += fStep ) + for ( sal_uLong i = 0; i < nCount; i++, fFactor += fStep ) { const ::basegfx::B2DPolyPolygon& rPolyPoly3D = *(::basegfx::B2DPolyPolygon*)rPolyPolyList3D.GetObject(i); SdrPathObj* pNewObj = new SdrPathObj(OBJ_POLY, rPolyPoly3D); @@ -506,7 +506,7 @@ sal_Bool FuMorph::ImpMorphPolygons( rPolyPolyList3D.Insert(pNewPolyPoly2D, LIST_APPEND); } } - return TRUE; + return sal_True; } diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index b348d6533930..fb19c4715ba3 100644..100755 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -97,8 +97,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) SfxUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager(); const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(); - ULONG nObject = 0; + sal_uLong nCount = rMarkList.GetMarkCount(); + sal_uLong nObject = 0; short nAnimationSet = ATTR_MISSING; short nEffectSet = ATTR_MISSING; @@ -120,26 +120,26 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) -// BOOL bDontKnow = FALSE; +// sal_Bool bDontKnow = sal_False; // defaulten (fuer Undo-Aktion) presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE; presentation::AnimationEffect eTextEffect = presentation::AnimationEffect_NONE; presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_MEDIUM; - BOOL bActive = FALSE; - BOOL bFadeOut = FALSE; + sal_Bool bActive = sal_False; + sal_Bool bFadeOut = sal_False; Color aFadeColor = COL_LIGHTGRAY; - BOOL bInvisible = FALSE; - BOOL bSoundOn = FALSE; + sal_Bool bInvisible = sal_False; + sal_Bool bSoundOn = sal_False; String aSound; - BOOL bPlayFull = FALSE; + sal_Bool bPlayFull = sal_False; presentation::ClickAction eClickAction = presentation::ClickAction_NONE; String aBookmark; presentation::AnimationEffect eSecondEffect = presentation::AnimationEffect_NONE; presentation::AnimationSpeed eSecondSpeed = presentation::AnimationSpeed_MEDIUM; - BOOL bSecondSoundOn = FALSE; - BOOL bSecondPlayFull = FALSE; + sal_Bool bSecondSoundOn = sal_False; + sal_Bool bSecondPlayFull = sal_False; SdAnimationInfo* pInfo; @@ -257,7 +257,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) } else { - if (nAnimationSet == ATTR_SET && bActive == TRUE) + if (nAnimationSet == ATTR_SET && bActive == sal_True) nAnimationSet = ATTR_MIXED; if (nEffectSet == ATTR_SET && eEffect != presentation::AnimationEffect_NONE) @@ -269,22 +269,22 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) if (nSpeedSet == ATTR_SET) nSpeedSet = ATTR_MIXED; - if (nFadeOutSet == ATTR_SET && bFadeOut == TRUE) + if (nFadeOutSet == ATTR_SET && bFadeOut == sal_True) nFadeOutSet = ATTR_MIXED; if (nFadeColorSet == ATTR_SET) nFadeColorSet = ATTR_MIXED; - if (nInvisibleSet == ATTR_SET && bInvisible == TRUE) + if (nInvisibleSet == ATTR_SET && bInvisible == sal_True) nInvisibleSet = ATTR_MIXED; - if (nSoundOnSet == ATTR_SET && bSoundOn == TRUE) + if (nSoundOnSet == ATTR_SET && bSoundOn == sal_True) nSoundOnSet = ATTR_MIXED; if (nSoundFileSet == ATTR_SET) nSoundFileSet = ATTR_MIXED; - if (nPlayFullSet == ATTR_SET && bPlayFull == TRUE) + if (nPlayFullSet == ATTR_SET && bPlayFull == sal_True) nPlayFullSet = ATTR_MIXED; if (nClickActionSet == ATTR_SET && eClickAction != presentation::ClickAction_NONE) @@ -299,10 +299,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) if (nSecondSpeedSet == ATTR_SET) nSecondSpeedSet = ATTR_MIXED; - if (nSecondSoundOnSet == ATTR_SET && bSecondSoundOn == TRUE) + if (nSecondSoundOnSet == ATTR_SET && bSecondSoundOn == sal_True) nSecondSoundOnSet = ATTR_MIXED; - if (nSecondPlayFullSet == ATTR_SET && bSecondPlayFull == TRUE) + if (nSecondPlayFullSet == ATTR_SET && bSecondPlayFull == sal_True) nSecondPlayFullSet = ATTR_MIXED; } } @@ -371,24 +371,24 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nAnimationSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_ACTIVE); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_ACTIVE, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_ACTIVE, sal_False)); if (nEffectSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, (USHORT)eEffect)); + aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, (sal_uInt16)eEffect)); else if (nEffectSet == ATTR_MIXED) aSet.InvalidateItem( ATTR_ANIMATION_EFFECT ); else aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_EFFECT, presentation::AnimationEffect_NONE)); if (nTextEffectSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, (USHORT)eTextEffect)); + aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, (sal_uInt16)eTextEffect)); else if (nTextEffectSet == ATTR_MIXED) aSet.InvalidateItem( ATTR_ANIMATION_TEXTEFFECT ); else aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_TEXTEFFECT, presentation::AnimationEffect_NONE)); if (nSpeedSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_SPEED, (USHORT)eSpeed)); + aSet.Put(SfxAllEnumItem(ATTR_ANIMATION_SPEED, (sal_uInt16)eSpeed)); else aSet.InvalidateItem(ATTR_ANIMATION_SPEED); @@ -397,7 +397,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nFadeOutSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_FADEOUT); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_FADEOUT, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_FADEOUT, sal_False)); if (nFadeColorSet == ATTR_SET) aSet.Put(SvxColorItem(aFadeColor, ATTR_ANIMATION_COLOR)); @@ -411,14 +411,14 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nInvisibleSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_INVISIBLE); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_INVISIBLE, sal_False)); if (nSoundOnSet == ATTR_SET) aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, bSoundOn)); else if (nSoundOnSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_SOUNDON); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_SOUNDON, sal_False)); if (nSoundFileSet == ATTR_SET) aSet.Put(SfxStringItem(ATTR_ANIMATION_SOUNDFILE, aSound)); @@ -430,10 +430,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nPlayFullSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ANIMATION_PLAYFULL); else - aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ANIMATION_PLAYFULL, sal_False)); if (nClickActionSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ACTION, (USHORT)eClickAction)); + aSet.Put(SfxAllEnumItem(ATTR_ACTION, (sal_uInt16)eClickAction)); else if (nClickActionSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ACTION); else @@ -445,14 +445,14 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) aSet.InvalidateItem(ATTR_ACTION_FILENAME); if (nSecondEffectSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECT, (USHORT)eSecondEffect)); + aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECT, (sal_uInt16)eSecondEffect)); else if (nSecondEffectSet == ATTR_MIXED) aSet.InvalidateItem( ATTR_ACTION_EFFECT ); else aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECT, presentation::AnimationEffect_NONE)); if (nSecondSpeedSet == ATTR_SET) - aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECTSPEED, (USHORT)eSecondSpeed)); + aSet.Put(SfxAllEnumItem(ATTR_ACTION_EFFECTSPEED, (sal_uInt16)eSecondSpeed)); else aSet.InvalidateItem(ATTR_ACTION_EFFECTSPEED); @@ -461,19 +461,19 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) else if (nSecondSoundOnSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ACTION_SOUNDON); else - aSet.Put(SfxBoolItem(ATTR_ACTION_SOUNDON, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ACTION_SOUNDON, sal_False)); if (nSecondPlayFullSet == ATTR_SET) aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, bSecondPlayFull)); else if (nPlayFullSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ACTION_PLAYFULL); else - aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, FALSE)); + aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, sal_False)); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractDialog* pDlg = pFact ? pFact->CreatSdActionDialog( NULL, &aSet, mpView ) : 0; - USHORT nResult = pDlg ? pDlg->Execute() : RET_CANCEL; + sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL; if( nResult == RET_OK ) { @@ -706,11 +706,11 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pInfo = mpDoc->GetAnimationInfo(pObject); - BOOL bCreated = FALSE; + sal_Bool bCreated = sal_False; if( !pInfo ) { pInfo = SdDrawDocument::GetShapeUserData(*pObject,true); - bCreated = TRUE; + bCreated = sal_True; } // das Pfadobjekt fuer 'an Kurve entlang'? @@ -731,7 +731,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) // pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj); pAction->SetClickAction(pInfo->meClickAction, pInfo->meClickAction); pAction->SetBookmark(pInfo->GetBookmark(), pInfo->GetBookmark()); -// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE); +// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, sal_True); pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb); pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, pInfo->meSecondSpeed); @@ -739,7 +739,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetSecondPlayFull(pInfo->mbSecondPlayFull, pInfo->mbSecondPlayFull); pUndoGroup->AddAction(pAction); -// pInfo->mbInvisibleInPresentation = TRUE; +// pInfo->mbInvisibleInPresentation = sal_True; } else { @@ -762,7 +762,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pAction->SetBookmark(pInfo->GetBookmark(), aBookmark); // pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, // pInfo->mbInvisibleInPresentation); - pAction->SetVerb(pInfo->mnVerb, (USHORT)pInfo->GetBookmark().ToInt32() ); + pAction->SetVerb(pInfo->mnVerb, (sal_uInt16)pInfo->GetBookmark().ToInt32() ); pAction->SetSecondEffect(pInfo->meSecondEffect, eSecondEffect); pAction->SetSecondSpeed(pInfo->meSecondSpeed, eSecondSpeed); pAction->SetSecondSoundOn(pInfo->mbSecondSoundOn, bSecondSoundOn); @@ -823,7 +823,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) // pInfo->mSetPath(pPath); if (eClickAction == presentation::ClickAction_VERB) - pInfo->mnVerb = (USHORT)aBookmark.ToInt32(); + pInfo->mnVerb = (sal_uInt16)aBookmark.ToInt32(); } } // Undo Gruppe dem Undo Manager uebergeben diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 32ca9d3278b3..c8de0fd5dfea 100644..100755 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -84,14 +84,14 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq ) SfxItemSet aNewAttr( mpViewShell->GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - aNewAttr.Put( aEditAttr, FALSE ); + aNewAttr.Put( aEditAttr, sal_False ); // Dialog hochfahren und ausfuehren SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdOutlineBulletTabDlg( NULL, &aNewAttr, mpView ) : 0; if( pDlg ) { - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 2797631d12db..b2a913ea3b61 100644..100755 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -53,7 +53,7 @@ namespace sd { -static USHORT SidArray[] = { +static sal_uInt16 SidArray[] = { SID_STYLE_FAMILY2, SID_STYLE_FAMILY3, SID_STYLE_FAMILY5, @@ -118,9 +118,9 @@ FunctionReference FuOutlineText::Create( ViewShell* pViewSh, ::sd::Window* pWin, |* \************************************************************************/ -BOOL FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; mpWindow->GrabFocus(); @@ -145,9 +145,9 @@ BOOL FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuOutlineText::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseMove(rMEvt); @@ -181,9 +181,9 @@ BOOL FuOutlineText::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseButtonUp(rMEvt); @@ -201,11 +201,11 @@ BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) if( pField && pField->ISA( SvxURLField ) ) { - bReturn = TRUE; + bReturn = sal_True; mpWindow->ReleaseMouse(); SfxStringItem aStrItem( SID_FILE_NAME, ( (SvxURLField*) pField)->GetURL() ); SfxStringItem aReferer( SID_REFERER, mpDocSh->GetMedium()->GetName() ); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); if ( rMEvt.IsMod1() ) @@ -235,16 +235,16 @@ BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuOutlineText::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuOutlineText::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; - USHORT nKeyGroup = rKEvt.GetKeyCode().GetGroup(); + sal_uInt16 nKeyGroup = rKEvt.GetKeyCode().GetGroup(); if( !mpDocSh->IsReadOnly() || nKeyGroup == KEYGROUP_CURSOR ) { mpWindow->GrabFocus(); diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index c0ef53f144b3..e4d263a1e4a6 100755 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -66,9 +66,9 @@ FuOutline::FuOutline ( |* \************************************************************************/ -BOOL FuOutline::Command(const CommandEvent& rCEvt) +sal_Bool FuOutline::Command(const CommandEvent& rCEvt) { - BOOL bResult = FALSE; + sal_Bool bResult = sal_False; OutlinerView* pOlView = static_cast<OutlineView*>(mpView)->GetViewByWindow(mpWindow); @@ -77,7 +77,7 @@ BOOL FuOutline::Command(const CommandEvent& rCEvt) if (pOlView) { pOlView->Command(rCEvt); // liefert leider keinen Returnwert - bResult = TRUE; + bResult = sal_True; } return bResult; } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index d4e2fcd8083f..8af2ee312f8b 100755 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -101,8 +101,8 @@ TYPEINIT1( FuPage, FuPoor ); void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource ) { - const USHORT* pPtr = rSource.GetRanges(); - USHORT p1, p2; + const sal_uInt16* pPtr = rSource.GetRanges(); + sal_uInt16 p1, p2; while( *pPtr ) { p1 = pPtr[0]; @@ -218,7 +218,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) SvxPageItem aPageItem( SID_ATTR_PAGE ); aPageItem.SetDescName( mpPage->GetName() ); aPageItem.SetPageUsage( (SvxPageUsage) SVX_PAGE_ALL ); - aPageItem.SetLandscape( mpPage->GetOrientation() == ORIENTATION_LANDSCAPE ? TRUE: FALSE ); + aPageItem.SetLandscape( mpPage->GetOrientation() == ORIENTATION_LANDSCAPE ? sal_True: sal_False ); aPageItem.SetNumType( mpDoc->GetPageNumType() ); aNewAttr.Put( aPageItem ); @@ -232,20 +232,20 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aNewAttr.Put( aMaxSizeItem ); // paperbin - SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, (const BYTE)mpPage->GetPaperBin() ); + SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, (const sal_uInt8)mpPage->GetPaperBin() ); aNewAttr.Put( aPaperBinItem ); - SvxLRSpaceItem aLRSpaceItem( (USHORT)mpPage->GetLftBorder(), (USHORT)mpPage->GetRgtBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE)); + SvxLRSpaceItem aLRSpaceItem( (sal_uInt16)mpPage->GetLftBorder(), (sal_uInt16)mpPage->GetRgtBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE)); aNewAttr.Put( aLRSpaceItem ); - SvxULSpaceItem aULSpaceItem( (USHORT)mpPage->GetUppBorder(), (USHORT)mpPage->GetLwrBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE)); + SvxULSpaceItem aULSpaceItem( (sal_uInt16)mpPage->GetUppBorder(), (sal_uInt16)mpPage->GetLwrBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE)); aNewAttr.Put( aULSpaceItem ); // Applikation bool bScale = mpDoc->GetDocumentType() != DOCUMENT_TYPE_DRAW; - aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ? TRUE : FALSE ) ); + aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ? sal_True : sal_False ) ); - BOOL bFullSize = mpPage->IsMasterPage() ? + sal_Bool bFullSize = mpPage->IsMasterPage() ? mpPage->IsBackgroundFullSize() : ((SdPage&)mpPage->TRG_GetMasterPage()).IsBackgroundFullSize(); aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT2, bFullSize ) ); @@ -253,8 +253,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) /////////////////////////////////////////////////////////////////////// // Merge ItemSet for dialog - const USHORT* pPtr = aNewAttr.GetRanges(); - USHORT p1 = pPtr[0], p2 = pPtr[1]; + const sal_uInt16* pPtr = aNewAttr.GetRanges(); + sal_uInt16 p1 = pPtr[0], p2 = pPtr[1]; while(pPtr[2] && (pPtr[2] - p2 == 1)) { p2 = pPtr[3]; @@ -324,8 +324,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aMigrateSet.Put( XFillBitmapItem( String(RTL_CONSTASCII_USTRINGPARAM("background")), XOBitmap(aGraphic) ) ); mpDoc->MigrateItemSet( &aMigrateSet, pTempSet.get(), NULL ); - pTempSet->Put( XFillBmpStretchItem( TRUE )); - pTempSet->Put( XFillBmpTileItem( FALSE )); + pTempSet->Put( XFillBmpStretchItem( sal_True )); + pTempSet->Put( XFillBmpTileItem( sal_False )); } } } @@ -346,8 +346,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) { // if some fillstyle-items are not set in the dialog, then // try to use the items before - BOOL bChanges = FALSE; - for( USHORT i=XATTR_FILL_FIRST; i<XATTR_FILL_LAST; i++ ) + sal_Bool bChanges = sal_False; + for( sal_uInt16 i=XATTR_FILL_FIRST; i<XATTR_FILL_LAST; i++ ) { if( aMergedAttr.GetItemState( i ) != SFX_ITEM_DEFAULT ) { @@ -355,7 +355,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) pTempSet->Put( aMergedAttr.Get( i ) ); else if( aMergedAttr.GetItem( i ) != pTempSet->GetItem( i ) ) - bChanges = TRUE; + bChanges = sal_True; } } @@ -363,7 +363,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) if( ( ( (XFillStyleItem*) pTempSet->GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) || ( ( pTempSet->GetItemState( XATTR_FILLSTYLE ) == SFX_ITEM_DEFAULT ) && ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) ) - mbPageBckgrdDeleted = TRUE; + mbPageBckgrdDeleted = sal_True; bool bSetToAllPages = false; @@ -420,8 +420,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) pUndoGroup->SetComment(aComment); //Set background on all master pages - USHORT nMasterPageCount = mpDoc->GetMasterSdPageCount(ePageKind); - for (USHORT i = 0; i < nMasterPageCount; ++i) + sal_uInt16 nMasterPageCount = mpDoc->GetMasterSdPageCount(ePageKind); + for (sal_uInt16 i = 0; i < nMasterPageCount; ++i) { SdPage *pMasterPage = mpDoc->GetMasterSdPage(i, ePageKind); SdStyleSheet *pStyle = @@ -434,8 +434,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) } //Remove background from all pages to reset to the master bg - USHORT nPageCount(mpDoc->GetSdPageCount(ePageKind)); - for(USHORT i=0; i<nPageCount; ++i) + sal_uInt16 nPageCount(mpDoc->GetSdPageCount(ePageKind)); + for(sal_uInt16 i=0; i<nPageCount; ++i) { SdPage *pPage = mpDoc->GetSdPage(i, ePageKind); @@ -457,7 +457,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) // if background filling is set to master pages then clear from page set if( mbMasterPage || bSetToAllPages ) { - for( USHORT nWhich = XATTR_FILL_FIRST; nWhich <= XATTR_FILL_LAST; nWhich++ ) + for( sal_uInt16 nWhich = XATTR_FILL_FIRST; nWhich <= XATTR_FILL_LAST; nWhich++ ) { pTempSet->ClearItem( nWhich ); } @@ -471,7 +471,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) mpDoc->SetDefaultWritingMode( nVal == FRMDIR_HORI_RIGHT_TOP ? ::com::sun::star::text::WritingMode_RL_TB : ::com::sun::star::text::WritingMode_LR_TB ); } - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); // BackgroundFill of Masterpage: no hard attributes allowed SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage(); @@ -501,16 +501,16 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) // Set new page-attributes PageKind ePageKind = mpDrawViewShell->GetPageKind(); const SfxPoolItem* pPoolItem; - BOOL bSetPageSizeAndBorder = FALSE; + sal_Bool bSetPageSizeAndBorder = sal_False; Size aNewSize(maSize); - INT32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1; - BOOL bScaleAll = TRUE; + sal_Int32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1; + sal_Bool bScaleAll = sal_True; Orientation eOrientation = mpPage->GetOrientation(); SdPage* pMasterPage = mpPage->IsMasterPage() ? mpPage : &(SdPage&)(mpPage->TRG_GetMasterPage()); - BOOL bFullSize = pMasterPage->IsBackgroundFullSize(); - USHORT nPaperBin = mpPage->GetPaperBin(); + sal_Bool bFullSize = pMasterPage->IsBackgroundFullSize(); + sal_uInt16 nPaperBin = mpPage->GetPaperBin(); - if( pArgs->GetItemState(SID_ATTR_PAGE, TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(SID_ATTR_PAGE, sal_True, &pPoolItem) == SFX_ITEM_SET ) { mpDoc->SetPageNumType(((const SvxPageItem*) pPoolItem)->GetNumType()); @@ -518,71 +518,71 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT; if( mpPage->GetOrientation() != eOrientation ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; mpDrawViewShell->ResetActualPage(); } - if( pArgs->GetItemState(SID_ATTR_PAGE_SIZE, TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(SID_ATTR_PAGE_SIZE, sal_True, &pPoolItem) == SFX_ITEM_SET ) { aNewSize = ((const SvxSizeItem*) pPoolItem)->GetSize(); if( mpPage->GetSize() != aNewSize ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE), - TRUE, &pPoolItem) == SFX_ITEM_SET ) + sal_True, &pPoolItem) == SFX_ITEM_SET ) { nLeft = ((const SvxLRSpaceItem*) pPoolItem)->GetLeft(); nRight = ((const SvxLRSpaceItem*) pPoolItem)->GetRight(); if( mpPage->GetLftBorder() != nLeft || mpPage->GetRgtBorder() != nRight ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE), - TRUE, &pPoolItem) == SFX_ITEM_SET ) + sal_True, &pPoolItem) == SFX_ITEM_SET ) { nUpper = ((const SvxULSpaceItem*) pPoolItem)->GetUpper(); nLower = ((const SvxULSpaceItem*) pPoolItem)->GetLower(); if( mpPage->GetUppBorder() != nUpper || mpPage->GetLwrBorder() != nLower ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } - if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT1), TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT1), sal_True, &pPoolItem) == SFX_ITEM_SET ) { bScaleAll = ((const SfxBoolItem*) pPoolItem)->GetValue(); } - if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT2), TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT2), sal_True, &pPoolItem) == SFX_ITEM_SET ) { bFullSize = ((const SfxBoolItem*) pPoolItem)->GetValue(); if(pMasterPage->IsBackgroundFullSize() != bFullSize ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } // Papierschacht (PaperBin) - if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_PAPERBIN), TRUE, &pPoolItem) == SFX_ITEM_SET ) + if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_PAPERBIN), sal_True, &pPoolItem) == SFX_ITEM_SET ) { nPaperBin = ((const SvxPaperBinItem*) pPoolItem)->GetValue(); if( mpPage->GetPaperBin() != nPaperBin ) - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; } if (nLeft == -1 && nUpper != -1) { - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; nLeft = mpPage->GetLftBorder(); nRight = mpPage->GetRgtBorder(); } else if (nLeft != -1 && nUpper == -1) { - bSetPageSizeAndBorder = TRUE; + bSetPageSizeAndBorder = sal_True; nUpper = mpPage->GetUppBorder(); nLower = mpPage->GetLwrBorder(); } @@ -592,8 +592,8 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) //////////////////////////////////////////////////////////////////////////////// // - // if bMasterPage==FALSE then create a background-object for this page with the - // properties set in the dialog before, but if mbPageBckgrdDeleted==TRUE then + // if bMasterPage==sal_False then create a background-object for this page with the + // properties set in the dialog before, but if mbPageBckgrdDeleted==sal_True then // the background of this page was set to invisible, so it would be a mistake // to create a new background-object for this page ! // @@ -615,7 +615,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( mpBackgroundObjUndoAction ) { // set merge flag, because a SdUndoGroupAction could have been inserted before - mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction, TRUE ); + mpDocSh->GetUndoManager()->AddUndoAction( mpBackgroundObjUndoAction, sal_True ); mpBackgroundObjUndoAction = 0; } diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 68f8a3e922d0..66fe24e2c56e 100644..100755 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -114,7 +114,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdParagraphTabDlg(NULL, &aNewAttr ) : 0; if( pDlg ) { - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { @@ -156,7 +156,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) } // invalidieren der Slots - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_ATTR_TABSTOP, SID_ATTR_PARA_ADJUST_LEFT, SID_ATTR_PARA_ADJUST_RIGHT, diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 0342c5f2bbc5..57a06e873f81 100755 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -100,11 +100,11 @@ FuPoor::FuPoor ( nSlotId( rReq.GetSlot() ), nSlotValue(0), pDialog(NULL), - bIsInDragMode(FALSE), - bNoScrollUntilInside (TRUE), - bScrollable (FALSE), - bDelayActive (FALSE), - bFirstMouseMove (FALSE), + bIsInDragMode(sal_False), + bNoScrollUntilInside (sal_True), + bScrollable (sal_False), + bDelayActive (sal_False), + bFirstMouseMove (sal_False), // #95491# remember MouseButton state mnCode(0) { @@ -162,7 +162,7 @@ void FuPoor::Deactivate() aScrollTimer.Stop(); aDelayToScrollTimer.Stop (); bScrollable = - bDelayActive = FALSE; + bDelayActive = sal_False; if (pDialog) { @@ -200,7 +200,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) if ( bNoScrollUntilInside ) { if ( rRect.IsInside(aPos) ) - bNoScrollUntilInside = FALSE; + bNoScrollUntilInside = sal_False; } else { @@ -249,16 +249,16 @@ IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { - USHORT nCode = rKEvt.GetKeyCode().GetCode(); - BOOL bReturn = FALSE; - BOOL bSlideShow = SlideShow::IsRunning( mpViewShell->GetViewShellBase() ); + sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); + sal_Bool bReturn = sal_False; + sal_Bool bSlideShow = SlideShow::IsRunning( mpViewShell->GetViewShellBase() ); switch (nCode) { @@ -312,7 +312,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = TRUE; + bReturn = sal_True; } } else @@ -340,7 +340,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = TRUE; + bReturn = sal_True; } } } @@ -369,7 +369,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -389,9 +389,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) if (mpViewShell->ISA(DrawViewShell)) static_cast<DrawViewShell*>(mpViewShell) - ->SetZoomOnPage(FALSE); + ->SetZoomOnPage(sal_False); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -405,9 +405,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) if (mpViewShell->ISA(DrawViewShell)) static_cast<DrawViewShell*>(mpViewShell) - ->SetZoomOnPage(FALSE); + ->SetZoomOnPage(sal_False); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -419,7 +419,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // Zoom auf Seite mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -431,7 +431,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) // Zoom auf selektierte Objekte mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_SIZE_OPTIMAL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -444,7 +444,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { // Naechstes ZoomRect einstellen mpViewShell->SetZoomRect(pZoomList->GetNextZoomRect()); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -457,7 +457,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { // Vorheriges ZoomRect einstellen mpViewShell->SetZoomRect(pZoomList->GetPreviousZoomRect()); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -470,7 +470,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { // Sprung zu erster Seite static_cast<DrawViewShell*>(mpViewShell)->SwitchPage(0); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -487,7 +487,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) static_cast<DrawViewShell*>(mpViewShell) ->SwitchPage(mpDoc->GetSdPageCount( pPage->GetPageKind()) - 1); - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -508,9 +508,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->SdrEndTextEdit(); // Previous page. - bReturn = TRUE; + bReturn = sal_True; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); - USHORT nSdPage = (pPage->GetPageNum() - 1) / 2; + sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2; if (nSdPage > 0) { @@ -554,9 +554,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->SdrEndTextEdit(); // Next page. - bReturn = TRUE; + bReturn = sal_True; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); - USHORT nSdPage = (pPage->GetPageNum() - 1) / 2; + sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2; if (nSdPage < mpDoc->GetSdPageCount(pPage->GetPageKind()) - 1) { @@ -641,7 +641,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } } - bReturn = TRUE; + bReturn = sal_True; } } } @@ -821,13 +821,13 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) if(mpView->IsDragObj()) { FASTBOOL bWasNoSnap = rDragStat.IsNoSnap(); - BOOL bWasSnapEnabled = mpView->IsSnapEnabled(); + sal_Bool bWasSnapEnabled = mpView->IsSnapEnabled(); // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)rDragStat).SetNoSnap(TRUE); + ((SdrDragStat&)rDragStat).SetNoSnap(sal_True); if(bWasSnapEnabled) - mpView->SetSnapEnabled(FALSE); + mpView->SetSnapEnabled(sal_False); mpView->MovAction(aEndPoint); mpView->EndDragObj(); @@ -860,7 +860,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) ScrollEnd(); } - bReturn = TRUE; + bReturn = sal_True; } } break; @@ -902,7 +902,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) 0L); // consumed - bReturn = TRUE; + bReturn = sal_True; } } } @@ -953,7 +953,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) 0L); // consumed - bReturn = TRUE; + bReturn = sal_True; } } } @@ -963,9 +963,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) return(bReturn); } -BOOL FuPoor::MouseMove(const MouseEvent& ) +sal_Bool FuPoor::MouseMove(const MouseEvent& ) { - return FALSE; + return sal_False; } // #97016# II @@ -1027,14 +1027,14 @@ IMPL_LINK( FuPoor, DragHdl, Timer *, EMPTYARG ) { if( mpView ) { - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); SdrHdl* pHdl = mpView->PickHandle(aMDPos); if ( pHdl==NULL && mpView->IsMarkedHit(aMDPos, nHitLog) - && !mpView->IsPresObjSelected(FALSE, TRUE) ) + && !mpView->IsPresObjSelected(sal_False, sal_True) ) { mpWindow->ReleaseMouse(); - bIsInDragMode = TRUE; + bIsInDragMode = sal_True; mpView->StartDrag( aMDPos, mpWindow ); } } @@ -1047,7 +1047,7 @@ IMPL_LINK( FuPoor, DragHdl, Timer *, EMPTYARG ) |* \************************************************************************/ -BOOL FuPoor::Command(const CommandEvent& rCEvt) +sal_Bool FuPoor::Command(const CommandEvent& rCEvt) { return( mpView->Command(rCEvt,mpWindow) ); } @@ -1061,7 +1061,7 @@ BOOL FuPoor::Command(const CommandEvent& rCEvt) IMPL_LINK_INLINE_START( FuPoor, DelayHdl, Timer *, EMPTYARG ) { aDelayToScrollTimer.Stop (); - bScrollable = TRUE; + bScrollable = sal_True; Point aPnt(mpWindow->GetPointerPosPixel()); @@ -1079,22 +1079,22 @@ IMPL_LINK_INLINE_END( FuPoor, DelayHdl, Timer *, pTimer ) |* \************************************************************************/ -BOOL FuPoor::MouseButtonUp (const MouseEvent& rMEvt) +sal_Bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); aDelayToScrollTimer.Stop (); return bScrollable = - bDelayActive = FALSE; + bDelayActive = sal_False; } -BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return FALSE; + return sal_False; } /************************************************************************* @@ -1105,7 +1105,7 @@ BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) void FuPoor::StartDelayToScrollTimer () { - bDelayActive = TRUE; + bDelayActive = sal_True; aDelayToScrollTimer.Start (); } @@ -1115,9 +1115,9 @@ void FuPoor::StartDelayToScrollTimer () |* \************************************************************************/ -BOOL FuPoor::RequestHelp(const HelpEvent& rHEvt) +sal_Bool FuPoor::RequestHelp(const HelpEvent& rHEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; SdrPageView* pPV = mpView->GetSdrPageView(); diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 0d6f0b5aa565..2f0459c5e349 100644..100755 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -76,8 +76,8 @@ SO2_DECL_REF(SvStorage) TYPEINIT1( FuPresentationLayout, FuPoor ); -#define POOL_BUFFER_SIZE (USHORT)32768 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (sal_uInt16)32768 +#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768 #define DOCUMENT_TOKEN (sal_Unicode('#')) /************************************************************************* @@ -114,11 +114,11 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) mpView->UnmarkAll(); } - BOOL bError = FALSE; + sal_Bool bError = sal_False; // die aktive Seite ermitteln - USHORT nSelectedPage = SDRPAGE_NOTFOUND; - for (USHORT nPage = 0; nPage < mpDoc->GetSdPageCount(PK_STANDARD); nPage++) + sal_uInt16 nSelectedPage = SDRPAGE_NOTFOUND; + for (sal_uInt16 nPage = 0; nPage < mpDoc->GetSdPageCount(PK_STANDARD); nPage++) { if (mpDoc->GetSdPage(nPage, PK_STANDARD)->IsSelected()) { @@ -135,19 +135,19 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) // wenn wir auf einer Masterpage sind, gelten die Aenderungen fuer alle // Seiten und Notizseiten, die das betreffende Layout benutzen - BOOL bOnMaster = FALSE; + sal_Bool bOnMaster = sal_False; if( mpViewShell && mpViewShell->ISA(DrawViewShell)) { EditMode eEditMode = static_cast<DrawViewShell*>(mpViewShell)->GetEditMode(); if (eEditMode == EM_MASTERPAGE) - bOnMaster = TRUE; + bOnMaster = sal_True; } - BOOL bMasterPage = bOnMaster; - BOOL bCheckMasters = FALSE; + sal_Bool bMasterPage = bOnMaster; + sal_Bool bCheckMasters = sal_False; // Dialog aufrufen - BOOL bLoad = FALSE; // tauchen neue Masterpages auf? + sal_Bool bLoad = sal_False; // tauchen neue Masterpages auf? String aFile; SfxItemSet aSet(mpDoc->GetPool(), ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END); @@ -177,7 +177,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractSdPresLayoutDlg* pDlg = pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, mpViewShell, NULL, aSet ) : 0; - USHORT nResult = pDlg ? pDlg->Execute() : RET_CANCEL; + sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL; switch (nResult) { @@ -196,14 +196,14 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) break; default: - bError = TRUE; + bError = sal_True; } delete pDlg; } if (!bError) { - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); // Hier werden nur Masterpages ausgewechselt, d.h. die aktuelle Seite // bleibt aktuell. Damit beim Ein- und Ausfuegen der Masterpages nicht @@ -213,7 +213,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) // removing a masterpage, it's possible that you are removing the // current masterpage. So you have to call ResetActualPage ! if( mpViewShell->ISA(DrawViewShell) && !bCheckMasters ) - static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(TRUE); + static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_True); if (bLoad) { @@ -238,7 +238,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) // Blockade wieder aufheben if (mpViewShell->ISA(DrawViewShell) && !bCheckMasters ) - static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(FALSE); + static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_False); /************************************************************************* |* Falls dargestellte Masterpage sichtbar war, neu darstellen @@ -251,7 +251,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) { ::sd::View* pView = static_cast<DrawViewShell*>(mpViewShell)->GetView(); - USHORT nPgNum = pSelectedPage->TRG_GetMasterPage().GetPageNum(); + sal_uInt16 nPgNum = pSelectedPage->TRG_GetMasterPage().GetPageNum(); if (static_cast<DrawViewShell*>(mpViewShell)->GetPageKind() == PK_NOTES) nPgNum++; @@ -275,12 +275,12 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) DrawViewShell* pDrawViewSh = static_cast<DrawViewShell*>(mpViewShell); EditMode eMode = pDrawViewSh->GetEditMode(); - BOOL bLayer = pDrawViewSh->IsLayerModeActive(); + sal_Bool bLayer = pDrawViewSh->IsLayerModeActive(); pDrawViewSh->ChangeEditMode( eMode, !bLayer ); pDrawViewSh->ChangeEditMode( eMode, bLayer ); } - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); } } diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index d65bc8aaffe3..56db54cc7564 100644..100755 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -97,32 +97,32 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) String aLayoutName = (((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue()); DBG_ASSERT(aLayoutName.Len(), "Layout unbestimmt"); - BOOL bUnique = FALSE; + sal_Bool bUnique = sal_False; sal_Int16 nDepth, nTmp; OutlineView* pOlView = static_cast<OutlineView*>(pOutlineViewShell->GetView()); OutlinerView* pOutlinerView = pOlView->GetViewByWindow( (Window*) mpWindow ); ::Outliner* pOutl = pOutlinerView->GetOutliner(); List* pList = pOutlinerView->CreateSelectionList(); Paragraph* pPara = (Paragraph*)pList->First(); - nDepth = pOutl->GetDepth((USHORT)pOutl->GetAbsPos( pPara ) ); + nDepth = pOutl->GetDepth((sal_uInt16)pOutl->GetAbsPos( pPara ) ); bool bPage = pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ); while( pPara ) { - nTmp = pOutl->GetDepth((USHORT) pOutl->GetAbsPos( pPara ) ); + nTmp = pOutl->GetDepth((sal_uInt16) pOutl->GetAbsPos( pPara ) ); if( nDepth != nTmp ) { - bUnique = FALSE; + bUnique = sal_False; break; } if( pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) != bPage ) { - bUnique = FALSE; + bUnique = sal_False; break; } - bUnique = TRUE; + bUnique = sal_True; pPara = (Paragraph*) pList->Next(); } @@ -131,7 +131,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) { String aStyleName = aLayoutName; aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) ); - USHORT nDlgId = TAB_PRES_LAYOUT_TEMPLATE; + sal_uInt16 nDlgId = TAB_PRES_LAYOUT_TEMPLATE; PresentationObjects ePO; if( bPage ) diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index dc5677c6ef2d..f5185dcbad0c 100644..100755 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -86,7 +86,7 @@ FunctionReference FuScale::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd: void FuScale::DoExecute( SfxRequest& rReq ) { - INT16 nValue; + sal_Int16 nValue; const SfxItemSet* pArgs = rReq.GetArgs(); @@ -94,9 +94,9 @@ void FuScale::DoExecute( SfxRequest& rReq ) { SfxItemSet aNewAttr( mpDoc->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); SvxZoomItem* pZoomItem; - USHORT nZoomValues = SVX_ZOOM_ENABLE_ALL; + sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL; - nValue = (INT16) mpWindow->GetZoom(); + nValue = (sal_Int16) mpWindow->GetZoom(); // Zoom auf Seitengroesse ? if( mpViewShell && mpViewShell->ISA( DrawViewShell ) && @@ -141,8 +141,8 @@ void FuScale::DoExecute( SfxRequest& rReq ) if( pDlg ) { - pDlg->SetLimits( (USHORT)mpWindow->GetMinZoom(), (USHORT)mpWindow->GetMaxZoom() ); - USHORT nResult = pDlg->Execute(); + pDlg->SetLimits( (sal_uInt16)mpWindow->GetMinZoom(), (sal_uInt16)mpWindow->GetMaxZoom() ); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { case RET_CANCEL: @@ -205,7 +205,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) } else if(mpViewShell && (pArgs->Count () == 1)) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, FALSE); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, sal_False); mpViewShell->SetZoom (pScale->GetValue ()); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArrayZoom ); diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 04fcf124cc14..3591b70af7bf 100755 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -54,7 +54,7 @@ class SfxRequest; namespace sd { -static USHORT SidArraySpell[] = { +static sal_uInt16 SidArraySpell[] = { SID_DRAWINGMODE, SID_OUTLINEMODE, SID_DIAMODE, @@ -78,7 +78,7 @@ FuSearch::FuSearch ( SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), pSdOutliner(NULL), - bOwnOutliner(FALSE) + bOwnOutliner(sal_False) { } @@ -95,12 +95,12 @@ void FuSearch::DoExecute( SfxRequest& ) if ( mpViewShell->ISA(DrawViewShell) ) { - bOwnOutliner = TRUE; + bOwnOutliner = sal_True; pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); } else if ( mpViewShell->ISA(OutlineViewShell) ) { - bOwnOutliner = FALSE; + bOwnOutliner = sal_False; pSdOutliner = mpDoc->GetOutliner(); } @@ -146,7 +146,7 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem ) { pSdOutliner->EndSpelling(); - bOwnOutliner = TRUE; + bOwnOutliner = sal_True; pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); pSdOutliner->PrepareSpelling(); } @@ -155,14 +155,14 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem ) pSdOutliner->EndSpelling(); delete pSdOutliner; - bOwnOutliner = FALSE; + bOwnOutliner = sal_False; pSdOutliner = mpDoc->GetOutliner(); pSdOutliner->PrepareSpelling(); } if (pSdOutliner) { - BOOL bEndSpelling = pSdOutliner->StartSearchAndReplace(pSearchItem); + sal_Bool bEndSpelling = pSdOutliner->StartSearchAndReplace(pSearchItem); if (bEndSpelling) { diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 2ddf6a5fb885..89eeb5460232 100644..100755 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -109,12 +109,12 @@ FuSelection::FuSelection ( SdDrawDocument* pDoc, SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq), - bTempRotation(FALSE), - bSelectionChanged(FALSE), - bHideAndAnimate(FALSE), + bTempRotation(sal_False), + bSelectionChanged(sal_False), + bHideAndAnimate(sal_False), pHdl(NULL), - bSuppressChangesOfSelection(FALSE), - bMirrorSide0(FALSE), + bSuppressChangesOfSelection(sal_False), + bMirrorSide0(sal_False), nEditMode(SID_BEZIER_MOVE), pWaterCanCandidate(NULL) { @@ -158,38 +158,38 @@ FuSelection::~FuSelection() |* \************************************************************************/ -BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // Hack fuer #?????# - bHideAndAnimate = FALSE; + bHideAndAnimate = sal_False; pHdl = NULL; - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); - BOOL bWaterCan = SD_MOD()->GetWaterCan(); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bWaterCan = SD_MOD()->GetWaterCan(); const bool bReadOnly = mpDocSh->IsReadOnly(); // When the right mouse button is pressed then only select objects // (and deselect others) as a preparation for showing the context // menu. const bool bSelectionOnly = rMEvt.IsRight(); - bMBDown = TRUE; - bSelectionChanged = FALSE; + bMBDown = sal_True; + bSelectionChanged = sal_False; if ( mpView->IsAction() ) { if ( rMEvt.IsRight() ) mpView->BckAction(); - return TRUE; + return sal_True; } - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); // The following code is executed for right clicks as well as for left // clicks in order to modify the selection for the right button as a // preparation for the context menu. The functions BegMarkObject() and // BegDragObject(), however, are not called for right clicks because a) - // it makes no sense and b) to have IsAction() return FALSE when called + // it makes no sense and b) to have IsAction() return sal_False when called // from Command() which is a prerequisite for the context menu. if ((rMEvt.IsLeft() || rMEvt.IsRight()) && !mpView->IsAction() @@ -206,7 +206,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) long nAngle0 = GetAngle(aMDPos - mpView->GetRef1()); nAngle0 -= 27000; nAngle0 = NormAngle360(nAngle0); - bMirrorSide0 = BOOL (nAngle0 < 18000L); + bMirrorSide0 = sal_Bool (nAngle0 < 18000L); if (!pHdl && mpView->Is3DRotationCreationActive()) { @@ -214,23 +214,23 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) * Wenn 3D-Rotationskoerper erstellt werden sollen, jetzt * die Erstellung beenden ******************************************************************/ - bSuppressChangesOfSelection = TRUE; + bSuppressChangesOfSelection = sal_True; if(mpWindow) mpWindow->EnterWait(); mpView->End3DCreation(); - bSuppressChangesOfSelection = FALSE; + bSuppressChangesOfSelection = sal_False; mpView->ResetCreationActive(); if(mpWindow) mpWindow->LeaveWait(); } - BOOL bTextEdit = FALSE; + sal_Bool bTextEdit = sal_False; SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); if ( eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != NULL ) ) { - bTextEdit = TRUE; + bTextEdit = sal_True; } if(!bTextEdit @@ -253,24 +253,24 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) else { // Handle oder markiertes Objekt getroffen - bFirstMouseMove = TRUE; + bFirstMouseMove = sal_True; aDragTimer.Start(); } if ( ! rMEvt.IsRight()) mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); - bReturn = TRUE; + bReturn = sal_True; } else { if (!rMEvt.IsMod2() && mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO)) { mpView->BegMacroObj(aMDPos, nHitLog, pObj, pPV, mpWindow); - bReturn = TRUE; + bReturn = sal_True; } else if ( bTextEdit ) { - UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); + sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier(); if (aVEvt.pObj->GetObjInventor() == SdrInventor && (nSdrObjKind == OBJ_TEXT || @@ -295,7 +295,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->ReleaseMouse(); SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL()); SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); mpWindow->ReleaseMouse(); @@ -313,7 +313,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } - bReturn = TRUE; + bReturn = sal_True; } else if(!rMEvt.IsMod2() && mpViewShell->ISA(DrawViewShell) @@ -353,7 +353,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // New: double click on empty space/on obj on MasterPage, leave group mpView->LeaveOneGroup(); - bReturn = TRUE; + bReturn = sal_True; } } } @@ -372,8 +372,8 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - bReturn = TRUE; - BOOL bDeactivateOLE = FALSE; + bReturn = sal_True; + sal_Bool bDeactivateOLE = sal_False; if ( !rMEvt.IsShift() && !rMEvt.IsMod2() ) { @@ -384,13 +384,13 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if (pIPClient && pIPClient->IsObjectInPlaceActive()) { // OLE-Objekt wird im nachfolgenden UnmarkAll() deaktiviert - bDeactivateOLE = TRUE; + bDeactivateOLE = sal_True; } mpView->UnmarkAll(); } - BOOL bMarked = FALSE; + sal_Bool bMarked = sal_False; if ( !rMEvt.IsMod1() && !bDeactivateOLE) { @@ -400,15 +400,15 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - BOOL bToggle = FALSE; + sal_Bool bToggle = sal_False; if (rMEvt.IsShift() && mpView->GetMarkedObjectList().GetMarkCount() > 1) { // Bei Einfachselektion kein Toggle - bToggle = TRUE; + bToggle = sal_True; } - bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, FALSE); + bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, sal_False); } } @@ -537,7 +537,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) mpView->UnmarkAllObj(); } - BOOL bMarked = FALSE; + sal_Bool bMarked = sal_False; if (!rMEvt.IsMod1()) { @@ -547,7 +547,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), FALSE); + bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), sal_False); } } @@ -596,15 +596,15 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuSelection::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FuDraw::MouseMove(rMEvt); + sal_Bool bReturn = FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive()) { if(bFirstMouseMove) { - bFirstMouseMove = FALSE; + bFirstMouseMove = sal_False; } else { @@ -640,9 +640,9 @@ BOOL FuSelection::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; // When the right mouse button is pressed then only select objects // (and deselect others) as a preparation for showing the context // menu. @@ -651,24 +651,24 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) if (bHideAndAnimate) { // Animation laeuft noch -> sofort returnieren - bHideAndAnimate = FALSE; + bHideAndAnimate = sal_False; pHdl = NULL; mpWindow->ReleaseMouse(); - return(TRUE); + return(sal_True); } if (aDragTimer.IsActive() ) { aDragTimer.Stop(); - bIsInDragMode = FALSE; + bIsInDragMode = sal_False; } if( !mpView ) - return (FALSE); + return (sal_False); Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if (mpView->IsFrameDragSingles() || !mpView->HasMarkablePoints()) { @@ -681,11 +681,11 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) * Objekt wurde verschoben ******************************************************************/ FrameView* pFrameView = mpViewShell->GetFrameView(); - BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE); + bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); } mpView->SetDragWithCopy(bDragWithCopy); @@ -702,7 +702,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) * Toggle zw. Selektion und Rotation **************************************************************/ SdrObject* pSingleObj = NULL; - ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); if (nMarkCount==1) { @@ -717,7 +717,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) && ! bSelectionOnly) { - bTempRotation = TRUE; + bTempRotation = sal_True; nSlotId = SID_OBJECT_ROTATE; Activate(); } @@ -731,9 +731,9 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { if (!pHdl) { - bSuppressChangesOfSelection = TRUE; + bSuppressChangesOfSelection = sal_True; mpView->Start3DCreation(); - bSuppressChangesOfSelection = FALSE; + bSuppressChangesOfSelection = sal_False; } else if (pHdl->GetKind() != HDL_MIRX && pHdl->GetKind() != HDL_REF1 && @@ -746,15 +746,15 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) long nAngle1 = GetAngle(aPnt - mpView->GetRef1()); nAngle1 -= 27000; nAngle1 = NormAngle360(nAngle1); - BOOL bMirrorSide1 = BOOL (nAngle1 < 18000L); + sal_Bool bMirrorSide1 = sal_Bool (nAngle1 < 18000L); if (bMirrorSide0 != bMirrorSide1) { - bSuppressChangesOfSelection = TRUE; + bSuppressChangesOfSelection = sal_True; if(mpWindow) mpWindow->EnterWait(); mpView->End3DCreation(); - bSuppressChangesOfSelection = FALSE; + bSuppressChangesOfSelection = sal_False; nSlotId = SID_OBJECT_SELECT; if(mpWindow) mpWindow->LeaveWait(); @@ -805,7 +805,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoGeoObject(*pWaterCanCandidate)); mpView->AddUndo(pUndoAttr); - pWaterCanCandidate->SetStyleSheet (pStyleSheet, FALSE); + pWaterCanCandidate->SetStyleSheet (pStyleSheet, sal_False); // #108981# mpView->EndUndo(); @@ -818,7 +818,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) // one now. } - USHORT nClicks = rMEvt.GetClicks(); + sal_uInt16 nClicks = rMEvt.GetClicks(); if (nClicks == 2 && rMEvt.IsLeft() && bMBDown && !rMEvt.IsMod1() && !rMEvt.IsShift() ) @@ -826,13 +826,13 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) DoubleClick(rMEvt); } - bMBDown = FALSE; + bMBDown = sal_False; ForcePointer(&rMEvt); pHdl = NULL; mpWindow->ReleaseMouse(); SdrObject* pSingleObj = NULL; - ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount(); if (nMarkCount==1) { @@ -848,7 +848,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) (pSingleObj->GetObjInventor() != SdrInventor || pSingleObj->GetObjIdentifier() == OBJ_MEASURE) ) ) { - bReturn = TRUE; + bReturn = sal_True; ForcePointer(&rMEvt); pHdl = NULL; mpWindow->ReleaseMouse(); @@ -873,11 +873,11 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) else if ( mpView->IsDragObj() ) { FrameView* pFrameView = mpViewShell->GetFrameView(); - BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE); + bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); } mpView->SetDragWithCopy(bDragWithCopy); @@ -887,7 +887,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { mpView->EndAction(); - USHORT nDrgLog2 = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog2 = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); if (Abs(aMDPos.X() - aPos.X()) < nDrgLog2 && @@ -910,7 +910,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) Abs(aPnt.Y() - aMDPos.Y()) < nDrgLog) { // Gruppe betreten - mpView->MarkObj(aPnt, nHitLog, FALSE, rMEvt.IsMod1()); + mpView->MarkObj(aPnt, nHitLog, sal_False, rMEvt.IsMod1()); } @@ -928,14 +928,14 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuSelection::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; switch (rKEvt.GetKeyCode().GetCode()) { @@ -982,7 +982,7 @@ void FuSelection::Activate() // (gemapter) Slot wird explizit auf Rotate gesetzt #31052# if( mpViewShell->ISA(DrawViewShell) ) { - USHORT* pSlotArray = + sal_uInt16* pSlotArray = static_cast<DrawViewShell*>(mpViewShell)->GetSlotArray(); pSlotArray[ 1 ] = SID_OBJECT_ROTATE; } @@ -1078,7 +1078,7 @@ void FuSelection::Activate() case SID_CONVERT_TO_3D_LATHE: { eMode = SDRDRAG_MIRROR; - bSuppressChangesOfSelection = TRUE; + bSuppressChangesOfSelection = sal_True; if ( mpView->GetDragMode() != eMode ) mpView->SetDragMode(eMode); @@ -1086,7 +1086,7 @@ void FuSelection::Activate() if (!mpView->Is3DRotationCreationActive()) mpView->Start3DCreation(); - bSuppressChangesOfSelection = FALSE; + bSuppressChangesOfSelection = sal_False; } break; @@ -1102,7 +1102,7 @@ void FuSelection::Activate() if (nSlotId != SID_OBJECT_ROTATE) { - bTempRotation = FALSE; + bTempRotation = sal_False; } FuDraw::Activate(); @@ -1130,7 +1130,7 @@ void FuSelection::Deactivate() void FuSelection::SelectionHasChanged() { - bSelectionChanged = TRUE; + bSelectionChanged = sal_True; FuDraw::SelectionHasChanged(); @@ -1153,17 +1153,17 @@ void FuSelection::SelectionHasChanged() |* \************************************************************************/ -void FuSelection::SetEditMode(USHORT nMode) +void FuSelection::SetEditMode(sal_uInt16 nMode) { nEditMode = nMode; if (nEditMode == SID_BEZIER_INSERT) { - mpView->SetInsObjPointMode(TRUE); + mpView->SetInsObjPointMode(sal_True); } else { - mpView->SetInsObjPointMode(FALSE); + mpView->SetInsObjPointMode(sal_False); } ForcePointer(); @@ -1179,11 +1179,11 @@ void FuSelection::SetEditMode(USHORT nMode) |* \************************************************************************/ -BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) +sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { - BOOL bAnimated = FALSE; - BOOL bClosed = pObj->IsClosedObj(); - BOOL bFilled = FALSE; + sal_Bool bAnimated = sal_False; + sal_Bool bClosed = pObj->IsClosedObj(); + sal_Bool bFilled = sal_False; if (bClosed) { @@ -1196,7 +1196,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) } const SetOfByte* pVisiLayer = &mpView->GetSdrPageView()->GetVisibleLayers(); - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); const long n2HitLog = nHitLog * 2; Point aHitPosR(rPos); Point aHitPosL(rPos); @@ -1227,13 +1227,13 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); mpWindow->ReleaseMouse(); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } } else if (!mpDocSh->ISA(GraphicDocShell) && @@ -1255,7 +1255,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxStringItem aItem(SID_NAVIGATOR_OBJECT, pInfo->GetBookmark()); mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1269,13 +1269,13 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxStringItem aStrItem(SID_FILE_NAME, sBookmark); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1286,7 +1286,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1297,7 +1297,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1308,7 +1308,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1319,7 +1319,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1334,7 +1334,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { (void)e; } - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1342,9 +1342,9 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { // Verb zuweisen mpView->UnmarkAll(); - mpView->MarkObj(pObj, mpView->GetSdrPageView(), FALSE, FALSE); + mpView->MarkObj(pObj, mpView->GetSdrPageView(), sal_False, sal_False); pDrViewSh->DoVerb((sal_Int16)pInfo->mnVerb); - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1358,7 +1358,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) if( INET_PROT_FILE == aURL.GetProtocol() ) { SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - SfxBoolItem aBrowsing( SID_BROWSE, TRUE ); + SfxBoolItem aBrowsing( SID_BROWSE, sal_True ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) @@ -1369,7 +1369,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) 0L ); } - bAnimated = TRUE; + bAnimated = sal_True; } break; @@ -1390,17 +1390,17 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) *pInArgs, aRet, aOutArgsIndex, aOutArgs); // Check the return value from the script - BOOL bTmp = sal_False; + sal_Bool bTmp = sal_False; if ( eErr == ERRCODE_NONE && aRet.getValueType() == getCppuBooleanType() && sal_True == ( aRet >>= bTmp ) && - bTmp == TRUE ) + bTmp == sal_True ) { - bAnimated = TRUE; + bAnimated = sal_True; } else { - bAnimated = FALSE; + bAnimated = sal_False; } } else @@ -1429,7 +1429,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) default: { - bAnimated = FALSE; + bAnimated = sal_False; } break; } @@ -1453,7 +1453,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) break; default: - bAnimated = FALSE; + bAnimated = sal_False; break; } } @@ -1491,7 +1491,7 @@ SdrObject* FuSelection::pickObject (const Point& rTestPoint) { SdrObject* pObject = NULL; SdrPageView* pPageView; - USHORT nHitLog = USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()); + sal_uInt16 nHitLog = sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width()); mpView->PickObj (rTestPoint, nHitLog, pObject, pPageView, SDRSEARCH_PICKMARKABLE); return pObject; } diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 76af1555c861..d0a9f83eef49 100644..100755 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -91,7 +91,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) for( nPage = mpDoc->GetSdPageCount( PK_STANDARD ) - 1L; nPage >= 0L; nPage-- ) { - pPage = mpDoc->GetSdPage( (USHORT) nPage, PK_STANDARD ); + pPage = mpDoc->GetSdPage( (sal_uInt16) nPage, PK_STANDARD ); String* pStr = new String( pPage->GetName() ); if ( !pStr->Len() ) @@ -100,7 +100,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) (*pStr).Append( UniString::CreateFromInt32( nPage + 1 ) ); } - aPageNameList.Insert( pStr, (ULONG) 0 ); + aPageNameList.Insert( pStr, (sal_uLong) 0 ); // ist dies unsere (vorhandene) erste Seite? if ( rPresPage == *pStr ) @@ -110,7 +110,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) } List* pCustomShowList = mpDoc->GetCustomShowList(); // No Create - BOOL bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage(); + sal_Bool bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage(); /* #109180# change in behaviour, even when always start with current page is enabled, range settings are still used if( bStartWithActualPage ) @@ -148,7 +148,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) rtl::OUString aPage; long nValue32; sal_Bool bValue; - bool bValuesChanged = FALSE; + bool bValuesChanged = sal_False; pDlg->GetAttr( aDlgSet ); @@ -254,7 +254,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) // wenn sich etwas geaendert hat, setzen wir das Modified-Flag, if ( bValuesChanged ) - mpDoc->SetChanged( TRUE ); + mpDoc->SetChanged( sal_True ); } delete pDlg; // Strings aus Liste loeschen diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index fad1cb324fd2..fb444635b7c9 100755 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -76,14 +76,14 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); SdrPageView* pPV = 0; - USHORT nHelpLine = 0; - BOOL bCreateNew = TRUE; + sal_uInt16 nHelpLine = 0; + sal_Bool bCreateNew = sal_True; // Get index of snap line or snap point from the request. - SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, FALSE); + SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, sal_False); if (pHelpLineIndex != NULL) { - nHelpLine = static_cast<USHORT>(pHelpLineIndex->GetValue()); + nHelpLine = static_cast<sal_uInt16>(pHelpLineIndex->GetValue()); // Reset the argument pointer to trigger the display of the dialog. pArgs = NULL; } @@ -101,13 +101,13 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) // request. Determine it from the mouse position. aLinePos = static_cast<DrawViewShell*>(mpViewShell)->GetMousePos(); - static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( FALSE ); + static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( sal_False ); if ( aLinePos.X() >= 0 ) { aLinePos = mpWindow->PixelToLogic(aLinePos); - USHORT nHitLog = (USHORT) mpWindow->PixelToLogic(Size(HITPIX,0)).Width(); + sal_uInt16 nHitLog = (sal_uInt16) mpWindow->PixelToLogic(Size(HITPIX,0)).Width(); bLineExist = mpView->PickHelpLine(aLinePos, nHitLog, *mpWindow, nHelpLine, pPV); if ( bLineExist ) aLinePos = (pPV->GetHelpLines())[nHelpLine].GetPos(); @@ -142,23 +142,23 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) if ( rHelpLine.GetKind() == SDRHELPLINE_POINT ) { pDlg->SetText(String(SdResId(STR_SNAPDLG_SETPOINT))); - pDlg->SetInputFields(TRUE, TRUE); + pDlg->SetInputFields(sal_True, sal_True); } else { pDlg->SetText(String(SdResId(STR_SNAPDLG_SETLINE))); if ( rHelpLine.GetKind() == SDRHELPLINE_VERTICAL ) - pDlg->SetInputFields(TRUE, FALSE); + pDlg->SetInputFields(sal_True, sal_False); else - pDlg->SetInputFields(FALSE, TRUE); + pDlg->SetInputFields(sal_False, sal_True); } - bCreateNew = FALSE; + bCreateNew = sal_False; } else pDlg->HideDeleteBtn(); - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); pDlg->GetAttr(aNewAttr); delete pDlg; diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 3ed152d1f862..29711d74ede0 100644..100755 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -80,10 +80,10 @@ void FuSummaryPage::DoExecute( SfxRequest& ) { ::sd::Outliner* pOutl = NULL; SdPage* pSummaryPage = NULL; - USHORT i = 0; - USHORT nFirstPage = SDRPAGE_NOTFOUND; - USHORT nSelectedPages = 0; - USHORT nCount = mpDoc->GetSdPageCount(PK_STANDARD); + sal_uInt16 i = 0; + sal_uInt16 nFirstPage = SDRPAGE_NOTFOUND; + sal_uInt16 nSelectedPages = 0; + sal_uInt16 nCount = mpDoc->GetSdPageCount(PK_STANDARD); while (i < nCount && nSelectedPages <= 1) { @@ -138,7 +138,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); // Seite mit Titel & Gliederung! - pSummaryPage = (SdPage*) mpDoc->AllocPage(FALSE); + pSummaryPage = (SdPage*) mpDoc->AllocPage(sal_False); pSummaryPage->SetSize(pActualPage->GetSize() ); pSummaryPage->SetBorder(pActualPage->GetLftBorder(), pActualPage->GetUppBorder(), @@ -153,12 +153,12 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // MasterPage der aktuellen Seite verwenden pSummaryPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage()); pSummaryPage->SetLayoutName(pActualPage->GetLayoutName()); - pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, TRUE); + pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); pSummaryPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); pSummaryPage->setHeaderFooterSettings(pActualPage->getHeaderFooterSettings()); // Notiz-Seite - SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(FALSE); + SdPage* pNotesPage = (SdPage*) mpDoc->AllocPage(sal_False); pNotesPage->SetSize(pActualNotesPage->GetSize()); pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(), pActualNotesPage->GetUppBorder(), @@ -175,13 +175,13 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // MasterPage der aktuellen Seite verwenden pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage()); pNotesPage->SetLayoutName(pActualNotesPage->GetLayoutName()); - pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), TRUE); + pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), sal_True); pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); pNotesPage->setHeaderFooterSettings(pActualNotesPage->getHeaderFooterSettings()); pOutl = new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT ); - pOutl->SetUpdateMode(FALSE); - pOutl->EnableUndo(FALSE); + pOutl->SetUpdateMode(sal_False); + pOutl->EnableUndo(sal_False); if (mpDocSh) pOutl->SetRefDevice(SD_MOD()->GetRefDevice( *mpDocSh )); @@ -208,9 +208,9 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // Harte Absatz- und Zeichenattribute entfernen SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), EE_ITEMS_START, EE_ITEMS_END); - ULONG nParaCount = pOutl->GetParagraphCount(); + sal_uLong nParaCount = pOutl->GetParagraphCount(); - for (USHORT nPara = 0; nPara < nParaCount; nPara++) + for (sal_uInt16 nPara = 0; nPara < nParaCount; nPara++) { pOutl->SetStyleSheet( nPara, pStyle ); pOutl->QuickRemoveCharAttribs(nPara); @@ -219,9 +219,9 @@ void FuSummaryPage::DoExecute( SfxRequest& ) } pTextObj->SetOutlinerParaObject( pOutl->CreateParaObject() ); - pTextObj->SetEmptyPresObj(FALSE); + pTextObj->SetEmptyPresObj(sal_False); - // Harte Attribute entfernen (Flag auf TRUE) + // Harte Attribute entfernen (Flag auf sal_True) SfxItemSet aAttr(mpDoc->GetPool()); aAttr.Put(XLineStyleItem(XLINE_NONE)); aAttr.Put(XFillStyleItem(XFILL_NONE)); diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 437d4bc246a6..d7a251cee531 100755 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -116,22 +116,22 @@ FunctionReference FuTemplate::Create( ViewShell* pViewSh, ::sd::Window* pWin, :: void FuTemplate::DoExecute( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); - USHORT nSId = rReq.GetSlot(); + sal_uInt16 nSId = rReq.GetSlot(); // StyleSheet-Parameter holen SfxStyleSheetBasePool* pSSPool = mpDoc->GetDocSh()->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSheet = NULL; const SfxPoolItem* pItem; - USHORT nFamily = USHRT_MAX; + sal_uInt16 nFamily = USHRT_MAX; if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, - FALSE, &pItem )) + sal_False, &pItem )) { nFamily = ( (const SfxUInt16Item &) pArgs->Get( SID_STYLE_FAMILY ) ).GetValue(); } else if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME, - FALSE, &pItem )) + sal_False, &pItem )) { String sFamily = ( (const SfxStringItem &) pArgs->Get( SID_STYLE_FAMILYNAME ) ).GetValue(); if (sFamily.CompareToAscii("graphics") == COMPARE_EQUAL) @@ -141,7 +141,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) } String aStyleName; - USHORT nRetMask = 0xffff; + sal_uInt16 nRetMask = 0xffff; switch( nSId ) { @@ -205,7 +205,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) { // Z.Z. geht immer noch der Dialog auf, um den Namen // der Vorlage einzugeben. - if( mpView->AreObjectsMarked() || TRUE ) + if( mpView->AreObjectsMarked() || sal_True ) { SfxStyleSheetBase *p = pSSPool->Find(aStyleName, (SfxStyleFamily) nFamily, SFXSTYLEBIT_ALL ); if(p) @@ -228,12 +228,12 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( pStyleSheet ) { pSSPool->Remove( pStyleSheet ); - nRetMask = TRUE; - mpDoc->SetChanged(TRUE); + nRetMask = sal_True; + mpDoc->SetChanged(sal_True); } else { - nRetMask = FALSE; + nRetMask = sal_False; } break; @@ -260,7 +260,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) ) { mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet); - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } } @@ -276,7 +276,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( pArgs->GetItemState( nSId ) == SFX_ITEM_SET ) { aStyleName = ( ( (const SfxStringItem &) pArgs->Get( nSId ) ).GetValue() ); - SD_MOD()->SetWaterCan( TRUE ); + SD_MOD()->SetWaterCan( sal_True ); pStyleSheet = pSSPool->Find( aStyleName, (SfxStyleFamily) nFamily); } // keine Praesentationsobjektvorlagen, die werden nur @@ -291,11 +291,11 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) } else - SD_MOD()->SetWaterCan( FALSE ); + SD_MOD()->SetWaterCan( sal_False ); } else { - SD_MOD()->SetWaterCan( FALSE ); + SD_MOD()->SetWaterCan( sal_False ); // Werkzeugleiste muss wieder enabled werden mpViewShell->Invalidate(); } @@ -318,7 +318,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) SfxAbstractTabDialog* pStdDlg = NULL; SfxAbstractTabDialog* pPresDlg = NULL; SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - BOOL bOldDocInOtherLanguage = FALSE; + sal_Bool bOldDocInOtherLanguage = sal_False; SfxItemSet aOriSet( pStyleSheet->GetItemSet() ); SfxStyleFamily eFamily = pStyleSheet->GetFamily(); @@ -330,7 +330,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) else if (eFamily == SD_STYLE_FAMILY_PSEUDO) { String aName(pStyleSheet->GetName()); - USHORT nDlgId = 0; + sal_uInt16 nDlgId = 0; if (aName == String(SdResId(STR_PSEUDOSHEET_TITLE))) { @@ -369,7 +369,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) // die Nummer ermitteln; ein Leerzeichen zwischen // Name und Nummer beachten String aNumStr(aName.Copy(aOutlineStr.Len() + 1)); - USHORT nLevel = (USHORT)aNumStr.ToInt32(); + sal_uInt16 nLevel = (sal_uInt16)aNumStr.ToInt32(); switch (nLevel) { case 1: ePO = PO_OUTLINE_1; break; @@ -386,7 +386,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) else { DBG_ERROR("Vorlage aus aelterer anderssprachiger Version"); - bOldDocInOtherLanguage = TRUE; + bOldDocInOtherLanguage = sal_True; } if( !bOldDocInOtherLanguage ) @@ -398,7 +398,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) { } - USHORT nResult = RET_CANCEL; + sal_uInt16 nResult = RET_CANCEL; const SfxItemSet* pOutSet = NULL; if (pStdDlg) { @@ -459,7 +459,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( (ePO >= PO_OUTLINE_1) && (ePO <= PO_OUTLINE_8) ) { - for( USHORT n = (USHORT)(ePO - PO_OUTLINE_1 + 2); n < 10; n++ ) + for( sal_uInt16 n = (sal_uInt16)(ePO - PO_OUTLINE_1 + 2); n < 10; n++ ) { String aName( sStyleName ); aName.Append( String::CreateFromInt32( (sal_Int32) n )); @@ -623,16 +623,16 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if( mpDoc->GetOnlineSpell() ) { const SfxPoolItem* pTempItem; - if( SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE, FALSE, &pTempItem ) || - SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CJK, FALSE, &pTempItem ) || - SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CTL, FALSE, &pTempItem ) ) + if( SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE, sal_False, &pTempItem ) || + SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CJK, sal_False, &pTempItem ) || + SFX_ITEM_SET == rAttr.GetItemState(EE_CHAR_LANGUAGE_CTL, sal_False, &pTempItem ) ) { mpDoc->StopOnlineSpelling(); mpDoc->StartOnlineSpelling(); } } - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); } break; @@ -657,7 +657,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) { nRetMask = pStyleSheet->GetMask(); SfxItemSet aCoreSet( mpDoc->GetPool() ); - mpView->GetAttributes( aCoreSet, TRUE ); + mpView->GetAttributes( aCoreSet, sal_True ); // wenn das Objekt eine Vorlage hatte, wird diese Parent // der neuen Vorlage @@ -683,7 +683,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) } ( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } @@ -710,7 +710,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet); ( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); - mpDoc->SetChanged(TRUE); + mpDoc->SetChanged(sal_True); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } } diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 2f3111665692..17256e42c5f1 100755 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -88,7 +88,7 @@ using namespace ::com::sun::star::linguistic2; namespace sd { -static USHORT SidArray[] = { +static sal_uInt16 SidArray[] = { SID_STYLE_FAMILY2, // 5542 SID_STYLE_FAMILY5, // 5545 SID_CUT, // 5710 @@ -129,7 +129,7 @@ static USHORT SidArray[] = { TYPEINIT1( FuText, FuConstruct ); -static BOOL bTestText = 0; +static sal_Bool bTestText = 0; /************************************************************************* |* @@ -139,7 +139,7 @@ static BOOL bTestText = 0; FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) -, bFirstObjCreated(FALSE) +, bFirstObjCreated(sal_False) , rRequest (rReq) { } @@ -160,7 +160,7 @@ void FuText::disposing() { if(mpView) { - if(mpView->SdrEndTextEdit(FALSE) == SDRENDTEXTEDIT_DELETED) + if(mpView->SdrEndTextEdit(sal_False) == SDRENDTEXTEDIT_DELETED) mxTextObj.reset( 0 ); // die RequestHandler der benutzten Outliner zuruecksetzen auf den @@ -233,7 +233,7 @@ void FuText::DoExecute( SfxRequest& ) } } - BOOL bQuickDrag = TRUE; + sal_Bool bQuickDrag = sal_True; const SfxItemSet* pArgs = rRequest.GetArgs(); @@ -243,10 +243,10 @@ void FuText::DoExecute( SfxRequest& ) && SID_TEXTEDIT == nSlotId && SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT) - && (UINT16)((SfxUInt16Item&)pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) + && (sal_uInt16)((SfxUInt16Item&)pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) { // Selection by doubleclick -> don't allow QuickDrag - bQuickDrag = FALSE; + bQuickDrag = sal_False; } SetInEditMode(aMEvt, bQuickDrag); @@ -258,22 +258,22 @@ void FuText::DoExecute( SfxRequest& ) |* \************************************************************************/ -BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) { - bMBDown = TRUE; + bMBDown = sal_True; - BOOL bReturn = FuDraw::MouseButtonDown(rMEvt); + sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); /* af: (de)Select object before showing the context menu. // Fuer PopupMenu (vorher DrawViewShell) if ((rMEvt.GetButtons() == MOUSE_RIGHT) && rMEvt.GetClicks() == 1 && mpView->IsTextEdit()) { - return (TRUE); + return (sal_True); } */ - mpView->SetMarkHdlWhenTextEdit(TRUE); + mpView->SetMarkHdlWhenTextEdit(sal_True); SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); @@ -281,7 +281,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) { // Text getroffen -> Event von SdrView auswerten lassen if (mpView->MouseButtonDown(rMEvt, mpWindow)) - return (TRUE); + return (sal_True); } if (rMEvt.GetClicks() == 1) @@ -315,16 +315,16 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) if (eHit == SDRHIT_TEXTEDIT) { - SetInEditMode(rMEvt, FALSE); + SetInEditMode(rMEvt, sal_False); } else { - BOOL bMacro = FALSE; + sal_Bool bMacro = sal_False; if (bMacro && mpView->PickObj(aMDPos,mpView->getHitTolLog(),pObj,pPV,SDRSEARCH_PICKMACRO)) { // Makro - USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); + sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); mpView->BegMacroObj(aMDPos,nHitLog,pObj,pPV,mpWindow); } else @@ -362,7 +362,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) mxTextObj.reset( static_cast<SdrTextObj*>(aVEvt.pObj) ); } - SetInEditMode(rMEvt, TRUE); + SetInEditMode(rMEvt, sal_True); } else if (aVEvt.eEvent == SDREVENT_EXECUTEURL && !rMEvt.IsMod2()) { @@ -372,7 +372,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->ReleaseMouse(); SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL()); SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName()); - SfxBoolItem aBrowseItem( SID_BROWSE, TRUE ); + SfxBoolItem aBrowseItem( SID_BROWSE, sal_True ); SfxViewFrame* pFrame = mpViewShell->GetViewFrame(); mpWindow->ReleaseMouse(); @@ -434,7 +434,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) } // Objekt draggen - bFirstMouseMove = TRUE; + bFirstMouseMove = sal_True; aDragTimer.Start(); } @@ -445,7 +445,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); if( (eHit == SDRHIT_HANDLE) || (eHit == SDRHIT_MARKEDOBJECT) ) { - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, aVEvt.pHdl, nDrgLog); } } @@ -460,7 +460,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) **********************************************************/ mpView->SetCurrentObj(OBJ_TEXT); mpView->SetEditMode(SDREDITMODE_CREATE); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aMDPos, (OutputDevice*) NULL, nDrgLog); } else @@ -480,7 +480,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) else if ( rMEvt.GetClicks() == 2 && !mpView->IsTextEdit() ) { MouseEvent aMEvt( mpWindow->GetPointerPosPixel() ); - SetInEditMode( aMEvt, FALSE ); + SetInEditMode( aMEvt, sal_False ); } if (!bIsInDragMode) @@ -498,14 +498,14 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuText::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuText::MouseMove(const MouseEvent& rMEvt) { - BOOL bReturn = FuDraw::MouseMove(rMEvt); + sal_Bool bReturn = FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive() ) { if( bFirstMouseMove ) - bFirstMouseMove = FALSE; + bFirstMouseMove = sal_False; else aDragTimer.Stop(); } @@ -542,8 +542,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) // Hoehe bekommt (sonst wird zuviel gepainted) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameHeightItem(0)); - aSet.Put(SdrTextAutoGrowWidthItem(FALSE)); - aSet.Put(SdrTextAutoGrowHeightItem(TRUE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_False)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_True)); pTxtObj->SetMergedItemSet(aSet); pTxtObj->AdjustTextFrameWidthAndHeight(); aSet.Put(SdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height())); @@ -553,8 +553,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) { SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameWidthItem(0)); - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); // #91853# Needs to be set since default is SDRTEXTHORZADJUST_BLOCK aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); @@ -572,8 +572,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool()); // #91510# - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); // #91508# //aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP)); @@ -599,8 +599,8 @@ void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool(), SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH); SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL; aSet.Put(SdrTextFitToSizeTypeItem(eFTS)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); - aSet.Put(SdrTextAutoGrowWidthItem(FALSE)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_False)); pTxtObj->SetMergedItemSet(aSet); pTxtObj->AdjustTextFrameWidthAndHeight(); } @@ -612,8 +612,8 @@ void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj) SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH); SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL; aSet.Put(SdrTextFitToSizeTypeItem(eFTS)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); - aSet.Put(SdrTextAutoGrowWidthItem(FALSE)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_False)); pTxtObj->SetMergedItemSet(aSet); pTxtObj->AdjustTextFrameWidthAndHeight(); } @@ -630,8 +630,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameHeightItem(0)); aSet.Put(SdrTextMaxFrameHeightItem(0)); - aSet.Put(SdrTextAutoGrowHeightItem(TRUE)); - aSet.Put(SdrTextAutoGrowWidthItem(FALSE)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_True)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_False)); pTxtObj->SetMergedItemSet(aSet); } else if( nSlotId == SID_ATTR_CHAR_VERTICAL ) @@ -639,8 +639,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameWidthItem(0)); aSet.Put(SdrTextMaxFrameWidthItem(0)); - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); - aSet.Put(SdrTextAutoGrowHeightItem(FALSE)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_False)); pTxtObj->SetMergedItemSet(aSet); } @@ -648,14 +648,14 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) } } -BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; if (aDragTimer.IsActive()) { aDragTimer.Stop(); - bIsInDragMode = FALSE; + bIsInDragMode = sal_False; } mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); @@ -663,9 +663,9 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); if( (mpView && mpView->MouseButtonUp(rMEvt, mpWindow)) || rMEvt.GetClicks() == 2 ) - return (TRUE); // Event von der SdrView ausgewertet + return (sal_True); // Event von der SdrView ausgewertet - BOOL bEmptyTextObj = FALSE; + sal_Bool bEmptyTextObj = sal_False; if (mxTextObj.is()) { @@ -675,9 +675,9 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) && ( rMarkList.GetMark(0)->GetMarkedSdrObj() == mxTextObj.get()) ) { if( mxTextObj.is() && !GetTextObj()->GetOutlinerParaObject() ) - bEmptyTextObj = TRUE; + bEmptyTextObj = sal_True; else - bFirstObjCreated = TRUE; + bFirstObjCreated = sal_True; } else { @@ -691,11 +691,11 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) * Objekt wurde verschoben **********************************************************************/ FrameView* pFrameView = mpViewShell->GetFrameView(); - BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE); + bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); } mpView->SetDragWithCopy(bDragWithCopy); @@ -717,7 +717,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) // vertical when there was a vertical one used last time. OutlinerParaObject* pOPO = GetTextObj()->GetOutlinerParaObject(); SdrOutliner& rOutl = mxTextObj->GetModel()->GetDrawOutliner(GetTextObj()); - BOOL bVertical((pOPO && pOPO->IsVertical()) + sal_Bool bVertical((pOPO && pOPO->IsVertical()) || nSlotId == SID_ATTR_CHAR_VERTICAL || nSlotId == SID_TEXT_FITTOSIZE_VERTICAL); rOutl.SetVertical(bVertical); @@ -755,14 +755,14 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) // #97016# ImpSetAttributesFitToSize(GetTextObj()); - SetInEditMode(rMEvt, FALSE); + SetInEditMode(rMEvt, sal_False); } else if ( nSlotId == SID_TEXT_FITTOSIZE_VERTICAL ) { // #97016# ImpSetAttributesFitToSizeVertical(GetTextObj()); - SetInEditMode(rMEvt, FALSE); + SetInEditMode(rMEvt, sal_False); } else { @@ -772,7 +772,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) // Damit die Handles und der graue Rahmen stimmen mpView->AdjustMarkHdl(); mpView->PickHandle(aPnt); - SetInEditMode(rMEvt, FALSE); + SetInEditMode(rMEvt, sal_False); } } else if ( mpView && mpView->IsAction()) @@ -782,7 +782,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) ForcePointer(&rMEvt); mpWindow->ReleaseMouse(); - USHORT nDrgLog1 = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog1 = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); if ( mpView && !mpView->AreObjectsMarked() && Abs(aMDPos.X() - aPnt.X()) < nDrgLog1 && @@ -807,13 +807,13 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) **********************************************************************/ mpView->SetCurrentObj(OBJ_TEXT); mpView->SetEditMode(SDREDITMODE_CREATE); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aMDPos, (OutputDevice*) NULL, nDrgLog); - BOOL bSnapEnabled = mpView->IsSnapEnabled(); + sal_Bool bSnapEnabled = mpView->IsSnapEnabled(); if (bSnapEnabled) - mpView->SetSnapEnabled(FALSE); + mpView->SetSnapEnabled(sal_False); aPnt.X() += nDrgLog + nDrgLog; aPnt.Y() += nDrgLog + nDrgLog; @@ -823,7 +823,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) if(mxTextObj.is()) { - GetTextObj()->SetDisableAutoWidthOnDragging(TRUE); + GetTextObj()->SetDisableAutoWidthOnDragging(sal_True); } if(!mpView->EndCreateObj(SDRCREATE_FORCEEND)) @@ -839,8 +839,8 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) SfxItemSet aSet(mpViewShell->GetPool()); aSet.Put(SdrTextMinFrameHeightItem(0)); aSet.Put(SdrTextMinFrameWidthItem(0)); - aSet.Put(SdrTextAutoGrowHeightItem(TRUE)); - aSet.Put(SdrTextAutoGrowWidthItem(TRUE)); + aSet.Put(SdrTextAutoGrowHeightItem(sal_True)); + aSet.Put(SdrTextAutoGrowWidthItem(sal_True)); // #91508# if(nSlotId == SID_ATTR_CHAR_VERTICAL) @@ -918,11 +918,11 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) } GetTextObj()->SetMergedItemSet(aSet); - GetTextObj()->SetDisableAutoWidthOnDragging(TRUE); - SetInEditMode(rMEvt, FALSE); + GetTextObj()->SetDisableAutoWidthOnDragging(sal_True); + SetInEditMode(rMEvt, sal_False); } - bFirstObjCreated = TRUE; + bFirstObjCreated = sal_True; } else { @@ -937,7 +937,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) } } - bMBDown = FALSE; + bMBDown = sal_False; FuConstruct::MouseButtonUp(rMEvt); return (bReturn); } @@ -946,18 +946,18 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuText::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuText::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FALSE; - mpView->SetMarkHdlWhenTextEdit(TRUE); + sal_Bool bReturn = sal_False; + mpView->SetMarkHdlWhenTextEdit(sal_True); KeyCode nCode = rKEvt.GetKeyCode(); - BOOL bShift = nCode.IsShift(); + sal_Bool bShift = nCode.IsShift(); // #97016# IV if(mxTextObj.is()) @@ -981,14 +981,14 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt) if ( mxTextObj.is() && mxTextObj->GetObjInventor() == SdrInventor && mxTextObj->GetObjIdentifier() == OBJ_TITLETEXT && rKEvt.GetKeyCode().GetCode() == KEY_RETURN ) { // Titeltext-Objekt: immer "weiche" Umbrueche - bShift = TRUE; + bShift = sal_True; } - USHORT nKey = nCode.GetCode(); + sal_uInt16 nKey = nCode.GetCode(); KeyCode aKeyCode (nKey, bShift, nCode.IsMod1(), nCode.IsMod2(), nCode.IsMod3() ); KeyEvent aKEvt(rKEvt.GetCharCode(), aKeyCode); - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; if (mpDocSh->IsReadOnly()) { @@ -996,17 +996,17 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt) } if( aKeyCode.GetCode() == KEY_PAGEUP || aKeyCode.GetCode() == KEY_PAGEDOWN ) { - bOK = FALSE; // default handling in base class + bOK = sal_False; // default handling in base class } if (bOK && mpView->KeyInput(aKEvt, mpWindow) ) { - bReturn = TRUE; + bReturn = sal_True; mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); // if ( pTextObj ) -// pTextObj->SetEmptyPresObj(FALSE); +// pTextObj->SetEmptyPresObj(sal_False); } else if (aKeyCode == KEY_ESCAPE) { @@ -1080,7 +1080,7 @@ void FuText::Deactivate() |* \************************************************************************/ -void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) +void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) { SdrPageView* pPV = mpView->GetSdrPageView(); if( mxTextObj.is() && (mxTextObj->GetPage() == pPV->GetPage()) ) @@ -1092,12 +1092,12 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) else mpView->SetEditMode(SDREDITMODE_EDIT); - BOOL bEmptyOutliner = FALSE; + sal_Bool bEmptyOutliner = sal_False; if (!GetTextObj()->GetOutlinerParaObject() && mpView->GetTextEditOutliner()) { ::Outliner* pOutl = mpView->GetTextEditOutliner(); - ULONG nParaAnz = pOutl->GetParagraphCount(); + sal_uLong nParaAnz = pOutl->GetParagraphCount(); Paragraph* p1stPara = pOutl->GetParagraph( 0 ); if (nParaAnz==1 && p1stPara) @@ -1105,15 +1105,15 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) // Bei nur einem Pararaph if (pOutl->GetText(p1stPara).Len() == 0) { - bEmptyOutliner = TRUE; + bEmptyOutliner = sal_True; } } } if (GetTextObj() != mpView->GetTextEditObject() || bEmptyOutliner) { - UINT32 nInv = mxTextObj->GetObjInventor(); - UINT16 nSdrObjKind = mxTextObj->GetObjIdentifier(); + sal_uInt32 nInv = mxTextObj->GetObjInventor(); + sal_uInt16 nSdrObjKind = mxTextObj->GetObjIdentifier(); if (nInv == SdrInventor && GetTextObj()->HasTextEdit() && (nSdrObjKind == OBJ_TEXT || @@ -1131,7 +1131,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) { OutlinerParaObject* pOPO = pTextObj->GetOutlinerParaObject(); if( ( pOPO && pOPO->IsVertical() ) || (nSlotId == SID_ATTR_CHAR_VERTICAL) || (nSlotId == SID_TEXT_FITTOSIZE_VERTICAL) ) - pOutl->SetVertical( TRUE ); + pOutl->SetVertical( sal_True ); if( pTextObj->getTextCount() > 1 ) { @@ -1142,7 +1142,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) if (mpView->SdrBeginTextEdit(pTextObj, pPV, mpWindow, sal_True, pOutl) && mxTextObj->GetObjInventor() == SdrInventor) { - bFirstObjCreated = TRUE; + bFirstObjCreated = sal_True; DeleteDefaultText(); OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); @@ -1199,9 +1199,9 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag) |* \************************************************************************/ -BOOL FuText::DeleteDefaultText() +sal_Bool FuText::DeleteDefaultText() { - BOOL bDeleted = FALSE; + sal_Bool bDeleted = sal_False; if ( mxTextObj.is() && mxTextObj->IsEmptyPresObj() ) { @@ -1220,21 +1220,21 @@ BOOL FuText::DeleteDefaultText() { ::Outliner* pOutliner = mpView->GetTextEditOutliner(); SfxStyleSheet* pSheet = pOutliner->GetStyleSheet( 0 ); - BOOL bIsUndoEnabled = pOutliner->IsUndoEnabled(); + sal_Bool bIsUndoEnabled = pOutliner->IsUndoEnabled(); if( bIsUndoEnabled ) - pOutliner->EnableUndo(FALSE); + pOutliner->EnableUndo(sal_False); pOutliner->SetText( String(), pOutliner->GetParagraph( 0 ) ); if( bIsUndoEnabled ) - pOutliner->EnableUndo(TRUE); + pOutliner->EnableUndo(sal_True); if (pSheet && (ePresObjKind == PRESOBJ_NOTES || ePresObjKind == PRESOBJ_TEXT)) pOutliner->SetStyleSheet(0, pSheet); - mxTextObj->SetEmptyPresObj(TRUE); - bDeleted = TRUE; + mxTextObj->SetEmptyPresObj(sal_True); + bDeleted = sal_True; } } } @@ -1248,7 +1248,7 @@ BOOL FuText::DeleteDefaultText() |* \************************************************************************/ -BOOL FuText::Command(const CommandEvent& rCEvt) +sal_Bool FuText::Command(const CommandEvent& rCEvt) { return( FuPoor::Command(rCEvt) ); } @@ -1259,9 +1259,9 @@ BOOL FuText::Command(const CommandEvent& rCEvt) |* \************************************************************************/ -BOOL FuText::RequestHelp(const HelpEvent& rHEvt) +sal_Bool FuText::RequestHelp(const HelpEvent& rHEvt) { - BOOL bReturn = FALSE; + sal_Bool bReturn = sal_False; OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); @@ -1358,7 +1358,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) } } - BOOL bQuickDrag = TRUE; + sal_Bool bQuickDrag = sal_True; const SfxItemSet* pArgs = rReq.GetArgs(); @@ -1368,10 +1368,10 @@ void FuText::ReceiveRequest(SfxRequest& rReq) && SID_TEXTEDIT == nSlotId && SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT) - && (UINT16) ((SfxUInt16Item&) pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) + && (sal_uInt16) ((SfxUInt16Item&) pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) { // Anwahl per Doppelklick -> kein QuickDrag zulassen - bQuickDrag = FALSE; + bQuickDrag = sal_False; } SetInEditMode(aMEvt, bQuickDrag); @@ -1388,7 +1388,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) IMPL_LINK( FuText, SpellError, void *, nLang ) { - String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(ULONG)nLang ) ); + String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(sal_uLong)nLang ) ); ErrorHandler::HandleError(* new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) ); return 0; diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 31797f3c8a03..6b8edfb50892 100755 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -93,7 +93,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) { std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) ); - const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); + const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange ); aCombSet.Put( aNewAttr ); aCombSet.Put( aSet ); diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index f434f2790620..6a46e9fca940 100644..100755 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -78,7 +78,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView ); - USHORT nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); switch( nResult ) { diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index 390522cc33ca..14ad1bad4ad3 100644..100755 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -50,7 +50,7 @@ namespace sd { -USHORT SidArrayZoom[] = { +sal_uInt16 SidArrayZoom[] = { SID_ATTR_ZOOM, SID_ZOOM_OUT, SID_ZOOM_IN, @@ -71,8 +71,8 @@ FuZoom::FuZoom( SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), - bVisible(FALSE), - bStartDrag(FALSE) + bVisible(sal_False), + bStartDrag(sal_False) { } @@ -89,8 +89,8 @@ FuZoom::~FuZoom() // Hide ZoomRect mpViewShell->DrawMarkRect(aZoomRect); - bVisible = FALSE; - bStartDrag = FALSE; + bVisible = sal_False; + bStartDrag = sal_False; } } @@ -106,18 +106,18 @@ FunctionReference FuZoom::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: |* \************************************************************************/ -BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt) +sal_Bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); mpWindow->CaptureMouse(); - bStartDrag = TRUE; + bStartDrag = sal_True; aBeginPosPix = rMEvt.GetPosPixel(); aBeginPos = mpWindow->PixelToLogic(aBeginPosPix); - return TRUE; + return sal_True; } /************************************************************************* @@ -126,7 +126,7 @@ BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuZoom::MouseMove(const MouseEvent& rMEvt) +sal_Bool FuZoom::MouseMove(const MouseEvent& rMEvt) { if (bStartDrag) { @@ -169,7 +169,7 @@ BOOL FuZoom::MouseMove(const MouseEvent& rMEvt) mpViewShell->DrawMarkRect(aZoomRect); } - bVisible = TRUE; + bVisible = sal_True; } return bStartDrag; @@ -181,7 +181,7 @@ BOOL FuZoom::MouseMove(const MouseEvent& rMEvt) |* \************************************************************************/ -BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt) +sal_Bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { // #95491# remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -190,7 +190,7 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { // Hide ZoomRect mpViewShell->DrawMarkRect(aZoomRect); - bVisible = FALSE; + bVisible = sal_False; } Point aPosPix = rMEvt.GetPosPixel(); @@ -199,7 +199,7 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { // Zoom Size aZoomSizePixel = mpWindow->LogicToPixel(aZoomRect).GetSize(); - ULONG nTol = DRGPIX + DRGPIX; + sal_uLong nTol = DRGPIX + DRGPIX; if ( aZoomSizePixel.Width() < (long) nTol && aZoomSizePixel.Height() < (long) nTol ) { @@ -221,11 +221,11 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt) mpWindow->GetOutputSizePixel())); mpViewShell->GetZoomList()->InsertZoomRect(aVisAreaWin); - bStartDrag = FALSE; + bStartDrag = sal_False; mpWindow->ReleaseMouse(); mpViewShell->Cancel(); - return TRUE; + return sal_True; } /************************************************************************* diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index 7b7a361bba80..aa2803ddb245 100755 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx @@ -42,8 +42,8 @@ TYPEINIT1(SdUndoGroup, SdUndoAction); SdUndoGroup::~SdUndoGroup() { - ULONG nLast = aCtn.Count(); - for (ULONG nAction = 0; nAction < nLast; nAction++) + sal_uLong nLast = aCtn.Count(); + for (sal_uLong nAction = 0; nAction < nLast; nAction++) { delete (SdUndoAction*) aCtn.GetObject(nAction); } @@ -56,9 +56,9 @@ SdUndoGroup::~SdUndoGroup() |* \************************************************************************/ -BOOL SdUndoGroup::Merge( SfxUndoAction* pNextAction ) +sal_Bool SdUndoGroup::Merge( SfxUndoAction* pNextAction ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pNextAction && pNextAction->ISA( SdUndoAction ) ) { @@ -67,7 +67,7 @@ BOOL SdUndoGroup::Merge( SfxUndoAction* pNextAction ) if( pClone ) { AddAction( pClone ); - bRet = TRUE; + bRet = sal_True; } } @@ -85,7 +85,7 @@ void SdUndoGroup::Undo() long nLast = aCtn.Count(); for (long nAction = nLast - 1; nAction >= 0; nAction--) { - ((SdUndoAction*)aCtn.GetObject((ULONG)nAction))->Undo(); + ((SdUndoAction*)aCtn.GetObject((sal_uLong)nAction))->Undo(); } } @@ -98,8 +98,8 @@ void SdUndoGroup::Undo() void SdUndoGroup::Redo() { - ULONG nLast = aCtn.Count(); - for (ULONG nAction = 0; nAction < nLast; nAction++) + sal_uLong nLast = aCtn.Count(); + for (sal_uLong nAction = 0; nAction < nLast; nAction++) { ((SdUndoAction*)aCtn.GetObject(nAction))->Redo(); } diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index a8b6c0647237..60959eb18ea3 100755 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -121,30 +121,30 @@ bool SmartTag::getContext( SdrViewContext& /*rContext*/ ) // -------------------------------------------------------------------- -ULONG SmartTag::GetMarkablePointCount() const +sal_uLong SmartTag::GetMarkablePointCount() const { return 0; } // -------------------------------------------------------------------- -ULONG SmartTag::GetMarkedPointCount() const +sal_uLong SmartTag::GetMarkedPointCount() const { return 0; } // -------------------------------------------------------------------- -BOOL SmartTag::MarkPoint(SdrHdl& /*rHdl*/, BOOL /*bUnmark*/ ) +sal_Bool SmartTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ ) { - return FALSE; + return sal_False; } // -------------------------------------------------------------------- -BOOL SmartTag::MarkPoints(const Rectangle* /*pRect*/, BOOL /*bUnmark*/ ) +sal_Bool SmartTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ ) { - return FALSE; + return sal_False; } // -------------------------------------------------------------------- @@ -368,14 +368,14 @@ bool SmartTagSet::getContext( SdrViewContext& rContext ) const // support point editing // -------------------------------------------------------------------- -BOOL SmartTagSet::HasMarkablePoints() const +sal_Bool SmartTagSet::HasMarkablePoints() const { - return GetMarkablePointCount() != 0 ? TRUE : FALSE; + return GetMarkablePointCount() != 0 ? sal_True : sal_False; } // -------------------------------------------------------------------- -ULONG SmartTagSet::GetMarkablePointCount() const +sal_uLong SmartTagSet::GetMarkablePointCount() const { if( mxSelectedTag.is() ) return mxSelectedTag->GetMarkablePointCount(); @@ -384,14 +384,14 @@ ULONG SmartTagSet::GetMarkablePointCount() const // -------------------------------------------------------------------- -BOOL SmartTagSet::HasMarkedPoints() const +sal_Bool SmartTagSet::HasMarkedPoints() const { - return GetMarkedPointCount() != 0 ? TRUE : FALSE; + return GetMarkedPointCount() != 0 ? sal_True : sal_False; } // -------------------------------------------------------------------- -ULONG SmartTagSet::GetMarkedPointCount() const +sal_uLong SmartTagSet::GetMarkedPointCount() const { if( mxSelectedTag.is() ) return mxSelectedTag->GetMarkedPointCount(); @@ -401,7 +401,7 @@ ULONG SmartTagSet::GetMarkedPointCount() const // -------------------------------------------------------------------- -BOOL SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const +sal_Bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const { const SmartHdl* pSmartHdl = dynamic_cast< const SmartHdl* >( &rHdl ); @@ -410,21 +410,21 @@ BOOL SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const // -------------------------------------------------------------------- -BOOL SmartTagSet::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) +sal_Bool SmartTagSet::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) { if( mxSelectedTag.is() ) return mxSelectedTag->MarkPoint( rHdl, bUnmark ); - return FALSE; + return sal_False; } // -------------------------------------------------------------------- -BOOL SmartTagSet::MarkPoints(const Rectangle* pRect, BOOL bUnmark) +sal_Bool SmartTagSet::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) { if( mxSelectedTag.is() ) return mxSelectedTag->MarkPoints( pRect, bUnmark ); - return FALSE; + return sal_False; } // -------------------------------------------------------------------- diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index ec0b223cf6a8..6f01d8613e0d 100644..100755 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -53,7 +53,7 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction( String aTheNewLayoutName, AutoLayout eTheOldAutoLayout, AutoLayout eTheNewAutoLayout, - BOOL bSet, + sal_Bool bSet, SdPage* pThePage): SdUndoAction(pTheDoc) { @@ -76,9 +76,9 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction( void SdPresentationLayoutUndoAction::Undo() { - pPage->SetPresentationLayout(aOldLayoutName, TRUE, TRUE, TRUE); + pPage->SetPresentationLayout(aOldLayoutName, sal_True, sal_True, sal_True); if (bSetAutoLayout) - pPage->SetAutoLayout(eOldAutoLayout, TRUE); + pPage->SetAutoLayout(eOldAutoLayout, sal_True); } /************************************************************************* @@ -91,7 +91,7 @@ void SdPresentationLayoutUndoAction::Redo() { pPage->SetPresentationLayout(aNewLayoutName); if (bSetAutoLayout) - pPage->SetAutoLayout(eNewAutoLayout, TRUE); + pPage->SetAutoLayout(eNewAutoLayout, sal_True); } /************************************************************************* |