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 /sd | |
| parent | a5b5ad9f9306d868430ed9efd210b95c24a15161 (diff) | |
convert SETTINGS_ #defines to 'enum class'
and dump the ones that nothing is listening to
Change-Id: I253ef284df785812a439dd160edba1b07fdbaac4
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/docprev.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdwindow.cxx | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 17b2ae6a57b8..75043dc27b41 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -112,7 +112,7 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) ); @@ -1112,7 +1112,7 @@ void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt ) { SfxDockingWindow::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { UpdateControl(); } diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 5701e941e1fd..f8217ebd2125 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -303,7 +303,7 @@ void SdDocPreviewWin::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { updateViewSettings(); } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 5ac34cc6a2f1..035d568896de 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -826,7 +826,7 @@ void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt ) void SdNavigatorWin::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) ApplyImageList(); Window::DataChanged( rDCEvt ); diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 0bd6522c6b80..f9b7983c5636 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -724,10 +724,10 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { // When the screen zoom factor has changed then reset the zoom // factor of the frame to always display the whole page. @@ -795,7 +795,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::DISPLAY) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { /* Virtual devices, which also depends on the resolution or the system control, should be updated. Otherwise, we should update |