diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-22 09:10:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-22 09:11:40 +0100 |
| commit | 9d2cfee5e9e3ac82fab2e920730d04f23593ec10 (patch) | |
| tree | 860f8e3363edb156741ed3bbc4314e92bc05ec3f /ucb | |
| parent | ae4da42e5fd0222fa1d1336ae1090b1ad840327f (diff) | |
some more clang warnings
Change-Id: I4359784279875dc9dac99bc4d2db95dccf094b20
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/gvfs/gvfs_content.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index 6ae71a85c1a8..d3b308362d46 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -504,7 +504,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) g_warning( "createNewContent (%d)", (int) create_document ); #endif - rtl::OUString aURL = getOUURI(); + rtl::OUString aURL = getOUURI(); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) aURL += rtl::OUString("/"); @@ -513,14 +513,14 @@ Content::createNewContent( const ucb::ContentInfo& Info ) // This looks problematic to me cf. webdav aURL += rtl::OUString::createFromAscii( name ); - uno::Reference< ucb::XContentIdentifier > xId + uno::Reference< ucb::XContentIdentifier > xId ( new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ) ); - try { + try { return new ::gvfs::Content( m_xSMgr, m_pProvider, xId, !create_document ); } catch ( ucb::ContentCreationException & ) { return uno::Reference< ucb::XContent >(); - } + } } rtl::OUString Content::getParentURL() @@ -1031,8 +1031,6 @@ void Content::destroy( sal_Bool bDeletePhysical ) throw( uno::Exception ) { // @@@ take care about bDeletePhysical -> trashcan support - rtl::OUString aURL = getOUURI(); - uno::Reference< ucb::XContent > xThis = this; deleted(); @@ -1397,7 +1395,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( rtl::OUString Content::getOUURI () { - osl::Guard< osl::Mutex > aGuard( m_aMutex ); + osl::Guard< osl::Mutex > aGuard( m_aMutex ); return m_xIdentifier->getContentIdentifier(); } |