diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-18 21:25:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-18 21:27:20 +0100 |
| commit | 1918546e92ce7a60ecc4fac55f17a0b9dd0a03a0 (patch) | |
| tree | 8853088b717b2efa99426c0c1fa5778de00022b2 /svx/source/form/fmundo.cxx | |
| parent | 5e455d5d0c55f63ba39c3337b24460398f195d3c (diff) | |
dynamic_cast followed by static_cast and elide some casts when possible
Change-Id: Ib7d303bc18aebaa562bb380a8f3ab7d9fddcbca9
Diffstat (limited to 'svx/source/form/fmundo.cxx')
| -rw-r--r-- | svx/source/form/fmundo.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index e49af1dc8abe..db6162f7d1ac 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -184,7 +184,6 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel) } } - FmXUndoEnvironment::~FmXUndoEnvironment() { if ( !m_bDisposed ) // i120746, call FormScriptingEnvironment::dispose to avoid memory leak @@ -194,7 +193,6 @@ FmXUndoEnvironment::~FmXUndoEnvironment() delete static_cast<PropertySetInfoCache*>(m_pPropertySetCache); } - void FmXUndoEnvironment::dispose() { OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::dispose: disposed twice?" ); @@ -288,10 +286,9 @@ void FmXUndoEnvironment::ModeChanged() void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { - const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint); - if (pSdrHint) + if (const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint)) { - switch( pSdrHint->GetKind() ) + switch (pSdrHint->GetKind()) { case HINT_OBJINSERTED: { @@ -308,9 +305,9 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) break; } } - else if (dynamic_cast<const SfxSimpleHint*>(&rHint)) + else if (const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint)) { - switch ( static_cast<const SfxSimpleHint*>(&rHint)->GetId() ) + switch (pSimpleHint->GetId()) { case SFX_HINT_DYING: dispose(); @@ -321,20 +318,18 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) break; } } - else if (dynamic_cast<const SfxEventHint*>(&rHint)) + else if (const SfxEventHint* pEventHint = dynamic_cast<const SfxEventHint*>(&rHint)) { - switch ( static_cast<const SfxEventHint*>(&rHint)->GetEventId() ) + switch (pEventHint->GetEventId()) { - case SFX_EVENT_CREATEDOC: + case SFX_EVENT_CREATEDOC: case SFX_EVENT_OPENDOC: ModeChanged(); break; } } - } - void FmXUndoEnvironment::Inserted(SdrObject* pObj) { if (pObj->GetObjInventor() == FmFormInventor) |