2 files changed, 3 insertions, 20 deletions
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index fd6089570a98..f9cff1bc9385 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -22,22 +22,12 @@ RemoteDialog::RemoteDialog( Window *pWindow ) :
     ModalDialog( pWindow, SdResId( DLG_PAIR_REMOTE ) ),
     mButtonConnect(     this, SdResId( BTN_CONNECT ) ),
     mButtonCancel(      this, SdResId( BTN_CANCEL ) ),
-    mClientBox(         this, NULL, SdResId( LB_SERVERS ) ),
-    mPreviouslyDiscoverable()
+    mClientBox(         this, NULL, SdResId( LB_SERVERS ) )
 {
-    (void) mPreviouslyDiscoverable; // avoid warnings about unused member
-
     FreeResource();
 
 #ifdef ENABLE_SDREMOTE
-
-#ifdef ENABLE_SDREMOTE_BLUETOOTH
-    mPreviouslyDiscoverable = RemoteServer::isBluetoothDiscoverable();
-    if ( !mPreviouslyDiscoverable )
-        RemoteServer::setBluetoothDiscoverable( true );
-#else
-	RemoteServer::setBluetoothDiscoverable( false );
-#endif
+    RemoteServer::ensureDiscoverable();
 
     vector<ClientInfo*> aClients( RemoteServer::getClients() );
 
@@ -80,12 +70,7 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton)
 
 IMPL_LINK_NOARG( RemoteDialog, CloseHdl )
 {
-#if defined(ENABLE_SDREMOTE) && defined(ENABLE_SDREMOTE_BLUETOOTH)
-    if ( !mPreviouslyDiscoverable )
-    {
-        RemoteServer::setBluetoothDiscoverable( false );
-    }
-#endif
+    RemoteServer::restoreDiscoverable();
     Close();
     return 0;
 }
diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx
index bc4831bd4ab6..882b9c21c343 100644
--- a/sd/source/ui/dlg/RemoteDialog.hxx
+++ b/sd/source/ui/dlg/RemoteDialog.hxx
@@ -27,8 +27,6 @@ private:
     OKButton        mButtonConnect;
     CancelButton    mButtonCancel;
     ClientBox       mClientBox;
-    // Whether discoverability was enabled befor the dialog started.
-    bool            mPreviouslyDiscoverable;
 
     DECL_DLLPRIVATE_LINK( HandleConnectButton, void * );
     DECL_LINK( CloseHdl, void * );