[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/source

[Eike Rathke]

 sc/source/ui/collab/sendfunc.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9a02dc094aaf9f7051fdcc103f1c2ef80e372479
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Mar 23 12:39:35 2012 +0100

    tubes: start session only if LIBO_TUBES=master

diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index afeef96..4e16629 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -509,9 +509,10 @@ public:
 SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc()
 {
     // FIXME: the chains should be auto-ptrs, so should be collab
+    const char* pEnv;
     if (getenv ("INTERCEPT"))
         return new ScDocFuncSend( *this, new ScDocFuncRecv( *this, new ScDocFuncDirect( *this ) ) );
-    else if (getenv ("LIBO_TUBES"))
+    else if ((pEnv = getenv ("LIBO_TUBES")) != NULL)
     {
         ScDocFuncRecv* pReceiver = new ScDocFuncRecv( *this, new ScDocFuncDirect( *this ) );
         ScDocFuncSend* pSender = new ScDocFuncSend( *this, pReceiver );
@@ -521,7 +522,8 @@ SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc()
                 LINK( pReceiver, ScDocFuncRecv, ReceiveFileCallback) );
         bOk = bOk && pCollab->initManager();
         bOk = bOk && pCollab->initAccountContact();
-        bOk = bOk && pCollab->startCollaboration();
+        if (!strcmp( pEnv, "master"))
+            bOk = bOk && pCollab->startCollaboration();
         if (bOk)
         {
             pReceiver->SetCollaboration( pCollab);