diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2016-03-18 13:55:24 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-03-30 11:01:30 +0200 |
| commit | 1fb314832ebd14cde6457feb2bf4f19e1bfcaa82 (patch) | |
| tree | da734f97c69385c0864c42249de09f2d5a3754a6 /sw | |
| parent | 2c29716d349353997bf7cdde63cd9f867c5baeb6 (diff) | |
notebookbar: Instantiate the notebookbar via sfx2 infrastructure.
Change-Id: Iaed4596246245560e646d9086e717d5fb516897e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view0.cxx | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 963164651352..6199616a939d 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -98,6 +98,7 @@ #include <modcfg.hxx> #include <fontcfg.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> +#include <sfx2/notebookbar/NotebookBarChildWindow.hxx> #include <sfx2/evntconf.hxx> #include <swatrset.hxx> #include <idxmrk.hxx> @@ -367,6 +368,11 @@ void SwDLL::RegisterControls() ::avmedia::MediaPlayer::RegisterChildWindow(false, pMod); ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod); + ::sfx2::NotebookBarChildWindow::RegisterChildWindow(false, pMod); + + //SfxFrame& rFrame = GetActiveView()->GetViewFrame()->GetFrame(); + //rFrame.GetSystemWindow()->SetNotebookBar("vcl/ui/notebookbar.ui", rFrame.GetFrameInterface()); + SwJumpToSpecificPageControl::RegisterControl(SID_JUMP_TO_SPECIFIC_PAGE, pMod); } diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 281b009f7fb6..cd4cd0e7acc8 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -37,6 +37,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> +#include <sfx2/notebookbar/NotebookBarChildWindow.hxx> #include <uivwimp.hxx> #include <avmedia/mediaplayer.hxx> #include <swmodule.hxx> @@ -98,6 +99,8 @@ void SwView::InitInterface_Impl() GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true); GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(::sfx2::NotebookBarChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SwSpellDialogChildWindow::GetChildWindowId()); |