diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-10 22:11:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-11 11:55:04 +0000 |
| commit | 6ddb02bad568be58c8728a40c43b81232c1ca4a0 (patch) | |
| tree | b6883ad68c870f9ce7e0ee2676956e673f2848d8 /sc/source/filter/xml/xmlwrap.cxx | |
| parent | c437b033748733273c43d071ab42a1863ed80416 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'sc/source/filter/xml/xmlwrap.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlwrap.cxx | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index ba9d4fc60480..a86d9edf0d62 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -66,6 +66,7 @@ #include <svx/xmleohlp.hxx> #include <rtl/logfile.hxx> +#include <rtl/strbuf.hxx> #include <unotools/saveopt.hxx> #include "document.hxx" @@ -220,9 +221,10 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe { #if OSL_DEBUG_LEVEL > 0 - ByteString aError( "SAX parse exception catched while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "SAX parse exception catched while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aError.getStr()); #endif String sErr( String::CreateFromInt32( r.LineNumber )); @@ -256,9 +258,11 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe { #if OSL_DEBUG_LEVEL > 0 - ByteString aError( "SAX exception catched while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "SAX exception catched while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aError.getStr()); #endif (void)r; // avoid warning in product version @@ -268,9 +272,11 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe catch( const packages::zip::ZipIOException& r ) { #if OSL_DEBUG_LEVEL > 0 - ByteString aError( "Zip exception catched while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "Zip exception catched while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL( aError.getStr() ); #endif (void)r; // avoid warning in product version @@ -279,9 +285,11 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe catch( const io::IOException& r ) { #if OSL_DEBUG_LEVEL > 0 - ByteString aError( "IO exception catched while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "IO exception catched while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aError.getStr()); #endif (void)r; // avoid warning in product version @@ -290,9 +298,11 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe catch( const uno::Exception& r ) { #if OSL_DEBUG_LEVEL > 0 - ByteString aError( "uno exception catched while importing:\n" ); - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM( + "uno exception catched while importing:\n")); + aError.append(rtl::OUStringToOString(r.Message, + RTL_TEXTENCODING_ASCII_US)); + OSL_FAIL(aError.getStr()); #endif (void)r; // avoid warning in product version |