diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-27 22:46:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-28 10:23:00 +0100 |
| commit | bfef1510c1f586b8b21c2c1bea6d7791eb9b91bf (patch) | |
| tree | 37d3ed2602569d4766388051bd8fc3e789c5db88 | |
| parent | 533ee0b970497d979a733fdca674e2aa18c30197 (diff) | |
ditch some ByteStrings
| -rw-r--r-- | sw/source/filter/html/htmlfly.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/docvw/srcedtw.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 0ef3d6c3340b..1f5984602930 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -948,7 +948,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, rHTMLWrt.aImgMapNames.Insert( new String(aIMapName), rHTMLWrt.aImgMapNames.Count() ); - ByteString aIndMap, aIndArea; + rtl::OString aIndMap, aIndArea; const sal_Char *pLF = 0, *pIndArea = 0, *pIndMap = 0; #if defined(UNX) sal_Char aLF[2] = "\x00"; @@ -965,8 +965,8 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, #else pLF = SwHTMLWriter::sNewLine; #endif - pIndArea = aIndArea.GetBuffer(); - pIndMap = aIndMap.GetBuffer(); + pIndArea = aIndArea.getStr(); + pIndMap = aIndMap.getStr(); } if( bScale ) diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index d84c4d2d26f0..b80904fa2a03 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -162,8 +162,8 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList) { // what was that? #if OSL_DEBUG_LEVEL > 1 - OSL_FAIL("Token not recognised!"); - OSL_FAIL(ByteString(sToken, gsl_getSystemTextEncoding()).GetBuffer()); + OSL_FAIL(OSL_FORMAT("Token %s not recognised!", + rtl::OUStringToOString(sToken, osl_getThreadTextEncoding()).getStr())); #endif } |