diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-12 12:55:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-12 12:57:05 +0200 |
| commit | 5333782d090a9e147c0c431f0f741863d1d8cf8e (patch) | |
| tree | efff4a9394099568688559d52a36c8d9fe94ebd2 /sfx2 | |
| parent | a5b5ad9f9306d868430ed9efd210b95c24a15161 (diff) | |
convert SETTINGS_ #defines to 'enum class'
and dump the ones that nothing is listening to
Change-Id: I253ef284df785812a439dd160edba1b07fdbaac4
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index f9b1377b4c54..9cd3947bec1a 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1649,7 +1649,7 @@ void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) if ( ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY ) ) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) { SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFaceColor() ) ); } @@ -2470,7 +2470,7 @@ void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) if ( ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY ) ) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) { SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFaceColor() ) ); InitToolBoxImages(); diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 91696f8efb7c..d85561438987 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -967,7 +967,7 @@ void ThumbnailView::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetType() == DataChangedEventType::DISPLAY) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 5f9c4d062f93..3313c1d54c7a 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -293,7 +293,7 @@ SfxTemplatePanelControl::~SfxTemplatePanelControl (void) void SfxTemplatePanelControl::DataChanged( const DataChangedEvent& _rDCEvt ) { if ( ( DataChangedEventType::SETTINGS == _rDCEvt.GetType() ) && - ( 0 != ( SETTINGS_STYLE & _rDCEvt.GetFlags() ) ) ) + ( AllSettingsFlags::STYLE & _rDCEvt.GetFlags() ) ) { pImpl->updateFamilyImages(); pImpl->updateNonFamilyImages(); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index fd57865e2dcb..66aa91b1f218 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -288,7 +288,7 @@ namespace sfx2 switch ( i_rDataChangedEvent.GetType() ) { case DataChangedEventType::SETTINGS: - if ( ( i_rDataChangedEvent.GetFlags() & SETTINGS_STYLE ) == 0) + if ( !( i_rDataChangedEvent.GetFlags() & AllSettingsFlags::STYLE ) ) break; // else fall through. case DataChangedEventType::FONTS: |