diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-25 17:01:11 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-26 06:41:23 +0000 |
| commit | 03ddeb203171c0e435e2a544e06768d6f51196cb (patch) | |
| tree | c30dc4bca1be0826bdacd2ecf6d16bac6c6038e0 /reportdesign/inc | |
| parent | 5ba6aafa20f78c6209c91a399a8110a415a274e1 (diff) | |
reportdesign: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: Ib5335ab6e64ee407e3aa8f9558a24af40a308107
Reviewed-on: https://gerrit.libreoffice.org/17981
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'reportdesign/inc')
| -rw-r--r-- | reportdesign/inc/PropertyForward.hxx | 4 | ||||
| -rw-r--r-- | reportdesign/inc/UndoActions.hxx | 1 | ||||
| -rw-r--r-- | reportdesign/inc/UndoEnv.hxx | 4 | ||||
| -rw-r--r-- | reportdesign/inc/pch/precompiled_rptui.hxx | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index b77d0cd60eea..a9c61b71ece3 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include "RptDef.hxx" @@ -32,7 +32,7 @@ namespace rptui { - typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::beans::XPropertyChangeListener + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::beans::XPropertyChangeListener > OPropertyForward_Base; /** \class OPropertyMediator diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index b64b0a8e7ca7..1190412646e8 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -36,7 +36,6 @@ #include <com/sun/star/report/XGroup.hpp> #include <com/sun/star/document/XUndoManager.hpp> -#include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include <comphelper/sequence.hxx> #include <svl/lstner.hxx> diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index aa7936180249..78a36c5c602f 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/report/XReportDefinition.hpp> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <memory> #include <svl/lstner.hxx> @@ -34,7 +34,7 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment - : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener + : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener , ::com::sun::star::util::XModifyListener > diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 712651d84caa..d917616b0f11 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -153,7 +153,7 @@ #include <cppuhelper/component_context.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <cstdlib> |