diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-07 17:16:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-08 08:08:35 +0200 |
| commit | a209172669e7a2de6065486e385e4e3007b74bd2 (patch) | |
| tree | 4a7e008cf700fb23ecc6e4cd44de1c6a08a9b7e7 /framework | |
| parent | 2675cbf042130f24fe7ea299b85b8f5f4794a667 (diff) | |
loplugin:constantparam
Change-Id: Ib92aba17c46a4ada75c2a0630f281759d995f32e
Reviewed-on: https://gerrit.libreoffice.org/40843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/dispatch/closedispatcher.hxx | 10 | ||||
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 13 |
2 files changed, 8 insertions, 15 deletions
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 2661687b5f7c..8cbda9de0a7e 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -168,9 +168,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper< ignores it and open/close other documents, we can't know which state the office has after closing of this frame. - @param bAllowSuspend - force calling of XController->suspend(). - @param bCloseAllOtherViewsToo if there are other top level frames, which contains views to the same document then our m_xCloseFrame, @@ -180,10 +177,9 @@ class CloseDispatcher : public ::cppu::WeakImplHelper< @return [boolean] sal_True if closing was successfully. */ - bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame , - bool bAllowSuspend , - bool bCloseAllOtherViewsToo, - bool& bControllerSuspended ); + bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame, + bool bCloseAllOtherViewsToo, + bool& bControllerSuspended ); /** @short close the member m_xCloseFrame. diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 7302507ebbe5..8ee7791ecd60 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -324,7 +324,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void) // document inside our own frame and decide then again, what has to be done! else { - if (implts_prepareFrameForClosing(m_xCloseFrame, true/*bAllowSuspend*/, bCloseAllViewsToo, bControllerSuspended)) + if (implts_prepareFrameForClosing(m_xCloseFrame, bCloseAllViewsToo, bControllerSuspended)) { // OK; this frame is empty now. // Check the environment again to decide, what is the next step. @@ -429,10 +429,9 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void) } } -bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame , - bool bAllowSuspend , - bool bCloseAllOtherViewsToo, - bool& bControllerSuspended ) +bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame, + bool bCloseAllOtherViewsToo, + bool& bControllerSuspended ) { // Frame already dead ... so this view is closed ... is closed ... is ... .-) if (! xFrame.is()) @@ -462,9 +461,7 @@ bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< c } } - // If allowed - inform user about modified documents or - // still running jobs (e.g. printing). - if (bAllowSuspend) + // Inform user about modified documents or still running jobs (e.g. printing). { css::uno::Reference< css::frame::XController > xController = xFrame->getController(); if (xController.is()) // some views don't uses a controller .-( (e.g. the help window) |