diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-10 16:29:31 +0900 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-07-17 09:39:04 +0200 |
| commit | 5c420fcdf9f36852df793b9944db4491271d23cf (patch) | |
| tree | 414b715e4b91d9eb6cf0c44ca12ebd91da0a82b9 /chart2/source/tools | |
| parent | 5f9cde384aa213cf8cf6c84a005647e59bc58ae6 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, in chart2.
Change-Id: Ib145860cf757d932fd5710f92c7f9ce33904b619
Diffstat (limited to 'chart2/source/tools')
| -rw-r--r-- | chart2/source/tools/ModifyListenerCallBack.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/tools/ModifyListenerHelper.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/tools/RegressionCurveModel.hxx | 4 | ||||
| -rw-r--r-- | chart2/source/tools/RegressionEquation.hxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index dd2f2816abef..4b65256ad41d 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -19,14 +19,14 @@ #include "ModifyListenerCallBack.hxx" #include "MutexContainer.hxx" -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; namespace chart { -typedef ::cppu::WeakComponentImplHelper1< +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::util::XModifyListener > ModifyListenerCallBack_Base; diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index f8522799c21b..b6d093e8d362 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -95,7 +95,7 @@ uno::Reference< util::XModifyListener > createModifyEventForwarder() } ModifyEventForwarder::ModifyEventForwarder() : - ::cppu::WeakComponentImplHelper2< + ::cppu::WeakComponentImplHelper< ::com::sun::star::util::XModifyBroadcaster, ::com::sun::star::util::XModifyListener >( m_aMutex ), m_aModifyListeners( m_aMutex ) diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 0fedc2ab9166..1bbb03bf554c 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -23,7 +23,7 @@ #include "OPropertySet.hxx" #include "ModifyListenerHelper.hxx" -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/chart2/XRegressionCurve.hpp> @@ -38,7 +38,7 @@ namespace chart namespace impl { -typedef ::cppu::WeakImplHelper6< +typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XServiceName, ::com::sun::star::chart2::XRegressionCurve, diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 27f7efc1bf4f..e20bba144728 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -30,7 +30,7 @@ #include "OPropertySet.hxx" #include "ModifyListenerHelper.hxx" -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> namespace chart @@ -38,7 +38,7 @@ namespace chart namespace impl { -typedef ::cppu::WeakImplHelper5< +typedef ::cppu::WeakImplHelper< css::lang::XServiceInfo, ::com::sun::star::util::XCloneable, ::com::sun::star::util::XModifyBroadcaster, |