diff options
| -rw-r--r-- | sc/source/ui/collab/sendfunc.cxx | 4 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index 771ee8b35500..1026d9be5755 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -523,9 +523,11 @@ SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc() LINK( pReceiver, ScDocFuncRecv, ReceiverCallback), LINK( pReceiver, ScDocFuncRecv, ReceiveFileCallback) ); bOk = bOk && pCollab->initManager(); - bOk = bOk && pCollab->initAccountContact(); if (!strcmp( pEnv, "master")) + { + bOk = bOk && pCollab->initAccountContact(); bOk = bOk && pCollab->startCollaboration(); + } if (bOk) { pReceiver->SetCollaboration( pCollab); diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 74145ec0a97a..f9ca143c729b 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -874,7 +874,6 @@ void TeleManager::iterateLoop( CallBackInvokedFunc pFunc ) GMainContext* pContext = getMainContext(); while (!(*pFunc)()) { - SAL_INFO( "tubes.loop", "TeleManager::iterateLoop: CallBackInvokedFunc"); g_main_context_iteration( pContext, TRUE); } } @@ -885,7 +884,6 @@ void TeleManager::iterateLoop( ManagerCallBackInvokedFunc pFunc ) GMainContext* pContext = getMainContext(); while (!(this->*pFunc)()) { - SAL_INFO( "tubes.loop", "TeleManager::iterateLoop: ManagerCallBackInvokedFunc"); g_main_context_iteration( pContext, TRUE); } } @@ -896,7 +894,6 @@ void TeleManager::iterateLoop( const TeleConference* pConference, ConferenceCall GMainContext* pContext = getMainContext(); while (!(pConference->*pFunc)()) { - SAL_INFO( "tubes.loop", "TeleManager::iterateLoop: ConferenceCallBackInvokedFunc"); g_main_context_iteration( pContext, TRUE); } } |