summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorSzymon Kłos <eszkadev@gmail.com>2016-05-10 19:16:47 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2016-05-17 12:40:15 +0000
commit6ebf9cfbf54052d7fae50cdab146cc5c63ba262a (patch)
tree60e9e0ccc0878746d7817d58497b7fa53c0468fd /vcl
parent2049e55f507b00cf70f72706900e75d20ff3bb30 (diff)
Set different ui file for NotebookBar in each app
Changes: + added ui file for start center, calc and impress + NotebookBar not visible in Math, Draw Change-Id: Ie35935e67524ac712930b088591e9e53955de4a1 Reviewed-on: https://gerrit.libreoffice.org/24860 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/brdwin.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 57f7e0c892b3..bc58e47d011e 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -2177,6 +2177,8 @@ void ImplBorderWindow::SetMenuBarMode( bool bHide )
void ImplBorderWindow::SetNotebookBar(const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame>& rFrame)
{
+ if (mpNotebookBar)
+ mpNotebookBar.disposeAndClear();
mpNotebookBar = VclPtr<NotebookBar>::Create(this, "NotebookBar", rUIXMLDescription, rFrame);
Resize();
}