#932003# forgotten to support XServiceInfo

4 files changed, 127 insertions, 1 deletions

diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index 8f91e249d5e7..0be04abf2253 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -69,6 +69,50 @@ sal_Int32 SAL_CALL XInputStream_impl::getMinorError()
 }
 
 
+//////////////////////////////////////////////////////////////////////////////////////////
+//  XServiceInfo
+//////////////////////////////////////////////////////////////////////////////////////////
+
+rtl::OUString SAL_CALL
+XInputStream_impl::getImplementationName()
+    throw(uno::RuntimeException)
+{
+    return rtl::OUString();
+}
+
+
+
+sal_Bool SAL_CALL
+XInputStream_impl::supportsService( const rtl::OUString& ServiceName )
+    throw(uno::RuntimeException)
+{
+    return false;
+}
+
+
+
+uno::Sequence< rtl::OUString > SAL_CALL
+XInputStream_impl::getSupportedServiceNames()
+    throw( uno::RuntimeException )
+{
+    uno::Sequence< rtl::OUString > ret( 0 );
+    return ret;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//  XTypeProvider
+//////////////////////////////////////////////////////////////////////////////////////////
+
+
+XTYPEPROVIDER_IMPL_4( XInputStream_impl,
+                      lang::XTypeProvider,
+                      lang::XServiceInfo,
+                      io::XSeekable,
+                      io::XInputStream )
+
+
+
 uno::Any SAL_CALL
 XInputStream_impl::queryInterface(
     const uno::Type& rType )
@@ -76,6 +120,8 @@ XInputStream_impl::queryInterface(
 {
     uno::Any aRet = cppu::queryInterface( rType,
                                           SAL_STATIC_CAST( io::XInputStream*,this ),
+                                          SAL_STATIC_CAST( lang::XTypeProvider*,this ),
+                                          SAL_STATIC_CAST( lang::XServiceInfo*,this ),
                                           SAL_STATIC_CAST( io::XSeekable*,this ) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 3f38922dab48..0cc5ff61aa50 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -10,9 +10,18 @@
 #ifndef _CPPUHELPER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
 #endif
+#ifndef _UCBHELPER_MACROS_HXX
+#include <ucbhelper/macros.hxx>
+#endif
 #ifndef _COM_SUN_STAR_UNO_XINTERFACE_HPP_
 #include <com/sun/star/uno/XInterface.hpp>
 #endif
+#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#endif
+#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#endif
 #ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_
 #include <com/sun/star/io/XSeekable.hpp>
 #endif
@@ -33,6 +42,8 @@ namespace fileaccess {
 
     class XInputStream_impl
         : public cppu::OWeakObject,
+          public com::sun::star::lang::XTypeProvider,
+          public com::sun::star::lang::XServiceInfo,
           public com::sun::star::io::XInputStream,
           public com::sun::star::io::XSeekable
     {
@@ -50,6 +61,24 @@ namespace fileaccess {
         sal_Int32 SAL_CALL getMinorError();
 
 
+        // XTypeProvider
+
+        XTYPEPROVIDER_DECL()
+
+        // XServiceInfo
+        virtual rtl::OUString SAL_CALL
+        getImplementationName()
+            throw( com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        supportsService( const rtl::OUString& ServiceName )
+            throw( com::sun::star::uno::RuntimeException);
+
+        virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+        getSupportedServiceNames()
+            throw( com::sun::star::uno::RuntimeException );
+
+
         virtual com::sun::star::uno::Any SAL_CALL
         queryInterface(
             const com::sun::star::uno::Type& rType )
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 7e74d94cd36f..e67530747480 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -39,6 +39,7 @@ XStream_impl::queryInterface(
 {
     uno::Any aRet = cppu::queryInterface( rType,
                                           SAL_STATIC_CAST( lang::XTypeProvider*,this ),
+                                          SAL_STATIC_CAST( lang::XServiceInfo*,this ),
                                           SAL_STATIC_CAST( io::XStream*,this ),
                                           SAL_STATIC_CAST( io::XInputStream*,this ),
                                           SAL_STATIC_CAST( io::XOutputStream*,this ),
@@ -67,12 +68,44 @@ XStream_impl::release(
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
+//  XServiceInfo
+//////////////////////////////////////////////////////////////////////////////////////////
+
+rtl::OUString SAL_CALL
+XStream_impl::getImplementationName()
+    throw( uno::RuntimeException)
+{
+    return rtl::OUString::createFromAscii("bla");
+}
+
+
+
+sal_Bool SAL_CALL
+XStream_impl::supportsService( const rtl::OUString& ServiceName )
+    throw( uno::RuntimeException)
+{
+    return false;
+}
+
+
+
+uno::Sequence< rtl::OUString > SAL_CALL
+XStream_impl::getSupportedServiceNames()
+    throw( uno::RuntimeException )
+{
+    uno::Sequence< rtl::OUString > ret( 0 );
+    return ret;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////
 //  XTypeProvider
 //////////////////////////////////////////////////////////////////////////////////////////
 
 
-XTYPEPROVIDER_IMPL_6( XStream_impl,
+XTYPEPROVIDER_IMPL_7( XStream_impl,
                       lang::XTypeProvider,
+                      lang::XServiceInfo,
                       io::XStream,
                       io::XSeekable,
                       io::XInputStream,
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index 20e1c94d4610..8047c3bd2602 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -22,6 +22,9 @@
 #ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #endif
+#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#endif
 #ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_
 #include <com/sun/star/io/XSeekable.hpp>
 #endif
@@ -52,6 +55,7 @@ namespace fileaccess {
     class XStream_impl
         : public cppu::OWeakObject,
           public com::sun::star::lang::XTypeProvider,
+          public com::sun::star::lang::XServiceInfo,
           public com::sun::star::io::XStream,
           public com::sun::star::io::XSeekable,
           public com::sun::star::io::XInputStream,
@@ -98,6 +102,20 @@ namespace fileaccess {
         XTYPEPROVIDER_DECL()
 
 
+        // XServiceInfo
+        virtual rtl::OUString SAL_CALL
+        getImplementationName()
+            throw( com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        supportsService( const rtl::OUString& ServiceName )
+            throw( com::sun::star::uno::RuntimeException);
+
+        virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+        getSupportedServiceNames()
+            throw( com::sun::star::uno::RuntimeException );
+
+
         // XStream
 
         virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL