mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up uses of Any::getValue() in desktop

Browse Source 
Change-Id: I20cc2dba64a07012c7d03ab5d2aca56dd8cfb042
This commit is contained in:
Stephan Bergmann 2016-06-10 18:55:35 +02:00
parent 177afb1ec3
commit e5ca1f73a0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
View File

@ -50,6 +50,7 @@
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/TypeClass.hpp> #include <com/sun/star/uno/TypeClass.hpp>
#include <o3tl/any.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
@ -562,8 +563,8 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus )
OUString text; OUString text;
if ( rStatus.hasValue() && !( rStatus >>= text) ) if ( rStatus.hasValue() && !( rStatus >>= text) )
{ {
if ( rStatus.getValueTypeClass() == uno::TypeClass_EXCEPTION ) if ( auto e = o3tl::tryAccess<uno::Exception>(rStatus) )
text = static_cast< uno::Exception const *>( rStatus.getValue() )->Message; text = e->Message;
if ( text.isEmpty() ) if ( text.isEmpty() )
text = ::comphelper::anyToString( rStatus ); // fallback text = ::comphelper::anyToString( rStatus ); // fallback
@ -800,11 +801,13 @@ void ExtensionCmdQueue::Thread::execute()
uno::Any exc( ::cppu::getCaughtException() ); uno::Any exc( ::cppu::getCaughtException() );
OUString msg; OUString msg;
deployment::DeploymentException dpExc; deployment::DeploymentException dpExc;
if ((exc >>= dpExc) && if (exc >>= dpExc)
dpExc.Cause.getValueTypeClass() == uno::TypeClass_EXCEPTION)
{ {
// notify error cause only: if (auto e = o3tl::tryAccess<uno::Exception>(dpExc.Cause))
msg = static_cast< uno::Exception const * >( dpExc.Cause.getValue() )->Message; {
// notify error cause only:
msg = e->Message;
}
} }
if (msg.isEmpty()) // fallback for debugging purposes if (msg.isEmpty()) // fallback for debugging purposes
msg = ::comphelper::anyToString(exc); msg = ::comphelper::anyToString(exc);