Get rid of vcl::unohelper::GetMultiServiceFactory

...which effectively is just a glorious wrapper around
comphelper::getProcessServiceFactory.

In turn gets also rid of ImplSVAppData's mxMSF and mpMSFTempFileName and the
rSMgr parameter to InitVCL.

All the VCL users "soffice", "spadmin", and "unopkg gui" appear to still work
fine.

Change-Id: I797d48f7d0d8c35bb82124c9ab0ee63850c4d863

5 files changed, 6 insertions, 6 deletions

diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx
index 0dcce2c0e2c0..fc5a80d0c776 100644
--- a/svtools/bmpmaker/bmp.cxx
+++ b/svtools/bmpmaker/bmp.cxx
@@ -235,7 +235,7 @@ int main( int nArgCount, char* ppArgs[] )
     ::std::vector< String > aArgs;
     BmpApp                  aBmpApp;
 
-    InitVCL( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >() );
+    InitVCL();
 
     for( int i = 1; i < nArgCount; i++ )
         aArgs.push_back( String( ppArgs[ i ], RTL_TEXTENCODING_ASCII_US ) );
diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx
index a840ff4ba707..f5fbe4675829 100644
--- a/svtools/bmpmaker/bmpsum.cxx
+++ b/svtools/bmpmaker/bmpsum.cxx
@@ -468,7 +468,7 @@ int main( int nArgCount, char* ppArgs[] )
     ::std::vector< String > aArgs;
     BmpSum                  aBmpSum;
 
-    InitVCL( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >() );
+    InitVCL();
 
     for( int i = 1; i < nArgCount; i++ )
         aArgs.push_back( String( ppArgs[ i ], RTL_TEXTENCODING_ASCII_US ) );
diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx
index ed0333f592c0..bb09e4a780bc 100644
--- a/svtools/bmpmaker/g2g.cxx
+++ b/svtools/bmpmaker/g2g.cxx
@@ -239,7 +239,7 @@ int main( int nArgCount, char* ppArgs[] )
     ::std::vector< String > aArgs;
     G2GApp                  aG2GApp;
 
-    InitVCL( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >() );
+    InitVCL();
 
     for( int i = 1; i < nArgCount; i++ )
         aArgs.push_back( String( ppArgs[ i ], RTL_TEXTENCODING_ASCII_US ) );
diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx
index 12855da0a3ba..3a05c9aa8576 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -55,7 +55,7 @@ SAL_IMPLEMENT_MAIN()
 
     comphelper::setProcessServiceFactory(xSFactory);
 
-    InitVCL(xSFactory);
+    InitVCL();
 
     {
         SvtLanguageTable aTable;
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 197cb70c0c67..5d9bb8e96347 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.cxx
@@ -31,7 +31,7 @@
 #include <svtools/filectrl.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include <vcl/unohelp.hxx>
+#include <comphelper/processfactory.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.h>
 #include <vcl/stdtext.hxx>
@@ -48,7 +48,7 @@ void FileControl::ImplBrowseFile( )
 
         const ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ));
 
-        Reference< XMultiServiceFactory > xMSF = vcl::unohelper::GetMultiServiceFactory();
+        Reference< XMultiServiceFactory > xMSF = comphelper::getProcessServiceFactory();
         Reference < dialogs::XFilePicker > xFilePicker( xMSF->createInstance( sServiceName ), UNO_QUERY );
         if ( xFilePicker.is() )
         {