diff options
| -rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 37 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 12 | ||||
| -rw-r--r-- | include/sfx2/sidebar/SidebarDockingWindow.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 15 |
4 files changed, 52 insertions, 13 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index aa52f3edc16b..54c8a8189ab5 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -45,6 +45,8 @@ #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> +#include <sfx2/sidebar/SidebarController.hxx> +#include <sfx2/sidebar/SidebarDockingWindow.hxx> #include <unotools/datetime.hxx> #include <unotools/syslocaleoptions.hxx> #include <comphelper/string.hxx> @@ -3270,10 +3272,35 @@ void DesktopLOKTest::testMultiDocuments() } } +namespace +{ + SfxChildWindow* lcl_initializeSidebar() + { + // in init.cxx we do setupSidebar which creaes the controller, do it here + + SfxViewShell* pViewShell = SfxViewShell::Current(); + CPPUNIT_ASSERT(pViewShell); + + SfxViewFrame* pViewFrame = pViewShell->GetViewFrame(); + CPPUNIT_ASSERT(pViewFrame); + + SfxChildWindow* pSideBar = pViewFrame->GetChildWindow(SID_SIDEBAR); + CPPUNIT_ASSERT(pSideBar); + + auto pDockingWin = dynamic_cast<sfx2::sidebar::SidebarDockingWindow *>(pSideBar->GetWindow()); + CPPUNIT_ASSERT(pDockingWin); + + pDockingWin->GetOrCreateSidebarController(); // just to create the controller + + return pSideBar; + } +}; + void DesktopLOKTest::testControlState() { LibLODocument_Impl* pDocument = loadDoc("search.ods"); pDocument->pClass->postUnoCommand(pDocument, ".uno:StarShapes", nullptr, false); + lcl_initializeSidebar(); Scheduler::ProcessEventsToIdle(); boost::property_tree::ptree aState; @@ -3287,17 +3314,9 @@ void DesktopLOKTest::testMetricField() { LibLODocument_Impl* pDocument = loadDoc("search.ods"); pDocument->pClass->postUnoCommand(pDocument, ".uno:StarShapes", nullptr, false); + SfxChildWindow* pSideBar = lcl_initializeSidebar(); Scheduler::ProcessEventsToIdle(); - SfxViewShell* pViewShell = SfxViewShell::Current(); - CPPUNIT_ASSERT(pViewShell); - - SfxViewFrame* pViewFrame = pViewShell->GetViewFrame(); - CPPUNIT_ASSERT(pViewFrame); - - SfxChildWindow* pSideBar = pViewFrame->GetChildWindow(SID_SIDEBAR); - CPPUNIT_ASSERT(pSideBar); - vcl::Window* pWin = pSideBar->GetWindow(); CPPUNIT_ASSERT(pWin); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 7d9c4cfc3643..b3fae56f721f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -874,13 +874,21 @@ void setupSidebar(std::u16string_view sidebarDeckId = u"") if (!pDockingWin) return; + pViewFrame->ShowChildWindow( SID_SIDEBAR ); + + const rtl::Reference<sfx2::sidebar::SidebarController>& xController + = pDockingWin->GetOrCreateSidebarController(); + + xController->FadeIn(); + xController->RequestOpenDeck(); + if (!sidebarDeckId.empty()) { - pDockingWin->GetSidebarController()->SwitchToDeck(sidebarDeckId); + xController->SwitchToDeck(sidebarDeckId); } else { - pDockingWin->GetSidebarController()->SwitchToDefaultDeck(); + xController->SwitchToDefaultDeck(); } pDockingWin->SyncUpdate(); diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx b/include/sfx2/sidebar/SidebarDockingWindow.hxx index 9bad1f5a8464..b22aefcb34a9 100644 --- a/include/sfx2/sidebar/SidebarDockingWindow.hxx +++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx @@ -46,6 +46,7 @@ public: void SyncUpdate(); auto& GetSidebarController() const { return mpSidebarController; } + rtl::Reference<sfx2::sidebar::SidebarController>& GetOrCreateSidebarController(); using SfxDockingWindow::Close; private: diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 18000601bfd0..23c3b459c3be 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -22,6 +22,7 @@ #include <sidebar/PanelDescriptor.hxx> #include <comphelper/dispatchcommand.hxx> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> @@ -49,11 +50,21 @@ SidebarDockingWindow::SidebarDockingWindow(SfxBindings* pSfxBindings, SidebarChi OSL_ASSERT(pSfxBindings!=nullptr); OSL_ASSERT(pSfxBindings->GetDispatcher()!=nullptr); } - else + else if (!comphelper::LibreOfficeKit::isActive()) { - const SfxViewFrame* pViewFrame = pSfxBindings->GetDispatcher()->GetFrame(); + GetOrCreateSidebarController(); + } +} + +rtl::Reference<sfx2::sidebar::SidebarController>& SidebarDockingWindow::GetOrCreateSidebarController() +{ + if (!mpSidebarController) + { + const SfxViewFrame* pViewFrame = GetBindings().GetDispatcher()->GetFrame(); mpSidebarController = sfx2::sidebar::SidebarController::create(this, pViewFrame); } + + return mpSidebarController; } SidebarDockingWindow::~SidebarDockingWindow() |