[Libreoffice-commits] core.git: 3 commits - include/svx svx/source svx/workben vcl/workben

[Caolán McNamara]

 include/svx/unoshape.hxx        |    2 +-
 svx/source/unodraw/unoshap3.cxx |    2 +-
 svx/workben/pixelctl.cxx        |    5 +++++
 vcl/workben/svpclient.cxx       |    5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit d58c32fc168d7c8431e09e7fd275eaed68e13a7d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 7 20:49:22 2014 +0000

    coverity#1251176 Uncaught exception
    
    Change-Id: Ibeedfcb59e3a249c066a9c0f5dd3fcced9beed90

diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index b0d2679..d56d87b 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -685,7 +685,7 @@ protected:
 public:
     Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw();
     // overide these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty,
         css::uno::Any& rValue )
             throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 571b3c1..fa6fc5f 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -304,7 +304,7 @@ struct ImpRememberTransAndRect
     Rectangle                   maRect;
 };
 
-bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     switch( pProperty->nWID )
     {
commit c0e348a72a2f027eb7cdfe5b66b0e901cfdd676b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 7 20:47:25 2014 +0000

    coverity#1251177 Uncaught exception
    
    Change-Id: Id71b104f8d1c420b3716b093cebad00a7eb3f431

diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx
index f962042..09cb020 100644
--- a/svx/workben/pixelctl.cxx
+++ b/svx/workben/pixelctl.cxx
@@ -68,6 +68,11 @@ SAL_IMPLEMENT_MAIN()
         SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
         return 1;
     }
+    catch (const std::exception& e)
+    {
+        SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+        return 1;
+    }
 
     return 0;
 }
commit dce66ad650a2707ea3fca3afef0cbe4ee3e2338c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 7 20:46:17 2014 +0000

    coverity#1251175 Uncaught exception
    
    Change-Id: I862320e5a4b8277ba39e8174b077df8c838b4629

diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 3f9e274..35cd62c 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -81,6 +81,11 @@ SAL_IMPLEMENT_MAIN()
         SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
         return 1;
     }
+    catch (const std::exception& e)
+    {
+        SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+        return 1;
+    }
 
     return 0;
 }