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 /desktop/source/deployment/registry | |
| 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 'desktop/source/deployment/registry')
| -rw-r--r-- | desktop/source/deployment/registry/help/dp_help.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index a5bd86141340..caf702a9143c 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -45,7 +45,6 @@ #include <helpcompiler/HelpIndexer.hxx> #endif #include <com/sun/star/ucb/SimpleFileAccess.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp> @@ -115,8 +114,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend void revokeEntryFromDb(OUString const & url); bool activateEntry(OUString const & url); - Reference< ucb::XSimpleFileAccess2 > getFileAccess( void ); - Reference< ucb::XSimpleFileAccess2 > m_xSFA; + Reference< ucb::XSimpleFileAccess3 > getFileAccess( void ); + Reference< ucb::XSimpleFileAccess3 > m_xSFA; const Reference<deployment::XPackageTypeInfo> m_xHelpTypeInfo; Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos; @@ -403,7 +402,7 @@ void BackendImpl::implProcessHelp( const OUString sHelpFolder = createFolder(OUString(), xCmdEnv); data.dataUrl = sHelpFolder; - Reference< ucb::XSimpleFileAccess2 > xSFA = getFileAccess(); + Reference< ucb::XSimpleFileAccess3 > xSFA = getFileAccess(); rtl::OUString aHelpURL = xPackage->getURL(); rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL ); rtl::OUString aName = xPackage->getName(); @@ -586,7 +585,7 @@ void BackendImpl::implProcessHelp( void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir, std::vector< rtl::OUString >& o_rXhpFileVector ) { - Reference< ucb::XSimpleFileAccess2 > xSFA = getFileAccess(); + Reference< ucb::XSimpleFileAccess3 > xSFA = getFileAccess(); // Scan xhp files recursively Sequence< rtl::OUString > aSeq = xSFA->getFolderContents( aDir, true ); @@ -612,7 +611,7 @@ void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir, } } -Reference< ucb::XSimpleFileAccess2 > BackendImpl::getFileAccess( void ) +Reference< ucb::XSimpleFileAccess3 > BackendImpl::getFileAccess( void ) { if( !m_xSFA.is() ) { |