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 /svx/source/svdraw | |
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 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svdoattr.cxx | 5 | ||||
-rw-r--r-- | svx/source/svdraw/svdoedge.cxx | 9 | ||||
-rw-r--r-- | svx/source/svdraw/svdomeas.cxx | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svdotxat.cxx | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svdpage.cxx | 13 | ||||
-rw-r--r-- | svx/source/svdraw/svdpntv.cxx | 5 |
6 files changed, 12 insertions, 22 deletions
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 2caab9295711..a188e1d2a105 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -31,7 +31,7 @@ #include <svx/svdorect.hxx> #include <svx/svdocirc.hxx> #include <svx/svdomeas.hxx> -#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #include <svl/itemiter.hxx> #include <svx/xenum.hxx> #include <svx/xlineit0.hxx> @@ -121,8 +121,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel) void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { - const SfxSimpleHint* pSimple = dynamic_cast<const SfxSimpleHint*>(&rHint); - bool bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId()); + bool bDataChg(SFX_HINT_DATACHANGED == rHint.GetId()); if(bDataChg) { diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index db40a25c2477..7b5ce5678631 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -25,7 +25,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <editeng/eeitem.hxx> -#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #include <svl/style.hxx> #include <sdr/contact/viewcontactofsdredgeobj.hxx> @@ -1559,8 +1559,7 @@ line (CL). The number of object margins per object varies between 0 and 3: void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { - const SfxSimpleHint* pSimple = dynamic_cast<const SfxSimpleHint*>(&rHint); - const sal_uInt32 nId = pSimple==nullptr ? 0 : pSimple->GetId(); + const sal_uInt32 nId = rHint.GetId(); bool bDataChg=nId==SFX_HINT_DATACHANGED; bool bDying=nId==SFX_HINT_DYING; bool bObj1=aCon1.pObj!=nullptr && aCon1.pObj->GetBroadcaster()==&rBC; @@ -1608,13 +1607,13 @@ void SdrEdgeObj::Reformat() { if( nullptr != aCon1.pObj ) { - SfxSimpleHint aHint( SFX_HINT_DATACHANGED ); + SfxHint aHint( SFX_HINT_DATACHANGED ); Notify( *const_cast<SfxBroadcaster*>(aCon1.pObj->GetBroadcaster()), aHint ); } if( nullptr != aCon2.pObj ) { - SfxSimpleHint aHint( SFX_HINT_DATACHANGED ); + SfxHint aHint( SFX_HINT_DATACHANGED ); Notify( *const_cast<SfxBroadcaster*>(aCon2.pObj->GetBroadcaster()), aHint ); } } diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 41146cdbaeb5..dcfda7e93744 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -34,7 +34,6 @@ #include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> #include <math.h> -#include <svl/smplhint.hxx> #include <svl/style.hxx> #include <sdr/contact/viewcontactofsdrmeasureobj.hxx> diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 170a2677e62c..f4e39095895f 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -34,7 +34,6 @@ #include <editeng/editview.hxx> -#include <svl/smplhint.hxx> #include <svl/whiter.hxx> #include <editeng/outlobj.hxx> #include <editeng/outliner.hxx> diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 9b987a725659..3bb3fe977f09 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -53,7 +53,7 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <algorithm> -#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #include <rtl/strbuf.hxx> #include <libxml/xmlwriter.h> @@ -1099,25 +1099,20 @@ SdrPageProperties::~SdrPageProperties() void SdrPageProperties::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { - const SfxSimpleHint* pSimpleHint = dynamic_cast< const SfxSimpleHint* >(&rHint); - - if(pSimpleHint) + switch(rHint.GetId()) { - switch(pSimpleHint->GetId()) - { - case SFX_HINT_DATACHANGED : + case SFX_HINT_DATACHANGED : { // notify change, broadcast ImpPageChange(*mpSdrPage); break; } - case SFX_HINT_DYING : + case SFX_HINT_DYING : { // Style needs to be forgotten ImpRemoveStyleSheet(); break; } - } } } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index f9b2b19a619e..2e26091d99c8 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -30,7 +30,7 @@ #endif #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #include <editeng/editdata.hxx> #include <svx/svdmrkv.hxx> @@ -236,8 +236,7 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) //If the stylesheet has been destroyed if (&rBC == mpDefaultStyleSheet) { - const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); - if (pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING) + if (rHint.GetId() == SFX_HINT_DYING) mpDefaultStyleSheet = nullptr; return; } |