diff options
Diffstat (limited to 'vcl/source/window/syswin.cxx')
| -rw-r--r-- | vcl/source/window/syswin.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 86c0a8b9dbd8..02b15dac35ce 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -39,8 +39,6 @@ #include <brdwin.hxx> #include <window.h> -#include "notebookbarwindow.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -940,9 +938,18 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar) } } -VclPtr<vcl::Window> SystemWindow::CreateNotebookBar(const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame>& rFrame) +void SystemWindow::SetNotebookBar(const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame>& rFrame) +{ + if (rUIXMLDescription != maNotebookBarUIFile) + { + static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->SetNotebookBar(rUIXMLDescription, rFrame); + maNotebookBarUIFile = rUIXMLDescription; + } +} + +VclPtr<NotebookBar> SystemWindow::GetNotebookBar() const { - return static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->CreateNotebookBarWindow(rUIXMLDescription, rFrame); + return static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->GetNotebookBar(); } void SystemWindow::SetMenuBarMode( MenuBarMode nMode ) |