diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-09-05 20:55:29 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-06 07:02:42 +0100 |
commit | 13bbb6f56d49bf891f6b6f075c1d75100fbc1a63 (patch) | |
tree | 1b2c5e698c2646eb31479020f9bde907d3f3fa89 /starmath/inc/toolbox.hxx | |
parent | 3c24537465a90e59a714c88e3f672f0786ecd573 (diff) |
convert floating RID_TOOLBOXWINDOW to .ui
well the dialog itself and the top toolbar, the
other toolbars remain as resources as now
Change-Id: If2bc5b2c108af0efb88fb018896806531cdafe60
Diffstat (limited to 'starmath/inc/toolbox.hxx')
-rw-r--r-- | starmath/inc/toolbox.hxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index 6e4f03753666..8f50a055bb1f 100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx @@ -32,8 +32,16 @@ class SmToolBoxWindow : public SfxFloatingWindow { protected: - ToolBox aToolBoxCat; - FixedLine aToolBoxCat_Delim; // to visually separate the catalog part + ToolBox* m_pToolBoxCat; + sal_uInt16 m_nUnbinopsId; + sal_uInt16 m_nRelationsId; + sal_uInt16 m_nSetoperationsId; + sal_uInt16 m_nFunctionsId; + sal_uInt16 m_nOperatorsId; + sal_uInt16 m_nAttributesId; + sal_uInt16 m_nBracketsId; + sal_uInt16 m_nFormatId; + sal_uInt16 m_nMiscId; ToolBox *pToolBoxCmd; ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES]; ImageList *aImageLists [NUM_TBX_CATEGORIES + 1]; /* regular */ @@ -50,6 +58,8 @@ protected: SmViewShell * GetView(); const ImageList * GetImageList( sal_uInt16 nResId ); + sal_uInt16 MapToolbarIdToCategory(sal_uInt16 nId) const; + public: SmToolBoxWindow(SfxBindings *pBindings, SfxChildWindow *pChildWindow, @@ -60,7 +70,7 @@ public: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent &rEvt ) SAL_OVERRIDE; - void AdjustPosSize( bool bSetPos ); + void AdjustPos(); void SetCategory(sal_uInt16 nCategory); }; |