diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-02-22 15:35:41 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-02-22 16:21:37 +0100 |
commit | f150ed241ff796a25bd1a797155104198b415f18 (patch) | |
tree | bce5481ac1cd29b781ad73c2eb5a7606c49f5da2 /sal/rtl | |
parent | 768da511046f22346874734da2418117f71dcd11 (diff) |
OUString ctor for string literals without RTL_CONSTASCII stuff
http://lists.freedesktop.org/archives/libreoffice/2012-February/025662.html
Diffstat (limited to 'sal/rtl')
-rw-r--r-- | sal/rtl/source/ustring.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sal/rtl/source/ustring.cxx b/sal/rtl/source/ustring.cxx index 0156ceae9a08..d7f8a96971ec 100644 --- a/sal/rtl/source/ustring.cxx +++ b/sal/rtl/source/ustring.cxx @@ -45,6 +45,7 @@ #include <string.h> #include <sal/alloca.h> +#include <sal/log.hxx> #include "hash.hxx" #include "strimp.hxx" @@ -600,7 +601,7 @@ static void rtl_string2UString_status( rtl_uString** ppThis, do { /* Check ASCII range */ - OSL_ENSURE( ((unsigned char)*pStr) <= 127, + SAL_WARN_IF( ((unsigned char)*pStr) > 127, "rtl.string", "rtl_string2UString_status() - Found char > 127 and RTL_TEXTENCODING_ASCII_US is specified" ); *pBuffer = *pStr; |