[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sfx2/source

Giuseppe Castagno giuseppe.castagno at acca-esse.eu
Tue Feb 23 06:16:41 UTC 2016


 sfx2/source/dialog/dinfdlg.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9407bf98487beba498216e5132dca565108069a5
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Fri Feb 19 17:45:46 2016 +0100

    Related tdf#81718: correctly display file size for...
    
    ...WebDAV elements.
    WebDAV UCP provider maps UCB 'Size' property to 'DAV:getcontentlength'.
    
    DAV:getcontentlength property is defined in Section 15.4 of RFC4918.
    <http://tools.ietf.org/html/rfc4918#section-15>
    
    Change-Id: Ie91d1f2aed417002f4d1ecae3e1188123c04d35b
    Reviewed-on: https://gerrit.libreoffice.org/22511
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    (cherry picked from commit 86cd3df1ec9719e3a2a56dad1d9d7935f52a9f61)
    Reviewed-on: https://gerrit.libreoffice.org/22613
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index bc3fa4b..0eabee9 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1073,7 +1073,8 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
 
     // determine size and type
     OUString aSizeText( m_aUnknownSize );
-    if ( aURL.GetProtocol() == INetProtocol::File )
+    if ( aURL.GetProtocol() == INetProtocol::File ||
+         aURL.isAnyKnownWebDAVScheme() )
         aSizeText = CreateSizeText( SfxContentHelper::GetSize( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) );
     m_pShowSizeFT->SetText( aSizeText );
 


More information about the Libreoffice-commits mailing list