Kaydet (Commit) 70ed8c32 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1438404 Identical code for different branches

Change-Id: I19a7bb7a142ddb90d9b42fe589900bd74d09e153
Reviewed-on: https://gerrit.libreoffice.org/59290
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst b576ab50
...@@ -94,29 +94,14 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE ...@@ -94,29 +94,14 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE
} }
void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange ( void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange (
const ConfigurationChangeEvent& rEvent) const ConfigurationChangeEvent& /*rEvent*/)
{ {
bool bDispose(false); Action aAction(maAction);
Action aAction (maAction);
if (rEvent.Type == "ConfigurationUpdateEnd")
{
Shutdown();
aAction(true);
bDispose = true;
}
else
{
Shutdown(); Shutdown();
aAction(true); aAction(true);
bDispose = true;
}
if (bDispose)
{
maAction = nullptr; maAction = nullptr;
dispose(); dispose();
}
} }
} } // end of namespace ::sdext::presenter } } // end of namespace ::sdext::presenter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment