[Libreoffice-commits] core.git: ucb/source

[Stephan Bergmann (via logerrit)]

 ucb/source/ucp/file/filinpstr.cxx |   38 --------------------------------------
 ucb/source/ucp/file/filinpstr.hxx |   25 ++-----------------------
 2 files changed, 2 insertions(+), 61 deletions(-)

New commits:
commit 780132ae68285be986731cd9b887b9546e8b421f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Sep 25 13:20:11 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Sep 25 18:32:08 2019 +0200

    Use cppu::WeakImplHelper
    
    Change-Id: I997286b864247fff6f1eda30fa8e4fcc074b887b
    Reviewed-on: https://gerrit.libreoffice.org/79536
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index 1f1fa2e76bf2..865b5e11ad62 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
-#include <cppuhelper/queryinterface.hxx>
 
 #include <com/sun/star/io/IOException.hpp>
 
@@ -77,43 +76,6 @@ XInputStream_impl::~XInputStream_impl()
     }
 }
 
-
-//  XTypeProvider
-
-
-XTYPEPROVIDER_IMPL_3( XInputStream_impl,
-                      lang::XTypeProvider,
-                      io::XSeekable,
-                      io::XInputStream )
-
-
-uno::Any SAL_CALL
-XInputStream_impl::queryInterface( const uno::Type& rType )
-{
-    uno::Any aRet = cppu::queryInterface( rType,
-                                          static_cast< io::XInputStream* >(this),
-                                          static_cast< lang::XTypeProvider* >(this),
-                                          static_cast< io::XSeekable* >(this) );
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
-void SAL_CALL
-XInputStream_impl::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-void SAL_CALL
-XInputStream_impl::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-
 sal_Int32 SAL_CALL
 XInputStream_impl::readBytes(
                  uno::Sequence< sal_Int8 >& aData,
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 37354f258b08..fffa47f62317 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -20,10 +20,9 @@
 #define INCLUDED_UCB_SOURCE_UCP_FILE_FILINPSTR_HXX
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ucbhelper/macros.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
@@ -35,10 +34,7 @@ namespace fileaccess {
     class TaskManager;
 
     class XInputStream_impl final
-        : public cppu::OWeakObject,
-          public css::lang::XTypeProvider,
-          public css::io::XInputStream,
-          public css::io::XSeekable
+        : public cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable>
     {
     public:
 
@@ -53,23 +49,6 @@ namespace fileaccess {
         sal_Int32 CtorSuccess() { return m_nErrorCode;}
         sal_Int32 getMinorError() { return m_nMinorErrorCode;}
 
-
-        // XTypeProvider
-
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-
-        virtual css::uno::Any SAL_CALL
-        queryInterface( const css::uno::Type& rType ) override;
-
-        virtual void SAL_CALL
-        acquire()
-            throw() override;
-
-        virtual void SAL_CALL
-        release()
-            throw() override;
-
         virtual sal_Int32 SAL_CALL
         readBytes(
             css::uno::Sequence< sal_Int8 >& aData,