diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-24 22:51:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-25 09:41:30 +0100 |
| commit | 8e17a413dcb7316597aa5e3842c002fb5b811621 (patch) | |
| tree | 39de605b06d73b2a31a92ebc81c139425a4e2753 /filter | |
| parent | 47f3f8c7e9d0ebc66443cc9d788874af6b87f468 (diff) | |
ByteString->rtl::OStringBuffer
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 2d812f1c9178..04b0947c2d94 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -128,6 +128,7 @@ #include <algorithm> #include <set> #include <unotools/streamwrap.hxx> +#include <rtl/strbuf.hxx> // PPT ColorScheme Slots #define PPT_COLSCHEME (0x08000000) @@ -4184,24 +4185,25 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd { if ( rIn.GetError() == 0 ) { - ByteString aMsg; + rtl::OStringBuffer aMsg; if ( rIn.Tell() > aTxMasterStyleHd.GetRecEndFilePos() ) { - aMsg += "\n "; - aMsg += "reading too many bytes:"; - aMsg += ByteString::CreateFromInt32( rIn.Tell() - aTxMasterStyleHd.GetRecEndFilePos() ); + aMsg.append(RTL_CONSTASCII_STRINGPARAM("\n ")); + aMsg.append(RTL_CONSTASCII_STRINGPARAM("reading too many bytes:")); + aMsg.append(static_cast<sal_Int32>(rIn.Tell() - aTxMasterStyleHd.GetRecEndFilePos())); } if ( rIn.Tell() < aTxMasterStyleHd.GetRecEndFilePos() ) { - aMsg += "\n "; - aMsg += "reading too less bytes:"; - aMsg += ByteString::CreateFromInt32( aTxMasterStyleHd.GetRecEndFilePos() - rIn.Tell() ); + aMsg.append(RTL_CONSTASCII_STRINGPARAM("\n ")); + aMsg.append(RTL_CONSTASCII_STRINGPARAM("reading too few bytes:")); + aMsg.append(static_cast<sal_Int32>(aTxMasterStyleHd.GetRecEndFilePos() - rIn.Tell())); } - if ( aMsg.Len() != 0 ) + if (aMsg.getLength()) { - aMsg.Insert( "]:", 0 ); - aMsg.Insert( "PptStyleSheet::operator>>[", 0 ); - OSL_FAIL(aMsg.GetBuffer()); + aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM("]:")); + aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM( + "PptStyleSheet::operator>>[")); + OSL_FAIL(aMsg.getStr()); } } if ( rIn.Tell() != aTxMasterStyleHd.GetRecEndFilePos() ) |