summaryrefslogtreecommitdiff
path: root/desktop/source/app/dispatchwatcher.cxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-11-07 14:30:15 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-11-07 14:30:15 +0000
commitcb2865f59c95f5fd72b4d032fb967a90b11fde73 (patch)
tree6e98dbf9f39959b701bdb8d8ba65fb40b58d7cd0 /desktop/source/app/dispatchwatcher.cxx
parentf47e7fffa595d061ffd5c920fc25217c2b2553df (diff)
#i71280# Forward successfull terminate call to OpenClients to prevent opening default document (fix by CD).
Diffstat (limited to 'desktop/source/app/dispatchwatcher.cxx')
-rw-r--r--desktop/source/app/dispatchwatcher.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 7db141e5ee..e0fee0ec62 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: dispatchwatcher.cxx,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: obo $ $Date: 2006-10-12 14:06:07 $
+ * last change: $Author: rt $ $Date: 2006-11-07 15:29:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -172,7 +172,7 @@ DispatchWatcher::~DispatchWatcher()
}
-void DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequestsList )
+sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequestsList )
{
Reference< XComponentLoader > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ),
@@ -494,9 +494,11 @@ void DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ
// We don't have any task open so we have to shutdown ourself!!
Reference< XDesktop > xDesktop2( xTasksSupplier, UNO_QUERY );
if ( xDesktop2.is() )
- xDesktop2->terminate();
+ return xDesktop2->terminate();
}
}
+
+ return sal_False;
}