diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 17:04:24 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 17:04:24 +0000 |
| commit | efabd7a3b650e1babe2355faa1a9c75b4c458ca7 (patch) | |
| tree | a66e9fe7f6d870066f5f2c216d14fd26aa1a866a /ucb/source/ucp/gvfs | |
| parent | 67a0670e88400ba1b309490ab262c9ab6a78c10e (diff) | |
INTEGRATION: CWS bgdlremove (1.5.40); FILE MERGED
2007/05/18 11:37:17 kso 1.5.40.2: #i77419# - cleanup of ucbhelper namespaces.
2007/05/11 09:20:53 kso 1.5.40.1: 76911# - ucbhelper lib no longer uses VOS.
(vos::ORef => rtl::Reference, vos::OMutex => osl::Mutex, ...)
Diffstat (limited to 'ucb/source/ucp/gvfs')
| -rw-r--r-- | ucb/source/ucp/gvfs/provider.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ucb/source/ucp/gvfs/provider.cxx b/ucb/source/ucp/gvfs/provider.cxx index 7fa569f7c0f6..4e60142871a1 100644 --- a/ucb/source/ucp/gvfs/provider.cxx +++ b/ucb/source/ucp/gvfs/provider.cxx @@ -4,9 +4,9 @@ * * $RCSfile: provider.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 13:54:42 $ + * last change: $Author: ihi $ $Date: 2007-06-05 18:04:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,8 +52,9 @@ using namespace gvfs; //========================================================================= //========================================================================= -ContentProvider::ContentProvider(const uno::Reference< lang::XMultiServiceFactory >& rSMgr ) - : ::ucb::ContentProviderImplHelper( rSMgr ) +ContentProvider::ContentProvider( + const uno::Reference< lang::XMultiServiceFactory >& rSMgr ) +: ::ucbhelper::ContentProviderImplHelper( rSMgr ) { } // sdafas @@ -135,11 +136,11 @@ ContentProvider::queryContent( // #endif // throw com::sun::star::ucb::IllegalIdentifierException(); // } - vos::OGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); // Check, if a content with given id already exists... uno::Reference< com::sun::star::ucb::XContent > xContent - = queryExistingContent( Identifier ).getBodyPtr(); + = queryExistingContent( Identifier ).get(); if ( xContent.is() ) return xContent; |