[Libreoffice-commits] core.git: sd/source

Andrzej Hunt (via logerrit) logerrit at kemper.freedesktop.org
Sat Jul 17 09:31:36 UTC 2021


 sd/source/ui/remotecontrol/Server.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 34309e232c13017c9d178627c652ebbbb5ffdeb3
Author:     Andrzej Hunt <andrzej at ahunt.org>
AuthorDate: Sat Jul 17 08:44:22 2021 +0200
Commit:     Andrzej Hunt <andrzej at ahunt.org>
CommitDate: Sat Jul 17 11:31:03 2021 +0200

    sdremote: remove commented out experimental check
    
    The entire if statement was introduced only to check for experimental
    mode in the following commit - the xContext check is seemingly only
    needed for null safety:
      79c1b16a96a6 (sdremote: make it possible to have only bluetooth enabled, 2012-11-27)
    
    Later, the epxerimental mode check was disabled in:
      b9d2671ae11d (merge WiFi support into remote control feature toggle, 2013-08-01)
    
    Given that the remote is clearly no longer experimental, it's
    time to remove the commented code entirely - and I think it's also
    safe to remove the xContext check too. (Note: the remote IS still
    controlled by the EnableSdRemote option, and IS disabled by default.)
    
    Change-Id: Id118924021d5029b4f15df9cbb3eba28f3b902c0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119091
    Tested-by: Jenkins
    Reviewed-by: Andrzej Hunt <andrzej at ahunt.org>

diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index d3f1ac67f904..36e052dd006f 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -78,13 +78,6 @@ RemoteServer::~RemoteServer()
 void RemoteServer::execute()
 {
     SAL_INFO( "sdremote", "RemoteServer::execute called" );
-    uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
-    if (!xContext.is()/* || !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)*/)
-    {
-        // SAL_INFO("sdremote", "not in experimental mode, disabling TCP server");
-        spServer = nullptr;
-        return;
-    }
     osl::SocketAddr aAddr( "0.0.0.0", PORT );
     if ( !mSocket.bind( aAddr ) )
     {


More information about the Libreoffice-commits mailing list