[Libreoffice-commits] core.git: sdext/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Aug 18 14:33:21 UTC 2018
sdext/source/presenter/PresenterFrameworkObserver.cxx | 27 ++++--------------
1 file changed, 6 insertions(+), 21 deletions(-)
New commits:
commit 70ed8c321e0f8a6058d92876de2eb49f8f0ebbb8
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 18 14:27:36 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 18 16:33:02 2018 +0200
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
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
More information about the Libreoffice-commits
mailing list