diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-03-07 17:26:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-08 16:23:45 +0000 |
| commit | 68b5875647dd3f39f9e01eec75383a5b9b3ef3a6 (patch) | |
| tree | 134049d495a93b6800c7eeddfebcc696e20d0ff7 /include/vcl | |
| parent | f14e5f5deaa49131e41300e9a7bf3ea54023b511 (diff) | |
convert custom bibliography toolbar to .ui format
Change-Id: I70eb0e2ff96879d1168b241852a0079f540b0319
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/dockwin.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/toolbox.hxx | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 23a5220abfa3..e126c3ea407c 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -247,11 +247,13 @@ private: mbRollUp:1, mbDockBtn:1, mbHideBtn:1, - mbIsDefferedInit:1, mbIsCalculatingInitialLayoutSize:1, mbInitialLayoutDone:1; +protected: + bool mbIsDefferedInit; VclPtr<vcl::Window> mpDialogParent; +private: SAL_DLLPRIVATE void ImplInitDockingWindowData(); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox); @@ -279,7 +281,7 @@ public: SAL_DLLPRIVATE bool ImplStartDocking( const Point& rPos ); SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; } SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutIdle.IsActive(); } - void doDeferredInit(WinBits nBits); + virtual void doDeferredInit(WinBits nBits); protected: DockingWindow( WindowType nType ); DockingWindow(vcl::Window* pParent, const ResId& rResId); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index f81673cc2ffd..da057b88c4a7 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -247,8 +247,10 @@ protected: } public: - ToolBox( vcl::Window* pParent, WinBits nStyle = 0 ); - ToolBox( vcl::Window* pParent, const ResId& rResId ); + ToolBox( vcl::Window* pParent, WinBits nStyle = 0 ); + ToolBox( vcl::Window* pParent, const ResId& rResId ); + ToolBox(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~ToolBox(); virtual void dispose() override; @@ -283,6 +285,7 @@ public: virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) override; virtual void Resizing( Size& rSize ) override; virtual Size GetOptimalSize() const override; + virtual void doDeferredInit(WinBits nBits) override; void InsertItem( const ResId& rResId ); /// Insert a command (like '.uno:Save'). |