Never pass -env: arguments across OfficeIPC connection

Change-Id: I1874ad0542bc8dcbe9ec588599a054030fd5d7d8

desktop/unx/source/start.c

@@ -45,6 +45,7 @@
 #include <osl/thread.h>
 #include <rtl/bootstrap.h>
 #include <rtl/digest.h>
+#include <rtl/process.h>
 #include <rtl/ustrbuf.h>
 #include <sal/main.h>
 
@@ -454,7 +455,7 @@ send_args( int fd, rtl_uString *pCwdPath )
     size_t nLen;
     rtl_uString *pEscapedCwdPath = escape_path( pCwdPath );
     sal_uInt32 nArg = 0;
-    sal_uInt32 nArgCount = osl_getCommandArgCount();
+    sal_uInt32 nArgCount = rtl_getAppCommandArgCount();
 
     rtl_uString_new_WithLength( &pBuffer, nCapacity );
     rtl_uString_new( &pTmp );
@@ -487,7 +488,7 @@ send_args( int fd, rtl_uString *pCwdPath )
                 rtl_uString_getLength( pBuffer ),
                 ",", 1 );
 
-        osl_getCommandArg( nArg, &pTmp );
+        rtl_getAppCommandArg( nArg, &pTmp );
 
         pEscapedTmp = escape_path( pTmp );
 

desktop/win32/source/officeloader/officeloader.cxx

@@ -21,6 +21,7 @@
 #define _UNICODE
 
 #include <cstddef>
+#include <cwchar>
 
 #define WIN32_LEAN_AND_MEAN
 #if defined _MSC_VER
@@ -290,7 +291,12 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
                         }
                         for ( int argn = 1; fSuccess && argn < argc2; argn++ )
                         {
-                            fSuccess = writeArgument(hPipe, ',', argv2[argn]);
+                            if (std::wcsncmp(
+                                    argv2[argn], L"-env:", std::wcslen(L"-env:"))
+                                != 0)
+                            {
+                                fSuccess = writeArgument(hPipe, ',', argv2[argn]);
+                            }
                         }
 
                         if ( fSuccess )