diff options
Diffstat (limited to 'sd/source/ui/dlg/animobjs.cxx')
-rwxr-xr-x | sd/source/ui/dlg/animobjs.cxx | 156 |
1 files changed, 78 insertions, 78 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index e179a0ba9f86..e5e27928f520 100755 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -176,8 +176,8 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, pWin ( pParent ), pBitmapEx ( NULL ), - bMovie ( FALSE ), - bAllObjects ( FALSE ), + bMovie ( sal_False ), + bAllObjects ( sal_False ), pBindings ( pInBindings ) { @@ -190,7 +190,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, // neues Dokument mit Seite erzeugen pMyDoc = new SdDrawDocument(DOCUMENT_TYPE_IMPRESS, NULL); - SdPage* pPage = (SdPage*) pMyDoc->AllocPage(FALSE); + SdPage* pPage = (SdPage*) pMyDoc->AllocPage(sal_False); pMyDoc->InsertPage(pPage); pControllerItem = new AnimationControllerItem( SID_ANIMATOR_STATE, this, pBindings ); @@ -232,7 +232,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, AnimationWindow::~AnimationWindow() { - ULONG i, nCount; + sal_uLong i, nCount; delete pControllerItem; @@ -265,7 +265,7 @@ IMPL_LINK( AnimationWindow, ClickFirstHdl, void *, EMPTYARG ) IMPL_LINK( AnimationWindow, ClickStopHdl, void *, EMPTYARG ) { - bMovie = FALSE; + bMovie = sal_False; return( 0L ); } @@ -275,22 +275,22 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) { ScopeLockGuard aGuard( maPlayLock ); - bMovie = TRUE; - BOOL bDisableCtrls = FALSE; - ULONG nCount = aBmpExList.Count(); - BOOL bReverse = p == &aBtnReverse; + bMovie = sal_True; + sal_Bool bDisableCtrls = sal_False; + sal_uLong nCount = aBmpExList.Count(); + sal_Bool bReverse = p == &aBtnReverse; // Kann spaeter schwer ermittelt werden - BOOL bRbtGroupEnabled = aRbtGroup.IsEnabled(); - BOOL bBtnGetAllObjectsEnabled = aBtnGetAllObjects.IsEnabled(); - BOOL bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); + sal_Bool bRbtGroupEnabled = aRbtGroup.IsEnabled(); + sal_Bool bBtnGetAllObjectsEnabled = aBtnGetAllObjects.IsEnabled(); + sal_Bool bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); // Gesamtzeit ermitteln Time aTime( 0 ); long nFullTime; if( aRbtBitmap.IsChecked() ) { - for( ULONG i = 0; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) aTime += *static_cast< Time* >( aTimeList.GetObject( i ) ); nFullTime = aTime.GetMSFromTime(); } @@ -304,16 +304,16 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) SfxProgress* pProgress = NULL; if( nFullTime >= 1000 ) { - bDisableCtrls = TRUE; + bDisableCtrls = sal_True; aBtnStop.Enable(); aBtnStop.Update(); String aStr( RTL_CONSTASCII_USTRINGPARAM( "Animator:" ) ); // Hier sollte man sich noch etwas gescheites ausdenken! pProgress = new SfxProgress( NULL, aStr, nFullTime ); } - ULONG nTmpTime = 0; + sal_uLong nTmpTime = 0; long i = 0; - BOOL bCount = i < (long) nCount; + sal_Bool bCount = i < (long) nCount; if( bReverse ) { i = nCount - 1; @@ -333,7 +333,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) DBG_ASSERT( pTime, "Keine Zeit gefunden!" ); aTimeField.SetTime( *pTime ); - ULONG nTime = pTime->GetMSFromTime(); + sal_uLong nTime = pTime->GetMSFromTime(); WaitInEffect( nTime, nTmpTime, pProgress ); nTmpTime += nTime; @@ -368,7 +368,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) } // Um die Controls wieder zu enablen - bMovie = FALSE; + bMovie = sal_False; if (nCount > 0) UpdateControl(i); @@ -403,12 +403,12 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) if( !pBitmapEx || p == &aRbtGroup || aRbtGroup.IsChecked() ) { aTimeField.SetText( String() ); - aTimeField.Enable( FALSE ); - aLbLoopCount.Enable( FALSE ); + aTimeField.Enable( sal_False ); + aLbLoopCount.Enable( sal_False ); } else if( p == &aRbtBitmap || aRbtBitmap.IsChecked() ) { - ULONG n = static_cast<ULONG>(aNumFldBitmap.GetValue()); + sal_uLong n = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); if( n > 0 ) { Time* pTime = static_cast< Time* >( aTimeList.GetObject( n - 1 ) ); @@ -429,7 +429,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) bAllObjects = pBtn == &aBtnGetAllObjects; // Code jetzt in AddObj() - SfxBoolItem aItem( SID_ANIMATOR_ADD, TRUE ); + SfxBoolItem aItem( SID_ANIMATOR_ADD, sal_True ); GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -445,7 +445,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) if( pBtn == &aBtnRemoveBitmap ) { - ULONG nPos = aBmpExList.GetCurPos(); + sal_uLong nPos = aBmpExList.GetCurPos(); pBitmapEx = static_cast< BitmapEx* >( aBmpExList.GetCurObject() ); if( pBitmapEx ) { @@ -533,7 +533,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) { // Code jetzt in CreatePresObj() - SfxBoolItem aItem( SID_ANIMATOR_CREATE, TRUE ); + SfxBoolItem aItem( SID_ANIMATOR_CREATE, sal_True ); GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); @@ -544,7 +544,7 @@ IMPL_LINK( AnimationWindow, ClickCreateGroupHdl, void *, EMPTYARG ) IMPL_LINK( AnimationWindow, ModifyBitmapHdl, void *, EMPTYARG ) { - ULONG nBmp = static_cast<ULONG>(aNumFldBitmap.GetValue()); + sal_uLong nBmp = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); if( nBmp > aBmpExList.Count() ) nBmp = aBmpExList.Count(); @@ -563,7 +563,7 @@ IMPL_LINK( AnimationWindow, ModifyBitmapHdl, void *, EMPTYARG ) IMPL_LINK( AnimationWindow, ModifyTimeHdl, void *, EMPTYARG ) { - ULONG nPos = static_cast<ULONG>(aNumFldBitmap.GetValue() - 1); + sal_uLong nPos = static_cast<sal_uLong>(aNumFldBitmap.GetValue() - 1); Time* pTime = static_cast< Time* >( aTimeList.GetObject( nPos ) ); DBG_ASSERT( pTime, "Zeit nicht gefunden!" ); @@ -575,7 +575,7 @@ IMPL_LINK( AnimationWindow, ModifyTimeHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) +void AnimationWindow::UpdateControl( sal_uLong nListPos, sal_Bool bDisableCtrls ) { String aString; @@ -584,7 +584,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) BitmapEx aBmp( *pBitmapEx ); SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); - SdrObject* pObject = (SdrObject*) pPage->GetObj( (ULONG) nListPos ); + SdrObject* pObject = (SdrObject*) pPage->GetObj( (sal_uLong) nListPos ); if( pObject ) { VirtualDevice aVD; @@ -638,15 +638,15 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) //aFiCount.SetText( String( SdResId( STR_NULL ) ) ); // Wenn kein Objekt in der Liste ist - aBtnFirst.Enable( FALSE ); - aBtnReverse.Enable( FALSE ); - aBtnPlay.Enable( FALSE ); - aBtnLast.Enable( FALSE ); - aNumFldBitmap.Enable( FALSE ); - aTimeField.Enable( FALSE ); - aLbLoopCount.Enable( FALSE ); - aBtnRemoveBitmap.Enable( FALSE ); - aBtnRemoveAll.Enable( FALSE ); + aBtnFirst.Enable( sal_False ); + aBtnReverse.Enable( sal_False ); + aBtnPlay.Enable( sal_False ); + aBtnLast.Enable( sal_False ); + aNumFldBitmap.Enable( sal_False ); + aTimeField.Enable( sal_False ); + aLbLoopCount.Enable( sal_False ); + aBtnRemoveBitmap.Enable( sal_False ); + aBtnRemoveAll.Enable( sal_False ); //aFtAdjustment.Enable(); //aLbAdjustment.Enable(); @@ -654,13 +654,13 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) if( bMovie && bDisableCtrls ) { - aBtnGetOneObject.Enable( FALSE ); - aBtnGetAllObjects.Enable( FALSE ); - aRbtGroup.Enable( FALSE ); - aRbtBitmap.Enable( FALSE ); - aBtnCreateGroup.Enable( FALSE ); - aFtAdjustment.Enable( FALSE ); - aLbAdjustment.Enable( FALSE ); + aBtnGetOneObject.Enable( sal_False ); + aBtnGetAllObjects.Enable( sal_False ); + aRbtGroup.Enable( sal_False ); + aRbtBitmap.Enable( sal_False ); + aBtnCreateGroup.Enable( sal_False ); + aFtAdjustment.Enable( sal_False ); + aLbAdjustment.Enable( sal_False ); } else { @@ -670,8 +670,8 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) aRbtBitmap.Enable(); aBtnCreateGroup.Enable(aBmpExList.Count() != 0); - aFtAdjustment.Enable( TRUE ); - aLbAdjustment.Enable( TRUE ); + aFtAdjustment.Enable( sal_True ); + aLbAdjustment.Enable( sal_True ); } ClickRbtHdl( NULL ); @@ -691,7 +691,7 @@ void AnimationWindow::ResetAttrs() // ----------------------------------------------------------------------- -void AnimationWindow::WaitInEffect( ULONG nMilliSeconds, ULONG nTime, +void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pProgress ) const { clock_t aEnd = Time::GetSystemTicks() + nMilliSeconds; @@ -715,13 +715,13 @@ void AnimationWindow::WaitInEffect( ULONG nMilliSeconds, ULONG nTime, Fraction AnimationWindow::GetScale() { Fraction aFrac; - ULONG nPos = aBmpExList.GetCurPos(); - ULONG nCount = aBmpExList.Count(); + sal_uLong nPos = aBmpExList.GetCurPos(); + sal_uLong nCount = aBmpExList.Count(); if( nCount > 0 ) { aBmpSize.Width() = 0; aBmpSize.Height() = 0; - for( ULONG i = 0; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) { pBitmapEx = static_cast< BitmapEx* >( aBmpExList.GetObject( i ) ); Size aTempSize( pBitmapEx->GetBitmap().GetSizePixel() ); @@ -846,22 +846,22 @@ void AnimationWindow::Resize() // ----------------------------------------------------------------------- -BOOL AnimationWindow::Close() +sal_Bool AnimationWindow::Close() { if( maPlayLock.isLocked() ) { - return FALSE; + return sal_False; } else { - SfxBoolItem aItem( SID_ANIMATION_OBJECTS, FALSE ); + SfxBoolItem aItem( SID_ANIMATION_OBJECTS, sal_False ); GetBindings().GetDispatcher()->Execute( SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); SfxDockingWindow::Close(); - return TRUE; + return sal_True; } } @@ -883,30 +883,30 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Objekt(e) clonen und den/die Clone(s) in die Liste stellen const SdrMarkList& rMarkList = rView.GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uLong nMarkCount = rMarkList.GetMarkCount(); SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); - ULONG nCloneCount = pPage->GetObjCount(); + sal_uLong nCloneCount = pPage->GetObjCount(); if (nMarkCount > 0) { // Wenn es sich um EIN Animationsobjekt oder ein Gruppenobjekt // handelt, das 'einzeln uebernommen' wurde, // werden die einzelnen Objekte eingefuegt - BOOL bAnimObj = FALSE; + sal_Bool bAnimObj = sal_False; if( nMarkCount == 1 ) { SdrMark* pMark = rMarkList.GetMark(0); SdrObject* pObject = pMark->GetMarkedSdrObj(); SdAnimationInfo* pAnimInfo = rView.GetDoc()->GetAnimationInfo( pObject ); - UINT32 nInv = pObject->GetObjInventor(); - UINT16 nId = pObject->GetObjIdentifier(); + sal_uInt32 nInv = pObject->GetObjInventor(); + sal_uInt16 nId = pObject->GetObjIdentifier(); // Animated Bitmap (GIF) if( nInv == SdrInventor && nId == OBJ_GRAF && ( (SdrGrafObj*) pObject )->IsAnimated() ) { const SdrGrafObj* pGrafObj = (SdrGrafObj*) pObject; Graphic aGraphic( pGrafObj->GetTransformedGraphic() ); - USHORT nCount = 0; + sal_uInt16 nCount = 0; if( aGraphic.IsAnimated() ) nCount = aGraphic.GetAnimation().Count(); @@ -915,7 +915,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) { const Animation aAnimation( aGraphic.GetAnimation() ); - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { const AnimationBitmap& rAnimBmp = aAnimation.Get( i ); @@ -943,8 +943,8 @@ void AnimationWindow::AddObj (::sd::View& rView ) } // Nachdem ein animated GIF uebernommen wurde, kann auch nur ein solches erstellt werden aRbtBitmap.Check(); - aRbtGroup.Enable( FALSE ); - bAnimObj = TRUE; + aRbtGroup.Enable( sal_False ); + bAnimObj = sal_True; } } else if( bAllObjects || ( pAnimInfo && pAnimInfo->mbIsMovie ) ) @@ -952,9 +952,9 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Mehrere Objekte SdrObjList* pObjList = ((SdrObjGroup*)pObject)->GetSubList(); - for( USHORT nObject = 0; nObject < pObjList->GetObjCount(); nObject++ ) + for( sal_uInt16 nObject = 0; nObject < pObjList->GetObjCount(); nObject++ ) { - SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (ULONG) nObject ); + SdrObject* pSnapShot = (SdrObject*) pObjList->GetObj( (sal_uLong) nObject ); pBitmapEx = new BitmapEx( SdrExchangeView::GetObjGraphic( pSnapShot->GetModel(), pSnapShot ).GetBitmapEx() ); aBmpExList.Insert( pBitmapEx, aBmpExList.GetCurPos() + 1 ); @@ -969,7 +969,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Weiterschalten der BitmapListe aBmpExList.Next(); } - bAnimObj = TRUE; + bAnimObj = sal_True; } } // Auch ein einzelnes animiertes Objekt @@ -998,7 +998,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Objekte einzeln uebernehmen if( bAllObjects ) { - for( ULONG nObject= 0; nObject < nMarkCount; nObject++ ) + for( sal_uLong nObject= 0; nObject < nMarkCount; nObject++ ) { // Clone SdrObject* pObject = rMarkList.GetMark( nObject )->GetMarkedSdrObj(); @@ -1014,14 +1014,14 @@ void AnimationWindow::AddObj (::sd::View& rView ) aBmpExList.Next(); } - bAnimObj = TRUE; // damit nicht nochmal weitergeschaltet wird + bAnimObj = sal_True; // damit nicht nochmal weitergeschaltet wird } else { SdrObjGroup* pCloneGroup = new SdrObjGroup; SdrObjList* pObjList = pCloneGroup->GetSubList(); - for (ULONG nObject= 0; nObject < nMarkCount; nObject++) + for (sal_uLong nObject= 0; nObject < nMarkCount; nObject++) pObjList->InsertObject(rMarkList.GetMark(nObject)->GetMarkedSdrObj()->Clone(), LIST_APPEND); pPage->InsertObject(pCloneGroup, aBmpExList.GetCurPos() + 1); @@ -1058,9 +1058,9 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) Size aTemp( pOutWin->GetOutputSizePixel() ); const Point aWindowCenter( pOutWin->PixelToLogic( Point( aTemp.Width() >> 1, aTemp.Height() >> 1 ) ) ); const OutputDevice* pDefDev = Application::GetDefaultDevice(); - const ULONG nCount = aBmpExList.Count(); + const sal_uLong nCount = aBmpExList.Count(); BitmapAdjustment eBA = (BitmapAdjustment) aLbAdjustment.GetSelectEntryPos(); - ULONG i; + sal_uLong i; // Groesste Bitmap ermitteln for( i = 0; i < nCount; i++ ) @@ -1147,7 +1147,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) // LoopCount (Anzahl der Durchlaeufe) ermitteln AnimationBitmap aAnimBmp; long nLoopCount = 0L; - USHORT nPos = aLbLoopCount.GetSelectEntryPos(); + sal_uInt16 nPos = aLbLoopCount.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != aLbLoopCount.GetEntryCount() - 1 ) // unendlich nLoopCount = (long) aLbLoopCount.GetSelectEntry().ToInt32(); @@ -1157,7 +1157,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) aAnimBmp.aSizePix = aBitmapSize; aAnimBmp.nWait = nTime; aAnimBmp.eDisposal = DISPOSE_BACK; - aAnimBmp.bUserInput = FALSE; + aAnimBmp.bUserInput = sal_False; aAnimation.Insert( aAnimBmp ); aAnimation.SetDisplaySizePixel( aMaxSizePix ); @@ -1257,8 +1257,8 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pGroup,true); pInfo->meEffect = presentation::AnimationEffect_NONE; pInfo->meSpeed = presentation::AnimationSpeed_MEDIUM; - pInfo->mbActive = TRUE; - pInfo->mbIsMovie = TRUE; + pInfo->mbActive = sal_True; + pInfo->mbIsMovie = sal_True; pInfo->maBlueScreen = COL_WHITE; rView.InsertObjectAtView( pGroup, *pPV, SDRINSERT_SETDEFLAYER); @@ -1284,7 +1284,7 @@ void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt ) \************************************************************************/ AnimationControllerItem::AnimationControllerItem( - USHORT _nId, + sal_uInt16 _nId, AnimationWindow* pAnimWin, SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), @@ -1294,14 +1294,14 @@ AnimationControllerItem::AnimationControllerItem( // ----------------------------------------------------------------------- -void AnimationControllerItem::StateChanged( USHORT nSId, +void AnimationControllerItem::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_ANIMATOR_STATE ) { const SfxUInt16Item* pStateItem = PTR_CAST( SfxUInt16Item, pItem ); DBG_ASSERT( pStateItem, "SfxUInt16Item erwartet"); - UINT16 nState = pStateItem->GetValue(); + sal_uInt16 nState = pStateItem->GetValue(); pAnimationWin->aBtnGetOneObject.Enable( nState & 1 ); pAnimationWin->aBtnGetAllObjects.Enable( nState & 2 ); |