summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-08-04 10:13:05 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-08-04 10:13:05 +0000
commit9ebb409facfec2f6ae15baa85ca558ead6374600 (patch)
tree613743cee4e2d683c93968034fbd081c0159e319
parent8e53cb92bcafa9e4fa9f2c15d2fc2946e0d9a22a (diff)
INTEGRATION: CWS pb17 (1.28.208); FILE MERGED
2006/07/26 07:29:21 as 1.28.208.1: #i64615# supress FirstStartWizard if it's requested via command line
-rw-r--r--desktop/source/app/cmdlineargs.cxx15
1 files changed, 13 insertions, 2 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index bb85d252f874..49d4a2ffb555 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: cmdlineargs.cxx,v $
*
- * $Revision: 1.28 $
+ * $Revision: 1.29 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 17:05:40 $
+ * last change: $Author: ihi $ $Date: 2006-08-04 11:13:05 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -360,6 +360,11 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
SetBoolParam_Impl( CMD_BOOLPARAM_TERMINATEAFTERINIT, sal_True );
return sal_True;
}
+ else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-nofirststartwizard" )) == sal_True )
+ {
+ SetBoolParam_Impl( CMD_BOOLPARAM_NOFIRSTSTARTWIZARD, sal_True );
+ return sal_True;
+ }
else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-nologo" )) == sal_True )
{
SetBoolParam_Impl( CMD_BOOLPARAM_NOLOGO, sal_True );
@@ -628,6 +633,12 @@ sal_Bool CommandLineArgs::IsTerminateAfterInit() const
return m_aBoolParams[ CMD_BOOLPARAM_TERMINATEAFTERINIT ];
}
+sal_Bool CommandLineArgs::IsNoFirstStartWizard() const
+{
+ osl::MutexGuard aMutexGuard( m_aMutex );
+ return m_aBoolParams[ CMD_BOOLPARAM_NOFIRSTSTARTWIZARD ];
+}
+
sal_Bool CommandLineArgs::IsNoLogo() const
{
osl::MutexGuard aMutexGuard( m_aMutex );