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 /ure | |
| 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 'ure')
| -rw-r--r-- | ure/source/uretest/cppmain.cc | 4 | ||||
| -rw-r--r-- | ure/source/uretest/cppserver.cc | 4 | ||||
| -rw-r--r-- | ure/source/uretest/cpptest.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index ab38ef99b6c7..6efcf64beda1 100644 --- a/ure/source/uretest/cppmain.cc +++ b/ure/source/uretest/cppmain.cc @@ -55,7 +55,7 @@ #include "com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp" #include "com/sun/star/util/theMacroExpander.hpp" #include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase1.hxx" +#include <cppuhelper/implbase.hxx> #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/interfacecontainer.hxx" #include "cppuhelper/unourl.hxx" @@ -77,7 +77,7 @@ namespace { -class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > { +class Service: public ::cppu::WeakImplHelper< css::lang::XMain > { public: explicit Service( css::uno::Reference< css::uno::XComponentContext > const & context): diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc index 69b33c3b9f6a..09a02ffc1c8f 100644 --- a/ure/source/uretest/cppserver.cc +++ b/ure/source/uretest/cppserver.cc @@ -27,7 +27,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase1.hxx" +#include <cppuhelper/implbase.hxx> #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/weak.hxx" #include "rtl/ustring.h" @@ -40,7 +40,7 @@ namespace { -class Service: public ::cppu::WeakImplHelper1< ::test::types::XServer > { +class Service: public ::cppu::WeakImplHelper< ::test::types::XServer > { public: Service() {} diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc index d1f112dabd82..db8dd3b9dcf8 100644 --- a/ure/source/uretest/cpptest.cc +++ b/ure/source/uretest/cpptest.cc @@ -25,7 +25,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase1.hxx" +#include <cppuhelper/implbase.hxx> #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/weak.hxx" #include "rtl/ustring.h" @@ -38,7 +38,7 @@ namespace { -class Service: public cppu::WeakImplHelper1< test::types::XTest > { +class Service: public cppu::WeakImplHelper< test::types::XTest > { public: Service() {} |