summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-08-18 14:27:36 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-08-18 16:33:02 +0200
commit70ed8c321e0f8a6058d92876de2eb49f8f0ebbb8 (patch)
tree79e9f353cac72f149bb3d40faaa94ed0a715426b
parentb576ab5073a8cdf5ca2db04838d255e142f5a896 (diff)
coverity#1438404 Identical code for different branches
Change-Id: I19a7bb7a142ddb90d9b42fe589900bd74d09e153 Reviewed-on: https://gerrit.libreoffice.org/59290 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.cxx27
1 files changed, 6 insertions, 21 deletions
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 55e0bf891da9..1bdfd979eaf0 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -94,29 +94,14 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE
}
void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange (
- const ConfigurationChangeEvent& rEvent)
+ const ConfigurationChangeEvent& /*rEvent*/)
{
- bool bDispose(false);
-
- Action aAction (maAction);
- if (rEvent.Type == "ConfigurationUpdateEnd")
- {
- Shutdown();
- aAction(true);
- bDispose = true;
- }
- else
- {
- Shutdown();
- aAction(true);
- bDispose = true;
- }
+ Action aAction(maAction);
+ Shutdown();
+ aAction(true);
- if (bDispose)
- {
- maAction = nullptr;
- dispose();
- }
+ maAction = nullptr;
+ dispose();
}
} } // end of namespace ::sdext::presenter