From 1b9772c6edb124bbd28004e312957d7ac854dcbe Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 30 Mar 2012 16:58:44 +0200 Subject: do not just warn on allocation failure, simply abort --- sal/inc/rtl/string.hxx | 2 +- sal/inc/rtl/ustring.hxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index 72af04ee79bc..8dbb41373a1c 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -249,7 +249,7 @@ public: rtl_uString2String( &pData, value, length, encoding, convertFlags ); if (pData == 0) { #if defined EXCEPTIONS_OFF - SAL_WARN("sal", "std::bad_alloc but EXCEPTIONS_OFF"); + abort(); #else throw std::bad_alloc(); #endif diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index a5528894e0d4..8035bdc50252 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -284,7 +284,7 @@ public: rtl_string2UString( &pData, value, length, encoding, convertFlags ); if (pData == 0) { #if defined EXCEPTIONS_OFF - SAL_WARN("sal", "std::bad_alloc but EXCEPTIONS_OFF"); + abort(); #else throw std::bad_alloc(); #endif @@ -1734,7 +1734,7 @@ public: rtl_uString_intern( &pNew, pData ); if (pNew == 0) { #if defined EXCEPTIONS_OFF - SAL_WARN("sal", "std::bad_alloc but EXCEPTIONS_OFF"); + abort(); #else throw std::bad_alloc(); #endif @@ -1777,7 +1777,7 @@ public: convertFlags, pInfo ); if (pNew == 0) { #if defined EXCEPTIONS_OFF - SAL_WARN("sal", "std::bad_alloc but EXCEPTIONS_OFF"); + abort(); #else throw std::bad_alloc(); #endif -- cgit