diff options
| -rw-r--r-- | desktop/source/app/makefile.mk | 4 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index aac11f204e34..fc2cb3800bb0 100644 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -57,6 +57,10 @@ CFLAGS+=-DENABLE_QUICKSTART_APPLET # 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 \ diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 00baae59b486..b5f4129a6474 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -580,8 +580,8 @@ void ShutdownIcon::terminateDesktop() return; // always remove ourselves as listener - xDesktop->removeTerminateListener( pInst ); pInst->m_bListenForTermination = true; + xDesktop->removeTerminateListener( pInst ); // terminate desktop only if no tasks exist Reference< XFramesSupplier > xSupplier( xDesktop, UNO_QUERY ); |