sdremote: Disable Impress Remote in the menu also when not allowed in Options.

Change-Id: Ida8a3847a54c5415e1802a6688e110202bac35c1

sd/source/ui/remotecontrol/Server.cxx

@@ -10,8 +10,8 @@
 #include <algorithm>
 #include <vector>
 
-#include "officecfg/Office/Common.hxx"
-#include "officecfg/Office/Impress.hxx"
+#include <officecfg/Office/Common.hxx>
+#include <officecfg/Office/Impress.hxx>
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -305,12 +305,11 @@ void SdDLL::RegisterRemotes()
     // Disable unless in experimental mode for now
     SAL_INFO( "sdremote", "SdDLL::RegisterRemotes called" );
     uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
-    if (!xContext.is() || !officecfg::Office::Impress::Misc::Start::EnableSdremote::get(xContext))
+    if ( xContext.is() && !officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) )
         return;
 
     sd::RemoteServer::setup();
     sd::DiscoveryService::setup();
-
 }
 
 bool RemoteServer::isBluetoothDiscoverable()

sd/source/ui/view/drviews7.cxx

@@ -26,6 +26,7 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/outlobj.hxx>
+#include <officecfg/Office/Impress.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svdpagv.hxx>
 #include <svx/clipfmtitem.hxx>
@@ -995,10 +996,16 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
        rSet.DisableItem(SID_ZOOM_PREV);
     }
 
+    bool bDisableSdremoteForGood = false;
 #ifndef ENABLE_SDREMOTE
-    rSet.ClearItem(SID_REMOTE_DLG);
-    rSet.DisableItem(SID_REMOTE_DLG);
+    bDisableSdremoteForGood = true;
 #endif
+    uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
+    if ( bDisableSdremoteForGood || ( xContext.is() && !officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) ) )
+    {
+        rSet.ClearItem(SID_REMOTE_DLG);
+        rSet.DisableItem(SID_REMOTE_DLG);
+    }
 
     // EditText aktiv
     if (GetViewShellBase().GetViewShellManager()->GetShell(RID_DRAW_TEXT_TOOLBOX) != NULL)