[Libreoffice-commits] .: vcl/unx

[Lubos Lunak]

 vcl/unx/kde4/KDEXLib.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6c744838c353198441e413cb86d8eb6d293801c9
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Oct 15 11:48:35 2010 +0200

    disable KDE's crash handler

diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index bde1a41..10d807e 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -131,7 +131,7 @@ void KDEXLib::Init()
             
     //kAboutData->setProgramIconName("OpenOffice");
 
-    m_nFakeCmdLineArgs = 1;
+    m_nFakeCmdLineArgs = 2;
     USHORT nIdx;
     vos::OExtCommandLine aCommandLine;
     int nParams = aCommandLine.getCommandArgCount();
@@ -146,10 +146,10 @@ void KDEXLib::Init()
             aCommandLine.getCommandArg( nIdx + 1, aParam );
             aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() );
 
-            m_nFakeCmdLineArgs = 3;
-            m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs ];
-            m_pFreeCmdLineArgs[ 1 ] = strdup( "-display" );
-            m_pFreeCmdLineArgs[ 2 ] = strdup( aDisplay.getStr() );
+            m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs + 2 ];
+            m_pFreeCmdLineArgs[ m_nFakeCmdLineArgs + 0 ] = strdup( "-display" );
+            m_pFreeCmdLineArgs[ m_nFakeCmdLineArgs + 1 ] = strdup( aDisplay.getStr() );
+            m_nFakeCmdLineArgs += 2;
         }
     }
     if ( !m_pFreeCmdLineArgs )
@@ -159,6 +159,7 @@ void KDEXLib::Init()
     osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData );
     rtl::OString aExec = rtl::OUStringToOString( aBin, osl_getThreadTextEncoding() );
     m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() );
+    m_pFreeCmdLineArgs[1] = strdup( "--nocrashhandler" );
 
     // make a copy of the string list for freeing it since
     // KApplication manipulates the pointers inside the argument vector