[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - jvmfwk/inc

[Caolán McNamara]

 jvmfwk/inc/vendorbase.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bbed86d9c84a4faf6cc36b162d41a77d8480610
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 22 21:02:17 2016 +0100

    Related: tdf#101057 inherit MalformedVersionException from std::exception
    
    so we don't get std::terminate on MacOSX if its thrown up to
    JavaVirtualMachine::getJavaVM
    
    Change-Id: I1c6b79bf16cbaa66b8f79d495239e301d3ca58de
    (cherry picked from commit a3b3c5fcd7efd3e33a0f0078bd6fd23689c45c41)
    Reviewed-on: https://gerrit.libreoffice.org/27508
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index 1bb7844..d5742783 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -82,7 +82,7 @@ OpenJDK at least, but probably not true for Lemotes JDK */
 #endif // SPARC, INTEL, POWERPC, MIPS, MIPS64, ARM, IA64, M68K, HPPA, ALPHA
 
 
-class MalformedVersionException
+class MalformedVersionException : public std::exception
 {
 public:
     MalformedVersionException();