1 files changed, 9 insertions, 10 deletions

diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 0de7dac8ad8a..5f6c60e231b8 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -107,7 +107,7 @@ public:
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
 
 protected:
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
     virtual void    Resize();
     virtual void    FillInfo( SfxChildWinInfo& ) const;
 
@@ -121,21 +121,20 @@ private:
     NumericField    aNumFldBitmap;
     TimeField       aTimeField;
     ListBox         aLbLoopCount;
-
+    FixedLine       aGrpBitmap;
     ImageButton     aBtnGetOneObject;
     ImageButton     aBtnGetAllObjects;
     ImageButton     aBtnRemoveBitmap;
     ImageButton     aBtnRemoveAll;
     FixedText       aFtCount;
     FixedInfo       aFiCount;
-    FixedLine       aGrpBitmap;
+    FixedLine       aGrpAnimation;
 
     RadioButton     aRbtGroup;
     RadioButton     aRbtBitmap;
     FixedText       aFtAdjustment;
     ListBox         aLbAdjustment;
     PushButton      aBtnCreateGroup;
-    FixedLine       aGrpAnimation;
 
     ::Window*       pWin;
     List            aBmpExList;
@@ -147,8 +146,8 @@ private:
     Size            aFltWinSize;
     Size            aDisplaySize;
     Size            aBmpSize;
-    BOOL            bMovie;
-    BOOL            bAllObjects;
+    sal_Bool            bMovie;
+    sal_Bool            bAllObjects;
 
     SfxBindings*                pBindings;
     AnimationControllerItem*    pControllerItem;
@@ -167,9 +166,9 @@ private:
     DECL_LINK( ModifyBitmapHdl, void * );
     DECL_LINK( ModifyTimeHdl, void * );
 
-    void            UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE );
+    void            UpdateControl( sal_uLong nPos, sal_Bool bDisableCtrls = sal_False );
     void            ResetAttrs();
-    void            WaitInEffect( ULONG nMilliSeconds, ULONG nTime,
+    void            WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime,
                                         SfxProgress* pStbMgr ) const;
     Fraction        GetScale();
 };
@@ -184,10 +183,10 @@ class AnimationControllerItem : public SfxControllerItem
 {
 
 public:
-    AnimationControllerItem( USHORT, AnimationWindow*, SfxBindings* );
+    AnimationControllerItem( sal_uInt16, AnimationWindow*, SfxBindings* );
 
 protected:
-    virtual void StateChanged( USHORT nSId, SfxItemState eState,
+    virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
         const SfxPoolItem* pState );
 private:
     AnimationWindow* pAnimationWin;