From 7d8196ea2f4ec3634dbad7367345e62c4ea9893d Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 22 Sep 2016 22:20:48 +0200 Subject: perf: eliminate SfxSimpleHint and move to SfxHint, tdf#87101 related There were over 150 places in *::Notify() functions that did some dynamic_cast of which ~98% were unnecessary because the base class SfxHint passed was an SfxSimpleHint anyway. dynamic_cast operations come with quite some cost, so avoid if possible. Specifically for ScFormulaCell::Notify() that created a bottleneck in scenarios where cells were notified that already handled a previous notification. In mass operations doing the dynamic_cast before it could be decided whether having to act on it or not this made 2/3 of all time spent in the Notify() call. To get rid of that rename/move SfxSimpleHint to SfxHint and let classes derive from SfxHint instead of SfxSimpleHint. This comes only with a slight cost that an additional sal_uInt32 is transported in such hints, initialized to 0, but this is neglectable compared to the huge gain. For the rare cases where a Notify() actually expects both, an SfxHint (formerly SfxSimpleHint) and a derived hint, this changed order of the dynamic_cast involved so the simple SfxHint::GetId() is handled last. Modules using such combinations can further optimize by treating the simple SfxHint::GetId() first once verified that none of the other derived hints use an ID not equal to zero respectively none of the ID values the simple hint uses. Change-Id: I9fcf723e3a4487ceb92336189d23a62c344cf0ce Reviewed-on: https://gerrit.libreoffice.org/29205 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- reportdesign/inc/pch/precompiled_rptui.hxx | 1 - reportdesign/source/core/sdr/UndoActions.cxx | 1 - reportdesign/source/core/sdr/UndoEnv.cxx | 5 ++--- reportdesign/source/ui/misc/ColorListener.cxx | 5 ++--- reportdesign/source/ui/report/ReportControllerObserver.cxx | 1 - reportdesign/source/ui/report/StartMarker.cxx | 4 +--- 6 files changed, 5 insertions(+), 12 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 7b366c818f33..d7b6b8505467 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -400,7 +400,6 @@ #include #include #include -#include #include #include #include diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index c029bae1a6f4..390b9a0b8540 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -37,7 +37,6 @@ #include #include -#include #include #include #include diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 4d20683c8d1f..0b0fcf1696be 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include @@ -191,8 +191,7 @@ void OXUndoEnvironment::ModeChanged() void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { - const SfxSimpleHint* pSimpleHint = dynamic_cast(&rHint); - if (pSimpleHint && pSimpleHint->GetId() == SFX_HINT_MODECHANGED ) + if (rHint.GetId() == SFX_HINT_MODECHANGED ) ModeChanged(); } diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index a4ec6faf4ddd..b119a1bdcc9a 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "ColorListener.hxx" -#include +#include #include #include "uistrings.hrc" @@ -51,8 +51,7 @@ void OColorListener::dispose() void OColorListener::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint) { - const SfxSimpleHint* pSimpleHint = dynamic_cast(&rHint); - if (pSimpleHint && pSimpleHint->GetId() == SFX_HINT_COLORS_CHANGED) + if (rHint.GetId() == SFX_HINT_COLORS_CHANGED) { m_nColor = m_aExtendedColorConfig.GetColorValue(CFG_REPORTDESIGNER,m_sColorEntry).getColor(); m_nTextBoundaries = m_aColorConfig.GetColorValue(::svtools::DOCBOUNDARIES).nColor; diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 801880dbb0c3..6e3dc687ba8e 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 7bbf48877a58..0e1d0f3b385b 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -32,7 +32,6 @@ #include #include -#include #define CORNER_SPACE 5 @@ -254,8 +253,7 @@ void OStartMarker::setTitle(const OUString& _sTitle) void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint) { OColorListener::Notify(rBc, rHint); - const SfxSimpleHint* pSimpleHint = dynamic_cast(&rHint); - if (pSimpleHint && pSimpleHint->GetId() == SFX_HINT_COLORS_CHANGED) + if (rHint.GetId() == SFX_HINT_COLORS_CHANGED) { setColor(); Invalidate(InvalidateFlags::Children); -- cgit