[Libreoffice-commits] core.git: 2 commits - vcl/workben xmlsecurity/source

[Caolán McNamara]

 vcl/workben/fftester.cxx               |    8 ++------
 xmlsecurity/source/helper/xsecsign.cxx |    6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 63cbf8fb02c3c53acc31c56a79c3f39e02c92f7b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Aug 23 19:58:58 2015 +0100

    fail on exception
    
    Change-Id: Ib48c6b05b7002db19e47d07fcfc0241468452190

diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index b50df80..adf03b9 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -377,13 +377,9 @@ try_again:
 
         /* If AFL_PERSISTENT not set or PERSIST_MAX exceeded, exit normally. */
     }
-    catch (const Exception& e)
+    catch (...)
     {
-        SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
-    }
-    catch (const std::exception &e)
-    {
-        SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+        abort();
     }
 
     _exit(ret);
commit e903601e636bcec8bdb7d1a4acb4bab27bf87533
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Aug 23 17:21:16 2015 +0100

    can replace sequence with simple array here
    
    Change-Id: I1b5125f5354dc2a1f4b4312dbe2b921d5cf13b49

diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index cfa312e..70149ce 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -43,14 +43,14 @@ namespace cssxs = com::sun::star::xml::sax;
 /* protected: for signature generation */
 OUString XSecController::createId()
 {
-    cssu::Sequence< sal_Int8 > aSeq( 16 );
-    rtl_createUuid (reinterpret_cast<sal_uInt8 *>(aSeq.getArray()), 0, sal_True);
+    sal_uInt8 aSeq[16];
+    rtl_createUuid( aSeq, 0, true );
 
     char str[68]="ID_";
     int length = 3;
     for (int i=0; i<16; ++i)
     {
-        length += sprintf(str+length, "%04x", (unsigned char)aSeq[i]);
+        length += sprintf(str+length, "%04x", aSeq[i]);
     }
 
     return OUString::createFromAscii(str);