diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2016-12-08 12:25:50 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-02-07 08:41:52 +0000 |
| commit | d8ccf8cf7a604cb1df04f23b5b5036fff1d4afdb (patch) | |
| tree | 3b98a3753cb3965785b357ff6025c86c9b56b275 /framework/source/services | |
| parent | d8546e9781df89249c218fb596bbe95b8a6c7469 (diff) | |
Stop question in context of session manager when cancel a frame
When shutdown or logout, LO make the question for all open
windows, but when you cancel a window the question for the other
windows are not necessary, this patch breaks the other questions.
in dependency of tdf#104101
Change-Id: I7119317d392ccd808c67fb57f82b1e990062abf2
Reviewed-on: https://gerrit.libreoffice.org/33311
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'framework/source/services')
| -rw-r--r-- | framework/source/services/desktop.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index e5133a7302eb..b210434b584c 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -158,6 +158,7 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon , cppu::OPropertySetHelper( cppu::WeakComponentImplHelperBase::rBHelper ) // Init member , m_bIsTerminated ( false ) // see dispose() for further information! + , m_bSession ( false ) , m_xContext ( xContext ) , m_aChildTaskContainer ( ) , m_aListenerContainer ( m_aMutex ) @@ -389,6 +390,7 @@ namespace bool SAL_CALL Desktop::terminateQuickstarterToo() { QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher); + m_bSession = true; return terminate(); } @@ -1702,7 +1704,10 @@ bool Desktop::impl_closeFrames(bool bAllowUI) if ( ! bSuspended ) { ++nNonClosedFrames; - continue; + if(m_bSession) + break; + else + continue; } } @@ -1754,6 +1759,9 @@ bool Desktop::impl_closeFrames(bool bAllowUI) } } + // reset the session + m_bSession = false; + return (nNonClosedFrames < 1); } |