tubes: avoid boost::signaling received packets

Change-Id: I63e262aa05ec7c06c15eaf74201b6ac1966e2e56

4 files changed, 9 insertions, 10 deletions

diff --git a/sc/source/ui/collab/sccollaboration.cxx b/sc/source/ui/collab/sccollaboration.cxx
index 100826369126..e9c4ea0c2e88 100644
--- a/sc/source/ui/collab/sccollaboration.cxx
+++ b/sc/source/ui/collab/sccollaboration.cxx
@@ -46,6 +46,13 @@ sal_uInt64 ScCollaboration::GetId()
     return reinterpret_cast<sal_uInt64> (mpScDocShell);
 }
 
+void ScCollaboration::PacketReceived( const OString& rPacket )
+{
+    ScDocFuncSend* pSender = GetScDocFuncSend();
+    if (pSender)
+        return pSender->RecvMessage( rPacket );
+}
+
 void ScCollaboration::SetCollaboration( TeleConference* pConference )
 {
     ScDocFunc* pDocFunc = &mpScDocShell->GetDocFunc();
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 7c2e1f3d2de7..6b59d5394a70 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -86,11 +86,6 @@ void ScDocFuncSend::RecvMessage( const rtl::OString &rString )
     }
 }
 
-void ScDocFuncSend::packetReceived( const OString &rPacket )
-{
-    RecvMessage( rPacket );
-}
-
 extern "C"
 {
     static void file_sent_cb( bool aSuccess, void* /* pUserData */ )
@@ -159,9 +154,6 @@ ScDocFuncSend::~ScDocFuncSend()
 void ScDocFuncSend::SetCollaboration( TeleConference* pConference )
 {
     mpConference = pConference;
-    if (mpConference)
-        mpConference->sigPacketReceived.connect( boost::bind(
-                    &ScDocFuncSend::packetReceived, this, _1 ) );
 }
 
 TeleConference* ScDocFuncSend::GetConference()
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index d4485d5eff19..07160c8e8e57 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -209,8 +209,6 @@ class ScDocFuncSend : public ScDocFunc
     ScDocFuncDirect     *mpDirect;
     TeleConference      *mpConference;
 
-    void packetReceived( const OString &rPacket );
-    void RecvMessage( const rtl::OString &rString );
     void SendMessage( ScChangeOpWriter &rOp );
 
 public:
@@ -219,6 +217,7 @@ public:
     ScDocFuncSend( ScDocShell& rDocSh, ScDocFuncDirect *pDirect );
     virtual ~ScDocFuncSend();
 
+    void                RecvMessage( const rtl::OString &rString );
     void                SetCollaboration( TeleConference* pConference );
     TeleConference*     GetConference();
     // TODO: I think this could be moved to TeleManager later.
diff --git a/sc/source/ui/inc/sccollaboration.hxx b/sc/source/ui/inc/sccollaboration.hxx
index bfdb98567969..811f1cf8ef3b 100644
--- a/sc/source/ui/inc/sccollaboration.hxx
+++ b/sc/source/ui/inc/sccollaboration.hxx
@@ -24,6 +24,7 @@ public:
     virtual void            ContactLeft();
     virtual TeleConference* GetConference();
     virtual sal_uInt64      GetId();
+    virtual void            PacketReceived( const OString& rPacket );
     virtual void            SetCollaboration( TeleConference* pConference );
     virtual void            SendFile( TpContact* pContact, const OUString& rURL );
 private: