From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09 --- tools/qa/cppunit/test_reversemap.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/qa/cppunit/test_reversemap.cxx') diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx index af232c0bcb1e..f20ffb32c7a8 100644 --- a/tools/qa/cppunit/test_reversemap.cxx +++ b/tools/qa/cppunit/test_reversemap.cxx @@ -80,14 +80,14 @@ namespace //Some slots are unused, so don't map to private, just set them to 'X' sal_uInt32 convertFlags = OUSTRING_TO_OSTRING_CVTFLAGS ^ RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE; - rtl::OUString sOrigText(&aAllChars[0], aAllChars.size(), eEncoding, convertFlags); + OUString sOrigText(&aAllChars[0], aAllChars.size(), eEncoding, convertFlags); sOrigText = sOrigText.replace( 0xfffd, 'X' ); //Should clearly be equal sal_Int32 nLength = aAllChars.size(); CPPUNIT_ASSERT_EQUAL(sOrigText.getLength(), nLength); - rtl::OUString sFinalText; + OUString sFinalText; //Split up in chunks of the same encoding returned by //getBestMSEncodingByChar, convert to it, and back @@ -99,16 +99,16 @@ namespace rtl_TextEncoding eCurrEncoding = getBestMSEncodingByChar(pStr[i]); if (eCurrEncoding != ePrevEncoding) { - rtl::OString aChunk(pStr+nChunkStart, i-nChunkStart, ePrevEncoding); - sFinalText += rtl::OStringToOUString(aChunk, ePrevEncoding); + OString aChunk(pStr+nChunkStart, i-nChunkStart, ePrevEncoding); + sFinalText += OStringToOUString(aChunk, ePrevEncoding); nChunkStart = i; } ePrevEncoding = eCurrEncoding; } if (nChunkStart < 255) { - rtl::OString aChunk(pStr+nChunkStart, 255-nChunkStart, ePrevEncoding); - sFinalText += rtl::OStringToOUString(aChunk, ePrevEncoding); + OString aChunk(pStr+nChunkStart, 255-nChunkStart, ePrevEncoding); + sFinalText += OStringToOUString(aChunk, ePrevEncoding); } //Final text should be the same as original -- cgit v1.2.3