diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-08 10:11:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-08 08:53:09 +0000 |
| commit | 98460e7a502e61f8885c6fb960f0f9fa69de4f3e (patch) | |
| tree | a7c06d89a21d76a265e96a95312fbdb7cb85a579 /framework/source/dispatch | |
| parent | 1a743fd8a27d063525e3567619a2971770c61574 (diff) | |
loplugin:expandablemethods in framework
Change-Id: I444f31f06d2445392a59879c2d7fb1f8ad1c24c6
Reviewed-on: https://gerrit.libreoffice.org/30684
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/popupmenudispatcher.cxx | 11 | ||||
| -rw-r--r-- | framework/source/dispatch/windowcommanddispatch.cxx | 5 |
2 files changed, 2 insertions, 14 deletions
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 3723f324f77f..c07f0bf26da2 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -171,7 +171,8 @@ throw( css::uno::RuntimeException, std::exception ) // --- SAFE --- SolarMutexClearableGuard aGuard; impl_RetrievePopupControllerQuery(); - impl_CreateUriRefFactory(); + if ( !m_xUriRefFactory.is() ) + m_xUriRefFactory = css::uri::UriReferenceFactory::create( m_xContext ); css::uno::Reference< css::container::XNameAccess > xPopupCtrlQuery( m_xPopupCtrlQuery ); css::uno::Reference< css::uri::XUriReferenceFactory > xUriRefFactory( m_xUriRefFactory ); @@ -337,14 +338,6 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery() } } -void PopupMenuDispatcher::impl_CreateUriRefFactory() -{ - if ( !m_xUriRefFactory.is() ) - { - m_xUriRefFactory = css::uri::UriReferenceFactory::create( m_xContext ); - } -} - } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 71ecaa0a5020..bc9e6389d707 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -127,11 +127,6 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, VclWindowEvent&, rEvent, vo return; } - impl_dispatchCommand(sCommand); -} - -void WindowCommandDispatch::impl_dispatchCommand(const OUString& sCommand) -{ // ignore all errors here. It's clicking a menu entry only ... // The user will try it again, in case nothing happens .-) try |