[Libreoffice-commits] core.git: sfx2/source

[Herbert Dürr]

 sfx2/source/appl/impldde.cxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit b16f164650f8345e51bf0b0c73bf9c8eee775bc2
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Jul 9 15:23:59 2014 +0000

    Related: #i125226# don't try to access known-bad DDE servers
    
    (cherry picked from commit 88de6a59d9d7933b86fdcba733277aa4fbd5e132)
    
    Conflicts:
    	sfx2/source/appl/impldde.cxx
    
    Change-Id: If4dcd49cfe15188d06e4e06cd8e58cdcc66ed5a4

diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 501346a..3bb38ba 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -243,9 +243,14 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
         }
 
 #if defined(WNT)
-
-        // Server not up, try once more to start it.
-        if( !bInWinExec )
+        bool bForbidden = bInWinExec;
+        // TODO: also check the security level
+        static const char* aBadServers[] = { "cmd" };
+        for (size_t i = 0; i < sizeof(aBadServers)/sizeof(*aBadServers); ++i)
+            bForbidden |= sServer.equalsAscii(aBadServers[i]);
+
+        // try to start the DDE server if it is not there
+        if( !bForbidden )
         {
             OStringBuffer aCmdLine(OUStringToOString(sServer, RTL_TEXTENCODING_ASCII_US));
             aCmdLine.append(".exe ");