filter/source/msfilter/svdfppt.cxx | 4 ++-- filter/source/svg/svgwriter.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit f3ff7103448083f55ce307b1078d60914a272521 Author: Michael Stahl <mst...@redhat.com> Date: Sat Feb 16 19:28:27 2013 +0100 filter: fix broken string conversion Change-Id: Iadcc6cddaf943b76dd82650c2f7246696aa438d1 diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index b307db4..cd8438f 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -4113,12 +4113,12 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd OStringBuffer aMsg; if ( rIn.Tell() > aTxMasterStyleHd.GetRecEndFilePos() ) { - aMsg.append("\n " + "reading too many bytes:" + + aMsg.append("\n reading too many bytes:" + OString::number(rIn.Tell() - aTxMasterStyleHd.GetRecEndFilePos())); } if ( rIn.Tell() < aTxMasterStyleHd.GetRecEndFilePos() ) { - aMsg.append("\n " + "reading too few bytes:" + + aMsg.append("\n reading too few bytes:" + OString::number(aTxMasterStyleHd.GetRecEndFilePos() - rIn.Tell())); } if (aMsg.getLength()) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 14e115e..61f1067 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -2943,8 +2943,8 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, rtl::OString sComment = pA->GetComment(); if (!sComment.isEmpty()) { - sType.append(OUString( sComment.getStr(), - sComment.getLength(), RTL_TEXTENCODING_UTF8 ); + sType.append(OStringToOUString( + sComment, RTL_TEXTENCODING_UTF8)); } if (sComment.equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN"))) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits