diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-19 10:15:06 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-19 07:48:50 +0000 |
| commit | e00d41f76d6cae3a93c112117af01287eb003e0e (patch) | |
| tree | 7aaa27f9051ae58fc0aea9d094b19a59a37e0641 /io/source/stm/odata.cxx | |
| parent | vcl: document VCL_DOUBLEBUFFERING_ENABLE (diff) | |
| download | core-e00d41f76d6cae3a93c112117af01287eb003e0e.tar.gz core-e00d41f76d6cae3a93c112117af01287eb003e0e.zip | |
io: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: Iad03db6b729a785ab8b29a69943fa45f5a36b21b
Reviewed-on: https://gerrit.libreoffice.org/17849
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'io/source/stm/odata.cxx')
| -rw-r--r-- | io/source/stm/odata.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index ca2bc78423fa..892c7968610d 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -23,8 +23,7 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/endian.h> @@ -50,7 +49,7 @@ using namespace ::com::sun::star::lang; namespace io_stm { class ODataInputStream : - public WeakImplHelper4 < + public WeakImplHelper < XDataInputStream, XActiveDataSink, XConnectable, @@ -496,7 +495,7 @@ Sequence<OUString> ODataInputStream_getSupportedServiceNames() class ODataOutputStream : - public WeakImplHelper4 < + public WeakImplHelper < XDataOutputStream, XActiveDataSource, XConnectable, @@ -910,7 +909,7 @@ typedef std::unordered_map > ObjectContainer_Impl; class OObjectOutputStream: - public ImplInheritanceHelper2< + public ImplInheritanceHelper< ODataOutputStream, /* parent */ XObjectOutputStream, XMarkableStream > { @@ -1177,7 +1176,7 @@ Sequence< OUString > OObjectOutputStream::getSupportedServiceNames() throw (std: } class OObjectInputStream: - public ImplInheritanceHelper2< + public ImplInheritanceHelper< ODataInputStream, /* parent */ XObjectInputStream, XMarkableStream > { |