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 /vcl/source/window/settings.cxx | |
| parent | a5b5ad9f9306d868430ed9efd210b95c24a15161 (diff) | |
convert SETTINGS_ #defines to 'enum class'
and dump the ones that nothing is listening to
Change-Id: I253ef284df785812a439dd160edba1b07fdbaac4
Diffstat (limited to 'vcl/source/window/settings.cxx')
| -rw-r--r-- | vcl/source/window/settings.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index d9a9b78d9d78..705efeca746b 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -57,12 +57,12 @@ void Window::SetSettings( const AllSettings& rSettings, bool bChild ) AllSettings aOldSettings(*mxSettings); OutputDevice::SetSettings( rSettings ); - sal_uLong nChangeFlags = aOldSettings.GetChangeFlags( rSettings ); + AllSettingsFlags nChangeFlags = aOldSettings.GetChangeFlags( rSettings ); // recalculate AppFont-resolution and DPI-resolution ImplInitResolutionSettings(); - if ( nChangeFlags ) + if ( bool(nChangeFlags) ) { DataChangedEvent aDCEvt( DataChangedEventType::SETTINGS, &aOldSettings, nChangeFlags ); DataChanged( aDCEvt ); @@ -91,10 +91,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) } AllSettings aOldSettings(*mxSettings); - sal_uLong nChangeFlags = mxSettings->Update( mxSettings->GetWindowUpdate(), rSettings ); - nChangeFlags |= SETTINGS_IN_UPDATE_SETTINGS; // Set this flag so the receiver of the data changed - // event can distinguish between the changing of global - // setting and a local change ( with SetSettings ) + AllSettingsFlags nChangeFlags = mxSettings->Update( mxSettings->GetWindowUpdate(), rSettings ); // recalculate AppFont-resolution and DPI-resolution ImplInitResolutionSettings(); @@ -110,7 +107,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) aSet.SetWheelBehavior( aOldSettings.GetMouseSettings().GetWheelBehavior() ); mxSettings->SetMouseSettings( aSet ); - if( (nChangeFlags & SETTINGS_STYLE) && IsBackground() ) + if( (nChangeFlags & AllSettingsFlags::STYLE) && IsBackground() ) { Wallpaper aWallpaper = GetBackground(); if( !aWallpaper.IsBitmap() && !aWallpaper.IsGradient() ) @@ -128,7 +125,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) } } - if ( nChangeFlags ) + if ( bool(nChangeFlags) ) { DataChangedEvent aDCEvt( DataChangedEventType::SETTINGS, &aOldSettings, nChangeFlags ); DataChanged( aDCEvt ); |