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/tmplctrl.hxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/inc/tmplctrl.hxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/inc/tmplctrl.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 254247103310..51f1238dfaff 100644..100755 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -34,10 +34,10 @@ class SdTemplateControl : public SfxStatusBarControl { public: - SdTemplateControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SdTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SdTemplateControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); |