diff options
author | Eike Rathke <erack@redhat.com> | 2016-09-22 22:20:48 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2016-09-23 15:14:03 +0000 |
commit | 7d8196ea2f4ec3634dbad7367345e62c4ea9893d (patch) | |
tree | 4550d4ccc4205ae5ca9f134d29927b202e10fb70 /starmath | |
parent | 751689283c9f3010f7978b6576b25ffc579202ef (diff) |
perf: eliminate SfxSimpleHint and move to SfxHint, tdf#87101 related
There were over 150 places in *::Notify() functions that did some
dynamic_cast<SfxSimpleHint*> 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 <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/inc/format.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/pch/precompiled_sm.hxx | 1 | ||||
-rw-r--r-- | starmath/source/cfgitem.cxx | 2 | ||||
-rw-r--r-- | starmath/source/document.cxx | 6 | ||||
-rw-r--r-- | starmath/source/view.cxx | 18 |
5 files changed, 13 insertions, 18 deletions
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx index 05a294d0aa1a..69d1bf6dcc01 100644 --- a/starmath/inc/format.hxx +++ b/starmath/inc/format.hxx @@ -20,7 +20,7 @@ #define INCLUDED_STARMATH_INC_FORMAT_HXX -#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #include <svl/SfxBroadcaster.hxx> #include "utility.hxx" #include <types.hxx> @@ -140,7 +140,7 @@ public: void RequestApplyChanges() { - Broadcast(SfxSimpleHint(HINT_FORMATCHANGED)); + Broadcast(SfxHint(HINT_FORMATCHANGED)); } }; diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx index 7decc8c2dae5..d63c2f0ad3d5 100644 --- a/starmath/inc/pch/precompiled_sm.hxx +++ b/starmath/inc/pch/precompiled_sm.hxx @@ -133,7 +133,6 @@ #include <svl/itemset.hxx> #include <svl/languageoptions.hxx> #include <svl/poolitem.hxx> -#include <svl/smplhint.hxx> #include <svl/stritem.hxx> #include <svl/svldllapi.h> #include <svx/svxdllapi.h> diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 5cf881739aa8..1daf41e62359 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -1196,7 +1196,7 @@ void SmMathConfig::ItemSetToConfig(const SfxItemSet &rSet) SetIgnoreSpacesRight( bVal ); // reformat (displayed) formulas accordingly - Broadcast(SfxSimpleHint(HINT_FORMATCHANGED)); + Broadcast(SfxHint(HINT_FORMATCHANGED)); } } if (rSet.GetItemState(SID_SAVE_ONLY_USED_SYMBOLS, true, &pItem) == SfxItemState::SET) diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 1a984526dbdc..1af687b4ce21 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -52,7 +52,7 @@ #include <svl/ptitem.hxx> #include <svtools/sfxecode.hxx> #include <svl/slstitm.hxx> -#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #include <svl/stritem.hxx> #include <svtools/transfer.hxx> #include <svl/undo.hxx> @@ -115,7 +115,7 @@ SFX_IMPL_OBJECTFACTORY(SmDocShell, SvGlobalName(SO3_SM_CLASSID), SfxObjectShellF void SmDocShell::Notify(SfxBroadcaster&, const SfxHint& rHint) { - switch (static_cast<const SfxSimpleHint&>(rHint).GetId()) + switch (rHint.GetId()) { case HINT_FORMATCHANGED: SetFormulaArranged(false); @@ -1321,7 +1321,7 @@ void SmDocShell::SetModified(bool bModified) if( IsEnableSetModified() ) { SfxObjectShell::SetModified( bModified ); - Broadcast(SfxSimpleHint(SFX_HINT_DOCCHANGED)); + Broadcast(SfxHint(SFX_HINT_DOCCHANGED)); } } diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 605fe7539c4b..03d8d403adaf 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -2041,18 +2041,14 @@ IMPL_LINK_TYPED( SmViewShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDl void SmViewShell::Notify( SfxBroadcaster& , const SfxHint& rHint ) { - const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if ( pSimpleHint ) + switch( rHint.GetId() ) { - switch( pSimpleHint->GetId() ) - { - case SFX_HINT_MODECHANGED: - case SFX_HINT_DOCCHANGED: - GetViewFrame()->GetBindings().InvalidateAll(false); - break; - default: - break; - } + case SFX_HINT_MODECHANGED: + case SFX_HINT_DOCCHANGED: + GetViewFrame()->GetBindings().InvalidateAll(false); + break; + default: + break; } } |