Don't fail on --protector.

If we have any "unknown" command line arguments Desktop init will fail,
however our LOK Tiled Rendering test uses Desktop (via soffice_main).
(Other unit tests don't use soffice_main hence this check never
comes into play.) It looks like it's most reliable simply to ignore
--protector here, rather than try to filter it out elsewhere (which
is difficult as it is passed to osl via SAL_IMPLEMENT_MAIN).

Change-Id: I95d047892851ba2cf9edd2e26bacc6efa0320f71

1 files changed, 12 insertions, 0 deletions

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 2cecabcc0fb3..d3271fd46c30 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -259,6 +259,18 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
             {
                 m_helpmath = true;
             }
+            else if ( oArg == "protector" )
+            {
+                // Not relevant for us here, but can be used in unit tests.
+                // Usually unit tests would not end up here, but e.g. the
+                // LOK Tiled Rendering tests end up running a full soffice
+                // process, and we can't bail on the use of --protector.
+
+                // We specifically need to consume the following 2 arguments
+                // for --protector
+                assert( supplier.next( &aArg ) );
+                assert( supplier.next( &aArg ) );
+            }
             else if ( oArg == "version" )
             {
                 m_version = true;