diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-10-11 16:47:39 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-11 16:56:07 +0100 |
| commit | 3ae112b753a71d32de70ee96afbe942b9aa7731c (patch) | |
| tree | 7538d0b4cc060f638c682316fc7c8a88378ed13a | |
| parent | 37eded548d96c21ebfb97554071a3d5527420473 (diff) | |
Fix -quickstart option, and help (i#108846)
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/cmdlinehelp.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/makefile.mk | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 8c93f46dbc..7f3d141f85 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -450,7 +450,7 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& } else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart" )) == sal_True ) { -#if defined(WNT) || defined(OS2) || defined(QUARTZ) +#if defined(ENABLE_QUICKSTART_APPLET) SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True ); #endif SetBoolParam_Impl( CMD_BOOLPARAM_NOQUICKSTART, sal_False ); diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 0869565ce7..a0ffd0b43c 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -83,7 +83,7 @@ namespace desktop "keep startup bitmap minimized.\n"\ "no startup screen, no default document and no UI.\n"\ "suppress restart/restore after fatal errors.\n"\ - "starts the quickstart service (only available on windows and OS/2 platform)\n"\ + "starts the quickstart service\n"\ "don't show startup screen.\n"\ "don't check for remote instances using the installation\n"\ "don't start with an empty document\n"\ diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index 085d8520e7..e69b387891 100644 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -53,6 +53,10 @@ CFLAGS+=-DGNOME_VFS_ENABLED # DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX) # .ENDIF +.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE" +CFLAGS+=-DENABLE_QUICKSTART_APPLET +.ENDIF + SHL1TARGET = sofficeapp SHL1OBJS = \ $(SLO)$/app.obj \ |