diff options
Diffstat (limited to 'cui/source/tabpages/textanim.cxx')
| -rw-r--r-- | cui/source/tabpages/textanim.cxx | 90 |
1 files changed, 54 insertions, 36 deletions
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index c7c38975a6d2..44051fcee53e 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -43,7 +43,7 @@ #include <dialmgr.hxx> #include "svx/dlgutil.hxx" -static USHORT pRanges[] = +static sal_uInt16 pRanges[] = { SDRATTR_TEXT_ANIKIND, SDRATTR_TEXT_ANIAMOUNT, @@ -75,7 +75,7 @@ SvxTextTabDialog::SvxTextTabDialog( Window* pParent, |* \************************************************************************/ -void SvxTextTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { switch( nId ) { @@ -156,6 +156,24 @@ SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& r aBtnLeft.SetClickHdl( aLink ); aBtnRight.SetClickHdl( aLink ); aBtnDown.SetClickHdl( aLink ); + + aNumFldCount.SetAccessibleRelationLabeledBy( &aTsbEndless ); + aMtrFldAmount.SetAccessibleRelationLabeledBy( &aTsbPixel ); + aMtrFldDelay.SetAccessibleRelationLabeledBy( &aTsbAuto ); + + aBtnUp.SetAccessibleRelationLabeledBy( &aFtDirection ); + aBtnLeft.SetAccessibleRelationLabeledBy( &aFtDirection ); + aBtnRight.SetAccessibleRelationLabeledBy( &aFtDirection ); + aBtnDown.SetAccessibleRelationLabeledBy( &aFtDirection ); + + aBtnUp.SetAccessibleRelationMemberOf( &aFlEffect ); + aBtnLeft.SetAccessibleRelationMemberOf( &aFlEffect ); + aBtnRight.SetAccessibleRelationMemberOf( &aFlEffect ); + aBtnDown.SetAccessibleRelationMemberOf( &aFlEffect ); + + aTsbEndless.SetAccessibleRelationLabeledBy( &aFtCount ); + aTsbPixel.SetAccessibleRelationLabeledBy( &aFtAmount ); + aTsbAuto.SetAccessibleRelationLabeledBy( &aFtDelay ); } /************************************************************************* @@ -186,7 +204,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) if( pItem ) { eAniKind = ( ( const SdrTextAniKindItem* )pItem )->GetValue(); - aLbEffect.SelectEntryPos( sal::static_int_cast< USHORT >(eAniKind) ); + aLbEffect.SelectEntryPos( sal::static_int_cast< sal_uInt16 >(eAniKind) ); } else aLbEffect.SetNoSelection(); @@ -203,10 +221,10 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) } else { - aBtnUp.Check( FALSE ); - aBtnLeft.Check( FALSE ); - aBtnRight.Check( FALSE ); - aBtnDown.Check( FALSE ); + aBtnUp.Check( sal_False ); + aBtnLeft.Check( sal_False ); + aBtnRight.Check( sal_False ); + aBtnDown.Check( sal_False ); } aBtnUp.SaveValue(); aBtnLeft.SaveValue(); @@ -219,8 +237,8 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANISTARTINSIDE ); if( pItem ) { - aTsbStartInside.EnableTriState( FALSE ); - BOOL bValue = ( ( const SdrTextAniStartInsideItem* )pItem )->GetValue(); + aTsbStartInside.EnableTriState( sal_False ); + sal_Bool bValue = ( ( const SdrTextAniStartInsideItem* )pItem )->GetValue(); if( bValue ) aTsbStartInside.SetState( STATE_CHECK ); else @@ -236,8 +254,8 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANISTOPINSIDE ); if( pItem ) { - aTsbStopInside.EnableTriState( FALSE ); - BOOL bValue = ( ( const SdrTextAniStopInsideItem* )pItem )->GetValue(); + aTsbStopInside.EnableTriState( sal_False ); + sal_Bool bValue = ( ( const SdrTextAniStopInsideItem* )pItem )->GetValue(); if( bValue ) aTsbStopInside.SetState( STATE_CHECK ); else @@ -253,7 +271,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANICOUNT ); if( pItem ) { - aTsbEndless.EnableTriState( FALSE ); + aTsbEndless.EnableTriState( sal_False ); long nValue = (long) ( ( const SdrTextAniCountItem* )pItem )->GetValue(); aNumFldCount.SetValue( nValue ); if( nValue == 0 ) @@ -261,7 +279,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) if( eAniKind == SDRTEXTANI_SLIDE ) { aTsbEndless.SetState( STATE_NOCHECK ); - aTsbEndless.Enable( FALSE ); + aTsbEndless.Enable( sal_False ); } else { @@ -286,7 +304,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIDELAY ); if( pItem ) { - aTsbAuto.EnableTriState( FALSE ); + aTsbAuto.EnableTriState( sal_False ); long nValue = (long) ( ( const SdrTextAniDelayItem* )pItem )->GetValue(); aMtrFldDelay.SetValue( nValue ); if( nValue == 0 ) @@ -311,7 +329,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIAMOUNT ); if( pItem ) { - aTsbPixel.EnableTriState( FALSE ); + aTsbPixel.EnableTriState( sal_False ); long nValue = (long) ( ( const SdrTextAniAmountItem* )pItem )->GetValue(); if( nValue <= 0 ) { @@ -367,10 +385,10 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -BOOL SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) +sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { - BOOL bModified = FALSE; - USHORT nPos; + sal_Bool bModified = sal_False; + sal_uInt16 nPos; TriState eState; // Animationstyp @@ -379,7 +397,7 @@ BOOL SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) nPos != aLbEffect.GetSavedValue() ) { rAttrs.Put( SdrTextAniKindItem( (SdrTextAniKind) nPos ) ); - bModified = TRUE; + bModified = sal_True; } // Animationsrichtung @@ -390,23 +408,23 @@ BOOL SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { SdrTextAniDirection eValue = (SdrTextAniDirection) GetSelectedDirection(); rAttrs.Put( SdrTextAniDirectionItem( eValue ) ); - bModified = TRUE; + bModified = sal_True; } // Start inside eState = aTsbStartInside.GetState(); if( eState != aTsbStartInside.GetSavedValue() ) { - rAttrs.Put( SdrTextAniStartInsideItem( (BOOL) STATE_CHECK == eState ) ); - bModified = TRUE; + rAttrs.Put( SdrTextAniStartInsideItem( (sal_Bool) STATE_CHECK == eState ) ); + bModified = sal_True; } // Stop inside eState = aTsbStopInside.GetState(); if( eState != aTsbStopInside.GetSavedValue() ) { - rAttrs.Put( SdrTextAniStopInsideItem( (BOOL) STATE_CHECK == eState ) ); - bModified = TRUE; + rAttrs.Put( SdrTextAniStopInsideItem( (sal_Bool) STATE_CHECK == eState ) ); + bModified = sal_True; } // Anzahl @@ -417,17 +435,17 @@ BOOL SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { sal_Int64 nValue = 0; if( eState == STATE_CHECK /*#89844#*/ && aTsbEndless.IsEnabled()) - bModified = TRUE; + bModified = sal_True; else { if( aStr != aNumFldCount.GetSavedValue() ) { nValue = aNumFldCount.GetValue(); - bModified = TRUE; + bModified = sal_True; } } if( bModified ) - rAttrs.Put( SdrTextAniCountItem( (UINT16) nValue ) ); + rAttrs.Put( SdrTextAniCountItem( (sal_uInt16) nValue ) ); } // Verzoegerung @@ -438,17 +456,17 @@ BOOL SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { sal_Int64 nValue = 0; if( eState == STATE_CHECK ) - bModified = TRUE; + bModified = sal_True; else { if( aStr != aMtrFldDelay.GetSavedValue() ) { nValue = aMtrFldDelay.GetValue(); - bModified = TRUE; + bModified = sal_True; } } if( bModified ) - rAttrs.Put( SdrTextAniDelayItem( (UINT16) nValue ) ); + rAttrs.Put( SdrTextAniDelayItem( (sal_uInt16) nValue ) ); } // Schrittweite @@ -467,9 +485,9 @@ BOOL SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { nValue = GetCoreValue( aMtrFldAmount, eUnit ); } - rAttrs.Put( SdrTextAniAmountItem( (INT16) nValue ) ); + rAttrs.Put( SdrTextAniAmountItem( (sal_Int16) nValue ) ); - bModified = TRUE; + bModified = sal_True; } return( bModified ); @@ -491,7 +509,7 @@ void SvxTextAnimationPage::Construct() |* \************************************************************************/ -USHORT* SvxTextAnimationPage::GetRanges() +sal_uInt16* SvxTextAnimationPage::GetRanges() { return( pRanges ); } @@ -516,7 +534,7 @@ SfxTabPage* SvxTextAnimationPage::Create( Window* pWindow, IMPL_LINK( SvxTextAnimationPage, SelectEffectHdl_Impl, void *, EMPTYARG ) { - USHORT nPos = aLbEffect.GetSelectEntryPos(); + sal_uInt16 nPos = aLbEffect.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { eAniKind = (SdrTextAniKind) nPos; @@ -736,9 +754,9 @@ void SvxTextAnimationPage::SelectDirection( SdrTextAniDirection nValue ) |* \************************************************************************/ -USHORT SvxTextAnimationPage::GetSelectedDirection() +sal_uInt16 SvxTextAnimationPage::GetSelectedDirection() { - USHORT nValue = 0; + sal_uInt16 nValue = 0; if( aBtnUp.IsChecked() ) nValue = SDRTEXTANI_UP; |