[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Szymon Kłos]

 include/sfx2/notebookbar/SfxNotebookBar.hxx |    3 +++
 sfx2/source/dialog/backingcomp.cxx          |    8 ++++++++
 sfx2/source/notebookbar/SfxNotebookBar.cxx  |   12 +++++++++---
 3 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 599f6db17c4d2e23496fbd23b1dec53c2402e4b1
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Wed Jun 1 21:47:27 2016 +0200

    notebookbar: load ui for the start center
    
    Change-Id: Iaf0e46436524e081edb287efd4074becaf02a98f
    Reviewed-on: https://gerrit.libreoffice.org/25799
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index 7f40e8a..156d616 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -26,6 +26,9 @@ public:
 
     /// Function to be called from the sdi's StateMethod.
     static void StateMethod(SfxBindings& rBindings, const OUString& rUIFile);
+    static void StateMethod(SystemWindow* pSysWindow,
+                            const css::uno::Reference<css::frame::XFrame> xFrame,
+                            const OUString& rUIFile);
 };
 
 } // namespace sfx2
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index 7569830..937501b 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -59,6 +59,7 @@
 
 #include <unotools/bootstrap.hxx>
 
+#include <sfx2/notebookbar/SfxNotebookBar.hxx>
 
 namespace {
 
@@ -429,6 +430,13 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
     if( pBack )
         pBack->setOwningFrame( m_xFrame );
 
+    // set NotebookBar
+    SystemWindow* pSysWindow = static_cast<SystemWindow*>(pParent);
+    if (pSysWindow)
+    {
+        sfx2::SfxNotebookBar::StateMethod(pSysWindow, m_xFrame, "sfx/ui/notebookbar.ui");
+    }
+
     // Set a minimum size for Start Center
     if( pParent && pBack )
     {
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index d2d9409..6888c5f 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -29,17 +29,23 @@ void SfxNotebookBar::ExecMethod(SfxBindings& rBindings)
 void SfxNotebookBar::StateMethod(SfxBindings& rBindings, const OUString& rUIFile)
 {
     SfxFrame& rFrame = rBindings.GetDispatcher_Impl()->GetFrame()->GetFrame();
+    StateMethod(rFrame.GetSystemWindow(), rFrame.GetFrameInterface(), rUIFile);
+}
 
+void SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
+                                 const css::uno::Reference<css::frame::XFrame> xFrame,
+                                 const OUString& rUIFile)
+{
     SvtViewOptions aViewOpt(E_WINDOW, "notebookbar");
 
     if (aViewOpt.IsVisible())
     {
         // setup if necessary
-        rFrame.GetSystemWindow()->SetNotebookBar(rUIFile, rFrame.GetFrameInterface());
+        pSysWindow->SetNotebookBar(rUIFile, xFrame);
 
-        rFrame.GetSystemWindow()->GetNotebookBar()->Show();
+        pSysWindow->GetNotebookBar()->Show();
     }
-    else if (auto pNotebookBar = rFrame.GetSystemWindow()->GetNotebookBar())
+    else if (auto pNotebookBar = pSysWindow->GetNotebookBar())
         pNotebookBar->Hide();
 }