summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-01-11 19:21:33 +0100
committerAndras Timar <atimar@suse.com>2012-01-12 00:10:15 +0100
commitc36fb812f806105901b0f5d1bd0315bcc5022812 (patch)
treed51c20ed1c9ebe1f99651a266988a1bf67a3dfd8 /desktop
parent673abdd398c5b7ae843a652c5f4342fd3876e761 (diff)
fix prefix of command line switches (-- instead of -) fdo#40991
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx6
-rw-r--r--desktop/source/app/officeipcthread.cxx4
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx12
3 files changed, 11 insertions, 11 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index ada6c82b1344..36fe3530ce04 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1350,7 +1350,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;
@@ -2521,7 +2521,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 ...
@@ -2956,7 +2956,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 2b03f5822718..bc4af2ee7fc6 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 4491de312592..3c83b976b57f 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;
}