sd/source/ui/remotecontrol/Server.cxx | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 8adabe2ed61102f661800de613f99a064dee5896
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Tue Aug 7 13:12:06 2012 +0200
Disable Remote unless in experimental mode.
Change-Id: I56263eeed7ce4376f6c4647efe699c2c6005f13d
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index cb982de..5970092 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: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
