commit e7fbe37c56d78af757f975b280bf113fb2fe40fd
author Miklos Vajna <vmiklos@collabora.co.uk> Sat Nov 08 13:15:44 2014 +0100
committer Miklos Vajna <vmiklos@collabora.co.uk> Sat Nov 08 13:37:52 2014 +0100
tree 5c9378d33e51e5186d88e0f841c61e4d9a34ff1e
parent 827e8d6a3b546422578e1dc62ad28039b53df713

writerfilter: SW_DEBUG_RTF_PASTE_{TO,FROM} is expected to be UTF-8

Change-Id: Ibcfa71cf9820db0b397a88e22aa6cc964048b71c

writerfilter/source/filter/RtfFilter.cxx

diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index baf7049..9172270 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);