INTEGRATION: CWS ucbfixes06 (1.1.2); FILE ADDED

2008/01/21 15:30:21 kso 1.1.2.1: #i85425# - cleanup of CVS module.

7 files changed, 1332 insertions, 0 deletions

diff --git a/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx b/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx
new file mode 100644
index 000000000000..07acbb2e4586
--- /dev/null
+++ b/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: IndexAccessor.hxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: obo $ $Date: 2008-03-25 15:19:23 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+#ifndef _XMLSEARCH_UTIL_INDEXACCESSOR_HXX_
+#define _XMLSEARCH_UTIL_INDEXACCESSOR_HXX_
+
+
+#ifndef _RTL_USTRING_HXX_
+#include  <rtl/ustring.hxx>
+#endif
+#ifndef _XMLSEARCH_EXCEP_XMLSEARCHEXCEPTIONS_HXX_
+#include <excep/XmlSearchExceptions.hxx>
+#endif
+
+namespace xmlsearch {
+
+    namespace util {
+
+        class RandomAccessStream;
+
+        class IndexAccessor
+        {
+        public:
+
+            enum ACCESSKIND { READ,
+                              WRITE,
+                              READWRITE };
+
+
+            IndexAccessor( const rtl::OUString& dirName )
+            {
+                if( dirName.getLength() )
+                    if( dirName.getStr()[dirName.getLength()-1] != sal_Unicode( '/' ) )
+                        dirName_ = ( dirName + rtl::OUString::createFromAscii( "/" ) ) ;
+                    else
+                        dirName_ = dirName;
+            }
+
+
+            ~IndexAccessor()
+            {
+            }
+
+
+            IndexAccessor( const IndexAccessor& accessor )
+            {
+                dirName_ = accessor.dirName_;
+            }
+
+
+            RandomAccessStream* getStream( const rtl::OUString& fileName,
+                                           const rtl::OUString& how ) const;
+
+
+            sal_Int32 readByteArray( sal_Int8*& data, const rtl::OUString& fileName )
+                throw( xmlsearch::excep::IOException );
+
+        private:
+
+            rtl::OUString  dirName_;
+
+        };
+
+    }
+}
+
+
+#endif
diff --git a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
new file mode 100644
index 000000000000..5a4037454935
--- /dev/null
+++ b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
@@ -0,0 +1,73 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: RandomAccessStream.hxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: obo $ $Date: 2008-03-25 15:19:34 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+#ifndef _XMLEARCH_UTIL_RANDOMACCESSSTREAM_HXX_
+#define _XMLEARCH_UTIL_RANDOMACCESSSTREAM_HXX_
+
+#ifndef _OSL_FILE_HXX_
+#include <osl/file.hxx>
+#endif
+
+namespace xmlsearch {
+
+    namespace util {
+
+
+        class RandomAccessStream
+        {
+        public:
+
+            virtual ~RandomAccessStream() { };
+
+            // The calle is responsible for allocating the buffer
+            virtual void seek( sal_Int32 ) = 0;
+            virtual sal_Int32 readBytes( sal_Int8*,sal_Int32 ) = 0;
+            virtual void writeBytes( sal_Int8*, sal_Int32 ) = 0;
+            virtual sal_Int32 length() = 0;
+            virtual void close() = 0;
+
+
+        protected:
+
+            enum OPENFLAG { Read = OpenFlag_Read,
+                            Write = OpenFlag_Write,
+                            Create = OpenFlag_Create };
+
+        };
+
+
+    }
+}
+
+#endif
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
new file mode 100644
index 000000000000..90b5b6eed2df
--- /dev/null
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
@@ -0,0 +1,94 @@
+#ifndef _CPPUHELPER_WEAK_HXX_
+#include <cppuhelper/weak.hxx>
+#endif
+#ifndef _OSL_MUTEX_HXX_
+#include <osl/mutex.hxx>
+#endif
+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
+#include <com/sun/star/io/XInputStream.hpp>
+#endif
+#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_
+#include <com/sun/star/io/XSeekable.hpp>
+#endif
+
+
+namespace chelp {
+
+    class BufferedInputStream
+        : public cppu::OWeakObject,
+          public com::sun::star::io::XInputStream,
+          public com::sun::star::io::XSeekable
+    {
+    private:
+
+        sal_Int32      m_nBufferLocation;
+        sal_Int32      m_nBufferSize;
+        sal_Int8      *m_pBuffer;
+        osl::Mutex     m_aMutex;
+
+    public:
+
+        BufferedInputStream(
+            const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream);
+
+        ~BufferedInputStream();
+
+        virtual com::sun::star::uno::Any SAL_CALL
+        queryInterface( const com::sun::star::uno::Type& rType )
+            throw( com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL acquire( void ) throw();
+
+        virtual void SAL_CALL release( void ) throw();
+
+
+        virtual sal_Int32 SAL_CALL readBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData,
+                                              sal_Int32 nBytesToRead )
+            throw( com::sun::star::io::NotConnectedException,
+                   com::sun::star::io::BufferSizeExceededException,
+                   com::sun::star::io::IOException,
+                   com::sun::star::uno::RuntimeException );
+
+        virtual sal_Int32 SAL_CALL readSomeBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData,
+                                                  sal_Int32 nMaxBytesToRead )
+            throw( com::sun::star::io::NotConnectedException,
+                   com::sun::star::io::BufferSizeExceededException,
+                   com::sun::star::io::IOException,
+                   com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
+            throw( com::sun::star::io::NotConnectedException,
+                   com::sun::star::io::BufferSizeExceededException,
+                   com::sun::star::io::IOException,
+                   com::sun::star::uno::RuntimeException );
+
+        virtual sal_Int32 SAL_CALL available( void )
+            throw( com::sun::star::io::NotConnectedException,
+                   com::sun::star::io::IOException,
+                   com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL closeInput( void )
+            throw( com::sun::star::io::NotConnectedException,
+                   com::sun::star::io::IOException,
+                   com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL seek( sal_Int64 location )
+            throw( com::sun::star::lang::IllegalArgumentException,
+                   com::sun::star::io::IOException,
+                   com::sun::star::uno::RuntimeException );
+
+        virtual sal_Int64 SAL_CALL getPosition( void )
+            throw( com::sun::star::io::IOException,
+                   com::sun::star::uno::RuntimeException );
+
+        virtual sal_Int64 SAL_CALL getLength( void )
+            throw( com::sun::star::io::IOException,
+                   com::sun::star::uno::RuntimeException );
+    };
+
+
+    extern com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
+    turnToSeekable(
+        const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream);
+
+}
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
new file mode 100644
index 000000000000..aa2d6f7e2111
--- /dev/null
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -0,0 +1,166 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: content.hxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: obo $ $Date: 2008-03-25 15:20:31 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef _CONTENT_HXX
+#define _CONTENT_HXX
+
+#ifndef _VOS_REF_HXX_
+#include <vos/ref.hxx>
+#endif
+#ifndef _UCBHELPER_CONTENTHELPER_HXX
+#include <ucbhelper/contenthelper.hxx>
+#endif
+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
+#include <com/sun/star/io/XInputStream.hpp>
+#endif
+
+#include "urlparameter.hxx"
+
+namespace com { namespace sun { namespace star { namespace beans {
+    struct Property;
+    struct PropertyValue;
+} } } }
+
+namespace com { namespace sun { namespace star { namespace sdbc {
+    class XRow;
+} } } }
+
+namespace chelp
+{
+
+//=========================================================================
+
+// UNO service name for the content.
+#define MYUCP_CONTENT_SERVICE_NAME \
+                            "com.sun.star.ucb.CHelpContent"
+
+//=========================================================================
+
+    class Databases;
+
+    struct ContentProperties
+    {
+        ::rtl::OUString aTitle;         // Title
+        ::rtl::OUString aContentType;   // ContentType
+        sal_Bool        bIsDocument;    // IsDocument
+        sal_Bool        bIsFolder;      // IsFolder
+
+        ContentProperties()
+            : bIsDocument( sal_True ), bIsFolder( sal_False ) {}
+    };
+
+//=========================================================================
+
+    class Content : public ::ucbhelper::ContentImplHelper
+    {
+    public:
+
+        Content( const ::com::sun::star::uno::Reference<
+                 ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+                 ::ucbhelper::ContentProviderImplHelper* pProvider,
+                 const ::com::sun::star::uno::Reference<
+                 ::com::sun::star::ucb::XContentIdentifier >& Identifier,
+                 Databases* pDatabases );
+
+        virtual ~Content();
+
+        // XInterface
+        XINTERFACE_DECL()
+
+        // XTypeProvider
+        XTYPEPROVIDER_DECL()
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL
+        getImplementationName()
+            throw( ::com::sun::star::uno::RuntimeException );
+
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames()
+            throw( ::com::sun::star::uno::RuntimeException );
+
+        // XContent
+        virtual rtl::OUString SAL_CALL
+        getContentType()
+            throw( com::sun::star::uno::RuntimeException );
+
+        // XCommandProcessor
+        virtual com::sun::star::uno::Any SAL_CALL
+        execute( const com::sun::star::ucb::Command& aCommand,
+                 sal_Int32 CommandId,
+                 const com::sun::star::uno::Reference<
+                 com::sun::star::ucb::XCommandEnvironment >& Environment )
+            throw( com::sun::star::uno::Exception,
+                   com::sun::star::ucb::CommandAbortedException,
+                   com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL
+        abort( sal_Int32 CommandId )
+            throw( com::sun::star::uno::RuntimeException );
+
+
+    private:
+
+        // private members;
+
+        ContentProperties m_aProps;
+        URLParameter      m_aURLParameter;
+        Databases*        m_pDatabases;
+
+
+        // private methods
+
+        virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
+        getProperties( const com::sun::star::uno::Reference<
+                       com::sun::star::ucb::XCommandEnvironment > & xEnv );
+        virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
+        getCommands( const com::sun::star::uno::Reference<
+                     com::sun::star::ucb::XCommandEnvironment > & xEnv );
+
+        virtual ::rtl::OUString getParentURL() { return ::rtl::OUString(); }
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
+        getPropertyValues( const ::com::sun::star::uno::Sequence<
+                           ::com::sun::star::beans::Property >& rProperties );
+        void setPropertyValues(
+            const ::com::sun::star::uno::Sequence<
+            ::com::sun::star::beans::PropertyValue >& rValues );
+
+
+    };
+
+}
+
+#endif
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
new file mode 100644
index 000000000000..65cddddcb540
--- /dev/null
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -0,0 +1,209 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: provider.hxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: obo $ $Date: 2008-03-25 15:22:03 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef _PROVIDER_HXX
+#define _PROVIDER_HXX
+
+#ifndef _RTL_USTRING_HXX_
+#include <rtl/ustring.hxx>
+#endif
+#ifndef _OSL_MUTEX_HXX_
+#include <osl/mutex.hxx>
+#endif
+#ifndef _UCBHELPER_PROVIDERHELPER_HXX
+#include <ucbhelper/providerhelper.hxx>
+#endif
+#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HPP_
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#endif
+#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_
+#include <com/sun/star/container/XContainerListener.hpp>
+#endif
+#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_
+#include <com/sun/star/container/XContainer.hpp>
+#endif
+#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_
+#include <com/sun/star/lang/XComponent.hpp>
+#endif
+
+
+namespace chelp {
+
+//=========================================================================
+
+// UNO service name for the provider. This name will be used by the UCB to
+// create instances of the provider.
+
+//#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME         "com.sun.star.ucb.CHelpContentProvider"
+#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME1   "com.sun.star.help.XMLHelp"
+#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH1 25
+
+#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME2  "com.sun.star.ucb.HelpContentProvider"
+#define MYUCP_CONTENT_PROVIDER_SERVICE_NAME_LENGTH2 36
+
+// URL scheme. This is the scheme the provider will be able to create
+// contents for. The UCB will select the provider ( i.e. in order to create
+// contents ) according to this scheme.
+
+#define MYUCP_URL_SCHEME        "vnd.sun.star.help"
+#define MYUCP_URL_SCHEME_LENGTH 18
+#define MYUCP_CONTENT_TYPE      "application/vnd.sun.star.xmlhelp"    // UCB Content Type.
+
+//=========================================================================
+
+
+    class Databases;
+
+
+    class ContentProvider :
+        public ::ucbhelper::ContentProviderImplHelper,
+        public ::com::sun::star::container::XContainerListener,
+        public ::com::sun::star::lang::XComponent
+    {
+    public:
+        ContentProvider(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMgr );
+
+        virtual ~ContentProvider();
+
+        // XInterface
+        XINTERFACE_DECL()
+
+            // XTypeProvider
+            XTYPEPROVIDER_DECL()
+
+            // XServiceInfo
+            XSERVICEINFO_DECL()
+
+            // XContentProvider
+            virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::ucb::XContent > SAL_CALL
+        queryContent( const ::com::sun::star::uno::Reference<
+                      ::com::sun::star::ucb::XContentIdentifier >& Identifier )
+            throw( ::com::sun::star::ucb::IllegalIdentifierException,
+                   ::com::sun::star::uno::RuntimeException );
+
+        //////////////////////////////////////////////////////////////////////
+        // Additional interfaces
+        //////////////////////////////////////////////////////////////////////
+
+        // XComponent
+
+        virtual void SAL_CALL
+        dispose(  )
+            throw (::com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL
+        addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
+            throw (::com::sun::star::uno::RuntimeException)
+        {
+            (void)xListener;
+        }
+
+        virtual void SAL_CALL
+        removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
+            throw (::com::sun::star::uno::RuntimeException)
+        {
+            (void)aListener;
+        }
+
+        // XConainerListener ( deriver from XEventListener )
+
+        virtual void SAL_CALL
+        disposing( const ::com::sun::star::lang::EventObject& Source )
+            throw (::com::sun::star::uno::RuntimeException)
+        {
+            (void)Source;
+            m_xContainer = com::sun::star::uno::Reference<com::sun::star::container::XContainer>(0);
+        }
+
+        virtual void SAL_CALL
+        elementInserted( const ::com::sun::star::container::ContainerEvent& Event )
+            throw (::com::sun::star::uno::RuntimeException)
+        {
+            (void)Event;
+        }
+
+        virtual void SAL_CALL
+        elementRemoved( const ::com::sun::star::container::ContainerEvent& Event )
+            throw (::com::sun::star::uno::RuntimeException)
+        {
+            (void)Event;
+        }
+
+        virtual void SAL_CALL
+        elementReplaced( const ::com::sun::star::container::ContainerEvent& Event )
+            throw (::com::sun::star::uno::RuntimeException);
+
+
+        //////////////////////////////////////////////////////////////////////
+        // Non-interface methods.
+        //////////////////////////////////////////////////////////////////////
+
+    private:
+
+        osl::Mutex     m_aMutex;
+        bool           isInitialized;
+        rtl::OUString  m_aScheme;
+        Databases*     m_pDatabases;
+        com::sun::star::uno::Reference<com::sun::star::container::XContainer> m_xContainer;
+
+        // private methods
+
+        void init();
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
+        getConfiguration() const;
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >
+        getHierAccess( const ::com::sun::star::uno::Reference<  ::com::sun::star::lang::XMultiServiceFactory >& sProvider,
+                       const char* file ) const;
+
+        ::rtl::OUString
+        getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
+                const char* key ) const;
+
+      sal_Bool
+      getBooleanKey(
+                    const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
+                    const char* key) const;
+
+      void subst( rtl::OUString& instpath ) const;
+    };
+
+}
+
+#endif
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx
new file mode 100644
index 000000000000..98ca15aa677f
--- /dev/null
+++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: resultset.hxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: obo $ $Date: 2008-03-25 15:22:26 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef _RESULTSET_HXX
+#define _RESULTSET_HXX
+
+#ifndef _UCBHELPER_RESULTSETHELPER_HXX
+#include <ucbhelper/resultsethelper.hxx>
+#endif
+#ifndef _VOS_REF_HXX_
+#include <vos/ref.hxx>
+#endif
+
+#include "content.hxx"
+
+namespace chelp {
+
+    class ResultSetFactory;
+
+    class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
+    {
+        vos::ORef< Content > m_xContent;
+        com::sun::star::uno::Reference<
+        com::sun::star::ucb::XCommandEnvironment > m_xEnv;
+        ResultSetFactory*                    m_pFactory;
+
+    private:
+        virtual void initStatic();
+        virtual void initDynamic();
+
+    public:
+        DynamicResultSet(
+            const com::sun::star::uno::Reference<
+            com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+            const vos::ORef< Content >& rxContent,
+            const com::sun::star::ucb::OpenCommandArgument2& rCommand,
+            const com::sun::star::uno::Reference<
+            com::sun::star::ucb::XCommandEnvironment >& rxEnv,
+            ResultSetFactory* pFactory );
+
+        ~DynamicResultSet();
+    };
+
+}
+
+#endif
+
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
new file mode 100644
index 000000000000..c2ec9d1d22c1
--- /dev/null
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -0,0 +1,612 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: resultsetbase.hxx,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: obo $ $Date: 2008-03-25 15:22:51 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+#ifndef _RESULTSETBASE_HXX
+#define _RESULTSETBASE_HXX
+
+#ifndef INCLUDED_STL_VECTOR
+#include <vector>
+#define INCLUDED_STL_VECTOR
+#endif
+#ifndef _CPPUHELPER_WEAK_HXX_
+#include <cppuhelper/weak.hxx>
+#endif
+#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_
+#include <cppuhelper/interfacecontainer.hxx>
+#endif
+#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_
+#include <com/sun/star/lang/XComponent.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_
+#include <com/sun/star/ucb/XContentAccess.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_
+#include <com/sun/star/sdbc/XCloseable.hpp>
+#endif
+#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
+#include <com/sun/star/beans/XPropertySet.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
+#include <com/sun/star/sdbc/XRow.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_
+#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UCB_NUMBEREDSORTINGINFO_HPP_
+#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
+#endif
+#ifndef _COM_SUN_STAR_UCB_XCONTENTPROVIDER_HPP_
+#include <com/sun/star/ucb/XContentProvider.hpp>
+#endif
+#ifndef  _COM_SUN_STAR_UCB_XCONTENTIDENTIFIER_HPP_
+#include <com/sun/star/ucb/XContentIdentifier.hpp>
+#endif
+#ifndef  _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+#ifndef _COM_SUN_STAR_BEANS_PROPERTY_HPP_
+#include <com/sun/star/beans/Property.hpp>
+#endif
+
+
+namespace chelp {
+
+    class ResultSetBase
+        : public cppu::OWeakObject,
+          public com::sun::star::lang::XComponent,
+          public com::sun::star::sdbc::XRow,
+          public com::sun::star::sdbc::XResultSet,
+          public com::sun::star::sdbc::XCloseable,
+          public com::sun::star::sdbc::XResultSetMetaDataSupplier,
+          public com::sun::star::beans::XPropertySet,
+          public com::sun::star::ucb::XContentAccess
+    {
+    public:
+
+        ResultSetBase( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&  xMSF,
+                       const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >&  xProvider,
+                       sal_Int32 nOpenMode,
+                       const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
+                       const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort );
+
+        virtual ~ResultSetBase();
+
+        // XInterface
+        virtual com::sun::star::uno::Any SAL_CALL
+        queryInterface(
+            const com::sun::star::uno::Type& aType )
+            throw( com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL
+        acquire(
+            void )
+            throw();
+
+        virtual void SAL_CALL
+        release(
+            void )
+            throw();
+
+        // XComponent
+        virtual void SAL_CALL
+        dispose(
+            void )
+            throw( com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL
+        addEventListener(
+            const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener )
+            throw( com::sun::star::uno::RuntimeException );
+
+        virtual void SAL_CALL
+        removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )
+            throw( com::sun::star::uno::RuntimeException );
+
+
+        // XRow
+        virtual sal_Bool SAL_CALL
+        wasNull(
+            void )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException )
+        {
+            if( 0<= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                m_nWasNull = m_aItems[m_nRow]->wasNull();
+            else
+                m_nWasNull = true;
+            return m_nWasNull;
+        }
+
+        virtual rtl::OUString SAL_CALL
+        getString(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getString( columnIndex );
+            else
+                return rtl::OUString();
+        }
+
+        virtual sal_Bool SAL_CALL
+        getBoolean(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getBoolean( columnIndex );
+            else
+                return false;
+        }
+
+        virtual sal_Int8 SAL_CALL
+        getByte(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getByte( columnIndex );
+            else
+                return sal_Int8( 0 );
+        }
+
+        virtual sal_Int16 SAL_CALL
+        getShort(
+            sal_Int32 columnIndex )
+            throw(
+                com::sun::star::sdbc::SQLException,
+                com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getShort( columnIndex );
+            else
+                return sal_Int16( 0 );
+        }
+
+        virtual sal_Int32 SAL_CALL
+        getInt(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException )
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getInt( columnIndex );
+            else
+                return sal_Int32( 0 );
+        }
+
+        virtual sal_Int64 SAL_CALL
+        getLong(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getLong( columnIndex );
+            else
+                return sal_Int64( 0 );
+        }
+
+        virtual float SAL_CALL
+        getFloat(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException )
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getFloat( columnIndex );
+            else
+                return float( 0 );
+        }
+
+        virtual double SAL_CALL
+        getDouble(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException )
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getDouble( columnIndex );
+            else
+                return double( 0 );
+        }
+
+        virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+        getBytes(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException )
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getBytes( columnIndex );
+            else
+                return com::sun::star::uno::Sequence< sal_Int8 >();
+        }
+
+        virtual com::sun::star::util::Date SAL_CALL
+        getDate(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getDate( columnIndex );
+            else
+                return com::sun::star::util::Date();
+        }
+
+        virtual com::sun::star::util::Time SAL_CALL
+        getTime(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getTime( columnIndex );
+            else
+                return com::sun::star::util::Time();
+        }
+
+        virtual com::sun::star::util::DateTime SAL_CALL
+        getTimestamp(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getTimestamp( columnIndex );
+            else
+                return com::sun::star::util::DateTime();
+        }
+
+        virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL
+        getBinaryStream(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getBinaryStream( columnIndex );
+            else
+                return com::sun::star::uno::Reference< com::sun::star::io::XInputStream >();
+        }
+
+        virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL
+        getCharacterStream(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getCharacterStream( columnIndex );
+            else
+                return com::sun::star::uno::Reference< com::sun::star::io::XInputStream >();
+        }
+
+        virtual com::sun::star::uno::Any SAL_CALL
+        getObject(
+            sal_Int32 columnIndex,
+            const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getObject( columnIndex,typeMap );
+            else
+                return com::sun::star::uno::Any();
+        }
+
+        virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL
+        getRef(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getRef( columnIndex );
+            else
+                return com::sun::star::uno::Reference< com::sun::star::sdbc::XRef >();
+        }
+
+        virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL
+        getBlob(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getBlob( columnIndex );
+            else
+                return com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob >();
+        }
+
+        virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL
+        getClob(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getClob( columnIndex );
+            else
+                return com::sun::star::uno::Reference< com::sun::star::sdbc::XClob >();
+        }
+
+        virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL
+        getArray(
+            sal_Int32 columnIndex )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException)
+        {
+            if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
+                return m_aItems[m_nRow]->getArray( columnIndex );
+            else
+                return com::sun::star::uno::Reference< com::sun::star::sdbc::XArray >();
+        }
+
+
+        // XResultSet
+
+        virtual sal_Bool SAL_CALL
+        next(
+            void )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        isBeforeFirst(
+            void )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        isAfterLast(
+            void )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        isFirst(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        isLast(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL
+        beforeFirst(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL
+        afterLast(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        first(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        last(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Int32 SAL_CALL
+        getRow(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        absolute(
+            sal_Int32 row )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        relative(
+            sal_Int32 rows )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        previous(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL
+        refreshRow(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        rowUpdated(
+            void )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        rowInserted(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual sal_Bool SAL_CALL
+        rowDeleted(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+
+        virtual  com::sun::star::uno::Reference<  com::sun::star::uno::XInterface > SAL_CALL
+        getStatement(
+            void  )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        // XCloseable
+
+        virtual void SAL_CALL
+        close(
+            void )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+        // XContentAccess
+
+        virtual rtl::OUString SAL_CALL
+        queryContentIdentifierString(
+            void )
+            throw( com::sun::star::uno::RuntimeException );
+
+        virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
+        queryContentIdentifier(
+            void )
+            throw( com::sun::star::uno::RuntimeException );
+
+        virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
+        queryContent(
+            void )
+            throw( com::sun::star::uno::RuntimeException );
+
+        // XResultSetMetaDataSupplier
+        virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > SAL_CALL
+        getMetaData(
+            void )
+            throw( com::sun::star::sdbc::SQLException,
+                   com::sun::star::uno::RuntimeException);
+
+
+        // XPropertySet
+        virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL
+        getPropertySetInfo()
+            throw( com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL setPropertyValue(
+            const rtl::OUString& aPropertyName,
+            const com::sun::star::uno::Any& aValue )
+            throw( com::sun::star::beans::UnknownPropertyException,
+                   com::sun::star::beans::PropertyVetoException,
+                   com::sun::star::lang::IllegalArgumentException,
+                   com::sun::star::lang::WrappedTargetException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual com::sun::star::uno::Any SAL_CALL
+        getPropertyValue(
+            const rtl::OUString& PropertyName )
+            throw( com::sun::star::beans::UnknownPropertyException,
+                   com::sun::star::lang::WrappedTargetException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL
+        addPropertyChangeListener(
+            const rtl::OUString& aPropertyName,
+            const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener )
+            throw( com::sun::star::beans::UnknownPropertyException,
+                   com::sun::star::lang::WrappedTargetException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL
+        removePropertyChangeListener(
+            const rtl::OUString& aPropertyName,
+            const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener )
+            throw( com::sun::star::beans::UnknownPropertyException,
+                   com::sun::star::lang::WrappedTargetException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL
+        addVetoableChangeListener(
+            const rtl::OUString& PropertyName,
+            const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
+            throw( com::sun::star::beans::UnknownPropertyException,
+                   com::sun::star::lang::WrappedTargetException,
+                   com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL removeVetoableChangeListener(
+            const rtl::OUString& PropertyName,
+            const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
+            throw( com::sun::star::beans::UnknownPropertyException,
+                   com::sun::star::lang::WrappedTargetException,
+                   com::sun::star::uno::RuntimeException);
+
+    protected:
+
+        com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >  m_xMSF;
+        com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >  m_xProvider;
+        sal_Int32                           m_nRow;
+        sal_Bool                            m_nWasNull;
+        sal_Int32                           m_nOpenMode;
+        sal_Bool                            m_bRowCountFinal;
+
+        typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet;
+        typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > >              ItemSet;
+        typedef std::vector< rtl::OUString >                                                             PathSet;
+
+        IdentSet                            m_aIdents;
+        ItemSet                             m_aItems;
+        PathSet                             m_aPath;
+
+        com::sun::star::uno::Sequence< com::sun::star::beans::Property >           m_sProperty;
+        com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >  m_sSortingInfo;
+
+        osl::Mutex                          m_aMutex;
+        cppu::OInterfaceContainerHelper*    m_pDisposeEventListeners;
+
+        cppu::OInterfaceContainerHelper*    m_pRowCountListeners;
+        cppu::OInterfaceContainerHelper*    m_pIsFinalListeners;
+    };
+
+
+} // end namespace fileaccess
+
+
+#endif