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.

6 files changed, 19 insertions, 45 deletions

diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
index 7fb1b94b328f..1293bb2cdb2f 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
@@ -36,7 +36,8 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <ucbhelper/contentbroker.hxx>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 #include <osl/process.h>
 #include <rtl/string.hxx>
 #include <boost/unordered_set.hpp>
@@ -86,13 +87,9 @@ class URLLister
 
 public:
     URLLister(uno::Reference<com::sun::star::uno::XComponentContext> xContext,
-              uno::Reference<lang::XMultiComponentFactory> xFactory,
               rtl::OUString absFileUrl)
     {
-        uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess
-            (xFactory->createInstanceWithContext
-             (::rtl::OUString( "com.sun.star.ucb.SimpleFileAccess"),
-              xContext), uno::UNO_QUERY_THROW);
+        uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
         xInputStream = xFileAccess->openFileRead(absFileUrl) ;
 
         mLF = rtl::OUString("\n");
@@ -171,7 +168,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
         rtl::OUString absFileUrlUrls;
         osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData);
 
-        URLLister aLister(xContext, xFactory, absFileUrlUrls);
+        URLLister aLister(xContext, absFileUrlUrls);
 
         fprintf(stdout, "<analyze>\n");
 
@@ -179,10 +176,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
 
         while (!aURL.isEmpty())
         {
-            uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess
-                (xFactory->createInstanceWithContext
-                 (::rtl::OUString("com.sun.star.ucb.SimpleFileAccess"),
-                  xContext), uno::UNO_QUERY_THROW );
+            uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
 
             rtl::OString aStr;
             aURL.convertToString(&aStr, RTL_TEXTENCODING_ASCII_US,
diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
index 6bb3ff34b799..37444b524c04 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
@@ -36,7 +36,8 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <ucbhelper/contentbroker.hxx>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 #include <osl/process.h>
 #include <rtl/string.hxx>
 #include <boost/unordered_set.hpp>
@@ -84,10 +85,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
     {
             rtl::OUString arg=aArguments[0];
 
-            uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess(
-            xFactory->createInstanceWithContext(
-                ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess"),
-                xContext), uno::UNO_QUERY_THROW );
+            uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
 
             rtl_uString *dir=NULL;
             osl_getProcessWorkingDir(&dir);
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
index 44c106bc6b5a..616c78486ee6 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
@@ -38,7 +38,8 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <ucbhelper/contentbroker.hxx>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 #include <osl/process.h>
 #include <rtl/string.hxx>
 #include <boost/unordered_set.hpp>
@@ -87,14 +88,9 @@ class URLLister
 
 public:
     URLLister(uno::Reference<com::sun::star::uno::XComponentContext> xContext,
-              uno::Reference<lang::XMultiComponentFactory> xFactory,
               rtl::OUString absFileUrl)
     {
-        uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess
-            (xFactory->createInstanceWithContext
-             (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
-                              ("com.sun.star.ucb.SimpleFileAccess")),
-              xContext), uno::UNO_QUERY_THROW);
+        uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
         xInputStream = xFileAccess->openFileRead(absFileUrl) ;
 
         mLF = rtl::OUString("\n");
@@ -174,7 +170,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
         rtl::OUString absFileUrlUrls;
         osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData);
 
-        URLLister aLister(xContext, xFactory, absFileUrlUrls);
+        URLLister aLister(xContext, absFileUrlUrls);
 
         fprintf(stdout, "<analyze>\n");
 
@@ -184,11 +180,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
 
         while (!aURL.isEmpty())
         {
-            uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess
-                (xFactory->createInstanceWithContext
-                 (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
-                                  ("com.sun.star.ucb.SimpleFileAccess")),
-                  xContext), uno::UNO_QUERY_THROW );
+            uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
 
             rtl::OString aStr;
             aURL.convertToString(&aStr, RTL_TEXTENCODING_ASCII_US,
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
index 3681549fe1af..c2d0e510405e 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
@@ -41,7 +41,8 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <ucbhelper/contentbroker.hxx>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 #include <osl/process.h>
 #include <rtl/string.hxx>
 #include <boost/unordered_set.hpp>
@@ -99,11 +100,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
 
         ::comphelper::setProcessServiceFactory(xServiceFactory);
 
-        uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess
-            (xFactory->createInstanceWithContext
-             (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
-                              ("com.sun.star.ucb.SimpleFileAccess")),
-              xContext), uno::UNO_QUERY_THROW );
+        uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
 
         rtl_uString *dir=NULL;
         osl_getProcessWorkingDir(&dir);
diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
index 9b2569a5f1d3..e9e16bcc62fa 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
@@ -345,10 +345,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
   printf("C\n");
             rtl::OUString arg=aArguments[0];
 
-            uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess(
-            xFactory->createInstanceWithContext(
-                ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess"),
-                xContext), uno::UNO_QUERY_THROW );
+            uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
 
             rtl_uString *dir=NULL;
             osl_getProcessWorkingDir(&dir);
diff --git a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
index 916e42f9a4fc..42f7da815570 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
@@ -248,19 +248,15 @@ xContext( xContext_ )
 
 sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException)
 {
-      uno::Sequence<uno::Any> aUcbInitSequence(2);
+    uno::Sequence<uno::Any> aUcbInitSequence(2);
     aUcbInitSequence[0] <<= rtl::OUString("Local");
     aUcbInitSequence[1] <<= rtl::OUString("Office");
     uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
-    uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW );
     if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence))
     {
             rtl::OUString arg=aArguments[0];
 
-            uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess(
-            xFactory->createInstanceWithContext(
-                ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess"),
-                xContext), uno::UNO_QUERY_THROW );
+            uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
 
             rtl_uString *dir=NULL;
             osl_getProcessWorkingDir(&dir);