diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-10-08 22:01:21 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-10 08:51:14 +0100 |
commit | af6980b1c7ed24d9102e5a88c095aa8fb4008715 (patch) | |
tree | 213a9412629d2b600f67123c72922d6515c505e8 /xmloff/source/core | |
parent | b2aa7673de144df737374b9173b5539f36f6a533 (diff) |
make xmloff ByteString free
Diffstat (limited to 'xmloff/source/core')
-rw-r--r-- | xmloff/source/core/xmlerror.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 12 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 640720166428..2ddcb8ed8d93 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -193,9 +193,9 @@ void XMLErrors::AddRecord( } // convert to byte string and signal the error - ByteString aError( String( sMessage.makeStringAndClear() ), - RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OString aError(rtl::OUStringToOString(sMessage.makeStringAndClear(), + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL( aError.getStr() ); #endif } diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 54b02a41f365..f244a5c65991 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -898,15 +898,15 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue if (GetModel().is()) { // print a trace message with the URL - ByteString aUrl( (String) GetModel()->getURL(), - RTL_TEXTENCODING_ASCII_US ); - RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "%s", aUrl.GetBuffer() ); + rtl::OString aUrl(rtl::OUStringToOString(GetModel()->getURL(), + RTL_TEXTENCODING_ASCII_US)); + RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "%s", aUrl.getStr() ); // we also want a trace message with the document class - ByteString aClass( (String)GetXMLToken(meClass), - RTL_TEXTENCODING_ASCII_US ); + rtl::OString aClass(rtl::OUStringToOString(GetXMLToken(meClass), + RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "class=\"%s\"", - aClass.GetBuffer() ); + aClass.getStr() ); } #endif diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 9574bd7334a8..cb431db22eee 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -725,10 +725,10 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName, #ifdef TIMELOG // If we do profiling, we want a trace message for the first element // in order to identify the stream. - ByteString aString( (String)rName, RTL_TEXTENCODING_ASCII_US ); + rtl::OString aString(rtl::OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", LOGFILE_AUTHOR, "SvXMLImport::StartElement( \"%s\", ... )", - aString.GetBuffer() ); + aString.getStr() ); #endif pContext = CreateContext( nPrefix, aLocalName, xAttrList ); |