diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-03-29 11:13:57 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-03-30 11:01:30 +0200 |
| commit | d039c4812db5ba4beed72deb44fe6b04137af6e5 (patch) | |
| tree | 4369ed1e5984bbfa7fd7d41ee103624782c79834 /sfx2 | |
| parent | 1fb314832ebd14cde6457feb2bf4f19e1bfcaa82 (diff) | |
notebookbar: Rename NotebookBarWindow to NotebookBar, and move accordingly.
Change-Id: If04a8f62aba0bcb712ae6405db318a4bd073fc54
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/notebookbar/NotebookBarChildWindow.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/notebookbar/NotebookBarChildWindow.cxx b/sfx2/source/notebookbar/NotebookBarChildWindow.cxx index 7c5609bea793..365d6ef8c546 100644 --- a/sfx2/source/notebookbar/NotebookBarChildWindow.cxx +++ b/sfx2/source/notebookbar/NotebookBarChildWindow.cxx @@ -23,9 +23,10 @@ NotebookBarChildWindow::NotebookBarChildWindow (vcl::Window* pParentWindow, sal_ : SfxChildWindow(pParentWindow, nId) { SfxFrame& rFrame = pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(); - VclPtr<vcl::Window> pNotebookBarWindow = rFrame.GetSystemWindow()->CreateNotebookBar("vcl/ui/notebookbar.ui", rFrame.GetFrameInterface()); + rFrame.GetSystemWindow()->SetNotebookBar("vcl/ui/notebookbar.ui", rFrame.GetFrameInterface()); - pNotebookBarWindow->SetHelpId(HID_NOTEBOOKBAR_WINDOW); + VclPtr<NotebookBar> pNotebookBar(rFrame.GetSystemWindow()->GetNotebookBar()); + pNotebookBar->SetHelpId(HID_NOTEBOOKBAR_WINDOW); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |