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

Stephan Bergmann sbergman at redhat.com
Mon Oct 20 06:43:15 PDT 2014


 forms/source/component/FormComponent.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 66da64c74829a68a8dc55c9380ecd6c84d0fc331
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 20 15:42:36 2014 +0200

    Missing include
    
    ...and only use getCaughtException as first statement in catch block.
    
    Change-Id: Idcac073896b84fd2671b52b2315f454651dbf910

diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 180a2c0..b7a3a9e 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -42,6 +42,7 @@
 #include <comphelper/listenernotification.hxx>
 #include <comphelper/property.hxx>
 #include <connectivity/dbtools.hxx>
+#include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <toolkit/helper/emptyfontdescriptor.hxx>
@@ -654,10 +655,11 @@ void SAL_CALL OControlModel::setName(const OUString& _rName) throw(RuntimeExcept
     }
     catch (const css::beans::UnknownPropertyException&)
     {
+        css::uno::Any a(cppu::getCaughtException());
         throw WrappedTargetRuntimeException(
             "OControlModel::setName",
             *const_cast< OControlModel* >( this ),
-            ::cppu::getCaughtException()
+            a
         );
     }
 }


More information about the Libreoffice-commits mailing list