From d1ebe20b94218eb6727e031977cbc8b9d4aa5336 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 2 May 2005 12:20:41 +0000 Subject: [PATCH] INTEGRATION: CWS hrobeta2 (1.2.108); FILE MERGED 2005/02/10 14:52:16 sb 1.2.108.1: #i42350# Removed non-ASCII characters from string literals. --- sal/qa/rtl/ostring/rtl_string.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index bf7d91120309..d4689175de0f 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -88,35 +88,35 @@ namespace rtl_string void convertUStringToString_002() { - rtl::OString sStr("Hällo"); + rtl::OString sStr("H\xE4llo"); rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15); rtl::OString sString; sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS); - CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Hällo")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True); } void convertUStringToString_003() { - rtl::OString sStr("Hällo"); + rtl::OString sStr("H\xC3\xA4llo"); rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_UTF8); rtl::OString sString; sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS); - CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Hällo")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("H\xE4llo")) == sal_True); } void convertUStringToString_004() { - rtl::OString sStr("Tschüß"); + rtl::OString sStr("Tsch\xFC\xDF"); rtl::OUString suString = rtl::OStringToOUString(sStr, RTL_TEXTENCODING_ISO_8859_15); rtl::OString sString; sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS); /* sal_Bool */ bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ISO_8859_15, OUSTRING_TO_OSTRING_CVTFLAGS); - CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Tschüß")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Tsch\xFC\xDF")) == sal_True); }