diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-07 22:24:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-07 22:29:12 +0000 |
| commit | 3b5ec68b846eb2f1eb289cc95047864e51941cf0 (patch) | |
| tree | a21bbc45dd1fcfb5547ffa6c0fe4306b2240d8c7 /svtools/source/svhtml | |
| parent | 06813401fdb6bcbcaed321ff53c4601af91dbba2 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'svtools/source/svhtml')
| -rw-r--r-- | svtools/source/svhtml/htmlout.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index da7ff07fc92e..c30dd849810f 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -648,7 +648,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, if( pObj ) { const sal_Char *pShape = 0; - ByteString aCoords; + rtl::OString aCoords; switch( pObj->GetType() ) { case( IMAP_OBJ_RECTANGLE ): @@ -956,7 +956,7 @@ rtl::OString HTMLOutFuncs::CreateTableDataOptionsValNum( // printf / scanf ist zu ungenau String aValStr; rFormatter.GetInputLineString( fVal, 0, aValStr ); - ByteString sTmp( aValStr, eDestEnc ); + rtl::OString sTmp(rtl::OUStringToOString(aValStr, eDestEnc)); aStrTD.append(' '). append(OOO_STRING_SVTOOLS_HTML_O_SDval). append(RTL_CONSTASCII_STRINGPARAM("=\"")). diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 8ec3503303e8..17f092d891af 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1927,7 +1927,7 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader, sTmp.append( cUC < 256U ? (sal_Char)cUC : '.' ); } - sCmp = ByteString( sTmp.makeStringAndClear() ); + sCmp = sTmp.makeStringAndClear(); } else { @@ -2270,9 +2270,10 @@ rtl_TextEncoding HTMLParser::GetEncodingByMIME( const String& rMime ) = aParameters.find("charset"); if (pCharset != 0) { - ByteString sValue( pCharset->m_sValue, RTL_TEXTENCODING_ASCII_US ); + rtl::OString sValue(rtl::OUStringToOString(pCharset->m_sValue, + RTL_TEXTENCODING_ASCII_US)); return GetExtendedCompatibilityTextEncoding( - rtl_getTextEncodingFromMimeCharset( sValue.GetBuffer() ) ); + rtl_getTextEncodingFromMimeCharset( sValue.getStr() ) ); } } return RTL_TEXTENCODING_DONTKNOW; |