diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-08 13:15:44 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-08 13:37:52 +0100 |
| commit | e7fbe37c56d78af757f975b280bf113fb2fe40fd (patch) | |
| tree | 5c9378d33e51e5186d88e0f841c61e4d9a34ff1e /writerfilter | |
| parent | 827e8d6a3b546422578e1dc62ad28039b53df713 (diff) | |
writerfilter: SW_DEBUG_RTF_PASTE_{TO,FROM} is expected to be UTF-8
Change-Id: Ibcfa71cf9820db0b397a88e22aa6cc964048b71c
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/filter/RtfFilter.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index baf7049ec0c7..91722703b94e 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -85,7 +85,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip // If this is set, write to this file, instead of the real document during paste. char* pEnv = getenv("SW_DEBUG_RTF_PASTE_TO"); OUString aOutStr; - if (!bIsNewDoc && pEnv && utl::LocalFileHelper::ConvertPhysicalNameToURL(OStringToOUString(pEnv, RTL_TEXTENCODING_UTF8), aOutStr)) + if (!bIsNewDoc && pEnv && utl::LocalFileHelper::ConvertPhysicalNameToURL(OUString::fromUtf8(pEnv), aOutStr)) { SvStream* pOut = utl::UcbStreamHelper::CreateStream(aOutStr, STREAM_WRITE); SvStream* pIn = utl::UcbStreamHelper::CreateStream(xInputStream); @@ -99,7 +99,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip if (!bIsNewDoc && pEnv) { OUString aInStr; - utl::LocalFileHelper::ConvertPhysicalNameToURL(OStringToOUString(pEnv, RTL_TEXTENCODING_UTF8), aInStr); + utl::LocalFileHelper::ConvertPhysicalNameToURL(OUString::fromUtf8(pEnv), aInStr); SvStream* pStream = utl::UcbStreamHelper::CreateStream(aInStr, STREAM_READ); uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStream)); xInputStream.set(xStream, uno::UNO_QUERY); |