[Libreoffice-commits] core.git: writerfilter/source
Caolán McNamara
caolanm at redhat.com
Tue Aug 18 06:07:52 PDT 2015
writerfilter/source/filter/RtfFilter.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cfa853c07fd4632fa40e62a5b4474c55d4588416
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 18 14:04:58 2015 +0100
this debugging code can definitely use osl
Change-Id: I420e7f242868a25a2f9a473c23c67dfd9a285b7c
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 7bf88b2..752330c 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -29,7 +29,7 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <unotools/localfilehelper.hxx>
+#include <osl/file.hxx>
#include <unotools/mediadescriptor.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -119,7 +119,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(OUString::fromUtf8(pEnv), aOutStr))
+ if (!bIsNewDoc && pEnv && osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(pEnv), aOutStr) == osl::FileBase::E_None)
{
std::unique_ptr<SvStream> pOut(utl::UcbStreamHelper::CreateStream(aOutStr, StreamMode::WRITE));
std::unique_ptr<SvStream> pIn(utl::UcbStreamHelper::CreateStream(xInputStream));
@@ -132,7 +132,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip
if (!bIsNewDoc && pEnv)
{
OUString aInStr;
- utl::LocalFileHelper::ConvertPhysicalNameToURL(OUString::fromUtf8(pEnv), aInStr);
+ osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(pEnv), aInStr);
SvStream* pStream = utl::UcbStreamHelper::CreateStream(aInStr, StreamMode::READ);
uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStream));
xInputStream.set(xStream, uno::UNO_QUERY);
More information about the Libreoffice-commits
mailing list