diff options
author | Andras Timar <atimar@suse.com> | 2012-01-11 19:21:33 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-01-11 19:25:45 +0100 |
commit | aab14cb9fbc7d82b804a89e4cc61fb874c8636c8 (patch) | |
tree | 06076784fd47291174d9d51811da496191ae5cf4 /desktop | |
parent | 8a3b584528e30f346cbab34141ee088eea16020c (diff) |
fix prefix of command line switches (-- instead of -)
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
-rw-r--r-- | desktop/source/app/officeipcthread.cxx | 4 | ||||
-rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 855418ae18df..afa53f602541 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1294,7 +1294,7 @@ void restartOnMac(bool passArguments) { for (sal_uInt32 i = 0; i < n; ++i) { rtl::OUString arg; OSL_VERIFY(osl_getCommandArg(i, &arg.pData) == osl_Process_E_None); - if (arg.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("-accept="))) { + if (arg.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("--accept="))) { wait = true; } rtl::OString arg8; @@ -2459,7 +2459,7 @@ void Desktop::OpenClients() } } - // Disable AutoSave feature in case "-norestore" or a similare command line switch is set on the command line. + // Disable AutoSave feature in case "--norestore" or a similar command line switch is set on the command line. // The reason behind: AutoSave/EmergencySave/AutoRecovery share the same data. // But the require that all documents, which are saved as backup should exists inside // memory. May be this mechanism will be inconsistent if the configuration exists ... @@ -2894,7 +2894,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) // connection to the first office. We want to reuse the quickstart option for the first office. // NOTICE: The quickstart service must be initialized inside the "main thread", so we use the // application events to do this (they are executed inside main thread)!!! - // Don't start quickstart service if the user specified "-invisible" on the command line! + // Don't start quickstart service if the user specified "--invisible" on the command line! sal_Bool bQuickstart( sal_True ); Sequence< Any > aSeq( 1 ); aSeq[0] <<= bQuickstart; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index df3306d45407..4eeb48ed4fd4 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -747,7 +747,7 @@ void SAL_CALL OfficeIPCThread::run() cProcessed.reset(); pRequest->pcProcessed = &cProcessed; - // Print requests are not dependent on the -invisible cmdline argument as they are + // Print requests are not dependent on the --invisible cmdline argument as they are // loaded with the "hidden" flag! So they are always checked. bDocRequestSent |= aCmdLineArgs->GetPrintList( pRequest->aPrintList ); bDocRequestSent |= ( aCmdLineArgs->GetPrintToList( pRequest->aPrintToList ) && @@ -756,7 +756,7 @@ void SAL_CALL OfficeIPCThread::run() if ( !rCurrentCmdLineArgs.IsInvisible() ) { // Read cmdline args that can open/create documents. As they would open a window - // they are only allowed if the "-invisible" is currently not used! + // they are only allowed if the "--invisible" is currently not used! bDocRequestSent |= aCmdLineArgs->GetOpenList( pRequest->aOpenList ); bDocRequestSent |= aCmdLineArgs->GetViewList( pRequest->aViewList ); bDocRequestSent |= aCmdLineArgs->GetStartList( pRequest->aStartList ); diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 68745cad067b..5dba571ad637 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -402,12 +402,12 @@ Reference<XComponentContext> connectToOffice( bool verbose ) { Sequence<OUString> args( 3 ); - args[ 0 ] = OUSTR("-nologo"); - args[ 1 ] = OUSTR("-nodefault"); + args[ 0 ] = OUSTR("--nologo"); + args[ 1 ] = OUSTR("--nodefault"); OUString pipeId( ::dp_misc::generateRandomPipeId() ); ::rtl::OUStringBuffer buf; - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("-accept=pipe,name=") ); + buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("--accept=pipe,name=") ); buf.append( pipeId ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(";urp;") ); args[ 2 ] = buf.makeStringAndClear(); @@ -418,7 +418,7 @@ Reference<XComponentContext> connectToOffice( dp_misc::writeConsole( OUSTR("Raising process: ") + appURL + - OUSTR("\nArguments: -nologo -nodefault ") + + OUSTR("\nArguments: --nologo --nodefault ") + args[2] + OUSTR("\n")); } @@ -426,7 +426,7 @@ Reference<XComponentContext> connectToOffice( ::dp_misc::raiseProcess( appURL, args ); if (verbose) - dp_misc::writeConsole("Ok. Connecting..."); + dp_misc::writeConsole("OK. Connecting..."); OSL_ASSERT( buf.getLength() == 0 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("uno:pipe,name=") ); @@ -438,7 +438,7 @@ Reference<XComponentContext> connectToOffice( buf.makeStringAndClear(), xLocalComponentContext ), UNO_QUERY_THROW ); if (verbose) - dp_misc::writeConsole("Ok.\n"); + dp_misc::writeConsole("OK.\n"); return xRet; } |