diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-18 13:45:41 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-19 08:18:37 +0200 |
commit | df418a41c1b90ab1a92eb150d01601f708856722 (patch) | |
tree | 9baa7d6894234657fce4d1f78535acc4d6750ceb | |
parent | 48c3b33d17591ff5b29f914ae5c0fdf787bf0d52 (diff) |
drop enum SvxViewHint::HintType
and rename the containing class
Change-Id: Id81623898b9ff102fcac6c2518240213b7d22233
-rw-r--r-- | include/svx/svdpntv.hxx | 9 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleTextEventQueue.cxx | 4 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleTextEventQueue.hxx | 4 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleTextHelper.cxx | 15 | ||||
-rw-r--r-- | svx/source/svdraw/svdpntv.cxx | 5 | ||||
-rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 11 |
6 files changed, 16 insertions, 32 deletions
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 0f75ed132838..2683453d9747 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -89,15 +89,10 @@ namespace sdr } -class SVX_DLLPUBLIC SvxViewHint : public SfxHint +class SVX_DLLPUBLIC SvxViewChangedHint : public SfxHint { public: - enum HintType { SVX_HINT_VIEWCHANGED }; - explicit SvxViewHint(HintType eType); - HintType GetHintType() const { return meHintType;} - -private: - HintType meHintType; + explicit SvxViewChangedHint(); }; /// Typedefs for a list of SdrPaintWindows diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index 4adc293c1b9f..03ed7c567f99 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx @@ -56,9 +56,9 @@ namespace accessibility maEventQueue.push_back( new TextHint( rHint ) ); } - void AccessibleTextEventQueue::Append( const SvxViewHint& rHint ) + void AccessibleTextEventQueue::Append( const SvxViewChangedHint& rHint ) { - maEventQueue.push_back( new SvxViewHint( rHint ) ); + maEventQueue.push_back( new SvxViewChangedHint( rHint ) ); } void AccessibleTextEventQueue::Append( const SvxEditSourceHint& rHint ) diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx index 76bc4625b598..293bbfd15630 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.hxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx @@ -27,7 +27,7 @@ class SfxHint; class SdrHint; class TextHint; -class SvxViewHint; +class SvxViewChangedHint; class SvxEditSourceHint; namespace accessibility @@ -51,7 +51,7 @@ namespace accessibility /// Append event to end of queue void Append( const TextHint& rHint ); /// Append event to end of queue - void Append( const SvxViewHint& rHint ); + void Append( const SvxViewChangedHint& rHint ); /// Append event to end of queue void Append( const SvxEditSourceHint& rHint ); diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 2d1b0296e611..b31023bada37 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -1176,7 +1176,7 @@ namespace accessibility const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>( &rHint ); const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint ); const TextHint* pTextHint = dynamic_cast<const TextHint*>( &rHint ); - const SvxViewHint* pViewHint = dynamic_cast<const SvxViewHint*>( &rHint ); + const SvxViewChangedHint* pViewHint = dynamic_cast<const SvxViewChangedHint*>( &rHint ); const SvxEditSourceHint* pEditSourceHint = dynamic_cast<const SvxEditSourceHint*>( &rHint ); try @@ -1267,14 +1267,9 @@ namespace accessibility } else if( pViewHint ) { - switch( pViewHint->GetHintType() ) - { - case SvxViewHint::SVX_HINT_VIEWCHANGED: - // just check visibility - UpdateVisibleChildren(); - UpdateBoundRect(); - break; - } + // just check visibility + UpdateVisibleChildren(); + UpdateBoundRect(); } else if( pSdrHint ) { @@ -1356,7 +1351,7 @@ namespace accessibility const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>( &rHint ); const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint ); const TextHint* pTextHint = dynamic_cast<const TextHint*>( &rHint ); - const SvxViewHint* pViewHint = dynamic_cast<const SvxViewHint*>( &rHint ); + const SvxViewChangedHint* pViewHint = dynamic_cast<const SvxViewChangedHint*>( &rHint ); const SvxEditSourceHint* pEditSourceHint = dynamic_cast<const SvxEditSourceHint*>( &rHint ); try diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 9b0807830477..6da1847d8754 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -115,8 +115,7 @@ OutputDevice* SdrPaintView::GetFirstOutputDevice() const } -SvxViewHint::SvxViewHint (HintType eHintType) - : meHintType(eHintType) +SvxViewChangedHint::SvxViewChangedHint() { } @@ -1242,7 +1241,7 @@ void SdrPaintView::VisAreaChanged(const OutputDevice* pOut) void SdrPaintView::VisAreaChanged(const SdrPageWindow& /*rWindow*/) { // notify SfxListener - Broadcast(SvxViewHint(SvxViewHint::SVX_HINT_VIEWCHANGED)); + Broadcast(SvxViewChangedHint()); } diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 15698073481a..7f84e6744417 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -332,14 +332,9 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } } } - else if (const SvxViewHint* pViewHint = dynamic_cast<const SvxViewHint*>(&rHint)) + else if (const SvxViewChangedHint* pViewHint = dynamic_cast<const SvxViewChangedHint*>(&rHint)) { - switch( pViewHint->GetHintType() ) - { - case SvxViewHint::SVX_HINT_VIEWCHANGED: - Broadcast( *pViewHint ); - break; - } + Broadcast( *pViewHint ); } else if (const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint)) { @@ -358,7 +353,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) // UpdateOutliner(); // #101029# Broadcast object changes, as they might change visible attributes - SvxViewHint aHint(SvxViewHint::SVX_HINT_VIEWCHANGED); + SvxViewChangedHint aHint; Broadcast( aHint ); } break; |