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

Stephan Bergmann sbergman at redhat.com
Mon Jun 20 16:18:24 UTC 2016


 sd/source/filter/eppt/pptexsoundcollection.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 978e7b03f8c966ec23b6781d67f612e4665a09f7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 20 18:17:59 2016 +0200

    This code unlikely wants conversion from UNO Bool or Char Anys
    
    ...which would be the main difference with convertPropertyValue, in addition to throwing an
    exception upon failure that would be caught directly by the surrounding try-catch block
    
    Change-Id: I960e23b797c71be655c4059125effade84d0630c

diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx
index 5475c5e..2027ff3 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.cxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.cxx
@@ -23,7 +23,6 @@
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/proptypehlp.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 
 namespace ppt
@@ -39,7 +38,7 @@ ExSoundEntry::ExSoundEntry(const OUString& rString)
             css::uno::Reference< css::ucb::XCommandEnvironment >(),
             comphelper::getProcessComponentContext() );
         sal_Int64 nVal = 0;
-        ::cppu::convertPropertyValue( nVal, aCnt.getPropertyValue("Size") );
+        aCnt.getPropertyValue("Size") >>= nVal;
         nFileSize = (sal_uInt32)nVal;
     }
     catch( css::uno::Exception& )


More information about the Libreoffice-commits mailing list