diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-06 13:27:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-07 07:56:39 +0100 |
| commit | 2e2d736ccbb21daae91603732c87d5375ede1b47 (patch) | |
| tree | 6621e351d38dff77dc16c6413767f4baa3c76326 /framework | |
| parent | 1647bc1309dcd313dff2614f4844b71b1c558dee (diff) | |
loplugin:collapseif in framework..sal
Change-Id: I3068b18f5cff024a48a8f8c68d69cadad30fe4d5
Reviewed-on: https://gerrit.libreoffice.org/62953
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/dispatch/loaddispatcher.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 836fcae3c60f..49d2a496e723 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -92,12 +92,9 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL, } css::uno::Reference< css::frame::XFrame > xBaseFrame(m_xOwnerFrame.get(), css::uno::UNO_QUERY); - if (!xBaseFrame.is()) - { - if (xListener.is()) - xListener->dispatchFinished( - css::frame::DispatchResultEvent(xThis, css::frame::DispatchResultState::FAILURE, css::uno::Any())); - } + if (!xBaseFrame.is() && xListener.is()) + xListener->dispatchFinished( + css::frame::DispatchResultEvent(xThis, css::frame::DispatchResultState::FAILURE, css::uno::Any())); // OK ... now the internal loader seems to be usable for new requests // and our owner frame seems to be valid for such operations. |