[Libreoffice-commits] .: test/source

Caolán McNamara caolan at kemper.freedesktop.org
Fri Jul 1 07:21:08 PDT 2011


 test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx |   11 ++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 41515f40e6a189bfd969b9fa08d378f48f3bf96c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 1 11:26:04 2011 +0100

    WaE: for windows compiler

diff --git a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index e58c78e..ed2c4f7 100644
--- a/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -95,9 +95,12 @@ bool Prot::protect(
 
 bool Prot::protect(CppUnit::Functor const & functor)
 {
-    try {
-        return functor();
-    } catch (const css::uno::Exception &e) {
+    bool bRet = false;
+    try
+    {
+        bRet = functor();
+    } catch (const css::uno::Exception &e)
+    {
         css::uno::Any a(cppu::getCaughtException());
         std::cerr
             << convert(rtl::OUString(
@@ -108,7 +111,7 @@ bool Prot::protect(CppUnit::Functor const & functor)
             << std::endl;
         throw;
     }
-    return false;
+    return bRet;
 }
 
 }


More information about the Libreoffice-commits mailing list