From 5837402fb1daa437d9a1a37edc9ede57319944f1 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 2 Nov 2012 17:46:30 +0200
Subject: 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
---
 desktop/source/deployment/dp_log.cxx                        |  3 +--
 desktop/source/deployment/registry/help/dp_help.cxx         | 11 +++++------
 desktop/source/migration/services/oo3extensionmigration.hxx |  3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'desktop')

diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 18e648d3d103..6b74a490fe83 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -38,7 +38,6 @@
 #include "com/sun/star/deployment/DeploymentException.hpp"
 #include "com/sun/star/ucb/XProgressHandler.hpp"
 #include "com/sun/star/ucb/SimpleFileAccess.hpp"
-#include "com/sun/star/ucb/XSimpleFileAccess2.hpp"
 #include "com/sun/star/io/XSeekable.hpp"
 #include <stdio.h>
 
@@ -104,7 +103,7 @@ ProgressLogImpl::ProgressLogImpl(
     boost::optional< Reference<task::XInteractionHandler> > interactionHandler;
     comphelper::unwrapArgs( args, log_file, interactionHandler );
 
-    Reference<ucb::XSimpleFileAccess2> xSimpleFileAccess( ucb::SimpleFileAccess::create(xContext) );
+    Reference<ucb::XSimpleFileAccess3> xSimpleFileAccess( ucb::SimpleFileAccess::create(xContext) );
     // optional ia handler:
     if (interactionHandler)
         xSimpleFileAccess->setInteractionHandler( *interactionHandler );
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() )
     {
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 950473a23b37..b0a70bb2e02f 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 #include <com/sun/star/deployment/XExtensionManager.hpp>
 
 #include <osl/mutex.hxx>
@@ -77,7 +76,7 @@ namespace migration
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >      m_ctx;
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XDocumentBuilder >  m_xDocBuilder;
-        ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 >       m_xSimpleFileAccess;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >       m_xSimpleFileAccess;
         ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager;
         ::osl::Mutex            m_aMutex;
         ::rtl::OUString         m_sSourceDir;
-- 
cgit