diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
| commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
| tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/inc/tpaction.hxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/inc/tpaction.hxx')
| -rw-r--r-- | sd/source/ui/inc/tpaction.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 4d8ba7cf67a9..66afd44f582c 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -96,7 +96,7 @@ private: SdDrawDocument* mpDoc; XColorTable* pColTab; - BOOL bTreeUpdated; + sal_Bool bTreeUpdated; List* pCurrentActions; String aLastFile; ::std::vector< long > aVerbVector; @@ -114,9 +114,9 @@ private: void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); void SetEditText( String const & rStr ); - String GetEditText( BOOL bURL = FALSE ); - USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); - USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); + String GetEditText( sal_Bool bURL = sal_False ); + sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); + sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: SdTPAction( Window* pParent, const SfxItemSet& rInAttrs ); @@ -124,7 +124,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); |