diff options
author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-07-21 21:16:09 +0200 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-12-04 12:23:01 +0100 |
commit | 40f7990037dd70b6b2885635052d19ea5d52dc51 (patch) | |
tree | 3099bfa0e3b202fef3e3d419e27c60e28eff91ee /sd | |
parent | 9f699caddf27e276bb8772a02d917ba6c1fbdba3 (diff) |
Don't start Impress Remote server in headless mode.
Change-Id: Ibafe57413a60745e949dc3146fbc843c52c029d6
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 7404bbddcfbf..d110832bee88 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -364,6 +364,21 @@ void RemoteServer::deauthoriseClient( ::boost::shared_ptr< ClientInfo > pClient void SdDLL::RegisterRemotes() { SAL_INFO( "sdremote", "SdDLL::RegisterRemotes called" ); + + // The remote server is likely of no use in headless mode. And as only + // one instance of the server can actually own the appropriate ports its + // probably best to not even try to do so from our headless instance + // (i.e. as to avoid blocking expected usage). + // It could perhaps be argued that we would still need the remote + // server for tiled rendering of presentations, but even then this + // implementation would not be of much use, i.e. would be controlling + // the purely imaginary headless presentation -- instead we'd need + // to have some sort of mechanism of plugging in our tiled rendering + // client to be controlled by the remote server, or provide an + // alternative implementation. + if ( Application::IsHeadlessModeEnabled() ) + return; + uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); if ( xContext.is() && !officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) ) return; |