[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - ucb/source

[Matúš Kukan]

 ucb/source/ucp/webdav/webdavcontent.cxx |    6 ++----
 ucb/source/ucp/webdav/webdavcontent.hxx |    4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 4467e9243818b111286fa013bba5b84cc0187160
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Fri Jul 11 12:54:02 2014 +0200

    webdav: Do not return reference here.
    
    This was missing in e07cefb4f7ba39d59d25815e208ed61269079142.
    
    (cherry picked from commit 89df4412dcff84eb7ef77bf77b5db499ed44fb18)
    
    Conflicts:
    	ucb/source/ucp/webdav/webdavcontent.cxx
    
    Change-Id: I1c9a3f88981ee67d9d5748f9e43eed1237422fb1

diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index e67b65e..d9ee9d8 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -3360,8 +3360,7 @@ Content::getBaseURI( const boost::scoped_ptr< DAVResourceAccess > & rResAccess )
     return OUString( rResAccess->getURL() );
 }
 
-//=========================================================================
-const Content::ResourceType & Content::getResourceType(
+Content::ResourceType Content::getResourceType(
                     const uno::Reference< ucb::XCommandEnvironment >& xEnv,
                     const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
                     bool * networkAccessAllowed )
@@ -3443,8 +3442,7 @@ const Content::ResourceType & Content::getResourceType(
     return m_eResourceType;
 }
 
-//=========================================================================
-const Content::ResourceType & Content::getResourceType(
+Content::ResourceType Content::getResourceType(
                     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
     throw ( uno::Exception )
 {
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index b36d88d..7d7ac1e 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -125,12 +125,12 @@ private:
     const OUString
     getBaseURI( const boost::scoped_ptr< DAVResourceAccess > & rResAccess );
 
-    const ResourceType &
+    ResourceType
     getResourceType( const ::com::sun::star::uno::Reference<
                          ::com::sun::star::ucb::XCommandEnvironment >& xEnv )
         throw ( ::com::sun::star::uno::Exception );
 
-    const ResourceType &
+    ResourceType
     getResourceType( const ::com::sun::star::uno::Reference<
                           ::com::sun::star::ucb::XCommandEnvironment >& xEnv,
                      const boost::scoped_ptr< DAVResourceAccess > & rResAccess,