diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-15 10:08:55 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-15 06:19:28 +0000 |
| commit | ee7da352b885cfead32abb3fd111acead0c32816 (patch) | |
| tree | 1609401dc01cc76a53a65b033827cfbe42fd1d0b /uui | |
| parent | 5bbff06137a87e97260a188f6745cf2a227f15cf (diff) | |
Resolves: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I7154f9472f02fdf47d27ba715db55bb1ec669a8a
Reviewed-on: https://gerrit.libreoffice.org/18580
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/fltdlg.cxx | 4 | ||||
| -rw-r--r-- | uui/source/interactionhandler.cxx | 4 | ||||
| -rw-r--r-- | uui/source/passwordcontainer.hxx | 4 | ||||
| -rw-r--r-- | uui/source/requeststringresolver.hxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 13f81bb2ae38..d91e97dfae54 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -22,7 +22,7 @@ #include "ids.hrc" #include <com/sun/star/util/XStringWidth.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <tools/urlobj.hxx> #include <vcl/button.hxx> @@ -165,7 +165,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem ) @seealso method InetURLObject::getAbbreviated() @threadsafe no *//*-*************************************************************************************************************/ -class StringCalculator : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XStringWidth > +class StringCalculator : public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringWidth > { public: explicit StringCalculator( const OutputDevice* pDevice ) diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index f3984d11d877..389670da2c71 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -27,7 +27,7 @@ #include "iahndl.hxx" #include <comphelper/namedvaluecollection.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> using namespace com::sun::star; @@ -35,7 +35,7 @@ using namespace com::sun::star; namespace { class UUIInteractionHandler: - public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo, + public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo, com::sun::star::lang::XInitialization, com::sun::star::task::XInteractionHandler2 >, private boost::noncopyable diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx index f48e5b223f87..aac2ee3f4a86 100644 --- a/uui/source/passwordcontainer.hxx +++ b/uui/source/passwordcontainer.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_UUI_SOURCE_PASSWORDCONTAINER_HXX #define INCLUDED_UUI_SOURCE_PASSWORDCONTAINER_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -137,7 +137,7 @@ private: class PasswordContainerInteractionHandler : - public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo, + public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo, com::sun::star::task::XInteractionHandler2 > { public: diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx index 964883b62b9b..d355c4bbaee1 100644 --- a/uui/source/requeststringresolver.hxx +++ b/uui/source/requeststringresolver.hxx @@ -24,12 +24,12 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/task/XInteractionRequestStringResolver.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> class UUIInteractionHelper; class UUIInteractionRequestStringResolver: - public cppu::WeakImplHelper2< + public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo, com::sun::star::task::XInteractionRequestStringResolver > { |