diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-18 20:36:30 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-18 20:36:30 +0200 |
| commit | 22c0e6556a630a736288c5b1b24f39fe4124566e (patch) | |
| tree | ea53656873a34548be2ad606bea7577dd5d22e59 /sd | |
| parent | Wrap all external use of RemoteServer in ENABLE_SDREMOTE. (diff) | |
| download | core-22c0e6556a630a736288c5b1b24f39fe4124566e.tar.gz core-22c0e6556a630a736288c5b1b24f39fe4124566e.zip | |
Some more fixes for ENABLE_SDREMOTE.
Change-Id: I56a8235ec0b844fc427c9d646357eb28943bf688
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/sddll.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/app/sddll.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/RemoteDialog.cxx | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx index e4f4fec5474b..5bd0c6fedab6 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 a5dec04dbef8..355d8bee2683 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 e6079234999b..288ad2971281 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 |