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

[Stephan Bergmann]

 desktop/source/lib/init.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 2163ec3691ece9a00927891645190a971f775295
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 26 14:40:34 2014 +0100

    No need to call osl_setCommandArgs
    
    ...cf. 2ad716f406e0fdb9b9294876c64ae92fecbf5e27 "Revert 'pyuno: set up fake
    command line in getComponentContext()'" and
    54981ce9286073306513fa58405ebc7730eb6dfb "Adapt some logs and assertions."
    
    Change-Id: I15229a29a3557b0490d7876b418dd24620ee4df5

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fcef5b0..261b2f6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -666,14 +666,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
 
     try
     {
-        // If we've set up the command args elsewhere then we cannot do it
-        // again (as an assert will fire), this will be the case e.g.
-        // for unit tests (and possibly if UNO is being used in addition
-        // to LOK in an external program).
-        if (!osl_areCommandArgsSet())
-        {
-            osl_setCommandArgs(0, NULL);
-        }
         initialize_uno(aAppURL);
         force_c_locale();