diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 17:00:50 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 17:00:50 +0000 |
| commit | 884d8643cd92e18b6a8ab25f0a7d456e0c000ec4 (patch) | |
| tree | c8369e3ee264329cdcedf8c2a5615634f9846b76 /ucb/source/ucp | |
| parent | bc78422d870d19d1a47c63c9eddad869a9c42515 (diff) | |
INTEGRATION: CWS bgdlremove (1.3.108); FILE MERGED
2007/05/18 11:37:16 kso 1.3.108.2: #i77419# - cleanup of ucbhelper namespaces.
2007/05/11 09:20:53 kso 1.3.108.1: 76911# - ucbhelper lib no longer uses VOS.
(vos::ORef => rtl::Reference, vos::OMutex => osl::Mutex, ...)
Diffstat (limited to 'ucb/source/ucp')
| -rw-r--r-- | ucb/source/ucp/ftp/ftpdynresultset.hxx | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx index ec9b5775ca55..29a6e089ded8 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.hxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ftpdynresultset.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-09 15:35:46 $ + * last change: $Author: ihi $ $Date: 2007-06-05 18:00:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,25 +36,20 @@ #ifndef _FTP_FTPDYNRESULTSET_HXX #define _FTP_FTPDYNRESULTSET_HXX -#ifndef _UCBHELPER_RESULTSETHELPER_HXX -#include <ucbhelper/resultsethelper.hxx> -#endif -#ifndef _VOS_REF_HXX_ -#include <vos/ref.hxx> -#endif -#ifndef _FTP_FTPCONTENT_HXX_ +#include "rtl/ref.hxx" +#include "ucbhelper/resultsethelper.hxx" + #include "ftpcontent.hxx" -#endif namespace ftp { class ResultSetFactory; - class DynamicResultSet : public ::ucb::ResultSetImplHelper + class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { - vos::ORef< FTPContent > m_xContent; + rtl::Reference< FTPContent > m_xContent; com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + com::sun::star::ucb::XCommandEnvironment > m_xEnv; ResultSetFactory* m_pFactory; private: @@ -64,11 +59,11 @@ namespace ftp { public: DynamicResultSet( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const vos::ORef< FTPContent >& rxContent, + com::sun::star::lang::XMultiServiceFactory >& rxSMgr, + const rtl::Reference< FTPContent >& rxContent, const com::sun::star::ucb::OpenCommandArgument2& rCommand, const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv, + com::sun::star::ucb::XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ); ~DynamicResultSet(); |