1 files changed, 1 insertions, 10 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 5ee61b0a19ba..a4169b3b66b9 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -199,18 +199,9 @@ static sal_Bool getFromCommandLineArgs(
             }
             rtl_uString_release( pArg );
         }
-        // If osl_setCommandArgs() has not been called yet (for
-        // instance, if this gets called from a static initialiser),
-        // don't initialise pNameValueList, as that would cause the
-        // code to ignore any -env:FOO=BAR on the command line once
-        // osl is told about it.
-        if( nArgCount > 0 )
-            pNameValueList = &nameValueList;
+        pNameValueList = &nameValueList;
     }
 
-    if( ! pNameValueList )
-        return sal_False;
-
     sal_Bool found = sal_False;
 
     for( NameValueList::iterator ii = pNameValueList->begin() ;