diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-06-16 23:29:03 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:13 +0200 |
| commit | deea13f9657f37d1c266cf5914faa14f3a641f80 (patch) | |
| tree | 3156bdb42b379579d4ee55b5971bcc07446128a4 | |
| parent | tubes: add File -> Collaborate menu entry to launch contacts widget (diff) | |
| download | core-deea13f9657f37d1c266cf5914faa14f3a641f80.tar.gz core-deea13f9657f37d1c266cf5914faa14f3a641f80.zip | |
tubes: ScDocFuncSend: store pointer to TeleManager
| -rw-r--r-- | sc/source/ui/collab/sendfunc.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index 9c04e0dbdc69..eba602997d03 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -484,9 +484,9 @@ public: } virtual ~ScDocFuncSend() {} - void SetCollaboration( bool bIsMaster ) + void SetCollaboration( TeleManager *pManager ) { - mpManager = TeleManager::get( !bIsMaster ); + mpManager = pManager; } virtual void EnterListAction( sal_uInt16 nNameResId ) @@ -515,14 +515,7 @@ public: SendFile( rText ); if ( rtl::OUString( rText ) == "contacts" ) - { - // For TeleManager::get() use the same master/slave mode we have - // for collaboration, if any. This is a hack anyway so don't care - // whether we really are in collab mode or not. - bool bIsMaster = false; - isCollabMode( bIsMaster ); - tubes::createContacts( TeleManager::get( bIsMaster ) ); - } + tubes::createContacts( mpManager ); return true; // needs some code auditing action } @@ -663,7 +656,7 @@ SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc() } if (bOk) { - pSender->SetCollaboration( bIsMaster ); + pSender->SetCollaboration( pManager ); } else { |