diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-22 09:59:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-22 09:59:46 +0200 |
| commit | 24600dcf3118cb01d57c31518d36be870f73e79c (patch) | |
| tree | a52948f34190ca54071d7d457b91471fb1703ad7 /desktop/source/app/app.cxx | |
| parent | 83eb114394879cbfd073322a51c47d02553c1fcf (diff) | |
loplugin:constantfunction
Change-Id: I7cb5b0c2cf9ade557173ca596ea5d42d853ff448
Diffstat (limited to 'desktop/source/app/app.cxx')
| -rw-r--r-- | desktop/source/app/app.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 504275222dd4..5c775ca873c7 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1894,8 +1894,12 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl) CloseSplashScreen(); CheckFirstRun( ); - EnableOleAutomation(); - +#ifdef WNT + // Registers a COM class factory of the service manager with the windows operating system. + Reference< XMultiServiceFactory > xSMgr= comphelper::getProcessServiceFactory(); + xSMgr->createInstance("com.sun.star.bridge.OleApplicationRegistration"); + xSMgr->createInstance("com.sun.star.comp.ole.EmbedServer"); +#endif const char *pExitPostStartup = getenv ("OOO_EXIT_POST_STARTUP"); if (pExitPostStartup && *pExitPostStartup) new ExitTimer(); @@ -1914,16 +1918,6 @@ IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl) } -// Registers a COM class factory of the service manager with the windows operating system. -void Desktop::EnableOleAutomation() -{ -#ifdef WNT - Reference< XMultiServiceFactory > xSMgr= comphelper::getProcessServiceFactory(); - xSMgr->createInstance("com.sun.star.bridge.OleApplicationRegistration"); - xSMgr->createInstance("com.sun.star.comp.ole.EmbedServer"); -#endif -} - void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { Sequence < com::sun::star::beans::PropertyValue > args(1); |