summaryrefslogtreecommitdiff
path: root/include/sfx2/sidebar/SidebarController.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'include/sfx2/sidebar/SidebarController.hxx')
-rw-r--r--include/sfx2/sidebar/SidebarController.hxx10
1 files changed, 4 insertions, 6 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;