summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2012-08-07 13:12:06 +0200
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2012-08-07 13:13:48 +0200
commit8adabe2ed61102f661800de613f99a064dee5896 (patch)
treec64049545006c024c676eedc3ed17bc29db64ede /sd
parente5c4127edd0c1d48ce7f7824debf3519fcc398d5 (diff)
Disable Remote unless in experimental mode.
Change-Id: I56263eeed7ce4376f6c4647efe699c2c6005f13d
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/remotecontrol/Server.cxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index cb982de76b96..5970092d423d 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -10,6 +10,7 @@
#include <algorithm>
#include <vector>
+#include "officecfg/Office/Common.hxx"
#include <comphelper/processfactory.hxx>
#include "sddll.hxx"
@@ -161,9 +162,13 @@ void RemoteServer::setup()
void SdDLL::RegisterRemotes()
{
- fprintf( stderr, "Register our remote control goodness\n" );
- sd::RemoteServer::setup();
- sd::DiscoveryService::setup();
+ // Disable unless in experimental mode for now
+ uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
+ if (!xContext.is() || !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
+ return;
+
+ sd::RemoteServer::setup();
+ sd::DiscoveryService::setup();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */