[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/filter/RtfFilter.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e7fbe37c56d78af757f975b280bf113fb2fe40fd
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Sat Nov 8 13:15:44 2014 +0100

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

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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits