[Libreoffice-commits] core.git: sc/inc sc/source

[Noel Grandin (via logerrit)]

 sc/inc/TablePivotChart.hxx              |    8 +++-----
 sc/source/ui/unoobj/TablePivotChart.cxx |    5 +----
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 6c3b3832902157324af49bca5a16cebdf5ba3caf
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Dec 25 21:07:32 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 07:38:23 2021 +0100

    use comphelper::WeakComponentImplHelper in TablePivotChart
    
    and remove some unnecessary use of SolarMutex
    
    Change-Id: I3934d89eb75f47a6b7051a8b737dcdbeecfa0c3a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127529
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sc/inc/TablePivotChart.hxx b/sc/inc/TablePivotChart.hxx
index 2ba73530ad85..8dc61d2582f8 100644
--- a/sc/inc/TablePivotChart.hxx
+++ b/sc/inc/TablePivotChart.hxx
@@ -15,8 +15,7 @@
 #include <com/sun/star/container/XNamed.hpp>
 
 #include <svl/lstner.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 
 #include "types.hxx"
 
@@ -25,14 +24,13 @@ class ScDocShell;
 namespace sc
 {
 
-typedef cppu::WeakComponentImplHelper<css::table::XTablePivotChart,
+typedef comphelper::WeakComponentImplHelper<css::table::XTablePivotChart,
                                       css::document::XEmbeddedObjectSupplier,
                                       css::container::XNamed,
                                       css::lang::XServiceInfo>
         TablePivotChart_Base;
 
-class TablePivotChart final : public cppu::BaseMutex,
-                        public TablePivotChart_Base,
+class TablePivotChart final : public TablePivotChart_Base,
                         public SfxListener
 {
 private:
diff --git a/sc/source/ui/unoobj/TablePivotChart.cxx 
b/sc/source/ui/unoobj/TablePivotChart.cxx
index 4ede28086fc5..ecc158002db7 100644
--- a/sc/source/ui/unoobj/TablePivotChart.cxx
+++ b/sc/source/ui/unoobj/TablePivotChart.cxx
@@ -28,8 +28,7 @@ namespace sc
 SC_SIMPLE_SERVICE_INFO(TablePivotChart, "TablePivotChart", 
"com.sun.star.table.TablePivotChart")
 
 TablePivotChart::TablePivotChart(ScDocShell* pDocShell, SCTAB nTab, const 
OUString& rName)
-    : TablePivotChart_Base(m_aMutex)
-    , m_pDocShell(pDocShell)
+    : m_pDocShell(pDocShell)
     , m_nTab(nTab)
     , m_aChartName(rName)
 {
@@ -66,13 +65,11 @@ uno::Reference<lang::XComponent> SAL_CALL 
TablePivotChart::getEmbeddedObject()
 
 OUString SAL_CALL TablePivotChart::getName()
 {
-    SolarMutexGuard aGuard;
     return m_aChartName;
 }
 
 void SAL_CALL TablePivotChart::setName(OUString const & /* aName */)
 {
-    SolarMutexGuard aGuard;
     throw uno::RuntimeException(); // name cannot be changed
 }