diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-01 09:46:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 06:49:07 +0000 |
| commit | cd71034b26a404c8f9b763865ef6ebdd0adeebb7 (patch) | |
| tree | ff2aaa6a6d1849b51d883d48dfdef04b17817fcd /sc | |
| parent | 70bfe5f71c1d45c14ce831051480a11c58ffc34d (diff) | |
comphelper::OBaseMutex -> cppu::BaseMutex
convert usage of deprecated class, and remove the old class
Change-Id: I19fb9271090d19e5531622b58492e1a848d306e2
Reviewed-on: https://gerrit.libreoffice.org/26843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/chartuno.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/AccessibleContextBase.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/inc/ChartRangeSelectionListener.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/celllistsource.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/cellvaluebinding.hxx | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index 77e1bd053a36..c11c70efcb92 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -113,7 +113,7 @@ typedef ::cppu::WeakComponentImplHelper< typedef ::comphelper::OPropertyContainer ScChartObj_PBase; typedef ::comphelper::OPropertyArrayUsageHelper< ScChartObj > ScChartObj_PABase; -class ScChartObj : public ::comphelper::OBaseMutex +class ScChartObj : public ::cppu::BaseMutex ,public ScChartObj_Base ,public ScChartObj_PBase ,public ScChartObj_PABase diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index c1503eee740c..3740cba2d5ff 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -36,10 +36,10 @@ #include <cppuhelper/interfacecontainer.h> #include <svl/lstner.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase5.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/servicehelper.hxx> -#include <comphelper/broadcasthelper.hxx> class Rectangle; @@ -61,7 +61,7 @@ typedef cppu::ImplHelper1< > ScAccessibleContextBaseImplEvent; class ScAccessibleContextBase - : public comphelper::OBaseMutex, + : public cppu::BaseMutex, public ScAccessibleContextBaseWeakImpl, public ScAccessibleContextBaseImplEvent, public SfxListener diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index e4f5c7d5a822..0970a9f1352b 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SC_SOURCE_UI_INC_CHARTRANGESELECTIONLISTENER_HXX #include <cppuhelper/compbase.hxx> -#include <comphelper/broadcasthelper.hxx> +#include <cppuhelper/basemutex.hxx> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -32,7 +32,7 @@ typedef ::cppu::WeakComponentImplHelper< ScChartRangeSelectionListener_Base; class ScChartRangeSelectionListener : - public comphelper::OBaseMutex, + public cppu::BaseMutex, public ScChartRangeSelectionListener_Base { public: diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 2cc076bd34e9..917513358d54 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -22,10 +22,10 @@ #include <com/sun/star/form/binding/XListEntrySource.hpp> #include <cppuhelper/compbase4.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/uno3.hxx> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/proparrhlp.hxx> #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> @@ -53,7 +53,7 @@ namespace calc typedef ::comphelper::OPropertyArrayUsageHelper< OCellListSource > OCellListSource_PABase; - class OCellListSource :public ::comphelper::OBaseMutex + class OCellListSource :public ::cppu::BaseMutex ,public OCellListSource_Base // order matters! before OCellListSource_PBase, so rBHelper gets initialized ,public OCellListSource_PBase ,public OCellListSource_PABase diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 94c8e63a170c..7550b486163b 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -23,10 +23,10 @@ #include <com/sun/star/form/binding/XValueBinding.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <cppuhelper/compbase5.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/uno3.hxx> -#include <comphelper/broadcasthelper.hxx> #include <comphelper/proparrhlp.hxx> #include <com/sun/star/table/XCell.hpp> #include <com/sun/star/table/CellAddress.hpp> @@ -55,7 +55,7 @@ namespace calc typedef ::comphelper::OPropertyArrayUsageHelper< OCellValueBinding > OCellValueBinding_PABase; - class OCellValueBinding :public ::comphelper::OBaseMutex + class OCellValueBinding :public ::cppu::BaseMutex ,public OCellValueBinding_Base // order matters! before OCellValueBinding_PBase, so rBHelper gets initialized ,public OCellValueBinding_PBase ,public OCellValueBinding_PABase |