diff options
| author | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
|---|---|---|
| committer | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
| commit | 4aca9b49a6f83b21ce0b66b67ad06ada1f920c9b (patch) | |
| tree | 08d182d985ff83224c2d23dd693ebab8026ae7c6 /sd/source/ui/inc/tbx_ww.hxx | |
| parent | a3f24d231e8f54d4af456f4781e444738f197631 (diff) | |
| parent | 2785e67bbcd479f864ea941bfd9a47916fd04aa4 (diff) | |
accfixes: merged to m100
Diffstat (limited to 'sd/source/ui/inc/tbx_ww.hxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/inc/tbx_ww.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index e8c3b93a7fa2..b59290883328 100644..100755 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -47,7 +47,7 @@ private: DECL_LINK( TbxSelectHdl, ToolBox * ); public: - SdPopupWindowTbx( USHORT nId, WindowAlign eAlign, + SdPopupWindowTbx( sal_uInt16 nId, WindowAlign eAlign, SdResId aRIdWin, SdResId aRIdTbx, SfxBindings& rBindings ); ~SdPopupWindowTbx(); @@ -71,17 +71,17 @@ private: class SdTbxControl : public SfxToolBoxControl { private: - BOOL IsCheckable( USHORT nSId ); + sal_Bool IsCheckable( sal_uInt16 nSId ); public: SFX_DECL_TOOLBOX_CONTROL(); - SdTbxControl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SdTbxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SdTbxControl() {} virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); }; |