summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-06 07:45:00 +0200
committerNoel Grandin <noel@peralex.com>2014-11-06 13:51:10 +0200
commit05050cdb23de586870bf479a9df5ced06828d498 (patch)
treea34c3bba9a921a5e9abf23d5757c15dfaea0ceac /filter
parent8f266781a6bd6a629bce65c0f613683047c9a794 (diff)
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
Diffstat (limited to 'filter')
-rw-r--r--filter/source/svg/svgwriter.cxx3
-rw-r--r--filter/source/xmlfilterdetect/filterdetect.cxx2
2 files changed, 2 insertions, 3 deletions
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 6d2efbad1713..b01880ea704f 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2684,8 +2684,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
OString sComment = pA->GetComment();
if (!sComment.isEmpty())
{
- sType.append(OStringToOUString(
- sComment, RTL_TEXTENCODING_UTF8));
+ sType.append(OUString::fromUtf8(sComment));
}
if (sComment.equalsIgnoreAsciiCase("FIELD_SEQ_BEGIN"))
{
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index a6f0089790e5..691036f16967 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -115,7 +115,7 @@ OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun:
}
if ( nUniPos == 3 || ( nUniPos == 0 && !bTryUtf16 ) ) // UTF-8 or non-Unicode
- resultString = OStringToOUString( read_uInt8s_ToOString( *pInStream, nSize ), RTL_TEXTENCODING_UTF8 );
+ resultString = OUString::fromUtf8( read_uInt8s_ToOString( *pInStream, nSize ) );
else if ( nUniPos == 2 || bTryUtf16 ) // UTF-16
resultString = read_uInt16s_ToOUString( *pInStream, nSize );