summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/odma
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-06-05 17:11:39 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-06-05 17:11:39 +0000
commitf855edf7a8914e94edc5244c557ef110847c7428 (patch)
tree0b08403b29909e3e7724d5eae550153bac109f18 /ucb/source/ucp/odma
parentaae2ed3532ec6ce888b34486330e6ead043ab148 (diff)
INTEGRATION: CWS bgdlremove (1.4.108); FILE MERGED
2007/05/18 14:06:51 kso 1.4.108.2: #i77419# - cleanup of ucbhelper namespaces. 2007/05/11 12:59:02 kso 1.4.108.1: #i76911# - ucbhelper no longer uses VOS
Diffstat (limited to 'ucb/source/ucp/odma')
-rw-r--r--ucb/source/ucp/odma/odma_resultset.hxx18
1 files changed, 7 insertions, 11 deletions
diff --git a/ucb/source/ucp/odma/odma_resultset.hxx b/ucb/source/ucp/odma/odma_resultset.hxx
index 4c1abbdb4d..9b62ae9cad 100644
--- a/ucb/source/ucp/odma/odma_resultset.hxx
+++ b/ucb/source/ucp/odma/odma_resultset.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: odma_resultset.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 15:54:13 $
+ * last change: $Author: ihi $ $Date: 2007-06-05 18:11:39 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -33,28 +33,24 @@
*
************************************************************************/
-// @@@ Adjust multi-include-protection-ifdef.
#ifndef ODMA_RESULTSET_HXX
#define ODMA_RESULTSET_HXX
#ifndef _UCBHELPER_RESULTSETHELPER_HXX
#include <ucbhelper/resultsethelper.hxx>
#endif
-#ifndef _VOS_REF_HXX_
-#include <vos/ref.hxx>
-#endif
-// @@@ Adjust multi-include-protection-ifdef and header file name.
+#include "rtl/ref.hxx"
+
#ifndef ODMA_CONTENT_HXX
#include "odma_content.hxx"
#endif
-// @@@ Adjust namespace name.
namespace odma {
-class DynamicResultSet : public ::ucb::ResultSetImplHelper
+class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
{
- vos::ORef< Content > m_xContent;
+ rtl::Reference< Content > m_xContent;
com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > m_xEnv;
@@ -66,7 +62,7 @@ public:
DynamicResultSet(
const com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
- const vos::ORef< Content >& rxContent,
+ const rtl::Reference< Content >& rxContent,
const com::sun::star::ucb::OpenCommandArgument2& rCommand,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment >& rxEnv );