Some more fixes for ENABLE_SDREMOTE.

Change-Id: I56a8235ec0b844fc427c9d646357eb28943bf688

sd/inc/sddll.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+git clone git://anongit.freedesktop.org/libreoffice/core libo/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,7 +45,9 @@
 class SdDLL
 {
 protected:
+#ifdef ENABLE_SDREMOTE
     static void     RegisterRemotes();
+#endif
     static void     RegisterFactorys();
     static void     RegisterInterfaces();
     static void     RegisterControllers();

sd/source/ui/app/sddll.cxx

@@ -125,7 +125,9 @@ void SdDLL::Init()
     SdrObjFactory::InsertMakeUserDataHdl(LINK(&aSdObjectFactory, SdObjectFactory, MakeUserData));
 
     // register your exotic remote controlls here
+#ifdef ENABLE_SDREMOTE
     RegisterRemotes();
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/dlg/RemoteDialog.cxx

@@ -66,6 +66,7 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton)
     else
         return 1;
 #endif
+        return 0;
 }
 
 IMPL_LINK_NOARG( RemoteDialog, CloseHdl )
@@ -76,8 +77,8 @@ IMPL_LINK_NOARG( RemoteDialog, CloseHdl )
         RemoteServer::setBluetoothDiscoverable( false );
     }
     Close();
-    return 0;
 #endif
+    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file