summaryrefslogtreecommitdiff
path: root/sd/source/ui/animations
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/animations')
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx38
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.src4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationDialog.cxx96
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationDialog.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.src41
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationList.cxx34
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationList.hxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationPane.cxx70
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationPane.hxx4
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/DialogListBox.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/SlideTransitionPane.cxx36
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/motionpathtag.cxx70
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/motionpathtag.hxx16
13 files changed, 235 insertions, 186 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index f79db4444..896ea1375 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -88,7 +88,7 @@ public:
virtual void MouseButtonUp( const MouseEvent& rMEvt );
- USHORT InsertCategory( const XubString& rStr, USHORT nPos = LISTBOX_APPEND );
+ sal_uInt16 InsertCategory( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND );
void SetDoubleClickLink( const Link& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; }
@@ -103,7 +103,7 @@ private:
CategoryListBox::CategoryListBox( Window* pParent, const ResId& rResId )
: ListBox( pParent, rResId )
{
- EnableUserDraw( TRUE );
+ EnableUserDraw( sal_True );
SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) );
}
@@ -111,9 +111,9 @@ CategoryListBox::~CategoryListBox()
{
}
-USHORT CategoryListBox::InsertCategory( const XubString& rStr, USHORT nPos /* = LISTBOX_APPEND */ )
+sal_uInt16 CategoryListBox::InsertCategory( const XubString& rStr, sal_uInt16 nPos /* = LISTBOX_APPEND */ )
{
- USHORT n = ListBox::InsertEntry( rStr, nPos );
+ sal_uInt16 n = ListBox::InsertEntry( rStr, nPos );
if( n != LISTBOX_ENTRY_NOTFOUND )
ListBox::SetEntryFlags( n, ListBox::GetEntryFlags(n) | LISTBOX_ENTRY_FLAG_DISABLE_SELECTION );
@@ -122,7 +122,7 @@ USHORT CategoryListBox::InsertCategory( const XubString& rStr, USHORT nPos /* =
void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt )
{
- const USHORT nItem = rUDEvt.GetItemId();
+ const sal_uInt16 nItem = rUDEvt.GetItemId();
if( ListBox::GetEntryFlags(nItem) & LISTBOX_ENTRY_FLAG_DISABLE_SELECTION )
{
@@ -148,7 +148,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt )
}
else
{
- DrawEntry( rUDEvt, TRUE, TRUE );
+ DrawEntry( rUDEvt, sal_True, sal_True );
}
}
@@ -210,9 +210,9 @@ private:
CustomAnimationCreateDialog* mpParent;
- USHORT mnCurvePathPos;
- USHORT mnPolygonPathPos;
- USHORT mnFreeformPathPos;
+ sal_uInt16 mnCurvePathPos;
+ sal_uInt16 mnPolygonPathPos;
+ sal_uInt16 mnFreeformPathPos;
};
@@ -261,7 +261,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus
FreeResource();
- USHORT nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
+ sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
if( nTabId == MOTIONPATH )
{
@@ -293,7 +293,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus
CustomAnimationPresetPtr pDescriptor = (*aIter++);
if( pDescriptor.get() && (bHasText || !pDescriptor->isTextOnly() ) )
{
- USHORT nPos = mpLBEffects->InsertEntry( pDescriptor->getLabel() );
+ sal_uInt16 nPos = mpLBEffects->InsertEntry( pDescriptor->getLabel() );
mpLBEffects->SetEntryData( nPos, static_cast<void*>( new CustomAnimationPresetPtr( pDescriptor ) ) );
if( nFirstEffect == LISTBOX_ENTRY_NOTFOUND )
@@ -336,7 +336,7 @@ IMPL_LINK( CustomAnimationCreateTabPage, implDoubleClickHdl, Control*, pControl
if( pControl == mpLBEffects )
{
if( mpLBEffects->GetSelectEntryCount() )
- mpParent->EndDialog( TRUE );
+ mpParent->EndDialog( sal_True );
}
return 0;
}
@@ -351,7 +351,7 @@ void CustomAnimationCreateTabPage::onSelectEffect()
CustomAnimationPresetPtr pPreset( *p );
const double fDuration = pPreset->getDuration();
- USHORT nPos = 0xffff;
+ sal_uInt16 nPos = 0xffff;
if( fDuration == 5.0 )
nPos = 0;
@@ -378,7 +378,7 @@ void CustomAnimationCreateTabPage::onSelectEffect()
void CustomAnimationCreateTabPage::clearEffects()
{
- USHORT nPos = mpLBEffects->GetEntryCount();
+ sal_uInt16 nPos = mpLBEffects->GetEntryCount();
while( nPos-- )
delete static_cast< CustomAnimationPresetPtr* >( mpLBEffects->GetEntryData( nPos ) );
@@ -405,7 +405,7 @@ PathKind CustomAnimationCreateTabPage::getCreatePathKind() const
if( mpLBEffects->GetSelectEntryCount() == 1 )
{
- const USHORT nPos = mpLBEffects->GetSelectEntryPos();
+ const sal_uInt16 nPos = mpLBEffects->GetSelectEntryPos();
if( nPos == mnCurvePathPos )
{
eKind = CURVE;
@@ -427,7 +427,7 @@ PathKind CustomAnimationCreateTabPage::getCreatePathKind() const
double CustomAnimationCreateTabPage::getDuration() const
{
- USHORT nPos = mpCBSpeed->GetSelectEntryPos();
+ sal_uInt16 nPos = mpCBSpeed->GetSelectEntryPos();
if( (nPos == 0xffff) || !mpCBSpeed->IsEnabled() )
{
CustomAnimationPresetPtr pPreset = getSelectedPreset();
@@ -449,7 +449,7 @@ double CustomAnimationCreateTabPage::getDuration() const
void CustomAnimationCreateTabPage::setDuration( double fDuration )
{
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
if( fDuration < 2.0f )
{
if( fDuration < 1.0f )
@@ -483,12 +483,12 @@ bool CustomAnimationCreateTabPage::getIsPreview() const
void CustomAnimationCreateTabPage::setIsPreview( bool bIsPreview )
{
- mpCBXPReview->Check( bIsPreview ? TRUE : FALSE );
+ mpCBXPReview->Check( bIsPreview ? sal_True : sal_False );
}
bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId )
{
- USHORT nPos = mpLBEffects->GetEntryCount();
+ sal_uInt16 nPos = mpLBEffects->GetEntryCount();
while( nPos-- )
{
void* pEntryData = mpLBEffects->GetEntryData( nPos );
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.src b/sd/source/ui/animations/CustomAnimationCreateDialog.src
index 162a1d6d4..8a57bfa02 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.src
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.src
@@ -98,11 +98,13 @@ TabDialog DLG_CUSTOMANIMATION_CREATE
TabPage RID_TP_CUSTOMANIMATION_ENTRANCE
{
+ HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_ENTRANCE";
Hide = TRUE;
Size = MAP_APPFONT ( 156, 217 );
ListBox LB_EFFECTS
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS";
Pos = MAP_APPFONT ( 3 , 3 ) ;
Size = MAP_APPFONT( 144, 160 );
OutputSize = TRUE;
@@ -121,6 +123,7 @@ TabPage RID_TP_CUSTOMANIMATION_ENTRANCE
ComboBox CB_SPEED
{
+ HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED";
Pos = MAP_APPFONT ( 48 , 166 ) ;
Size = MAP_APPFONT ( 101, 48 );
TabStop = TRUE ;
@@ -130,6 +133,7 @@ TabPage RID_TP_CUSTOMANIMATION_ENTRANCE
CheckBox CBX_PREVIEW
{
+ HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW";
Pos = MAP_APPFONT ( 3 , 181 ) ;
Size = MAP_APPFONT ( 143 , 10 ) ;
TabStop = TRUE ;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 476e313c8..d8df66e7b 100644..100755
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -121,7 +121,7 @@ public:
virtual Control* getControl();
private:
- std::map< USHORT, rtl::OUString > maPropertyValues;
+ std::map< sal_uInt16, rtl::OUString > maPropertyValues;
ListBox* mpControl;
};
@@ -161,7 +161,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
while( aIter != aEnd )
{
- USHORT nPos = mpControl->InsertEntry( rPresets.getUINameForProperty( (*aIter) ) );
+ sal_uInt16 nPos = mpControl->InsertEntry( rPresets.getUINameForProperty( (*aIter) ) );
if( (*aIter) == aPropertyValue )
mpControl->SelectEntryPos( nPos );
maPropertyValues[nPos] = (*aIter++);
@@ -169,7 +169,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
}
else
{
- mpControl->Enable( FALSE );
+ mpControl->Enable( sal_False );
}
}
}
@@ -233,7 +233,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con
if ( !pColorTable )
{
pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
- bKillTable = TRUE;
+ bKillTable = sal_True;
}
sal_Int32 nColor = 0;
@@ -242,7 +242,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con
for ( long i = 0; i < pColorTable->Count(); i++ )
{
XColorEntry* pEntry = pColorTable->GetColor(i);
- USHORT nPos = mpControl->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
+ sal_uInt16 nPos = mpControl->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
if( pEntry->GetColor().GetRGBColor() == (sal_uInt32)nColor )
mpControl->SelectEntryPos( nPos );
}
@@ -324,7 +324,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const
if(!pFontList)
{
- pFontList = new FontList( Application::GetDefaultDevice(), NULL, FALSE );
+ pFontList = new FontList( Application::GetDefaultDevice(), NULL, sal_False );
bMustDelete = true;
}
@@ -583,7 +583,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window
mpMetric->SetMax( 100 );
mpMenu = new PopupMenu();
- for( USHORT i = 25; i < 101; i += 25 )
+ for( sal_uInt16 i = 25; i < 101; i += 25 )
{
String aStr( String::CreateFromInt32( i ) );
aStr += sal_Unicode('%');
@@ -613,7 +613,7 @@ TransparencyPropertyBox::~TransparencyPropertyBox()
void TransparencyPropertyBox::updateMenu()
{
sal_Int64 nValue = mpMetric->GetValue();
- for( USHORT i = 25; i < 101; i += 25 )
+ for( sal_uInt16 i = 25; i < 101; i += 25 )
mpMenu->CheckItem( i, nValue == i );
}
@@ -1241,10 +1241,10 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
if ( !pColorTable )
{
pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
- bKillTable = TRUE;
+ bKillTable = sal_True;
}
- mpCLBDimColor->SetUpdateMode( FALSE );
+ mpCLBDimColor->SetUpdateMode( sal_False );
for ( long i = 0; i < pColorTable->Count(); i++ )
{
@@ -1252,7 +1252,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
mpCLBDimColor->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
- mpCLBDimColor->SetUpdateMode( TRUE );
+ mpCLBDimColor->SetUpdateMode( sal_True );
if ( bKillTable )
delete pColorTable;
@@ -1377,7 +1377,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
sal_Bool bHasAfterEffect = sal_False;
pSet->getPropertyValue( nHandleHasAfterEffect ) >>= bHasAfterEffect;
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
if( bHasAfterEffect )
{
nPos++;
@@ -1391,7 +1391,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
sal_Int32 nColor = 0;
aDimColor >>= nColor;
Color aColor( nColor );
- USHORT nColorPos = mpCLBDimColor->GetEntryPos( aColor );
+ sal_uInt16 nColorPos = mpCLBDimColor->GetEntryPos( aColor );
if ( LISTBOX_ENTRY_NOTFOUND != nColorPos )
mpCLBDimColor->SelectEntryPos( nColorPos );
else
@@ -1416,7 +1416,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
{
if( pSet->getPropertyState( nHandleIterateType ) != STLPropertyState_AMBIGUOUS)
{
- USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
+ sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
sal_Int32 nIterateType = 0;
pSet->getPropertyValue( nHandleIterateType ) >>= nIterateType;
@@ -1439,16 +1439,16 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
}
else
{
- mpFTTextAnim->Enable( FALSE );
- mpLBTextAnim->Enable( FALSE );
- mpMFTextDelay->Enable( FALSE );
- mpFTTextDelay->Enable( FALSE );
+ mpFTTextAnim->Enable( sal_False );
+ mpLBTextAnim->Enable( sal_False );
+ mpMFTextDelay->Enable( sal_False );
+ mpFTTextDelay->Enable( sal_False );
}
if( pSet->getPropertyState( nHandleSoundURL ) != STLPropertyState_AMBIGUOUS )
{
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
const Any aValue( pSet->getPropertyValue( nHandleSoundURL ) );
@@ -1465,20 +1465,20 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
{
const String aTmp( aSoundURL );
- ULONG i;
+ sal_uLong i;
for( i = 0; i < maSoundList.Count(); i++ )
{
String* pString = (String*)maSoundList.GetObject( i );
if( *pString == aTmp )
{
- nPos = (USHORT)i+2;
+ nPos = (sal_uInt16)i+2;
break;
}
}
if( nPos == 0 )
{
- nPos = (USHORT)maSoundList.Count()+2;
+ nPos = (sal_uInt16)maSoundList.Count()+2;
maSoundList.Insert( new String( aTmp ), LIST_APPEND );
INetURLObject aURL( aTmp );
nPos = mpLBSound->InsertEntry( aURL.GetBase(), nPos );
@@ -1526,7 +1526,7 @@ CustomAnimationEffectTabPage::~CustomAnimationEffectTabPage()
void CustomAnimationEffectTabPage::updateControlStates()
{
- USHORT nPos = mpLBAfterEffect->GetSelectEntryPos();
+ sal_uInt16 nPos = mpLBAfterEffect->GetSelectEntryPos();
mpCLBDimColor->Enable( nPos == 1 );
mpFTDimColor->Enable( nPos == 1 );
@@ -1545,7 +1545,7 @@ IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl )
{
if( pControl == mpLBAfterEffect )
{
- USHORT nPos = static_cast<ListBox*>( mpLBAfterEffect )->GetSelectEntryPos();
+ sal_uInt16 nPos = static_cast<ListBox*>( mpLBAfterEffect )->GetSelectEntryPos();
if( nPos == 1 )
{
if( mpCLBDimColor->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
@@ -1559,7 +1559,7 @@ IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl )
}
else if( pControl == mpLBSound )
{
- USHORT nPos = mpLBSound->GetSelectEntryPos();
+ sal_uInt16 nPos = mpLBSound->GetSelectEntryPos();
if( nPos == (mpLBSound->GetEntryCount() - 1) )
{
openSoundFileDialog();
@@ -1625,7 +1625,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
pSet->setPropertyValue( nHandleDecelerate, makeAny( fTemp ) );
}
- USHORT nPos = mpLBAfterEffect->GetSelectEntryPos();
+ sal_uInt16 nPos = mpLBAfterEffect->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
sal_Bool bAfterEffect = nPos != 0;
@@ -1736,7 +1736,7 @@ void CustomAnimationEffectTabPage::fillSoundListBox()
mpLBSound->InsertEntry( String( SdResId( STR_CUSTOMANIMATION_NO_SOUND ) ) );
mpLBSound->InsertEntry( String( SdResId( STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND ) ) );
- for( ULONG i = 0; i < maSoundList.Count(); i++ )
+ for( sal_uLong i = 0; i < maSoundList.Count(); i++ )
{
String* pString = (String*)maSoundList.GetObject( i );
INetURLObject aURL( *pString );
@@ -1811,8 +1811,8 @@ void CustomAnimationEffectTabPage::openSoundFileDialog()
String aStr; aStr += sal_Unicode('%');
aStrWarning.SearchAndReplace( aStr , aFile );
WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning );
- aWarningBox.SetModalInputMode (TRUE);
- bQuitLoop = aWarningBox.Execute()==RET_RETRY ? FALSE : TRUE;
+ aWarningBox.SetModalInputMode (sal_True);
+ bQuitLoop = aWarningBox.Execute()==RET_RETRY ? sal_False : sal_True;
bValidSoundFile=false;
}
@@ -1827,12 +1827,12 @@ void CustomAnimationEffectTabPage::openSoundFileDialog()
if( !bValidSoundFile )
nPos = 0;
- mpLBSound->SelectEntryPos( (USHORT) nPos );
+ mpLBSound->SelectEntryPos( (sal_uInt16) nPos );
}
void CustomAnimationEffectTabPage::onSoundPreview()
{
- const USHORT nPos = mpLBSound->GetSelectEntryPos();
+ const sal_uInt16 nPos = mpLBSound->GetSelectEntryPos();
if( nPos >= 2 ) try
{
@@ -1905,7 +1905,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
{
sal_Int16 nStart = 0;
pSet->getPropertyValue( nHandleStart ) >>= nStart;
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
switch( nStart )
{
case EffectNodeType::WITH_PREVIOUS: nPos = 1; break;
@@ -1936,7 +1936,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
}
else
{
- USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
+ sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
if( fDuration == 5.0 )
nPos = 0;
@@ -1965,7 +1965,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
if( aRepeatCount.hasValue() )
aRepeatCount >>= fRepeat;
- USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
+ sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
if( fRepeat == 0 )
nPos = 0;
@@ -2000,7 +2000,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
sal_Int16 nFill = 0;
if( pSet->getPropertyValue( nHandleRewind ) >>= nFill )
{
- mpCBXRewind->Check( (nFill == AnimationFill::REMOVE) ? TRUE : FALSE );
+ mpCBXRewind->Check( (nFill == AnimationFill::REMOVE) ? sal_True : sal_False );
}
else
{
@@ -2042,7 +2042,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
}
String aDescription( getShapeDescription( xShape, true ) );
- USHORT nPos = mpLBTrigger->InsertEntry( aDescription );
+ sal_uInt16 nPos = mpLBTrigger->InsertEntry( aDescription );
mpLBTrigger->SetEntryData( nPos, (void*)(sal_IntPtr)nShape );
if( xShape == xTrigger )
@@ -2059,8 +2059,8 @@ IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl )
{
if( pControl == mpLBTrigger.get() )
{
- mpRBClickSequence->Check( FALSE );
- mpRBInteractive->Check( TRUE );
+ mpRBClickSequence->Check( sal_False );
+ mpRBInteractive->Check( sal_True );
}
return 0;
@@ -2068,7 +2068,7 @@ IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl )
void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
{
- USHORT nPos = mpLBStart->GetSelectEntryPos();
+ sal_uInt16 nPos = mpLBStart->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
sal_Int16 nStart;
@@ -2268,7 +2268,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
{
sal_Int32 nTextGrouping = 0;
if( pSet->getPropertyValue( nHandleTextGrouping ) >>= nTextGrouping )
- maLBGroupText.SelectEntryPos( (USHORT)(nTextGrouping + 1) );
+ maLBGroupText.SelectEntryPos( (sal_uInt16)(nTextGrouping + 1) );
}
if( pSet->getPropertyState( nHandleHasVisibleShape ) != STLPropertyState_AMBIGUOUS )
@@ -2300,7 +2300,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
}
else
{
- maCBXAnimateForm.Enable( FALSE );
+ maCBXAnimateForm.Enable( sal_False );
}
maCBXReverse.SetState( STATE_DONTKNOW );
@@ -2322,7 +2322,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
sal_Int32 nPos = 6;
while( (nPos > 2) && (nPos > nMaxParaDepth) )
{
- maLBGroupText.RemoveEntry( (USHORT)nPos );
+ maLBGroupText.RemoveEntry( (sal_uInt16)nPos );
nPos--;
}
}
@@ -2332,7 +2332,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
{
- USHORT nPos = maLBGroupText.GetSelectEntryPos();
+ sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
sal_Int32 nTextGrouping = nPos - 1;
@@ -2381,7 +2381,7 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet )
void CustomAnimationTextAnimTabPage::updateControlStates()
{
- USHORT nPos = maLBGroupText.GetSelectEntryPos();
+ sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos();
maCBXGroupAuto.Enable( nPos > 1 );
maMFGroupAuto.Enable( nPos > 1 );
@@ -2389,12 +2389,12 @@ void CustomAnimationTextAnimTabPage::updateControlStates()
if( !mbHasVisibleShapes && nPos > 0 )
{
- maCBXAnimateForm.Check(FALSE);
- maCBXAnimateForm.Enable(FALSE);
+ maCBXAnimateForm.Check(sal_False);
+ maCBXAnimateForm.Enable(sal_False);
}
else
{
- maCBXAnimateForm.Enable(TRUE);
+ maCBXAnimateForm.Enable(sal_True);
}
}
@@ -2406,7 +2406,7 @@ IMPL_LINK( CustomAnimationTextAnimTabPage, implSelectHdl, Control*, EMPTYARG )
// --------------------------------------------------------------------
-CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, USHORT nPage /* = 0 */ )
+CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, sal_uInt16 nPage /* = 0 */ )
: TabDialog( pParent, SdResId( DLG_CUSTOMANIMATION ) ), mpSet( pSet ), mpResultSet( 0 )
{
mpTabControl = new TabControl( this, SdResId( 1 ) );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 1e03feec0..a5f8cc1ca 100644..100755
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -159,7 +159,7 @@ class STLPropertySet;
class CustomAnimationDialog : public TabDialog
{
public:
- CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, USHORT nPage = 0 );
+ CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, sal_uInt16 nPage = 0 );
~CustomAnimationDialog();
STLPropertySet* getDefaultSet() { return mpSet; }
diff --git a/sd/source/ui/animations/CustomAnimationDialog.src b/sd/source/ui/animations/CustomAnimationDialog.src
index 594bb7f2d..ac18e85c5 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.src
+++ b/sd/source/ui/animations/CustomAnimationDialog.src
@@ -96,6 +96,7 @@ TabDialog DLG_CUSTOMANIMATION
TabPage RID_TP_CUSTOMANIMATION_EFFECT
{
+ HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_EFFECT";
Hide = TRUE;
Size = MAP_APPFONT ( WIDTH , 159 );
Text [ en-US ] = "Effect";
@@ -120,6 +121,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
ListBox LB_PROPERTY_1
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_PROPERTY_1";
Pos = MAP_APPFONT ( X2+6 , 14 ) ;
Size = MAP_APPFONT ( W2, 100 );
Hide = TRUE;
@@ -139,6 +141,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
ListBox LB_PROPERTY_2
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_PROPERTY_2";
Pos = MAP_APPFONT ( X2+6 , 14 ) ;
Size = MAP_APPFONT ( W2, 100 );
Hide = TRUE;
@@ -149,6 +152,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
CheckBox CB_SMOOTH_START
{
+ HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_START";
Pos = MAP_APPFONT( X1+6, 14 );
Size = MAP_APPFONT ( (W0 / 2) , 10 ) ;
Hide = TRUE;
@@ -158,6 +162,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
CheckBox CB_SMOOTH_END
{
+ HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_END";
Pos = MAP_APPFONT( X1 + (W0 / 2) + 3, 14 );
Size = MAP_APPFONT ( (W0 / 2) , 10 ) ;
Hide = TRUE;
@@ -167,6 +172,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
CheckBox CB_AUTORESTART
{
+ HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_AUTORESTART";
Pos = MAP_APPFONT( X1+6, 14 );
Size = MAP_APPFONT ( W0 , 10 ) ;
Hide = TRUE;
@@ -190,6 +196,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
RadioButton RB_FROM_START
{
+ HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_FROM_START";
OutputSize = TRUE;
Pos = MAP_APPFONT ( X1 , 16 ) ;
Size = MAP_APPFONT( W0, 10 );
@@ -201,6 +208,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
RadioButton RB_FROM_LAST
{
+ HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_FROM_LAST";
OutputSize = TRUE;
Pos = MAP_APPFONT ( X1 , 29 ) ;
Size = MAP_APPFONT( W0, 10 );
@@ -212,6 +220,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
RadioButton RB_FROM_TIME
{
+ HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_FROM_TIME";
OutputSize = TRUE;
Pos = MAP_APPFONT ( X1 , 42 ) ;
Size = MAP_APPFONT( W0, 10 );
@@ -223,6 +232,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
MetricField MF_START_TIME
{
+ HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_START_TIME";
OutputSize = TRUE;
Pos = MAP_APPFONT ( X1 , 55 ) ;
Size = MAP_APPFONT ( W1, 12 );
@@ -253,6 +263,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
RadioButton RB_STOP_ON_CLICK
{
+ HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_STOP_ON_CLICK";
OutputSize = TRUE;
Pos = MAP_APPFONT ( X1 , 81 ) ;
Size = MAP_APPFONT( W0, 10 );
@@ -264,6 +275,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
RadioButton RB_STOP_ON_NEXT_SLIDE
{
+ HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_STOP_ON_NEXT_SLIDE";
OutputSize = TRUE;
Pos = MAP_APPFONT ( X1 , 94 ) ;
Size = MAP_APPFONT( W0, 10 );
@@ -275,6 +287,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
RadioButton RB_STOP_AFTER_N_SLIDES
{
+ HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_STOP_AFTER_N_SLIDES";
OutputSize = TRUE;
Pos = MAP_APPFONT ( X1 , 107 ) ;
Size = MAP_APPFONT( W0, 10 );
@@ -286,6 +299,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
MetricField MF_STOP_AFTER_SLIDES
{
+ HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_STOP_AFTER_SLIDES";
OutputSize = TRUE;
Pos = MAP_APPFONT ( X1 , 55 ) ;
Size = MAP_APPFONT ( W1, 12 );
@@ -329,6 +343,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
ListBox LB_SOUND
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_SOUND";
Pos = MAP_APPFONT ( X2 , 3 ) ;
Size = MAP_APPFONT ( W2 - 19, 100 );
TabStop = TRUE ;
@@ -338,6 +353,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
PushButton PB_SOUND_PREVIEW
{
+ HelpID = "sd:PushButton:RID_TP_CUSTOMANIMATION_EFFECT:PB_SOUND_PREVIEW";
Pos = MAP_APPFONT ( X2 + W2 - 16 , 2 ) ;
Size = MAP_APPFONT( 16, 14 );
OutputSize = TRUE;
@@ -355,6 +371,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
ListBox LB_AFTER_EFFECT
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_AFTER_EFFECT";
Pos = MAP_APPFONT ( X2 , 18 ) ;
Size = MAP_APPFONT ( W2, 100 );
TabStop = TRUE ;
@@ -379,6 +396,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
ListBox CLB_DIMCOLOR
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:CLB_DIMCOLOR";
Pos = MAP_APPFONT( X2, 33 );
Size = MAP_APPFONT ( W2, 100 );
TabStop = TRUE ;
@@ -397,6 +415,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
ListBox LB_TEXT_ANIM
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM";
Pos = MAP_APPFONT ( X2 , 48 ) ;
Size = MAP_APPFONT ( W2, 100 );
TabStop = TRUE ;
@@ -422,6 +441,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
MetricField MF_TEXT_DELAY
{
+ HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY";
Pos = MAP_APPFONT ( X2, 64 ) ;
Size = MAP_APPFONT ( 42, 12 );
TabStop = TRUE ;
@@ -440,6 +460,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT
TabPage RID_TP_CUSTOMANIMATION_DURATION
{
+ HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_DURATION";
Hide = TRUE;
Size = MAP_APPFONT ( WIDTH , 159 );
Text [ en-US ] = "Timing";
@@ -455,6 +476,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION
ListBox LB_START
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_START";
Pos = MAP_APPFONT ( X2 , 3 ) ;
Size = MAP_APPFONT ( W2, 48 );
TabStop = TRUE ;
@@ -480,6 +502,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION
MetricField MF_START_DELAY
{
+ HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_DURATION:MF_START_DELAY";
Pos = MAP_APPFONT ( X2 , 18 ) ;
Size = MAP_APPFONT ( W2, 12 );
Border = TRUE ;
@@ -506,6 +529,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION
ComboBox CB_DURATION
{
+ HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_DURATION";
Pos = MAP_APPFONT ( X2 , 33 ) ;
Size = MAP_APPFONT ( W2, 48 );
TabStop = TRUE ;
@@ -524,6 +548,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION
ComboBox CB_REPEAT
{
+ HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_REPEAT";
Pos = MAP_APPFONT ( X2 , 48 ) ;
Size = MAP_APPFONT ( W2, 48 );
TabStop = TRUE ;
@@ -533,6 +558,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION
CheckBox CBX_REWIND
{
+ HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_DURATION:CBX_REWIND";
Pos = MAP_APPFONT ( X0 , 66 ) ;
Size = MAP_APPFONT ( W0 , 10 ) ;
TabStop = TRUE ;
@@ -550,6 +576,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION
RadioButton RB_CLICKSEQUENCE
{
+ HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_CLICKSEQUENCE";
Pos = MAP_APPFONT ( X1+6, 92 ) ;
Size = MAP_APPFONT ( W0 , 10 ) ;
Text [ en-US ] = "Animate as part of click sequence" ;
@@ -558,6 +585,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION
RadioButton RB_INTERACTIVE
{
+ HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE";
Pos = MAP_APPFONT ( X1+6, 105 ) ;
Size = MAP_APPFONT ( W0 , 10 ) ;
Text [ en-US ] = "Start effect on click of" ;
@@ -566,6 +594,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION
ListBox LB_TRIGGER
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER";
Pos = MAP_APPFONT ( X1+18 , 118 );
Size = MAP_APPFONT ( W2, 80 );
TabStop = TRUE ;
@@ -576,6 +605,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION
TabPage RID_TP_CUSTOMANIMATION_TEXT
{
+ HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_TEXT";
Hide = TRUE;
Size = MAP_APPFONT ( WIDTH , 159 );
Text [ en-US ] = "Text Animation";
@@ -591,6 +621,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT
ListBox LB_GROUP_TEXT
{
+ HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_TEXT:LB_GROUP_TEXT";
Pos = MAP_APPFONT ( X2 , 3 ) ;
Size = MAP_APPFONT ( W2, 48 );
TabStop = TRUE ;
@@ -609,8 +640,9 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT
};
};
- Checkbox CBX_GROUP_AUTO
+ CheckBox CBX_GROUP_AUTO
{
+ HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO";
Pos = MAP_APPFONT ( X0 , 20 ) ;
Size = MAP_APPFONT ( W0 , 10 ) ;
TabStop = TRUE ;
@@ -620,6 +652,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT
MetricField MF_GROUP_AUTO
{
+ HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_TEXT:MF_GROUP_AUTO";
Pos = MAP_APPFONT ( X2 , 18 ) ;
Size = MAP_APPFONT ( W2, 12 );
Border = TRUE ;
@@ -635,16 +668,18 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT
SpinSize = 5 ;
};
- Checkbox CBX_ANIMATE_FORM
+ CheckBox CBX_ANIMATE_FORM
{
+ HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_ANIMATE_FORM";
Pos = MAP_APPFONT ( X0 , 33 ) ;
Size = MAP_APPFONT ( W0 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Animate attached shape" ;
};
- Checkbox CBX_REVERSE
+ CheckBox CBX_REVERSE
{
+ HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_REVERSE";
Pos = MAP_APPFONT ( X0 , 46 ) ;
Size = MAP_APPFONT ( W0 , 10 ) ;
TabStop = TRUE ;
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index abeb6b1ec..13c54b5a8 100644..100755
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -211,10 +211,10 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true )
class CustomAnimationListEntryItem : public SvLBoxString
{
public:
- CustomAnimationListEntryItem( SvLBoxEntry*,USHORT nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent );
+ CustomAnimationListEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent );
virtual ~CustomAnimationListEntryItem();
void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
- void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* );
+ void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
SvLBoxItem* Create() const;
void Clone( SvLBoxItem* pSource );
@@ -226,7 +226,7 @@ private:
// --------------------------------------------------------------------
-CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvLBoxEntry* pEntry, USHORT nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent )
+CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent )
: SvLBoxString( pEntry, nFlags, aDescription )
, mpParent( pParent )
, maDescription( aDescription )
@@ -255,7 +255,7 @@ void CustomAnimationListEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEn
// --------------------------------------------------------------------
-void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry )
+void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
{
SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this );
@@ -275,7 +275,7 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHOR
aPos.X() += 19;
- USHORT nImage;
+ sal_uInt16 nImage;
switch( mpEffect->getPresetClass() )
{
case EffectPresetClass::ENTRANCE: nImage = IMG_CUSTOMANIMATION_ENTRANCE_EFFECT; break;
@@ -361,11 +361,11 @@ CustomAnimationListEntry::~CustomAnimationListEntry()
class CustomAnimationTriggerEntryItem : public SvLBoxString
{
public:
- CustomAnimationTriggerEntryItem( SvLBoxEntry*,USHORT nFlags, OUString aDescription, CustomAnimationList* pParent );
+ CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent );
virtual ~CustomAnimationTriggerEntryItem();
- virtual USHORT IsA();
+ virtual sal_uInt16 IsA();
void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
- void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* );
+ void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
SvLBoxItem* Create() const;
void Clone( SvLBoxItem* pSource );
@@ -376,7 +376,7 @@ private:
// --------------------------------------------------------------------
-CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, USHORT nFlags, OUString aDescription, CustomAnimationList* pParent )
+CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent )
: SvLBoxString( pEntry, nFlags, aDescription ), mpParent( pParent ), maDescription( aDescription )
{
}
@@ -389,9 +389,9 @@ CustomAnimationTriggerEntryItem::~CustomAnimationTriggerEntryItem()
// --------------------------------------------------------------------
-USHORT CustomAnimationTriggerEntryItem::IsA()
+sal_uInt16 CustomAnimationTriggerEntryItem::IsA()
{
- return (USHORT)-1;
+ return (sal_uInt16)-1;
}
// --------------------------------------------------------------------
@@ -409,7 +409,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry*
// --------------------------------------------------------------------
-void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* )
+void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* )
{
Size aSize( rDev.GetOutputSizePixel().Width(), static_cast< SvTreeListBox* >(&rDev)->GetEntryHeight() );
@@ -467,7 +467,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId
, mpController( pController )
, mpLastParentEntry(0)
{
- SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) );
+ SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT );
EnableContextMenuHandling();
SetSelectionMode( MULTIPLE_SELECTION );
@@ -477,7 +477,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId
// --------------------------------------------------------------------
-const Image& CustomAnimationList::getImage( USHORT nId )
+const Image& CustomAnimationList::getImage( sal_uInt16 nId )
{
DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" );
@@ -756,7 +756,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection )
{
try
{
- SelectAll(FALSE);
+ SelectAll(sal_False);
if( aSelection.hasValue() )
{
@@ -854,7 +854,7 @@ EffectSequence CustomAnimationList::getSelection() const
// --------------------------------------------------------------------
-BOOL CustomAnimationList::DoubleClickHdl()
+sal_Bool CustomAnimationList::DoubleClickHdl()
{
mpController->onDoubleClick();
return false;
@@ -904,7 +904,7 @@ PopupMenu* CustomAnimationList::CreateContextMenu()
// --------------------------------------------------------------------
-void CustomAnimationList::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
+void CustomAnimationList::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry )
{
mpController->onContextMenu( nSelectedPopupEntry );
}
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index f8cb482f1..24ef25eae 100644..100755
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -45,7 +45,7 @@ class ICustomAnimationListController
public:
virtual void onSelect() = 0;
virtual void onDoubleClick() = 0;
- virtual void onContextMenu( USHORT nSelectedPopupEntry ) = 0;
+ virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry ) = 0;
virtual ~ICustomAnimationListController() {}
};
@@ -76,12 +76,12 @@ public:
// overrides
virtual void SelectHdl();
- virtual BOOL DoubleClickHdl();
+ virtual sal_Bool DoubleClickHdl();
virtual void Paint( const Rectangle& rRect );
virtual PopupMenu* CreateContextMenu( void );
- virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry );
+ virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry );
virtual void KeyInput( const KeyEvent& rKEvt );
@@ -89,7 +89,7 @@ public:
virtual void notify_change();
- const Image& getImage( USHORT nId );
+ const Image& getImage( sal_uInt16 nId );
bool isExpanded( const CustomAnimationEffectPtr& pEffect ) const;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index a44583903..40feb6dd9 100644..100755
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -290,7 +290,7 @@ CustomAnimationPane::~CustomAnimationPane()
void CustomAnimationPane::addUndo()
{
- SfxUndoManager* pManager = mrBase.GetDocShell()->GetUndoManager();
+ ::svl::IUndoManager* pManager = mrBase.GetDocShell()->GetUndoManager();
if( pManager )
{
SdPage* pPage = SdPage::getImplementation( mxCurrentPage );
@@ -730,15 +730,15 @@ void CustomAnimationPane::updateControls()
if( !mxView.is() )
{
- mpPBAddEffect->Enable( FALSE );
- mpPBChangeEffect->Enable( FALSE );
- mpPBRemoveEffect->Enable( FALSE );
- mpFLEffect->Enable( FALSE );
- mpFTStart->Enable( FALSE );
- mpLBStart->Enable( FALSE );
- mpPBPropertyMore->Enable( FALSE );
- mpLBProperty->Enable( FALSE );
- mpFTProperty->Enable( FALSE );
+ mpPBAddEffect->Enable( sal_False );
+ mpPBChangeEffect->Enable( sal_False );
+ mpPBRemoveEffect->Enable( sal_False );
+ mpFLEffect->Enable( sal_False );
+ mpFTStart->Enable( sal_False );
+ mpLBStart->Enable( sal_False );
+ mpPBPropertyMore->Enable( sal_False );
+ mpLBProperty->Enable( sal_False );
+ mpFTProperty->Enable( sal_False );
mpCustomAnimationList->clear();
return;
}
@@ -817,12 +817,12 @@ void CustomAnimationPane::updateControls()
else
{
mpLBProperty->setSubControl( 0 );
- mpFTProperty->Enable( FALSE );
- mpLBProperty->Enable( FALSE );
- mpPBPropertyMore->Enable( FALSE );
+ mpFTProperty->Enable( sal_False );
+ mpLBProperty->Enable( sal_False );
+ mpPBPropertyMore->Enable( sal_False );
}
- USHORT nPos = 0xffff;
+ sal_uInt16 nPos = 0xffff;
sal_Int16 nNodeType = pEffect->getNodeType();
switch( nNodeType )
@@ -858,19 +858,19 @@ void CustomAnimationPane::updateControls()
mpCBSpeed->SelectEntryPos( nPos );
}
- mpPBPropertyMore->Enable( TRUE );
+ mpPBPropertyMore->Enable( sal_True );
- mpFTChangeOrder->Enable( TRUE );
+ mpFTChangeOrder->Enable( sal_True );
}
else
{
mpLBProperty->setSubControl( 0 );
- mpFTProperty->Enable( FALSE );
- mpLBProperty->Enable( FALSE );
- mpPBPropertyMore->Enable( FALSE );
- mpFTSpeed->Enable(FALSE);
- mpCBSpeed->Enable(FALSE);
- mpFTChangeOrder->Enable( FALSE );
+ mpFTProperty->Enable( sal_False );
+ mpLBProperty->Enable( sal_False );
+ mpPBPropertyMore->Enable( sal_False );
+ mpFTSpeed->Enable(sal_False);
+ mpCBSpeed->Enable(sal_False);
+ mpFTChangeOrder->Enable( sal_False );
mpLBStart->SetNoSelection();
mpCBSpeed->SetNoSelection();
mpFLEffect->SetText( maStrModify );
@@ -1057,7 +1057,7 @@ void CustomAnimationPane::onDoubleClick()
showOptions();
}
-void CustomAnimationPane::onContextMenu( USHORT nSelectedPopupEntry )
+void CustomAnimationPane::onContextMenu( sal_uInt16 nSelectedPopupEntry )
{
switch( nSelectedPopupEntry )
{
@@ -1741,7 +1741,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
}
}
-void CustomAnimationPane::showOptions( USHORT nPage /* = 0 */ )
+void CustomAnimationPane::showOptions( sal_uInt16 nPage /* = 0 */ )
{
STLPropertySet* pSet = createSelectionSet();
@@ -1937,7 +1937,7 @@ void CustomAnimationPane::onChange( bool bCreate )
{
if( bCreate )
{
- mpCustomAnimationList->SelectAll( FALSE );
+ mpCustomAnimationList->SelectAll( sal_False );
// gather shapes from the selection
std::vector< Any >::iterator aIter( aTargets.begin() );
@@ -1947,6 +1947,16 @@ void CustomAnimationPane::onChange( bool bCreate )
{
CustomAnimationEffectPtr pCreated = mpMainSequence->append( pDescriptor, (*aIter), fDuration );
+ // if only one shape with text and no fill or outline is selected, animate only by first level paragraphs
+ if( bHasText && (aTargets.size() == 1) )
+ {
+ Reference< XShape > xShape( (*aIter), UNO_QUERY );
+ if( xShape.is() && !hasVisibleShape( xShape ) )
+ {
+ mpMainSequence->createTextGroup( pCreated, 1, -1.0, sal_False, sal_False );
+ }
+ }
+
if( bFirst )
bFirst = false;
else
@@ -1996,7 +2006,7 @@ void CustomAnimationPane::onChange( bool bCreate )
void CustomAnimationPane::createPath( PathKind eKind, std::vector< Any >& rTargets, double fDuration)
{
- USHORT nSID = 0;
+ sal_uInt16 nSID = 0;
switch( eKind )
{
@@ -2065,7 +2075,7 @@ void CustomAnimationPane::onChangeStart()
if( mpLBStart->GetSelectEntryCount() == 1 )
{
sal_Int16 nNodeType;
- USHORT nPos= mpLBStart->GetSelectEntryPos();
+ sal_uInt16 nPos= mpLBStart->GetSelectEntryPos();
switch( nPos )
{
case 0: nNodeType = EffectNodeType::ON_CLICK; break;
@@ -2151,7 +2161,7 @@ void CustomAnimationPane::onChangeSpeed()
double fDuration;
- USHORT nPos= mpCBSpeed->GetSelectEntryPos();
+ sal_uInt16 nPos= mpCBSpeed->GetSelectEntryPos();
switch( nPos )
{
@@ -2429,7 +2439,7 @@ void CustomAnimationPane::markShapesFromSelectedEffects()
Reference< XShape > xShape( pEffect->getTargetShape() );
SdrObject* pObj = GetSdrObjectFromXShape( xShape );
if( pObj )
- pView->MarkObj(pObj, pView->GetSdrPageView(), FALSE, FALSE);
+ pView->MarkObj(pObj, pView->GetSdrPageView(), sal_False, sal_False);
}
}
}
@@ -2445,7 +2455,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot
CustomAnimationEffectPtr pEffect = xTag->getEffect();
if( (pPathObj != 0) && pEffect.get() != 0 )
{
- SfxUndoManager* pManager = mrBase.GetDocShell()->GetUndoManager();
+ ::svl::IUndoManager* pManager = mrBase.GetDocShell()->GetUndoManager();
if( pManager )
{
SdPage* pPage = SdPage::getImplementation( mxCurrentPage );
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index ad349c287..58b277e0b 100644..100755
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -96,7 +96,7 @@ public:
// ICustomAnimationListController
virtual void onSelect();
virtual void onDoubleClick();
- virtual void onContextMenu( USHORT nSelectedPopupEntry );
+ virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry );
void addUndo();
@@ -110,7 +110,7 @@ private:
void updateMotionPathTags();
void markShapesFromSelectedEffects();
- void showOptions( USHORT nPage = 0 );
+ void showOptions( sal_uInt16 nPage = 0 );
void moveSelection( bool bUp );
void onPreview( bool bForcePreview );
diff --git a/sd/source/ui/animations/DialogListBox.cxx b/sd/source/ui/animations/DialogListBox.cxx
index a525378d4..a58f677b5 100644..100755
--- a/sd/source/ui/animations/DialogListBox.cxx
+++ b/sd/source/ui/animations/DialogListBox.cxx
@@ -280,7 +280,7 @@ void DialogListBox::StateChanged( StateChangedType nType )
}
else if ( ( nType == STATE_CHANGE_UPDATEMODE ) || ( nType == STATE_CHANGE_DATA ) )
{
- BOOL bUpdate = IsUpdateMode();
+ sal_Bool bUpdate = IsUpdateMode();
mpChild->SetUpdateMode( bUpdate );
if ( bUpdate && IsReallyVisible() )
ImplCheckScrollBars();
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index b35693d9f..eca89e234 100644..100755
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -132,9 +132,9 @@ struct TransitionEffect
mfDuration = 2.0;
mnTime = 0;
mePresChange = PRESCHANGE_MANUAL;
- mbSoundOn = FALSE;
- mbLoopSound = FALSE;
- mbStopSound = FALSE;
+ mbSoundOn = sal_False;
+ mbLoopSound = sal_False;
+ mbStopSound = sal_False;
mbEffectAmbiguous = false;
mbDurationAmbiguous = false;
@@ -183,12 +183,12 @@ struct TransitionEffect
{
if( mbStopSound )
{
- rOutPage.SetStopSound( TRUE );
- rOutPage.SetSound( FALSE );
+ rOutPage.SetStopSound( sal_True );
+ rOutPage.SetSound( sal_False );
}
else
{
- rOutPage.SetStopSound( FALSE );
+ rOutPage.SetStopSound( sal_False );
rOutPage.SetSound( mbSoundOn );
rOutPage.SetSoundFile( maSound );
}
@@ -222,9 +222,9 @@ struct TransitionEffect
// other settings
double mfDuration;
- ULONG mnTime;
+ sal_uLong mnTime;
PresChange mePresChange;
- BOOL mbSoundOn;
+ sal_Bool mbSoundOn;
String maSound;
bool mbLoopSound;
bool mbStopSound;
@@ -264,9 +264,9 @@ void lcl_CreateUndoForPages(
const ::sd::slidesorter::SharedPageSelection& rpPages,
::sd::ViewShellBase& rBase )
{
- ::sd::DrawDocShell* pDocSh = rBase.GetDocShell();
- SfxUndoManager* pManager = pDocSh->GetUndoManager();
- SdDrawDocument* pDoc = pDocSh->GetDoc();
+ ::sd::DrawDocShell* pDocSh = rBase.GetDocShell();
+ ::svl::IUndoManager* pManager = pDocSh->GetUndoManager();
+ SdDrawDocument* pDoc = pDocSh->GetDoc();
if( pManager && pDocSh && pDoc )
{
String aComment( SdResId(STR_UNDO_SLIDE_PARAMS) );
@@ -345,7 +345,7 @@ struct lcl_EqualsSoundFileName : public ::std::unary_function< String, bool >
{
// note: formerly this was a case insensitive search for all
// platforms. It seems more sensible to do this platform-dependent
-#if defined( WIN ) || defined( WNT )
+#if defined( WNT )
return maStr.EqualsIgnoreCaseAscii( rStr );
#else
return maStr.Equals( rStr );
@@ -836,7 +836,7 @@ void SlideTransitionPane::updateControls()
if( lcl_findSoundInList( maSoundList, aEffect.maSound, nPos ))
{
// skip first three entries
- maLB_SOUND.SelectEntryPos( (USHORT)nPos + 3 );
+ maLB_SOUND.SelectEntryPos( (sal_uInt16)nPos + 3 );
maCurrentSoundFile = aEffect.maSound;
}
}
@@ -857,8 +857,8 @@ void SlideTransitionPane::updateControls()
if( aEffect.mbPresChangeAmbiguous )
{
- maRB_ADVANCE_ON_MOUSE.Check( FALSE );
- maRB_ADVANCE_AUTO.Check( FALSE );
+ maRB_ADVANCE_ON_MOUSE.Check( sal_False );
+ maRB_ADVANCE_AUTO.Check( sal_False );
}
else
{
@@ -960,7 +960,7 @@ void SlideTransitionPane::openSoundFileDialog()
String aStr( sal_Unicode( '%' ));
aStrWarning.SearchAndReplace( aStr , aFile );
WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning );
- aWarningBox.SetModalInputMode (TRUE);
+ aWarningBox.SetModalInputMode (sal_True);
bQuitLoop = (aWarningBox.Execute() != RET_RETRY);
bValidSoundFile = false;
@@ -969,7 +969,7 @@ void SlideTransitionPane::openSoundFileDialog()
if( bValidSoundFile )
// skip first three entries in list
- maLB_SOUND.SelectEntryPos( (USHORT)nPos + 3 );
+ maLB_SOUND.SelectEntryPos( (sal_uInt16)nPos + 3 );
}
if( ! bValidSoundFile )
@@ -978,7 +978,7 @@ void SlideTransitionPane::openSoundFileDialog()
{
tSoundListType::size_type nPos = 0;
if( lcl_findSoundInList( maSoundList, maCurrentSoundFile, nPos ))
- maLB_SOUND.SelectEntryPos( (USHORT)nPos + 3 );
+ maLB_SOUND.SelectEntryPos( (sal_uInt16)nPos + 3 );
else
maLB_SOUND.SelectEntryPos( 0 ); // NONE
}
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index ef5e41756..eb58d7c4d 100644..100755
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -136,7 +136,7 @@ bool PathDragMove::BeginSdrDrag()
}
}
Show();
- return TRUE;
+ return sal_True;
}
bool PathDragMove::EndSdrDrag(bool /*bCopy*/)
@@ -144,7 +144,7 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/)
Hide();
if( mxTag.is() )
mxTag->MovePath( DragStat().GetDX(), DragStat().GetDY() );
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
@@ -204,7 +204,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/)
pPathObj->SetPathPoly( aDragPoly );
}
}
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
@@ -267,7 +267,7 @@ public:
SdPathHdl( const SmartTagReference& xTag, SdrPathObj* mpPathObj );
virtual ~SdPathHdl();
virtual void CreateB2dIAObject();
- virtual BOOL IsFocusHdl() const;
+ virtual sal_Bool IsFocusHdl() const;
virtual Pointer GetSdrDragPointer() const;
virtual bool isMarkable() const;
@@ -332,9 +332,9 @@ void SdPathHdl::CreateB2dIAObject()
// --------------------------------------------------------------------
-BOOL SdPathHdl::IsFocusHdl() const
+sal_Bool SdPathHdl::IsFocusHdl() const
{
- return FALSE;
+ return sal_False;
}
// --------------------------------------------------------------------
@@ -402,7 +402,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
aStartArrow.setClosed(true);
mpPathObj->SetMergedItem(XLineStartItem(aEmpty,::basegfx::B2DPolyPolygon(aStartArrow)));
mpPathObj->SetMergedItem(XLineStartWidthItem(400));
- mpPathObj->SetMergedItem(XLineStartCenterItem(TRUE));
+ mpPathObj->SetMergedItem(XLineStartCenterItem(sal_True));
updatePathAttributes();
@@ -450,7 +450,7 @@ void MotionPathTag::updatePathAttributes()
aEndArrow.setClosed(true);
mpPathObj->SetMergedItem(XLineEndItem(aEmpty,::basegfx::B2DPolyPolygon(aEndArrow)));
mpPathObj->SetMergedItem(XLineEndWidthItem(400));
- mpPathObj->SetMergedItem(XLineEndCenterItem(TRUE));
+ mpPathObj->SetMergedItem(XLineEndCenterItem(sal_True));
}
else
{
@@ -585,7 +585,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl )
if( pHdl && !rMEvt.IsRight() )
{
mrView.BrkAction();
- const USHORT nDrgLog = (USHORT)pOut->PixelToLogic(Size(DRGPIX,0)).Width();
+ const sal_uInt16 nDrgLog = (sal_uInt16)pOut->PixelToLogic(Size(DRGPIX,0)).Width();
rtl::Reference< MotionPathTag > xTag( this );
SdrDragMethod* pDragMethod;
@@ -626,7 +626,7 @@ bool MotionPathTag::KeyInput( const KeyEvent& rKEvt )
if( !mpPathObj )
return false;
- USHORT nCode = rKEvt.GetKeyCode().GetCode();
+ sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
switch( nCode )
{
case KEY_DELETE:
@@ -800,13 +800,13 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt )
if(mrView.IsDragObj())
{
bool bWasNoSnap = mrView.GetDragStat().IsNoSnap();
- BOOL bWasSnapEnabled = mrView.IsSnapEnabled();
+ sal_Bool bWasSnapEnabled = mrView.IsSnapEnabled();
// switch snapping off
if(!bWasNoSnap)
- ((SdrDragStat&)mrView.GetDragStat()).SetNoSnap(TRUE);
+ ((SdrDragStat&)mrView.GetDragStat()).SetNoSnap(sal_True);
if(bWasSnapEnabled)
- mrView.SetSnapEnabled(FALSE);
+ mrView.SetSnapEnabled(sal_False);
mrView.MovAction(aEndPoint);
mrView.EndDragObj();
@@ -830,7 +830,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt )
// --------------------------------------------------------------------
-ULONG MotionPathTag::GetMarkablePointCount() const
+sal_uLong MotionPathTag::GetMarkablePointCount() const
{
if( mpPathObj && isSelected() )
{
@@ -844,7 +844,7 @@ ULONG MotionPathTag::GetMarkablePointCount() const
// --------------------------------------------------------------------
-ULONG MotionPathTag::GetMarkedPointCount() const
+sal_uLong MotionPathTag::GetMarkedPointCount() const
{
if( mpMark )
{
@@ -859,9 +859,9 @@ ULONG MotionPathTag::GetMarkedPointCount() const
// --------------------------------------------------------------------
-BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark )
+sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark )
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
if( mpPathObj && mrView.IsPointMarkable( rHdl ) && (rHdl.GetKind() != HDL_SMARTTAG) )
{
SmartHdl* pSmartHdl = dynamic_cast< SmartHdl* >( &rHdl );
@@ -873,7 +873,7 @@ BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark )
{
pPts->ForceSort();
mrView.MarkListHasChanged();
- bRet=TRUE;
+ bRet=sal_True;
}
}
}
@@ -882,16 +882,16 @@ BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark )
// --------------------------------------------------------------------
-BOOL MotionPathTag::MarkPoints(const Rectangle* pRect, BOOL bUnmark )
+sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark )
{
- BOOL bChgd=FALSE;
+ sal_Bool bChgd=sal_False;
if( mpPathObj && isSelected() )
{
sal_Int32 nHdlNum = mrView.GetHdlList().GetHdlCount() - 1;
while( nHdlNum > 0 )
{
- SmartHdl* pHdl = dynamic_cast< SmartHdl* >( mrView.GetHdl( sal::static_int_cast< ULONG >( nHdlNum-- ) ) );
+ SmartHdl* pHdl = dynamic_cast< SmartHdl* >( mrView.GetHdl( sal::static_int_cast< sal_uLong >( nHdlNum-- ) ) );
if( pHdl && (pHdl->getTag().get() == this) && mrView.IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark)
{
@@ -899,7 +899,7 @@ BOOL MotionPathTag::MarkPoints(const Rectangle* pRect, BOOL bUnmark )
if( pRect==NULL || pRect->IsInside(aPos))
{
if( mrView.MarkPointHelper(pHdl,mpMark,bUnmark) )
- bChgd=TRUE;
+ bChgd=sal_True;
}
}
}
@@ -982,7 +982,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
if( isSelected() )
{
- mrView.GetSdrPageView()->SetHasMarkedObj(TRUE);
+ mrView.GetSdrPageView()->SetHasMarkedObj(sal_True);
if( !mrView.IsFrameDragSingles() )
{
@@ -1005,7 +1005,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
rHandlerList.AddHdl( pSmartHdl );
- const bool bSelected= pMrkPnts && pMrkPnts->Exist(sal::static_int_cast< USHORT >(nHandle));
+ const bool bSelected= pMrkPnts && pMrkPnts->Exist(sal::static_int_cast< sal_uInt16 >(nHandle));
pSmartHdl->SetSelected(bSelected);
if( mrView.IsPlusHandlesAlwaysVisible() || bSelected )
@@ -1018,7 +1018,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
{
pPlusHdl->SetObj(mpPathObj);
pPlusHdl->SetPageView(mrView.GetSdrPageView());
- pPlusHdl->SetPlusHdl(TRUE);
+ pPlusHdl->SetPlusHdl(sal_True);
rHandlerList.AddHdl(pPlusHdl);
}
}
@@ -1031,10 +1031,10 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
if(!aRect.IsEmpty())
{
- ULONG nCount = rHandlerList.GetHdlCount();
+ sal_uLong nCount = rHandlerList.GetHdlCount();
- BOOL bWdt0=aRect.Left()==aRect.Right();
- BOOL bHgt0=aRect.Top()==aRect.Bottom();
+ sal_Bool bWdt0=aRect.Left()==aRect.Right();
+ sal_Bool bHgt0=aRect.Top()==aRect.Bottom();
if (bWdt0 && bHgt0)
{
rHandlerList.AddHdl(new SmartHdl( xThis, mpPathObj, aRect.TopLeft(),HDL_UPLFT));
@@ -1116,7 +1116,7 @@ void MotionPathTag::selectionChanged()
if( mrView.GetViewShell() && mrView.GetViewShell()->GetViewFrame() )
{
SfxBindings& rBindings = mrView.GetViewShell()->GetViewFrame()->GetBindings();
- rBindings.InvalidateAll(TRUE);
+ rBindings.InvalidateAll(sal_True);
}
}
// --------------------------------------------------------------------
@@ -1149,7 +1149,7 @@ void MotionPathTag::DeleteMarkedPoints()
}
}
-BOOL MotionPathTag::IsDeleteMarkedPointsPossible() const
+sal_Bool MotionPathTag::IsDeleteMarkedPointsPossible() const
{
return mpPathObj && isSelected() && (GetMarkedPointCount() != 0);
}
@@ -1165,12 +1165,12 @@ bool MotionPathTag::IsRipUpAtMarkedPointsPossible() const
return false;
}
-BOOL MotionPathTag::IsSetMarkedSegmentsKindPossible() const
+sal_Bool MotionPathTag::IsSetMarkedSegmentsKindPossible() const
{
if( mpPathObj )
return mrView.IsSetMarkedSegmentsKindPossible();
else
- return FALSE;
+ return sal_False;
}
SdrPathSegmentKind MotionPathTag::GetMarkedSegmentsKind() const
@@ -1199,12 +1199,12 @@ void MotionPathTag::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
}
}
-BOOL MotionPathTag::IsSetMarkedPointsSmoothPossible() const
+sal_Bool MotionPathTag::IsSetMarkedPointsSmoothPossible() const
{
if( mpPathObj )
return mrView.IsSetMarkedPointsSmoothPossible();
else
- return FALSE;
+ return sal_False;
}
SdrPathSmoothKind MotionPathTag::GetMarkedPointsSmooth() const
@@ -1252,7 +1252,7 @@ void MotionPathTag::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
}
}
-void MotionPathTag::CloseMarkedObjects(BOOL /*bToggle*/, BOOL /*bOpen*/ )
+void MotionPathTag::CloseMarkedObjects(sal_Bool /*bToggle*/, sal_Bool /*bOpen*/ )
{
// not supported for motion path
}
diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx
index 2af2c08ab..c0f1df430 100644..100755
--- a/sd/source/ui/animations/motionpathtag.hxx
+++ b/sd/source/ui/animations/motionpathtag.hxx
@@ -65,11 +65,11 @@ public:
virtual bool KeyInput( const KeyEvent& rKEvt );
// callbacks from sdr view
- virtual ULONG GetMarkablePointCount() const;
- virtual ULONG GetMarkedPointCount() const;
- virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE);
+ virtual sal_uLong GetMarkablePointCount() const;
+ virtual sal_uLong GetMarkedPointCount() const;
+ virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False);
virtual void CheckPossibilities();
- virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark);
+ virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark);
const CustomAnimationEffectPtr& getEffect() const { return mpEffect; }
@@ -77,20 +77,20 @@ public:
// IPolyPolygonEditorController
virtual void DeleteMarkedPoints();
- virtual BOOL IsDeleteMarkedPointsPossible() const;
+ virtual sal_Bool IsDeleteMarkedPointsPossible() const;
virtual void RipUpAtMarkedPoints();
virtual bool IsRipUpAtMarkedPointsPossible() const;
- virtual BOOL IsSetMarkedSegmentsKindPossible() const;
+ virtual sal_Bool IsSetMarkedSegmentsKindPossible() const;
virtual SdrPathSegmentKind GetMarkedSegmentsKind() const;
virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind);
- virtual BOOL IsSetMarkedPointsSmoothPossible() const;
+ virtual sal_Bool IsSetMarkedPointsSmoothPossible() const;
virtual SdrPathSmoothKind GetMarkedPointsSmooth() const;
virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind);
- virtual void CloseMarkedObjects(BOOL bToggle, BOOL bOpen );
+ virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen );
virtual bool IsOpenCloseMarkedObjectsPossible() const;
virtual SdrObjClosedKind GetMarkedObjectsClosedState() const;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 12:16:58 +0000