diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-06 19:59:36 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-07 09:01:16 +0000 |
| commit | 4e0a5cf0f929ae5fef7eda8057202ac29a8f3a77 (patch) | |
| tree | 6e3348a7a019e734d8924865bc8755f90694bdca /svx/source/form | |
| parent | 7884205f64a962b586a553fd094abc46a3c1562e (diff) | |
svx: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: Id881385b2653da2ee89498afbd6453d40acaea83
Reviewed-on: https://gerrit.libreoffice.org/18358
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/form')
| -rw-r--r-- | svx/source/form/filtnav.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/fmscriptingenv.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/fmtextcontrolshell.cxx | 6 | ||||
| -rw-r--r-- | svx/source/form/fmundo.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/legacyformcontroller.cxx | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index b9fcbb29e834..ea1d6a0d7965 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -39,7 +39,7 @@ #include <comphelper/uno3.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqlnode.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <fmservs.hxx> #include <fmshimp.hxx> #include <sfx2/dispatch.hxx> @@ -281,7 +281,7 @@ public: // class FmFilterAdapter, Listener an den FilterControls -class FmFilterAdapter : public ::cppu::WeakImplHelper1< XFilterControllerListener > +class FmFilterAdapter : public ::cppu::WeakImplHelper< XFilterControllerListener > { FmFilterModel* m_pModel; Reference< XIndexAccess > m_xControllers; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 3c7690cb47d9..fbc8b845b4b4 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/awt/XControl.hpp> #include <tools/diagnose_ex.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> @@ -75,7 +75,7 @@ namespace svxform //= FormScriptListener - typedef ::cppu::WeakImplHelper1 < XScriptListener + typedef ::cppu::WeakImplHelper < XScriptListener > FormScriptListener_Base; /** implements the XScriptListener interface, is used by FormScriptingEnvironment diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index e90f74b61937..affd7bfc8708 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> @@ -160,7 +160,7 @@ namespace svx 0 }; - typedef ::cppu::WeakImplHelper1 < XFocusListener + typedef ::cppu::WeakImplHelper < XFocusListener > FmFocusListenerAdapter_Base; class FmFocusListenerAdapter : public FmFocusListenerAdapter_Base { @@ -246,7 +246,7 @@ namespace svx m_xWindow.clear(); } - typedef ::cppu::WeakImplHelper1 < XMouseListener + typedef ::cppu::WeakImplHelper < XMouseListener > FmMouseListenerAdapter_Base; class FmMouseListenerAdapter : public FmMouseListenerAdapter_Base { diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 35d4538fb380..ae9d25137fc1 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -73,9 +73,9 @@ using namespace ::dbtools; #include <com/sun/star/script/XScriptListener.hpp> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -class ScriptEventListenerWrapper : public cppu::WeakImplHelper1< XScriptListener > +class ScriptEventListenerWrapper : public cppu::WeakImplHelper< XScriptListener > { public: explicit ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException ) diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 2edb9002fc39..385da67c6138 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/processfactory.hxx> @@ -58,7 +58,7 @@ namespace svxform //= LegacyFormController - typedef ::cppu::WeakImplHelper2 < form::XFormController + typedef ::cppu::WeakImplHelper < form::XFormController , XServiceInfo > LegacyFormController_Base; /** is an implementation of the legacy form controller service, namely css.form.FormController, supporting the |