summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-09-22 22:20:48 +0200
committerEike Rathke <erack@redhat.com>2016-09-23 15:14:03 +0000
commit7d8196ea2f4ec3634dbad7367345e62c4ea9893d (patch)
tree4550d4ccc4205ae5ca9f134d29927b202e10fb70 /sfx2/source/dialog
parent751689283c9f3010f7978b6576b25ffc579202ef (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 'sfx2/source/dialog')
-rw-r--r--sfx2/source/dialog/basedlgs.cxx24
-rw-r--r--sfx2/source/dialog/templdlg.cxx44
2 files changed, 28 insertions, 40 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index d97ae949afeb..953e8da4d6eb 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -64,15 +64,11 @@ public:
void SfxModelessDialog_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ switch( rHint.GetId() )
{
- switch( pSimpleHint->GetId() )
- {
- case SFX_HINT_DYING:
- pMgr->Destroy();
- break;
- }
+ case SFX_HINT_DYING:
+ pMgr->Destroy();
+ break;
}
}
@@ -89,15 +85,11 @@ public:
void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if ( pSimpleHint )
+ switch( rHint.GetId() )
{
- switch( pSimpleHint->GetId() )
- {
- case SFX_HINT_DYING:
- pMgr->Destroy();
- break;
- }
+ case SFX_HINT_DYING:
+ pMgr->Destroy();
+ break;
}
}
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 2519c8ae9f85..66da9470e6e7 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1463,22 +1463,21 @@ IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, TimeOut, Idle *, void )
void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
+ const sal_uInt32 nId = rHint.GetId();
+
// tap update
- const SfxSimpleHint* pSfxSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
- if(pSfxSimpleHint)
+ switch(nId)
{
- switch(pSfxSimpleHint->GetId())
- {
- case SFX_HINT_UPDATEDONE:
+ case SFX_HINT_UPDATEDONE:
{
SfxViewFrame *pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
SfxObjectShell *pDocShell = pViewFrame->GetObjectShell();
if (
- bUpdate &&
- (
- !IsCheckedItem(SID_STYLE_WATERCAN) ||
- (pDocShell && pDocShell->GetStyleSheetPool() != pStyleSheetPool)
- )
+ bUpdate &&
+ (
+ !IsCheckedItem(SID_STYLE_WATERCAN) ||
+ (pDocShell && pDocShell->GetStyleSheetPool() != pStyleSheetPool)
+ )
)
{
bUpdate = false;
@@ -1516,27 +1515,24 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
break;
}
- // Necessary if switching between documents and in both documents
- // the same template is used. Do not immediately call Update_Impl,
- // for the case that one of the documents is an internal InPlaceObjekt!
- case SFX_HINT_DOCCHANGED:
+ // Necessary if switching between documents and in both documents
+ // the same template is used. Do not immediately call Update_Impl,
+ // for the case that one of the documents is an internal InPlaceObjekt!
+ case SFX_HINT_DOCCHANGED:
bUpdate = true;
- break;
- case SFX_HINT_DYING:
- {
- EndListening(*pStyleSheetPool);
- pStyleSheetPool=nullptr;
- break;
- }
- }
+ break;
+ case SFX_HINT_DYING:
+ {
+ EndListening(*pStyleSheetPool);
+ pStyleSheetPool=nullptr;
+ break;
+ }
}
// Do not set timer when the stylesheet pool is in the box, because it is
// possible that a new one is registered after the timer is up -
// works bad in UpdateStyles_Impl ()!
- const sal_uInt32 nId = pSfxSimpleHint ? pSfxSimpleHint->GetId() : 0;
-
if(!bDontUpdate && nId != SFX_HINT_DYING &&
(dynamic_cast<const SfxStyleSheetPoolHint*>(&rHint) ||
dynamic_cast<const SfxStyleSheetHint*>(&rHint) ||