summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-06-05 17:11:12 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-06-05 17:11:12 +0000
commitf35310caee44fbb4b0297066c908f16e57a69f4a (patch)
treea44a140c5c5443f3b9ed5c405e6936504c434cef /ucb/source
parent917a0dca61290eb6093a88b6a9a41b90eaf565a9 (diff)
INTEGRATION: CWS bgdlremove (1.4.108); FILE MERGED
2007/05/18 14:06:50 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')
-rw-r--r--ucb/source/ucp/odma/odma_content.hxx23
-rw-r--r--ucb/source/ucp/odma/odma_datasupplier.hxx8
-rw-r--r--ucb/source/ucp/odma/odma_inputstream.hxx27
-rw-r--r--ucb/source/ucp/odma/odma_provider.hxx36
4 files changed, 45 insertions, 49 deletions
diff --git a/ucb/source/ucp/odma/odma_content.hxx b/ucb/source/ucp/odma/odma_content.hxx
index ebebb39570..7a370b062d 100644
--- a/ucb/source/ucp/odma/odma_content.hxx
+++ b/ucb/source/ucp/odma/odma_content.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: odma_content.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 15:50:31 $
+ * last change: $Author: ihi $ $Date: 2007-06-05 18:09:13 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -33,7 +33,6 @@
*
************************************************************************/
-// @@@ Adjust multi-include-protection-ifdef.
#ifndef ODMA_CONTENT_HXX
#define ODMA_CONTENT_HXX
@@ -55,7 +54,7 @@ namespace com { namespace sun { namespace star {
class XInputStream;
}
}}}
-namespace ucb
+namespace ucbhelper
{
class Content;
}
@@ -76,11 +75,11 @@ namespace odma
//=========================================================================
class ContentProvider;
class ContentProperties;
-class Content : public ::ucb::ContentImplHelper
+class Content : public ::ucbhelper::ContentImplHelper
{
- ::vos::ORef<ContentProperties> m_aProps;
- ContentProvider* m_pProvider;
- ::ucb::Content* m_pContent;
+ ::rtl::Reference<ContentProperties> m_aProps;
+ ContentProvider* m_pProvider;
+ ::ucbhelper::Content* m_pContent;
private:
virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
@@ -144,7 +143,7 @@ public:
ContentProvider* pProvider,
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& Identifier,
- const ::vos::ORef<ContentProperties>& _rProps);
+ const ::rtl::Reference<ContentProperties>& _rProps);
virtual ~Content();
// XInterface
@@ -195,9 +194,9 @@ public:
::com::sun::star::lang::XMultiServiceFactory >& rSMgr,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::Property >& rProperties,
- const ::vos::ORef<ContentProperties>& rData,
- const ::vos::ORef<
- ::ucb::ContentProviderImplHelper >& rProvider,
+ const ::rtl::Reference<ContentProperties>& rData,
+ const ::rtl::Reference<
+ ::ucbhelper::ContentProviderImplHelper >& rProvider,
const ::rtl::OUString& rContentId );
ContentProvider* getContentProvider() const { return m_pProvider; }
diff --git a/ucb/source/ucp/odma/odma_datasupplier.hxx b/ucb/source/ucp/odma/odma_datasupplier.hxx
index 08dc631ca1..6d3c474833 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.hxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: odma_datasupplier.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 15:51:37 $
+ * last change: $Author: ihi $ $Date: 2007-06-05 18:10:07 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -45,14 +45,14 @@ namespace odma {
struct DataSupplier_Impl;
class Content;
-class DataSupplier : public ucb::ResultSetDataSupplier
+class DataSupplier : public ucbhelper::ResultSetDataSupplier
{
DataSupplier_Impl* m_pImpl;
public:
DataSupplier( const com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
- const vos::ORef< Content >& rContent,
+ const rtl::Reference< Content >& rContent,
sal_Int32 nOpenMode );
virtual ~DataSupplier();
diff --git a/ucb/source/ucp/odma/odma_inputstream.hxx b/ucb/source/ucp/odma/odma_inputstream.hxx
index 1011aed116..324932a62d 100644
--- a/ucb/source/ucp/odma/odma_inputstream.hxx
+++ b/ucb/source/ucp/odma/odma_inputstream.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: odma_inputstream.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 15:52:08 $
+ * last change: $Author: ihi $ $Date: 2007-06-05 18:10:34 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -57,11 +57,10 @@
#ifndef _CPPUHELPER_IMPLBASE5_HXX_
#include <cppuhelper/implbase5.hxx>
#endif
-#ifndef _VOS_REF_HXX_
-#include <vos/ref.hxx>
-#endif
+
+#include "rtl/ref.hxx"
-namespace ucb
+namespace ucbhelper
{
class Content;
}
@@ -83,12 +82,12 @@ namespace odma
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> m_xInput;
::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> m_xInputSeek;
- ::vos::ORef<ContentProperties> m_aProp;
- ::ucb::Content* m_pContent;
- ContentProvider* m_pProvider;
- sal_Bool m_bInputStreamCalled;
- sal_Bool m_bOutputStreamCalled;
- sal_Bool m_bModified;
+ ::rtl::Reference<ContentProperties> m_aProp;
+ ::ucbhelper::Content* m_pContent;
+ ContentProvider* m_pProvider;
+ sal_Bool m_bInputStreamCalled;
+ sal_Bool m_bOutputStreamCalled;
+ sal_Bool m_bModified;
void ensureInputStream() throw( ::com::sun::star::io::IOException );
void ensureOutputStream() throw( ::com::sun::star::io::IOException );
@@ -96,9 +95,9 @@ namespace odma
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException );
public:
- OOdmaStream(::ucb::Content* _pContent,
+ OOdmaStream(::ucbhelper::Content* _pContent,
ContentProvider* _pProvider,
- const ::vos::ORef<ContentProperties>& _rProp);
+ const ::rtl::Reference<ContentProperties>& _rProp);
virtual ~OOdmaStream();
// com::sun::star::io::XInputStream
virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead )
diff --git a/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx
index 4ce4372e74..ef052906fc 100644
--- a/ucb/source/ucp/odma/odma_provider.hxx
+++ b/ucb/source/ucp/odma/odma_provider.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: odma_provider.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 15:53:43 $
+ * last change: $Author: ihi $ $Date: 2007-06-05 18:11:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -33,7 +33,6 @@
*
************************************************************************/
-// @@@ Adjust multi-include-protection-ifdef.
#ifndef ODMA_PROVIDER_HXX
#define ODMA_PROVIDER_HXX
@@ -43,20 +42,19 @@
#ifndef ODMA_LIB_HXX
#include "odma_lib.hxx"
#endif
-#ifndef _VOS_REF_HXX_
-#include <vos/ref.hxx>
-#endif
+
+#include "rtl/ref.hxx"
+
#include <map>
+
#ifndef ODMA_CONTENTPROPS_HXX
#include "odma_contentprops.hxx"
#endif
-// @@@ Adjust namespace name.
+
namespace odma {
//=========================================================================
-// @@@ Adjust defines.
-
// UNO service name for the provider. This name will be used by the UCB to
// create instances of the provider.
#define ODMA_CONTENT_PROVIDER_SERVICE_NAME \
@@ -82,20 +80,20 @@ namespace odma {
//=========================================================================
class ContentProperties;
-class ContentProvider : public ::ucb::ContentProviderImplHelper
+class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
{
- typedef ::std::map< ::rtl::OString, ::vos::ORef<ContentProperties> > ContentsMap;
+ typedef ::std::map< ::rtl::OString, ::rtl::Reference<ContentProperties> > ContentsMap;
ContentsMap m_aContents; // contains all ContentProperties
static ODMHANDLE m_aOdmHandle; // the one and only ODMA handle to our DMS
/** fillDocumentProperties fills the given _rProp with ODMA properties
@param _rProp the ContentProperties
*/
- void fillDocumentProperties(const ::vos::ORef<ContentProperties>& _rProp);
+ void fillDocumentProperties(const ::rtl::Reference<ContentProperties>& _rProp);
/**
*/
- ::vos::ORef<ContentProperties> getContentProperty(const ::rtl::OUString& _sName,
+ ::rtl::Reference<ContentProperties> getContentProperty(const ::rtl::OUString& _sName,
const ContentPropertiesMemberFunctor& _aFunctor) const;
public:
ContentProvider( const ::com::sun::star::uno::Reference<
@@ -131,7 +129,7 @@ public:
/** append add an entry to the internal map
@param _rProp the content properties
*/
- void append(const ::vos::ORef<ContentProperties>& _rProp);
+ void append(const ::rtl::Reference<ContentProperties>& _rProp);
/** closeDocument closes the document
@param _sDocumentId the id of the document
@@ -148,28 +146,28 @@ public:
@return the content properties for this content or an empty refernce
*/
- ::vos::ORef<ContentProperties> queryContentProperty(const ::rtl::OUString& _sDocumentName);
+ ::rtl::Reference<ContentProperties> queryContentProperty(const ::rtl::OUString& _sDocumentName);
/** getContentProperty returns the ContentProperties for the first content with that title
@param _sTitle the title of the document
@return the content properties
*/
- ::vos::ORef<ContentProperties> getContentPropertyWithTitle(const ::rtl::OUString& _sTitle) const;
+ ::rtl::Reference<ContentProperties> getContentPropertyWithTitle(const ::rtl::OUString& _sTitle) const;
/** getContentProperty returns the ContentProperties for the first content with that SavedAsName
@param _sSaveAsName the SavedAsName of the document
@return the content properties
*/
- ::vos::ORef<ContentProperties> getContentPropertyWithSavedAsName(const ::rtl::OUString& _sSaveAsName) const;
+ ::rtl::Reference<ContentProperties> getContentPropertyWithSavedAsName(const ::rtl::OUString& _sSaveAsName) const;
/** openDoc returns the URL for the temporary file for the specific Content and opens it
@param _rProp used for check if already open, the member m_sFileURL will be set if is wan't opened yet
@return the URL of the temporary file
*/
- static ::rtl::OUString openDoc(const ::vos::ORef<ContentProperties>& _rProp) throw (::com::sun::star::uno::Exception);
+ static ::rtl::OUString openDoc(const ::rtl::Reference<ContentProperties>& _rProp) throw (::com::sun::star::uno::Exception);
/** convertURL converts a normal URL into an ODMA understandable name
@param _sCanonicURL the URL from ContentIndentifier
@@ -183,7 +181,7 @@ public:
@return true when successful
*/
- sal_Bool deleteDocument(const ::vos::ORef<ContentProperties>& _rProp);
+ sal_Bool deleteDocument(const ::rtl::Reference<ContentProperties>& _rProp);
};
}