diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-18 20:24:02 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-18 20:30:57 +0200 |
| commit | 8f81eb2d742408548088e46b9ccab3a006015102 (patch) | |
| tree | bd69dc651ca921c4832b42f3db61f5842f9a605c /sd | |
| parent | fac308c3641c55e12014613eb7fc09cb51039e44 (diff) | |
Wrap all external use of RemoteServer in ENABLE_SDREMOTE.
Change-Id: I09d7427f3b0a07850b71f76c1df718401fea9ce7
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/RemoteDialog.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index 28b41589904b..e6079234999b 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -53,6 +53,7 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton) { // setBusy( true ); // Fixme: Try and connect +#ifdef ENABLE_SDREMOTE long aSelected = mClientBox.GetActiveEntryIndex(); if ( aSelected < 0 ) return 1; @@ -64,16 +65,19 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton) } else return 1; +#endif } IMPL_LINK_NOARG( RemoteDialog, CloseHdl ) { +#ifdef ENABLE_SDREMOTE if ( !mPreviouslyDiscoverable ) { RemoteServer::setBluetoothDiscoverable( false ); } Close(); return 0; +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 75aceb17c0e1..e085f47a6d86 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -611,7 +611,9 @@ SlideshowImpl::~SlideshowImpl() void SAL_CALL SlideshowImpl::disposing() { +#ifdef ENABLE_SDREMOTE RemoteServer::presentationStopped(); +#endif if( mxShow.is() && mpDoc ) NotifyDocumentEvent( mpDoc, "OnEndPresentation" ); @@ -1511,7 +1513,9 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } +#ifdef ENABLE_SDREMOTE RemoteServer::presentationStarted( this ); +#endif } // --------------------------------------------------------- |