diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
| commit | fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch) | |
| tree | 49a72b76d2d2a92af6371748c19277778159b86d /writerperfect | |
| parent | e36dae401fc8963c9a92cb2c11d9b650b943c6d3 (diff) | |
Revert "use the new OUString::fromUtf8 method"
This reverts commit 05050cdb23de586870bf479a9df5ced06828d498,
not all places that use e.g. OStringToOUString to convert potential UTF-8
are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and
some places like e.g. in codemaker are happy with the best-effort effect
of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/source/common/WPXSvInputStream.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index 30779d14b652..3c22f9d3b341 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -206,7 +206,7 @@ SotStorageStreamRef OLEStorageImpl::getStream(const rtl::OUString &rPath) SotStorageStreamRef OLEStorageImpl::getStream(const std::size_t nId) { if (!maStreams[nId].stream.ref.Is()) - maStreams[nId].stream.ref = createStream(rtl::OUString::fromUtf8(maStreams[nId].name)); + maStreams[nId].stream.ref = createStream(rtl::OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8)); return maStreams[nId].stream.ref; } @@ -352,7 +352,7 @@ Reference<XInputStream> ZipStorageImpl::getStream(const rtl::OUString &rPath) Reference<XInputStream> ZipStorageImpl::getStream(const std::size_t nId) { if (!maStreams[nId].xStream.is()) - maStreams[nId].xStream = createStream(rtl::OUString::fromUtf8(maStreams[nId].aName)); + maStreams[nId].xStream = createStream(rtl::OStringToOUString(maStreams[nId].aName, RTL_TEXTENCODING_UTF8)); return maStreams[nId].xStream; } @@ -625,7 +625,7 @@ bool WPXSvInputStreamImpl::existsSubStream(const char *const name) PositionHolder pos(mxSeekable); mxSeekable->seek(0); - const rtl::OUString aName(rtl::OUString::fromUtf8(rtl::OString(name))); + const rtl::OUString aName(rtl::OStringToOUString(rtl::OString(name), RTL_TEXTENCODING_UTF8)); if (isOLE()) { @@ -655,7 +655,7 @@ librevenge::RVNGInputStream *WPXSvInputStreamImpl::getSubStreamByName(const char PositionHolder pos(mxSeekable); mxSeekable->seek(0); - const rtl::OUString aName(rtl::OUString::fromUtf8(rtl::OString(name))); + const rtl::OUString aName(rtl::OStringToOUString(rtl::OString(name), RTL_TEXTENCODING_UTF8)); if (isOLE()) { |