Remove unused/null sd::ClientBox::m_pServer

Change-Id: I5d79bcd75088d5ba2aa773ebf0809281cab07924

3 files changed, 6 insertions, 11 deletions

diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index 8aec838a4f3f..5da2882f364d 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -22,7 +22,7 @@ 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 ) )
+    mClientBox(         this, SdResId( LB_SERVERS ) )
 {
     FreeResource();
 
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index bce4935e2ac2..f1eef9d53417 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -21,6 +21,7 @@
 
 #include "RemoteDialogClientBox.hxx"
 #include "RemoteDialog.hrc"
+#include "RemoteServer.hxx"
 
 #include "comphelper/processfactory.hxx"
 #include "com/sun/star/i18n/CollatorOptions.hpp"
@@ -62,8 +63,7 @@ ClientRemovedListener::~ClientRemovedListener()
 //------------------------------------------------------------------------------
 // ClientBox
 //------------------------------------------------------------------------------
-ClientBox::ClientBox( Dialog* pParent, RemoteServer *pServer,
-                      const SdResId& aId ) :
+ClientBox::ClientBox( Dialog* pParent, const SdResId& aId ) :
     Control( pParent, aId ),
     m_bHasScrollBar( false ),
     m_bHasActive( false ),
@@ -77,8 +77,7 @@ ClientBox::ClientBox( Dialog* pParent, RemoteServer *pServer,
     m_nExtraHeight( 2 ),
     m_aPinBox( this, SdResId( INPUT_PIN ) ),
     m_aPinDescription( this, SdResId( TEXT_PIN ) ),
-    m_pScrollBar( new ScrollBar( this, WB_VERT ) ),
-    m_pServer( pServer )
+    m_pScrollBar( new ScrollBar( this, WB_VERT ) )
 {
     m_pScrollBar->SetScrollHdl( LINK( this, ClientBox, ScrollHdl ) );
     m_pScrollBar->EnableDrag();
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index 9c59057941b6..522225a3fe44 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -32,7 +32,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "RemoteServer.hxx"
 #include "sdresid.hxx"
 
 namespace sd {
@@ -48,6 +47,7 @@ namespace sd {
 //                          struct ClientBoxEntry
 //------------------------------------------------------------------------------
 struct ClientBoxEntry;
+struct ClientInfo;
 
 typedef ::boost::shared_ptr< ClientBoxEntry > TClientBoxEntry;
 
@@ -112,7 +112,6 @@ class ClientBox:
 
     com::sun::star::uno::Reference< ClientRemovedListener > m_xRemoveListener;
 
-    RemoteServer      *m_pServer;
     //This mutex is used for synchronizing access to m_vEntries.
     //Currently it is used to synchronize adding, removing entries and
     //functions like getItemName, getItemDescription, etc. to prevent
@@ -141,8 +140,7 @@ class ClientBox:
 
 
 public:
-                    ClientBox( Dialog* pParent, RemoteServer *pServer,
-                               const SdResId& aId );
+                    ClientBox( Dialog* pParent, const SdResId& aId );
                    ~ClientBox();
 
     void    MouseButtonDown( const MouseEvent& rMEvt );
@@ -174,8 +172,6 @@ public:
     void            checkEntries();
 
     OUString getPin();
-
-    RemoteServer*    getServer() const { return m_pServer; }
 };
 
 }