From d08578912f2c9ef42d4349079422e25b951e544e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 29 May 2012 17:17:28 +0200
Subject: fdo#46808, Adapt UNO services to new style, Part 7, updating ::create

Update calls to factories to use new SimpleFileAccess::create method

Change-Id: Ie5b0696fe2228a9033b19969245a53c21a61aa14
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
---
 desktop/source/migration/services/oo3extensionmigration.cxx | 5 +----
 desktop/source/migration/services/oo3extensionmigration.hxx | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'desktop/source/migration/services')

diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 12f4ec49aab3..726f6a5c85cc 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -219,10 +219,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
 
     if ( !m_xSimpleFileAccess.is() )
     {
-        m_xSimpleFileAccess = uno::Reference< ucb::XSimpleFileAccess >(
-            m_ctx->getServiceManager()->createInstanceWithContext(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")),
-                m_ctx ), uno::UNO_QUERY );
+        m_xSimpleFileAccess = ucb::SimpleFileAccess::create(m_ctx);
     }
 
     ::rtl::OUString aExtIdentifier;
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index adadb3b293e6..d16a15b88376 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -34,7 +34,8 @@
 #include <com/sun/star/task/XJob.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess.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>
@@ -80,7 +81,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::XSimpleFileAccess >      m_xSimpleFileAccess;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess2 >       m_xSimpleFileAccess;
         ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager;
         ::osl::Mutex            m_aMutex;
         ::rtl::OUString         m_sSourceDir;
-- 
cgit