[Libreoffice-commits] .: Branch 'libreoffice-3-6' - unotools/inc unotools/source

[Libreoffice Gerrit user]

 unotools/inc/unotools/ucbhelper.hxx     |    7 +++++++
 unotools/source/ucbhelper/ucbhelper.cxx |   17 ++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 16a63f16699fd1383eb4bea6abfed9a98ed94838
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Aug 22 09:11:23 2012 +0200

    fdo#46249: UCBContentHelper::GetTitle must not fail for void property
    
    This was a regression introduced with 2af9040d38af7c7353855415dbea0134585058f3
    "Cleaned up utl::UCBContentHelper."  GetSize exhibited the same problem and has
    also been fixed.  IsYounger exhibits a similar problem, but has not been
    addressed, as it is unclear what to return in case no dates can be compared; it
    is only used in one place (handling SID_EDITDOC in
    SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it appears,
    only contents for which DateModified /does/ yield a non-void value are relevant.
    
    Change-Id: Iff9f5e1ed6f45eede117713d64a265b98f6862b1
    Reviewed-on: https://gerrit.libreoffice.org/449
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx
index 358d8e1..3ff576b 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -47,6 +47,10 @@ UNOTOOLS_DLLPUBLIC bool IsDocument(rtl::OUString const & url);
 
 UNOTOOLS_DLLPUBLIC bool IsFolder(rtl::OUString const & url);
 
+/// @param title must not be null
+/// @return true iff title has been set (i.e., if obtaining the "Title" property
+///     of the given content yields a non-void value without raising a
+///     non-RuntimeException; RuntimeExceptions are passed through)
 UNOTOOLS_DLLPUBLIC bool GetTitle(
     rtl::OUString const & url, rtl::OUString * title);
 
@@ -62,6 +66,9 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
     ucbhelper::Content & parent, rtl::OUString const & title,
     ucbhelper::Content & result, bool exclusive = false);
 
+/// @return the value of the "Size" property of the given content, or zero if
+///     obtaining the property yields a void value or raises a
+///     non-RuntimeException (RuntimeExceptions are passed through)
 UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(rtl::OUString const & url);
 
 UNOTOOLS_DLLPUBLIC bool IsYounger(
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index cbb9ee9..09203df 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -200,11 +200,7 @@ bool utl::UCBContentHelper::GetTitle(
 {
     assert(title != 0);
     try {
-        *title = content(url).
-            getPropertyValue(
-                rtl::OUString("Title")).
-            get<rtl::OUString>();
-        return true;
+        return content(url).getPropertyValue(rtl::OUString("Title")) >>= *title;
     } catch (css::uno::RuntimeException const &) {
         throw;
     } catch (css::ucb::CommandAbortedException const &) {
@@ -337,10 +333,13 @@ bool utl::UCBContentHelper::MakeFolder(
 
 sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
     try {
-        return
-            content(url).getPropertyValue(
-                rtl::OUString("Size")).
-            get<sal_Int64>();
+        sal_Int64 n = 0;
+        bool ok = (content(url).getPropertyValue(rtl::OUString("Size")) >>= n);
+        SAL_INFO_IF(
+            !ok, "unotools",
+            "UCBContentHelper::GetSize(" << url
+                << "): Size cannot be determined");
+        return n;
     } catch (css::uno::RuntimeException const &) {
         throw;
     } catch (css::ucb::CommandAbortedException const &) {