summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2015-09-15 10:08:55 +0900
committerNoel Grandin <noelgrandin@gmail.com>2015-09-15 06:19:28 +0000
commitee7da352b885cfead32abb3fd111acead0c32816 (patch)
tree1609401dc01cc76a53a65b033827cfbe42fd1d0b /sot
parent5bbff06137a87e97260a188f6745cf2a227f15cf (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 'sot')
-rw-r--r--sot/source/sdstor/ucbstorage.cxx4
-rw-r--r--sot/source/unoolestorage/xolesimplestorage.hxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index d6321fd797bb..7e1cfb4a8e78 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -55,7 +55,7 @@
#include <unotools/localfilehelper.hxx>
#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <ucbhelper/commandenvironment.hxx>
#include "sot/stg.hxx"
@@ -81,7 +81,7 @@ static int nOpenFiles=0;
static int nOpenStreams=0;
#endif
-typedef ::cppu::WeakImplHelper2 < XInputStream, XSeekable > FileInputStreamWrapper_Base;
+typedef ::cppu::WeakImplHelper < XInputStream, XSeekable > FileInputStreamWrapper_Base;
class FileStreamWrapper_Impl : public FileInputStreamWrapper_Base
{
protected:
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index 818de7548739..03593c7d93ec 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/io/XOutputStream.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <osl/mutex.hxx>
@@ -38,7 +38,7 @@
#include <sot/stg.hxx>
-class OLESimpleStorage : public ::cppu::WeakImplHelper3
+class OLESimpleStorage : public ::cppu::WeakImplHelper
< ::com::sun::star::embed::XOLESimpleStorage
, ::com::sun::star::lang::XInitialization
, ::com::sun::star::lang::XServiceInfo >