[Libreoffice-commits] core.git: ucb/source

[Matúš Kukan]

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

New commits:
commit 89df4412dcff84eb7ef77bf77b5db499ed44fb18
Author: Matúš Kukan <matus.ku...@collabora.com>
Date:   Fri Jul 11 12:54:02 2014 +0200

    webdav: Do not return reference here.
    
    This was missing in e07cefb4f7ba39d59d25815e208ed61269079142.
    
    Change-Id: I1c9a3f88981ee67d9d5748f9e43eed1237422fb1

diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx 
b/ucb/source/ucp/webdav/webdavcontent.cxx
index 3829a0c..99af57c 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -3323,7 +3323,7 @@ Content::getBaseURI( const boost::scoped_ptr< 
DAVResourceAccess > & rResAccess )
 }
 
 
-const Content::ResourceType & Content::getResourceType(
+Content::ResourceType Content::getResourceType(
                     const uno::Reference< ucb::XCommandEnvironment >& xEnv,
                     const boost::scoped_ptr< DAVResourceAccess > & rResAccess,
                     bool * networkAccessAllowed )
@@ -3406,7 +3406,7 @@ const Content::ResourceType & Content::getResourceType(
 }
 
 
-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 f6e0639..3f6c2cb 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,

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits