[Libreoffice-commits] .: sd/inc sd/source

[Libreoffice Gerrit user]

 sd/inc/sddll.hxx                  |    4 +++-
 sd/source/ui/app/sddll.cxx        |    2 ++
 sd/source/ui/dlg/RemoteDialog.cxx |    3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 22c0e6556a630a736288c5b1b24f39fe4124566e
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Tue Sep 18 20:36:30 2012 +0200

    Some more fixes for ENABLE_SDREMOTE.
    
    Change-Id: I56a8235ec0b844fc427c9d646357eb28943bf688

diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx
index e4f4fec..5bd0c6f 100644
--- a/sd/inc/sddll.hxx
+++ b/sd/inc/sddll.hxx
@@ -1,4 +1,4 @@
-/* -*- 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();
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index a5dec04..355d8be 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/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: */
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index e607923..288ad29 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/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