diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-31 09:22:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-31 09:22:53 +0100 |
| commit | ced1151a1ad00fb2913a4c0f54e4544f4e566c05 (patch) | |
| tree | 416403e0c91acc4cbfe6219f1930ea0273a856e0 /vcl/workben | |
| parent | 6bc62f4f43c7458399169ddb2cba30ae4188b1bd (diff) | |
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
Diffstat (limited to 'vcl/workben')
| -rw-r--r-- | vcl/workben/svdem.cxx | 4 | ||||
| -rw-r--r-- | vcl/workben/svpclient.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/svptest.cxx | 4 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index cbdea98c5f98..42ecc9cdd042 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -47,7 +47,9 @@ SAL_IMPLEMENT_MAIN() Reference< XMultiServiceFactory > xMS; xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "types.rdb" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); - InitVCL( xMS ); + comphelper::setProcessServiceFactory( xMS ); + + InitVCL(); ::Main(); DeInitVCL(); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 2f8c8561a948..a07bec606728 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -100,7 +100,7 @@ SAL_IMPLEMENT_MAIN() exit( 1 ); } - InitVCL( xFactory ); + InitVCL(); ::Main(); DeInitVCL(); diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 6e08dc1e2831..996d6fc1093a 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -66,7 +66,9 @@ SAL_IMPLEMENT_MAIN() Reference< XMultiServiceFactory > xMS; xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "types.rdb" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); - InitVCL( xMS ); + comphelper::setProcessServiceFactory( xMS ); + + InitVCL(); ::Main(); DeInitVCL(); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index b5fbb89089b0..448b5c30b721 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -59,7 +59,9 @@ SAL_IMPLEMENT_MAIN() Reference< XMultiServiceFactory > xMS; xMS = cppu::createRegistryServiceFactory( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "types.rdb" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); - InitVCL( xMS ); + comphelper::setProcessServiceFactory( xMS ); + + InitVCL(); ::Main(); DeInitVCL(); |