summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-11-02 17:46:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-11-15 08:28:44 +0100
commit5837402fb1daa437d9a1a37edc9ede57319944f1 (patch)
tree61e39515cd546fe7ad76364ebb444850b93541ce /oox
parent3f15a663b273e4a437fd68335d6eab2b11fc80c9 (diff)
fdo#46808, use service constructor for ucb::SimpleFileAccess
I upgraded the service to return XSimpleFileAccess3, since it already implemented that interface, and it's backwards compatible. Change-Id: I40001a46048bd21a23b6a2f58a95376f06fc634b
Diffstat (limited to 'oox')
-rw-r--r--oox/source/dump/dumperbase.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 31b1a2ffd720..02bfa4cbfd0d 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XTextOutputStream.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
#include <comphelper/docpasswordhelper.hxx>
#include <osl/file.hxx>
#include <rtl/math.hxx>
@@ -109,7 +108,7 @@ Reference< XInputStream > InputOutputHelper::openInputStream(
Reference< XInputStream > xInStrm;
if( rxContext.is() ) try
{
- Reference<XSimpleFileAccess2> xFileAccess(SimpleFileAccess::create(rxContext));
+ Reference<XSimpleFileAccess3> xFileAccess(SimpleFileAccess::create(rxContext));
xInStrm = xFileAccess->openFileRead( rFileName );
}
catch( Exception& )
@@ -126,7 +125,7 @@ Reference< XOutputStream > InputOutputHelper::openOutputStream(
Reference< XOutputStream > xOutStrm;
if( rxContext.is() ) try
{
- Reference<XSimpleFileAccess2> xFileAccess(SimpleFileAccess::create(rxContext));
+ Reference<XSimpleFileAccess3> xFileAccess(SimpleFileAccess::create(rxContext));
xOutStrm = xFileAccess->openFileWrite( rFileName );
}
catch( Exception& )
@@ -1886,7 +1885,7 @@ void StorageObjectBase::implDump()
if( bIsRoot ) try
{
aSysOutPath += OOX_DUMP_DUMPEXT;
- Reference<XSimpleFileAccess2> xFileAccess(SimpleFileAccess::create(getContext()));
+ Reference<XSimpleFileAccess3> xFileAccess(SimpleFileAccess::create(getContext()));
xFileAccess->kill( aSysOutPath );
}
catch( Exception& )