[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/dlg/RemoteDialog.cxx        |    4 ++++
 sd/source/ui/slideshow/slideshowimpl.cxx |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit 8f81eb2d742408548088e46b9ccab3a006015102
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Tue Sep 18 20:24:02 2012 +0200

    Wrap all external use of RemoteServer in ENABLE_SDREMOTE.
    
    Change-Id: I09d7427f3b0a07850b71f76c1df718401fea9ce7

diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index 28b4158..e607923 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 75aceb1..e085f47 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
 }
 
 // ---------------------------------------------------------