diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 7 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 23 | ||||
| -rw-r--r-- | svx/source/xml/xmleohlp.cxx | 6 |
3 files changed, 22 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index cddbd3285444..9618c0bab20c 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> +#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <cppuhelper/exc_hlp.hxx> @@ -423,9 +424,11 @@ uno::Reference< css::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Imp { xMan.set(xFrame->getPropertyValue("LayoutManager"),uno::UNO_QUERY); } - catch ( uno::Exception& ) + catch ( uno::Exception& ex ) { - throw uno::RuntimeException(); + css::uno::Any anyEx = cppu::getCaughtException(); + throw css::lang::WrappedTargetRuntimeException( ex.Message, + nullptr, anyEx ); } return xMan; diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 008be0731645..e584504026bf 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -30,6 +30,7 @@ #include <svx/svdpool.hxx> #include <comphelper/classids.hxx> #include <comphelper/propertysequence.hxx> +#include <cppuhelper/exc_hlp.hxx> #include <sfx2/frmdescr.hxx> #include <vcl/svapp.hxx> @@ -879,19 +880,21 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr pMedia->SetInputStream(xStream); } } - catch (const css::ucb::ContentCreationException& e) + catch (const css::ucb::ContentCreationException&) { + css::uno::Any exc = cppu::getCaughtException(); throw css::lang::WrappedTargetException( "ContentCreationException Setting InputStream!", static_cast<OWeakObject *>(this), - makeAny(e)); + exc); } - catch (const css::ucb::CommandFailedException& e) + catch (const css::ucb::CommandFailedException&) { + css::uno::Any anyEx = cppu::getCaughtException(); throw css::lang::WrappedTargetException( "CommandFailedException Setting InputStream!", static_cast<OWeakObject *>(this), - makeAny(e)); + anyEx); } #endif break; @@ -964,19 +967,19 @@ bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPr { rValue <<= pMedia->GetInputStream(); } - catch (const css::ucb::ContentCreationException& e) + catch (const css::ucb::ContentCreationException&) { + css::uno::Any anyEx = cppu::getCaughtException(); throw css::lang::WrappedTargetException( "ContentCreationException Getting InputStream!", - static_cast < OWeakObject * > ( this ), - makeAny( e ) ); + static_cast < OWeakObject * > ( this ), anyEx ); } - catch (const css::ucb::CommandFailedException& e) + catch (const css::ucb::CommandFailedException&) { + css::uno::Any anyEx = cppu::getCaughtException(); throw css::lang::WrappedTargetException( "CommandFailedException Getting InputStream!", - static_cast < OWeakObject * > ( this ), - makeAny( e ) ); + static_cast < OWeakObject * > ( this ), anyEx ); } break; diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index c3f61476440e..a5058f1e7610 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -42,6 +42,7 @@ #include <comphelper/fileformat.h> #include <comphelper/classids.hxx> +#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <svx/xmleohlp.hxx> #include <map> @@ -564,11 +565,12 @@ OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL(const OUSt { throw; } - catch (const Exception& e) + catch (const Exception&) { + css::uno::Any anyEx = cppu::getCaughtException(); throw WrappedTargetRuntimeException( "SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL non-RuntimeException", - static_cast<uno::XWeak*>(this), uno::makeAny(e)); + static_cast<uno::XWeak*>(this), anyEx); } return sRet; } |