diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-11 09:16:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-11 16:07:15 +0100 |
| commit | af77dff1c08313fd355d173eacff9267595f7087 (patch) | |
| tree | 895fe5b6c995acbd2df0897062d91f7a8bd0772a | |
| parent | 3e38f8c507d9924fac00b6b7dffc6dafb98bb368 (diff) | |
ofz#4583 Abrt
Change-Id: Id6e782cb09a76901cdd8c43b25eff3d53700ece7
Reviewed-on: https://gerrit.libreoffice.org/46216
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index bfc41acfd63c..11ba1cbbdf76 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -24,6 +24,7 @@ #include <unotools/datetime.hxx> #include <sfx2/lnkbase.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XCustomShapeEngine.hpp> #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> @@ -424,9 +425,15 @@ Reference< XCustomShapeEngine > const & SdrObjCustomShape::GetCustomShapeEngine( aPropValues[ 0 ].Name = "CustomShape"; aPropValues[ 0 ].Value <<= aXShape; aArgument[ 0 ] <<= aPropValues; - Reference< XInterface > xInterface( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( aEngine, aArgument, xContext ) ); - if ( xInterface.is() ) - mxCustomShapeEngine.set( xInterface, UNO_QUERY ); + try + { + Reference<XInterface> xInterface(xContext->getServiceManager()->createInstanceWithArgumentsAndContext(aEngine, aArgument, xContext)); + if (xInterface.is()) + mxCustomShapeEngine.set( xInterface, UNO_QUERY ); + } + catch (const css::loader::CannotActivateFactoryException&) + { + } } return mxCustomShapeEngine; |