diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-02 17:46:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-15 08:28:44 +0100 |
| commit | 5837402fb1daa437d9a1a37edc9ede57319944f1 (patch) | |
| tree | 61e39515cd546fe7ad76364ebb444850b93541ce /linguistic | |
| parent | 3f15a663b273e4a437fd68335d6eab2b11fc80c9 (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 'linguistic')
| -rw-r--r-- | linguistic/source/convdic.cxx | 5 | ||||
| -rw-r--r-- | linguistic/source/dicimp.cxx | 5 | ||||
| -rw-r--r-- | linguistic/source/dlistimp.cxx | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index ed7a9c5a98b6..6824e9f11127 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -40,7 +40,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/util/XFlushListener.hpp> @@ -85,7 +84,7 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) uno::Reference< io::XInputStream > xIn; try { - uno::Reference< ucb::XSimpleFileAccess2 > xAccess( ucb::SimpleFileAccess::create(xContext) ); + uno::Reference< ucb::XSimpleFileAccess3 > xAccess( ucb::SimpleFileAccess::create(xContext) ); xIn = xAccess->openFileRead( rMainURL ); } catch (const uno::Exception &) @@ -248,7 +247,7 @@ void ConvDic::Save() uno::Reference< io::XStream > xStream; try { - uno::Reference< ucb::XSimpleFileAccess2 > xAccess( ucb::SimpleFileAccess::create(xContext) ); + uno::Reference< ucb::XSimpleFileAccess3 > xAccess( ucb::SimpleFileAccess::create(xContext) ); xStream = xAccess->openFileReadWrite( aMainURL ); } catch (const uno::Exception &) diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 39658f181d09..71dd8f0385ab 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -34,7 +34,6 @@ #include <unotools/ucbstreamhelper.hxx> #include <com/sun/star/ucb/SimpleFileAccess.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <com/sun/star/linguistic2/DictionaryType.hpp> #include <com/sun/star/linguistic2/DictionaryEventFlags.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> @@ -264,7 +263,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL) uno::Reference< io::XInputStream > xStream; try { - uno::Reference< ucb::XSimpleFileAccess2 > xAccess( ucb::SimpleFileAccess::create(xContext) ); + uno::Reference< ucb::XSimpleFileAccess3 > xAccess( ucb::SimpleFileAccess::create(xContext) ); xStream = xAccess->openFileRead( rMainURL ); } catch (const uno::Exception &) @@ -400,7 +399,7 @@ sal_uLong DictionaryNeo::saveEntries(const OUString &rURL) uno::Reference< io::XStream > xStream; try { - uno::Reference< ucb::XSimpleFileAccess2 > xAccess( ucb::SimpleFileAccess::create(xContext) ); + uno::Reference< ucb::XSimpleFileAccess3 > xAccess( ucb::SimpleFileAccess::create(xContext) ); xStream = xAccess->openFileReadWrite( rURL ); } catch (const uno::Exception &) diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index a705657cb78e..fd9f377057de 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -38,7 +38,6 @@ #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include "defs.hxx" #include "dlistimp.hxx" @@ -897,7 +896,7 @@ static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bo uno::Reference< io::XInputStream > xStream; try { - uno::Reference< ucb::XSimpleFileAccess2 > xAccess( ucb::SimpleFileAccess::create(xContext) ); + uno::Reference< ucb::XSimpleFileAccess3 > xAccess( ucb::SimpleFileAccess::create(xContext) ); xStream = xAccess->openFileRead( rFileURL ); } catch (const uno::Exception &) |