diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-23 16:03:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-25 17:19:22 +0200 |
| commit | d116894b26f538793a0d5dc5847efd2fb53e7acb (patch) | |
| tree | 5d99d51c14bccc6a08d646b32246814c8b1bd61d /framework/source/dispatch | |
| parent | 3361e28f944d9f752f0e0df91968559f1ae55f72 (diff) | |
loplugin:oncevar in formula..framework
Change-Id: I96d6af49c1994ebd7d6dcc41469127e3151b4350
Reviewed-on: https://gerrit.libreoffice.org/39186
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source/dispatch')
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 3 | ||||
| -rw-r--r-- | framework/source/dispatch/popupmenudispatcher.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 2df66d3c36b1..38cb7f3e53eb 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -252,7 +252,6 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void) // Allow calling of XController->suspend() everytimes. // Dispatch is an UI functionality. We implement such dispatch object here. // And further XController->suspend() was designed to bring an UI ... - bool bAllowSuspend = true; bool bControllerSuspended = false; bool bCloseAllViewsToo; @@ -325,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, bAllowSuspend, bCloseAllViewsToo, bControllerSuspended)) + if (implts_prepareFrameForClosing(m_xCloseFrame, true/*bAllowSuspend*/, bCloseAllViewsToo, bControllerSuspended)) { // OK; this frame is empty now. // Check the environment again to decide, what is the next step. diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 5a93197c8b99..bef0902c5fde 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -307,8 +307,7 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery() if ( xLayoutManager.is() ) { css::uno::Reference< css::ui::XUIElement > xMenuBar; - OUString aMenuBar( "private:resource/menubar/menubar" ); - xMenuBar = xLayoutManager->getElement( aMenuBar ); + xMenuBar = xLayoutManager->getElement( "private:resource/menubar/menubar" ); m_xPopupCtrlQuery.set( xMenuBar, css::uno::UNO_QUERY ); } |