removetooltypes01: #i112600# Remove tools types from sd

11 files changed, 177 insertions, 177 deletions

diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index f76b84d29826..430f3f7f6a9e 100755
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -97,7 +97,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; }
 
@@ -112,7 +112,7 @@ private:
 CategoryListBox::CategoryListBox( Window* pParent, const ResId& rResId )
 : ListBox( pParent, rResId )
 {
-    EnableUserDraw( TRUE );
+    EnableUserDraw( sal_True );
     SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) );
 }
 
@@ -120,9 +120,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 );
 
@@ -131,7 +131,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 )
     {
@@ -157,7 +157,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt )
     }
     else
     {
-        DrawEntry( rUDEvt, TRUE, TRUE );
+        DrawEntry( rUDEvt, sal_True, sal_True );
     }
 }
 
@@ -219,9 +219,9 @@ private:
 
     CustomAnimationCreateDialog*        mpParent;
 
-    USHORT mnCurvePathPos;
-    USHORT mnPolygonPathPos;
-    USHORT mnFreeformPathPos;
+    sal_uInt16 mnCurvePathPos;
+    sal_uInt16 mnPolygonPathPos;
+    sal_uInt16 mnFreeformPathPos;
 
 };
 
@@ -270,7 +270,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus
 
     FreeResource();
 
-    USHORT nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
+    sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
 
     if( nTabId == MOTIONPATH )
     {
@@ -302,7 +302,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 )
@@ -345,7 +345,7 @@ IMPL_LINK( CustomAnimationCreateTabPage, implDoubleClickHdl, Control*, pControl
     if( pControl == mpLBEffects )
     {
         if( mpLBEffects->GetSelectEntryCount() )
-            mpParent->EndDialog( TRUE );
+            mpParent->EndDialog( sal_True );
     }
     return 0;
 }
@@ -360,7 +360,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;
@@ -387,7 +387,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 ) );
 
@@ -414,7 +414,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;
@@ -436,7 +436,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();
@@ -458,7 +458,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 )
@@ -492,12 +492,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/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 7f942562b951..4beb1a7d8e0b 100755
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -132,7 +132,7 @@ public:
     virtual Control* getControl();
 
 private:
-    std::map< USHORT, rtl::OUString > maPropertyValues;
+    std::map< sal_uInt16, rtl::OUString > maPropertyValues;
     ListBox* mpControl;
 };
 
@@ -172,7 +172,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++);
@@ -180,7 +180,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
         }
         else
         {
-            mpControl->Enable( FALSE );
+            mpControl->Enable( sal_False );
         }
     }
 }
@@ -244,7 +244,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;
@@ -253,7 +253,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 );
     }
@@ -335,7 +335,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;
     }
 
@@ -594,7 +594,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('%');
@@ -624,7 +624,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 );
 }
 
@@ -1264,10 +1264,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++ )
     {
@@ -1275,7 +1275,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
         mpCLBDimColor->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
     }
 
-    mpCLBDimColor->SetUpdateMode( TRUE );
+    mpCLBDimColor->SetUpdateMode( sal_True );
 
     if ( bKillTable )
         delete pColorTable;
@@ -1400,7 +1400,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++;
@@ -1414,7 +1414,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
@@ -1439,7 +1439,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;
@@ -1462,16 +1462,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 ) );
 
@@ -1488,20 +1488,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 );
@@ -1549,7 +1549,7 @@ CustomAnimationEffectTabPage::~CustomAnimationEffectTabPage()
 
 void CustomAnimationEffectTabPage::updateControlStates()
 {
-    USHORT nPos = mpLBAfterEffect->GetSelectEntryPos();
+    sal_uInt16 nPos = mpLBAfterEffect->GetSelectEntryPos();
     mpCLBDimColor->Enable( nPos == 1 );
     mpFTDimColor->Enable( nPos == 1 );
 
@@ -1568,7 +1568,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 )
@@ -1582,7 +1582,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();
@@ -1648,7 +1648,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;
@@ -1759,7 +1759,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 );
@@ -1834,8 +1834,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;
             }
@@ -1850,12 +1850,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
     {
@@ -1928,7 +1928,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;
@@ -1959,7 +1959,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
         }
         else
         {
-            USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
+            sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
 
             if( fDuration == 5.0 )
                 nPos = 0;
@@ -1988,7 +1988,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;
@@ -2023,7 +2023,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
         {
@@ -2065,7 +2065,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*)nShape );
             if( xShape == xTrigger )
@@ -2082,8 +2082,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;
@@ -2091,7 +2091,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;
@@ -2291,7 +2291,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 )
@@ -2323,7 +2323,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
     }
     else
     {
-        maCBXAnimateForm.Enable( FALSE );
+        maCBXAnimateForm.Enable( sal_False );
     }
 
     maCBXReverse.SetState( STATE_DONTKNOW );
@@ -2345,7 +2345,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent,
         sal_Int32 nPos = 6;
         while( (nPos > 2) && (nPos > nMaxParaDepth) )
         {
-            maLBGroupText.RemoveEntry( (USHORT)nPos );
+            maLBGroupText.RemoveEntry( (sal_uInt16)nPos );
             nPos--;
         }
     }
@@ -2355,7 +2355,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;
@@ -2404,7 +2404,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 );
@@ -2412,12 +2412,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);
     }
 }
 
@@ -2429,7 +2429,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 e732f4a0e731..cf479d874470 100644..100755
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -158,7 +158,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/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 8dbb9fd95c41..a80617e17eb0 100755
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -214,10 +214,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 );
 
@@ -229,7 +229,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 )
@@ -258,7 +258,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 )
 {
     const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
@@ -279,7 +279,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;
@@ -365,11 +365,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 );
 
@@ -380,7 +380,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 )
 {
 }
@@ -393,9 +393,9 @@ CustomAnimationTriggerEntryItem::~CustomAnimationTriggerEntryItem()
 
 // --------------------------------------------------------------------
 
-USHORT CustomAnimationTriggerEntryItem::IsA()
+sal_uInt16 CustomAnimationTriggerEntryItem::IsA()
 {
-    return (USHORT)-1;
+    return (sal_uInt16)-1;
 }
 
 // --------------------------------------------------------------------
@@ -419,7 +419,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() );
 
@@ -487,7 +487,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId
 
 // --------------------------------------------------------------------
 
-const Image&  CustomAnimationList::getImage( USHORT nId, bool bHighContrast )
+const Image&  CustomAnimationList::getImage( sal_uInt16 nId, bool bHighContrast )
 {
     DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" );
 
@@ -819,7 +819,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection )
 {
     try
     {
-        SelectAll(FALSE);
+        SelectAll(sal_False);
 
         if( aSelection.hasValue() )
         {
@@ -917,7 +917,7 @@ EffectSequence CustomAnimationList::getSelection() const
 
 // --------------------------------------------------------------------
 
-BOOL CustomAnimationList::DoubleClickHdl()
+sal_Bool CustomAnimationList::DoubleClickHdl()
 {
     mpController->onDoubleClick();
     return false;
@@ -967,7 +967,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 66b1e2c6a436..185c1a6dbb5c 100755
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -46,7 +46,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() {}
 };
 
@@ -83,12 +83,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 );
 
@@ -97,7 +97,7 @@ public:
 
     virtual void notify_change();
 
-    const Image& getImage( USHORT nId, bool bHighContrast );
+    const Image& getImage( sal_uInt16 nId, bool bHighContrast );
 
     bool isExpanded( const CustomAnimationEffectPtr& pEffect ) const;
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 8b96e08b4a8c..29bde1e8ac96 100644..100755
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -729,15 +729,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;
     }
@@ -818,15 +818,15 @@ 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 )
@@ -862,19 +862,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 );
@@ -1061,7 +1061,7 @@ void CustomAnimationPane::onDoubleClick()
     showOptions();
 }
 
-void CustomAnimationPane::onContextMenu( USHORT nSelectedPopupEntry )
+void CustomAnimationPane::onContextMenu( sal_uInt16 nSelectedPopupEntry )
 {
     switch( nSelectedPopupEntry )
     {
@@ -1747,7 +1747,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
     }
 }
 
-void CustomAnimationPane::showOptions( USHORT nPage /* = 0 */ )
+void CustomAnimationPane::showOptions( sal_uInt16 nPage /* = 0 */ )
 {
     STLPropertySet* pSet = createSelectionSet();
 
@@ -1943,7 +1943,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() );
@@ -2002,7 +2002,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 )
     {
@@ -2071,7 +2071,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;
@@ -2157,7 +2157,7 @@ void CustomAnimationPane::onChangeSpeed()
 
         double fDuration;
 
-        USHORT nPos= mpCBSpeed->GetSelectEntryPos();
+        sal_uInt16 nPos= mpCBSpeed->GetSelectEntryPos();
 
         switch( nPos )
         {
@@ -2435,7 +2435,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);
             }
         }
     }
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 7343bc547f32..33dd25ebaf66 100644..100755
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -95,7 +95,7 @@ public:
     // ICustomAnimationListController
     virtual void onSelect();
     virtual void onDoubleClick();
-    virtual void onContextMenu( USHORT nSelectedPopupEntry );
+    virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry );
 
     void addUndo();
 
@@ -109,7 +109,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 e1fe8d5d3918..83e4cbdd4d65 100644..100755
--- a/sd/source/ui/animations/DialogListBox.cxx
+++ b/sd/source/ui/animations/DialogListBox.cxx
@@ -279,7 +279,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 fe34f0138db2..82858cf06572 100755
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -133,9 +133,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;
@@ -184,12 +184,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 );
             }
@@ -223,9 +223,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;
@@ -839,7 +839,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;
             }
         }
@@ -860,8 +860,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
     {
@@ -890,7 +890,7 @@ void SlideTransitionPane::updateControlState()
 
     maPB_APPLY_TO_ALL.Enable( mbHasSelection );
     maPB_PLAY.Enable( mbHasSelection );
-//     maPB_SLIDE_SHOW.Enable( TRUE );
+//     maPB_SLIDE_SHOW.Enable( sal_True );
     maCB_AUTO_PREVIEW.Enable( mbHasSelection );
 }
 
@@ -964,7 +964,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;
@@ -973,7 +973,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 )
@@ -982,7 +982,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 30992f913705..c6105919e645 100644..100755
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -135,7 +135,7 @@ bool PathDragMove::BeginSdrDrag()
         }
     }
     Show();
-    return TRUE;
+    return sal_True;
 }
 
 bool PathDragMove::EndSdrDrag(bool /*bCopy*/)
@@ -143,7 +143,7 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/)
     Hide();
     if( mxTag.is() )
         mxTag->MovePath( DragStat().GetDX(), DragStat().GetDY() );
-    return TRUE;
+    return sal_True;
 }
 // --------------------------------------------------------------------
 
@@ -203,7 +203,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/)
             pPathObj->SetPathPoly( aDragPoly );
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 // --------------------------------------------------------------------
@@ -266,7 +266,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;
 
@@ -331,9 +331,9 @@ void SdPathHdl::CreateB2dIAObject()
 
 // --------------------------------------------------------------------
 
-BOOL SdPathHdl::IsFocusHdl() const
+sal_Bool SdPathHdl::IsFocusHdl() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 // --------------------------------------------------------------------
@@ -401,7 +401,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();
 
@@ -449,7 +449,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
     {
@@ -584,7 +584,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;
@@ -625,7 +625,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:
@@ -799,13 +799,13 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt )
             if(mrView.IsDragObj())
             {
                 FASTBOOL 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();
@@ -829,7 +829,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt )
 
 // --------------------------------------------------------------------
 
-ULONG MotionPathTag::GetMarkablePointCount() const
+sal_uLong MotionPathTag::GetMarkablePointCount() const
 {
     if( mpPathObj && isSelected() )
     {
@@ -843,7 +843,7 @@ ULONG MotionPathTag::GetMarkablePointCount() const
 
 // --------------------------------------------------------------------
 
-ULONG MotionPathTag::GetMarkedPointCount() const
+sal_uLong MotionPathTag::GetMarkedPointCount() const
 {
     if( mpMark )
     {
@@ -858,9 +858,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 );
@@ -872,7 +872,7 @@ BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark )
             {
                 pPts->ForceSort();
                 mrView.MarkListHasChanged();
-                bRet=TRUE;
+                bRet=sal_True;
             }
         }
     }
@@ -881,16 +881,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)
             {
@@ -898,7 +898,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;
                 }
             }
         }
@@ -981,7 +981,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
 
         if( isSelected() )
         {
-            mrView.GetSdrPageView()->SetHasMarkedObj(TRUE);
+            mrView.GetSdrPageView()->SetHasMarkedObj(sal_True);
 
             if( !mrView.IsFrameDragSingles() )
             {
@@ -1004,7 +1004,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 )
@@ -1017,7 +1017,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
                             {
                                 pPlusHdl->SetObj(mpPathObj);
                                 pPlusHdl->SetPageView(mrView.GetSdrPageView());
-                                pPlusHdl->SetPlusHdl(TRUE);
+                                pPlusHdl->SetPlusHdl(sal_True);
                                 rHandlerList.AddHdl(pPlusHdl);
                             }
                         }
@@ -1030,10 +1030,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));
@@ -1115,7 +1115,7 @@ void MotionPathTag::selectionChanged()
     if( mrView.GetViewShell() && mrView.GetViewShell()->GetViewFrame() )
     {
         SfxBindings& rBindings = mrView.GetViewShell()->GetViewFrame()->GetBindings();
-        rBindings.InvalidateAll(TRUE);
+        rBindings.InvalidateAll(sal_True);
     }
 }
 // --------------------------------------------------------------------
@@ -1159,7 +1159,7 @@ void MotionPathTag::DeleteMarkedPoints()
     }
 }
 
-BOOL MotionPathTag::IsDeleteMarkedPointsPossible() const
+sal_Bool MotionPathTag::IsDeleteMarkedPointsPossible() const
 {
     return mpPathObj && isSelected() && (GetMarkedPointCount() != 0);
 }
@@ -1175,12 +1175,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
@@ -1210,12 +1210,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
@@ -1264,7 +1264,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 1413636fca2b..1e286e0e760e 100644..100755
--- a/sd/source/ui/animations/motionpathtag.hxx
+++ b/sd/source/ui/animations/motionpathtag.hxx
@@ -64,11 +64,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; }
 
@@ -76,20 +76,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;