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/fusel.hxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/inc/fusel.hxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/inc/fusel.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index 3aab29ff0c61..55ec9c0db2de 100644..100755 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -50,20 +50,20 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren virtual void SelectionHasChanged(); - void SetEditMode(USHORT nMode); - USHORT GetEditMode() { return nEditMode; } + void SetEditMode(sal_uInt16 nMode); + sal_uInt16 GetEditMode() { return nEditMode; } - BOOL AnimateObj(SdrObject* pObj, const Point& rPos); + sal_Bool AnimateObj(SdrObject* pObj, const Point& rPos); /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -82,13 +82,13 @@ protected: virtual ~FuSelection(); - BOOL bTempRotation; - BOOL bSelectionChanged; - BOOL bHideAndAnimate; + sal_Bool bTempRotation; + sal_Bool bSelectionChanged; + sal_Bool bHideAndAnimate; SdrHdl* pHdl; - BOOL bSuppressChangesOfSelection; - BOOL bMirrorSide0; - USHORT nEditMode; + sal_Bool bSuppressChangesOfSelection; + sal_Bool bMirrorSide0; + sal_uInt16 nEditMode; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; private: |