diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-16 14:07:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-17 12:35:54 +0000 |
| commit | 48c15285c52f6554f1aadab6068c076c2139ef89 (patch) | |
| tree | 35360eb56a9177528d0de813e20bc5bdc1454a79 /starmath/inc | |
| parent | f4804a6cf1fa2a1941f43829a9801638bd456e2c (diff) | |
implement loading docking windows from .ui format
Change-Id: I90375232aefbe40412614ca0f30ba467cf393f2e
Diffstat (limited to 'starmath/inc')
| -rw-r--r-- | starmath/inc/ElementsDockingWindow.hxx | 8 | ||||
| -rw-r--r-- | starmath/inc/starmath.hrc | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index 013b6cd30e7b..85b27a4f9a6b 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -107,13 +107,15 @@ class SmElementsControl : public Control void build(); public: - SmElementsControl(vcl::Window *pParent, const ResId& rResId); + SmElementsControl(vcl::Window *pParent); virtual ~SmElementsControl(); void setElementSetId(sal_uInt16 aSetId); void setVerticalMode(bool bVertical); + Size GetOptimalSize() const SAL_OVERRIDE; + DECL_LINK( ScrollHdl, void* ); void DoScroll(long nDelta); @@ -124,8 +126,8 @@ class SmElementsDockingWindow : public SfxDockingWindow { static const sal_uInt16 aCategories[]; - SmElementsControl maElementsControl; - ListBox maElementListBox; + SmElementsControl* mpElementsControl; + ListBox* mpElementListBox; virtual void Resize() SAL_OVERRIDE; SmViewShell* GetView(); diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index e5aab1968642..7196b26dd269 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -94,7 +94,6 @@ #define RID_SYMBOLFILESSTR (RID_APP_START + 809) #define RID_ALLFILESSTR (RID_APP_START + 810) #define RID_STATUSBAR (RID_APP_START + 816) -#define RID_ELEMENTSDOCKINGWINDOW (RID_APP_START + 817) #define STR_MATH_DOCUMENT_FULLTYPE_CURRENT (RID_APP_START + 821) #define STR_STATSTR_READING (RID_APP_START + 823) |