From e7fbe37c56d78af757f975b280bf113fb2fe40fd Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sat, 8 Nov 2014 13:15:44 +0100 Subject: writerfilter: SW_DEBUG_RTF_PASTE_{TO,FROM} is expected to be UTF-8 Change-Id: Ibcfa71cf9820db0b397a88e22aa6cc964048b71c --- writerfilter/source/filter/RtfFilter.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'writerfilter') 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 xStream(new utl::OStreamWrapper(*pStream)); xInputStream.set(xStream, uno::UNO_QUERY); -- cgit eoffice-6-2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-03-19Optimize 'Breeze' icon themeAndrew
2015-03-18tdf#87234 - Addition of many large and small breeze iconsYousuf Philips