diff options
Diffstat (limited to 'starmath/inc/toolbox.hxx')
| -rw-r--r-- | starmath/inc/toolbox.hxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index 77d3fb50a4..e3345a3ce1 100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx @@ -32,12 +32,10 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/childwin.hxx> #include <vcl/toolbox.hxx> + #include "smmod.hxx" #include "config.hxx" - -#include "dialog.hrc" - -#define NUM_TBX_CATEGORIES 9 +#include "toolbox.hrc" class SmToolBoxWindow : public SfxFloatingWindow { @@ -48,18 +46,18 @@ protected: ToolBox *pToolBoxCmd; ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES]; ImageList *aImageLists [NUM_TBX_CATEGORIES + 1]; /* regular */ - USHORT nActiveCategoryRID; + sal_uInt16 nActiveCategoryRID; - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void GetFocus(); - void ApplyImageLists( USHORT nCategoryRID ); + void ApplyImageLists( sal_uInt16 nCategoryRID ); DECL_LINK( CategoryClickHdl, ToolBox* ); DECL_LINK( CmdSelectHdl, ToolBox* ); SmViewShell * GetView(); - const ImageList * GetImageList( USHORT nResId ); + const ImageList * GetImageList( sal_uInt16 nResId ); public: SmToolBoxWindow(SfxBindings *pBindings, @@ -72,7 +70,7 @@ public: virtual void DataChanged( const DataChangedEvent &rEvt ); void AdjustPosSize( bool bSetPos ); - void SetCategory(USHORT nCategory); + void SetCategory(sal_uInt16 nCategory); }; /**************************************************************************/ @@ -83,7 +81,7 @@ class SmToolBoxWrapper : public SfxChildWindow protected: SmToolBoxWrapper(Window *pParentWindow, - USHORT, SfxBindings*, SfxChildWinInfo*); + sal_uInt16, SfxBindings*, SfxChildWinInfo*); }; #endif |