diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-10 17:50:12 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-20 07:06:22 +0000 |
| commit | a890a7696ff5dfc3ec8a012ba59cc04db4a1473d (patch) | |
| tree | 9e0d23aadb43f2bbdf3bac2db8aff76307bda5fc /sfx2 | |
| parent | 3f0677b86f4831b011a2baece85cf93c68646cd5 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, for comphelper.
This also includes extra changes in other modules
required accordingly.
Change-Id: Id1537f46f1c90f760a0d8987a6dafa0e1da03b8f
Reviewed-on: https://gerrit.libreoffice.org/16929
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appuno.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/inc/fltoptint.hxx | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 876cf3423e0d..4c3e83b45919 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -59,6 +59,7 @@ #include <tools/config.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/document/FilterOptionsRequest.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -1707,7 +1708,7 @@ uno::Sequence< uno::Reference< task::XInteractionContinuation > > } -class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< task::XInteractionRequest > +class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper< task::XInteractionRequest > { uno::Any m_aRequest; uno::Sequence< uno::Reference< task::XInteractionContinuation > > m_lContinuations; @@ -1777,7 +1778,7 @@ com::sun::star::uno::Reference < task::XInteractionRequest > RequestPackageRepar } -class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< task::XInteractionRequest > +class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper< task::XInteractionRequest > { uno::Any m_aRequest; uno::Sequence< uno::Reference< task::XInteractionContinuation > > m_lContinuations; diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx index 1572cc7f5054..1200eef67b64 100644 --- a/sfx2/source/inc/fltoptint.hxx +++ b/sfx2/source/inc/fltoptint.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/document/XInteractionFilterOptions.hpp> #include <com/sun/star/frame/XModel.hpp> #include <comphelper/interaction.hxx> +#include <cppuhelper/implbase.hxx> class FilterOptionsContinuation : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterOptions > { @@ -32,7 +33,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getFilterOptions( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class RequestFilterOptions : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > +class RequestFilterOptions : public ::cppu::WeakImplHelper< ::com::sun::star::task::XInteractionRequest > { ::com::sun::star::uno::Any m_aRequest; |