diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2016-06-02 15:43:45 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-06-28 07:53:22 +0000 |
| commit | c4e0d6596da5ef2aa040b9974aac987c6a93bb6d (patch) | |
| tree | c920a093acd572470cc87dd9c94798111242be0e /vcl | |
| parent | be40d4e7102d79d1e3aac5771869585cd1545379 (diff) | |
notebookbar: added slide transition tab
- created VclVBox control which creates SlideTransitionPane
- SlideTransitionPane extended with second constructor
which loads ui in horizontal mode
- introduced CloseMethod for NotebookBar to kill widgets in right order
Change-Id: Ic3ba35cb7734aa744a4804c5b670fed7c1bec204
Reviewed-on: https://gerrit.libreoffice.org/25844
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/brdwin.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/syswin.cxx | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 49c60c9ba190..fd3859b9f67c 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -177,6 +177,7 @@ public: void SetMenuBarMode( bool bHide ); void SetNotebookBar(const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame>& rFrame); + void CloseNotebookBar(); const VclPtr<NotebookBar>& GetNotebookBar() const { return mpNotebookBar; } void SetMinOutputSize( long nWidth, long nHeight ) diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index bf4270c2f795..32606f7040fe 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -2183,6 +2183,14 @@ void ImplBorderWindow::SetNotebookBar(const OUString& rUIXMLDescription, const c Resize(); } +void ImplBorderWindow::CloseNotebookBar() +{ + if (mpNotebookBar) + mpNotebookBar.disposeAndClear(); + mpNotebookBar = nullptr; + Resize(); +} + void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index bdf2e44a6ffd..ca0f47feaa95 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -939,6 +939,12 @@ void SystemWindow::SetNotebookBar(const OUString& rUIXMLDescription, const css:: } } +void SystemWindow::CloseNotebookBar() +{ + static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->CloseNotebookBar(); + maNotebookBarUIFile = ""; +} + VclPtr<NotebookBar> SystemWindow::GetNotebookBar() const { return static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->GetNotebookBar(); |