diff options
| -rw-r--r-- | include/sfx2/sidebar/SidebarController.hxx | 10 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 1 |
3 files changed, 7 insertions, 11 deletions
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 0a09f993dbad..baedec092484 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -37,14 +37,13 @@ #include <com/sun/star/ui/XSidebar.hpp> #include <optional> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/basemutex.hxx> +#include <comphelper/compbase.hxx> namespace com::sun::star::awt { class XWindow; } namespace com::sun::star::frame { class XDispatch; } namespace com::sun::star::ui { class XUIElement; } -typedef cppu::WeakComponentImplHelper < +typedef comphelper::WeakComponentImplHelper < css::ui::XContextChangeEventListener, css::beans::XPropertyChangeListener, css::ui::XSidebar, @@ -61,8 +60,7 @@ class DeckDescriptor; class SidebarDockingWindow; class SFX2_DLLPUBLIC SidebarController final - : private ::cppu::BaseMutex, - public SidebarControllerInterfaceBase + : public SidebarControllerInterfaceBase { public: static rtl::Reference<SidebarController> create(SidebarDockingWindow* pParentWindow, @@ -294,7 +292,7 @@ private: */ void ShowPanel (const Panel& rPanel); - virtual void SAL_CALL disposing() override; + virtual void disposing(std::unique_lock<std::mutex>&) override; std::unique_ptr<ResourceManager> mpResourceManager; diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 279b602cb2a6..eb1bfc5bbb9a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -110,8 +110,7 @@ namespace { SidebarController::SidebarController ( SidebarDockingWindow* pParentWindow, const SfxViewFrame* pViewFrame) - : SidebarControllerInterfaceBase(m_aMutex), - mpParentWindow(pParentWindow), + : mpParentWindow(pParentWindow), mpViewFrame(pViewFrame), mxFrame(pViewFrame->GetFrame().GetFrameInterface()), mpTabBar(VclPtr<TabBar>::Create( @@ -273,7 +272,7 @@ namespace }; } -void SAL_CALL SidebarController::disposing() +void SidebarController::disposing(std::unique_lock<std::mutex>&) { SolarMutexGuard aSolarMutexGuard; @@ -359,8 +358,6 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex void SAL_CALL SidebarController::disposing (const css::lang::EventObject& ) { - SolarMutexGuard aSolarMutexGuard; - dispose(); } diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index c8f847fffb3b..71e55767450e 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -33,6 +33,7 @@ #include <vcl/event.hxx> #include <comphelper/lok.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> +#include <osl/diagnose.h> #include <boost/property_tree/json_parser.hpp> |