diff options
144 files changed, 226 insertions, 263 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 6818d8124b84..c468932e9768 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -1458,7 +1458,7 @@ void ModulWindowLayout::Paint (Rectangle const&) void ModulWindowLayout::DataChanged (DataChangedEvent const& rDCEvt) { Layout::DataChanged(rDCEvt); - if (rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE)) + if (rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) aSyntaxColors.SettingsChanged(); } diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 1b8420bfcd7e..be7e74034826 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1025,7 +1025,7 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt) { Window::DataChanged(rDCEvt); if (rDCEvt.GetType() == DataChangedEventType::SETTINGS - && (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0) + && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) { Color aColor(GetSettings().GetStyleSettings().GetFieldColor()); const AllSettings* pOldSettings = rDCEvt.GetOldSettings(); @@ -1543,7 +1543,7 @@ void BreakPointWindow::DataChanged(DataChangedEvent const & rDCEvt) { Window::DataChanged(rDCEvt); if (rDCEvt.GetType() == DataChangedEventType::SETTINGS - && (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0) + && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) { Color aColor(GetSettings().GetStyleSettings().GetFieldColor()); const AllSettings* pOldSettings = rDCEvt.GetOldSettings(); @@ -2066,7 +2066,7 @@ void ComplexEditorWindow::DataChanged(DataChangedEvent const & rDCEvt) { Window::DataChanged(rDCEvt); if (rDCEvt.GetType() == DataChangedEventType::SETTINGS - && (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0) + && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) { Color aColor(GetSettings().GetStyleSettings().GetFaceColor()); const AllSettings* pOldSettings = rDCEvt.GetOldSettings(); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 57b6592dec37..a04d198178ab 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1351,7 +1351,7 @@ void DialogWindow::printPage( sal_Int32 nPage, Printer* pPrinter ) void DialogWindow::DataChanged( const DataChangedEvent& rDCEvt ) { - if( (rDCEvt.GetType()==DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if( (rDCEvt.GetType()==DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { InitSettings( true, true, true ); Invalidate(); diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index c4f4615ea09e..961a7bde65e4 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -132,7 +132,7 @@ void Layout::Deactivating () void Layout::DataChanged (DataChangedEvent const& rDCEvt) { Window::DataChanged(rDCEvt); - if (rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE)) + if (rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) { bool bInvalidate = false; Color aColor = GetSettings().GetStyleSettings().GetWindowColor(); diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 14872783f22d..2ba7043207da 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -79,7 +79,7 @@ void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt) { Window::DataChanged(rDCEvt); if (rDCEvt.GetType() == DataChangedEventType::SETTINGS - && (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0) + && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) { Color aColor(GetSettings().GetStyleSettings().GetFieldColor()); const AllSettings* pOldSettings = rDCEvt.GetOldSettings(); diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 004fec933383..11f48f9dc9e2 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -70,7 +70,7 @@ void InsertErrorBarsDialog::DataChanged( const DataChangedEvent& rDCEvt ) { ModalDialog::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) m_apErrorBarResources->FillValueSets(); } diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index c83c42f36614..4d58bb7f91a8 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -61,7 +61,7 @@ void ErrorBarsTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { SfxTabPage::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) m_aErrorBarResources.FillValueSets(); } diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index 8b630931664a..a998056f8edf 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -55,7 +55,7 @@ void TrendlineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { SfxTabPage::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) m_aTrendlineResources.FillValueSets(); } diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 70f6c1131767..c46bab4e0b48 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -218,7 +218,7 @@ void ChartWindow::DataChanged( const DataChangedEvent& rDCEvt ) vcl::Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { adjustHighContrastMode(); } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index adba2c90c1a6..c7367ebd6818 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -4586,7 +4586,7 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt ) SvTreeListBox::DataChanged( rDCEvt ); if (( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE )) { BuildCheckBoxButtonImages( m_pButtonData ); Invalidate(); diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index a62545f2c015..45e8dcb06531 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -147,7 +147,7 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 99f1b20b23b0..bed354282be4 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -804,7 +804,7 @@ void ColorConfigWindow_Impl::DataChanged (DataChangedEvent const& rDCEvt) { Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { StyleSettings const& rStyleSettings = GetSettings().GetStyleSettings(); bool const bHighContrast = rStyleSettings.GetHighContrastMode(); @@ -973,7 +973,7 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); SetBackground(Wallpaper(rStyleSettings.GetFieldColor())); diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 173755a1b462..dbc1463f2980 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -329,7 +329,7 @@ bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * ) if ( bModified ) { // broadcast the change - DataChangedEvent aDataChanged( DataChangedEventType::SETTINGS, NULL, SETTINGS_STYLE ); + DataChangedEvent aDataChanged( DataChangedEventType::SETTINGS, NULL, AllSettingsFlags::STYLE ); Application::NotifyAllWindows( aDataChanged ); } diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index cfd5abacca6c..56cdabbf2cb4 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -313,7 +313,7 @@ int AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet ) void AlignmentTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { SfxTabPage::DataChanged( rDCEvt ); - if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { InitVsRefEgde(); } diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 12b0254295fb..a764095e5a13 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -339,7 +339,7 @@ void BackgroundPreviewImpl::Paint( const Rectangle& ) void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { Invalidate(); } diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index e19bdd837e7d..ea67be5d6224 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1187,7 +1187,7 @@ IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox) void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { - if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) FillValueSets(); SfxTabPage::DataChanged( rDCEvt ); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index d073f7939e8b..ebe7526d3a8f 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -498,7 +498,7 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { SfxTabPage::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) FillValueSet(); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 2e77686a33e8..169f898f6946 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -219,7 +219,7 @@ void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); - if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitSettings( true, true ); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index b4d821e75424..a8ce8ca49283 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -821,7 +821,7 @@ void SvxHatchTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) void SvxHatchTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) m_pCtlPreview->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); SvxTabPage::DataChanged( rDCEvt ); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 9ce242df5055..df15d595ce4a 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1813,7 +1813,7 @@ void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { SvxTabPage::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { FillListboxes(); } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 4b31f991efce..8cafbc8669b3 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -898,7 +898,7 @@ void SvxLineDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { SfxTabPage::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { sal_Int32 nOldSelect = m_pLbLineStyles->GetSelectEntryPos(); m_pLbLineStyles->Clear(); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 3916d015228c..a4cafe54584c 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -664,7 +664,7 @@ void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { SfxTabPage::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { sal_Int32 nOldSelect = m_pLbLineEnds->GetSelectEntryPos(); m_pLbLineEnds->Clear(); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 575dffd0b925..5ce1a69806dc 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -156,7 +156,7 @@ namespace Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings( true, true, true ); Invalidate(); @@ -1236,7 +1236,7 @@ void OAppDetailPageHelper::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(); @@ -1333,7 +1333,7 @@ void OPreviewWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index c89c310ca50d..59095b637a38 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -372,7 +372,7 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings( true, true, true ); Invalidate(); @@ -593,7 +593,7 @@ void OApplicationDetailView::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/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 386c3a35dfe4..902c7181d5fe 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -97,7 +97,7 @@ void OApplicationSwapWindow::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/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 1678d9e7a223..2bbd2c66231c 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -118,7 +118,7 @@ void OTitleWindow::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/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 8b06212650ed..fe2d505e9018 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -141,7 +141,7 @@ void OAppBorderWindow::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(); Invalidate(); @@ -233,7 +233,7 @@ void OApplicationView::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(); Invalidate(); diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 0fc07aec03b9..dc27afe956a3 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -180,7 +180,7 @@ namespace dbaui (rDCEvt.GetType() == DataChangedEventType::DISPLAY) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { // Check if we need to get new images for normal/high contrast mode m_rController.notifyHiContrastChanged(); diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index a52c730f1f82..5313d4213cb6 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -92,7 +92,7 @@ void OSplitterView::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 6f36e7458f66..d034b68bd597 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -822,7 +822,7 @@ namespace dbaui if ((( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE )) { // Check if we need to get new images for normal/high contrast mode checkImageList(); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index d5932f002564..0c85536ed824 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -123,7 +123,7 @@ namespace dbaui if ((( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE )) { // Check if we need to get new images for normal/high contrast mode m_pTablesList->notifyHiContrastChanged(); diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index e5332c622318..bb18fc04b0fc 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -83,7 +83,7 @@ namespace dbaui DataChangedEvent* pData = reinterpret_cast<DataChangedEvent*>(_pEvt->GetData()); if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) || ( pData->GetType() == DataChangedEventType::DISPLAY )) && - ( pData->GetFlags() & SETTINGS_STYLE ))) + ( pData->GetFlags() & AllSettingsFlags::STYLE ))) // check if imagelist changed checkImageList(); } diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index cc1df57bee4a..996a84c0e162 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -150,7 +150,7 @@ void OTableBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index bcd511b043ba..8ddf70267f80 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -520,7 +520,7 @@ void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent) void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) ApplyImageList(); ToolBox::DataChanged( rDCEvt ); } diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 53f8f065f369..28b743674415 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -469,7 +469,7 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve { if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS ) || ( pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY )) && - ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) + ( pDataChangedEvent->GetFlags() & AllSettingsFlags::STYLE )) { CheckAndUpdateImages(); } diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 44f189a140c3..8728f5b1df4d 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -556,7 +556,7 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt ) ( rDCEvt.GetType() == DataChangedEventType::FONTS ) || ( rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE )) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; css::uno::Reference< css::beans::XPropertySet > xPropSet( m_xFrame, css::uno::UNO_QUERY ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 3ef8de628af3..0cfc9099f467 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -2066,7 +2066,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) { if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS ) || ( pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY )) && - ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) + ( pDataChangedEvent->GetFlags() & AllSettingsFlags::STYLE )) { CheckAndUpdateImages(); } diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index b04e0c470002..990a7ec0033b 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -25,6 +25,7 @@ #include <tools/gen.hxx> #include <vcl/keycod.hxx> #include <vcl/cmdevt.hxx> +#include <vcl/settings.hxx> class AllSettings; class OutputDevice; @@ -493,18 +494,18 @@ class VCL_DLLPUBLIC DataChangedEvent { private: void* mpData; - sal_uLong mnFlags; + AllSettingsFlags mnFlags; DataChangedEventType mnType; public: explicit DataChangedEvent(); explicit DataChangedEvent( DataChangedEventType nType, const void* pData = NULL, - sal_uLong nFlags = 0 ); + AllSettingsFlags nFlags = AllSettingsFlags::NONE ); DataChangedEventType GetType() const { return mnType; } void* GetData() const { return mpData; } - sal_uLong GetFlags() const { return mnFlags; } + AllSettingsFlags GetFlags() const { return mnFlags; } const AllSettings* GetOldSettings() const; }; @@ -512,13 +513,13 @@ public: inline DataChangedEvent::DataChangedEvent() { mpData = NULL; - mnFlags = 0; + mnFlags = AllSettingsFlags::NONE; mnType = DataChangedEventType::NONE; } inline DataChangedEvent::DataChangedEvent( DataChangedEventType nType, const void* pData, - sal_uLong nChangeFlags ) + AllSettingsFlags nChangeFlags ) { mpData = (void*)pData; mnFlags = nChangeFlags; diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 709d95eee439..a65712774b00 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -29,6 +29,7 @@ #include <vcl/wall.hxx> #include <i18nlangtag/languagetag.hxx> #include <unotools/syslocale.hxx> +#include <o3tl/typed_flags_set.hxx> #include <boost/optional.hpp> #include <boost/shared_ptr.hpp> @@ -618,21 +619,16 @@ public: // - AllSettings - -const int SETTINGS_MOUSE = 0x00000001; -const int SETTINGS_STYLE = 0x00000002; -const int SETTINGS_MISC = 0x00000004; -const int SETTINGS_SOUND = 0x00000008; -const int SETTINGS_HELP = 0x00000010; -const int SETTINGS_LOCALE = 0x00000020; -const int SETTINGS_UILOCALE = 0x00000040; -const int SETTINGS_ALLSETTINGS = ( SETTINGS_MOUSE | - SETTINGS_STYLE | SETTINGS_MISC | - SETTINGS_SOUND | - SETTINGS_HELP | - SETTINGS_LOCALE | SETTINGS_UILOCALE ); -const int SETTINGS_IN_UPDATE_SETTINGS = 0x00000800; // this flag indicates that the data changed event was created - // in Windows::UpdateSettings probably because of a global - // settings changed +enum class AllSettingsFlags { + NONE = 0x0000, + STYLE = 0x0002, + MISC = 0x0004, + LOCALE = 0x0020, +}; +namespace o3tl +{ + template<> struct typed_flags<AllSettingsFlags> : is_typed_flags<AllSettingsFlags, 0x026> {}; +} class VCL_DLLPUBLIC AllSettings { @@ -669,10 +665,10 @@ public: const vcl::I18nHelper& GetLocaleI18nHelper() const; const vcl::I18nHelper& GetUILocaleI18nHelper() const; - sal_uLong GetWindowUpdate() const; + AllSettingsFlags GetWindowUpdate() const; - sal_uLong Update( sal_uLong nFlags, const AllSettings& rSettings ); - sal_uLong GetChangeFlags( const AllSettings& rSettings ) const; + AllSettingsFlags Update( AllSettingsFlags nFlags, const AllSettings& rSettings ); + AllSettingsFlags GetChangeFlags( const AllSettings& rSettings ) const; bool operator ==( const AllSettings& rSet ) const; bool operator !=( const AllSettings& rSet ) const; diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 3b52b4d2116e..8bbd52dd88ad 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -59,7 +59,7 @@ void OColorListener::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 532bdea1a68f..53b5fcf6f33f 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -169,7 +169,7 @@ void ODesignView::DataChanged( const DataChangedEvent& rDCEvt ) ODataView::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index d1402db5de02..0c6f3957a33d 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -105,7 +105,7 @@ public: DataChangedEvent* pData = reinterpret_cast<DataChangedEvent*>(_pEvt->GetData()); if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) || ( pData->GetType() == DataChangedEventType::DISPLAY )) && - ( pData->GetFlags() & SETTINGS_STYLE ))) + ( pData->GetFlags() & AllSettingsFlags::STYLE ))) { OEnvLock aLock(*this); diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 86a1911caa52..1ec3c0a309ce 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -217,7 +217,7 @@ void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 4f8c90d82355..934255557688 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -355,7 +355,7 @@ void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index fbfd18b241c5..9cfc174e4423 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -208,7 +208,7 @@ void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index c3e8c2de802d..c849571e2c10 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -287,7 +287,7 @@ void OViewsWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 80296637bbd5..cc9bf9810062 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -779,7 +779,7 @@ void ScInputWindow::StateChanged( StateChangedType nType ) void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { // update item images ScModule* pScMod = SC_MOD(); @@ -1109,7 +1109,7 @@ void ScInputBarGroup::TriggerToolboxLayout() else rParent.SetToolbarLayoutMode( TBX_LAYOUT_NORMAL ); xLayoutManager->lock(); - DataChangedEvent aFakeUpdate( DataChangedEventType::SETTINGS, NULL, SETTINGS_STYLE ); + DataChangedEvent aFakeUpdate( DataChangedEventType::SETTINGS, NULL, AllSettingsFlags::STYLE ); // this basically will trigger the reposititioning of the // items in the toolbar from ImplFormat ( which is controlled by @@ -2033,7 +2033,7 @@ void ScTextWnd::RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextDat void ScTextWnd::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 78c9ea0175c6..f99a609ea52a 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -982,7 +982,7 @@ void ScCsvGrid::Command( const CommandEvent& rCEvt ) void ScCsvGrid::DataChanged( const DataChangedEvent& rDCEvt ) { - if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { InitColors(); InitFonts(); diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index c04a7d46ecba..1aae189e4672 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -372,7 +372,7 @@ void ScCsvRuler::LoseFocus() void ScCsvRuler::DataChanged( const DataChangedEvent& rDCEvt ) { - if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { InitColors(); Repaint(); diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 5deb5834d422..424bcc0b6dd7 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -233,7 +233,7 @@ void ScCsvTableBox::Resize() void ScCsvTableBox::DataChanged( const DataChangedEvent& rDCEvt ) { - if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) InitControls(); ScCsvControl::DataChanged( rDCEvt ); } diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index e80a88b9c49d..f8d5f82707a0 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -392,7 +392,7 @@ void ScPrivatSplit::StateChanged( StateChangedType nType ) void ScPrivatSplit::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 74be9381cc05..85b7d0e590c4 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -452,7 +452,7 @@ void CommandToolBox::InitImageList() void CommandToolBox::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { // update item images @@ -735,7 +735,7 @@ void ScNavigatorDlg::Paint( const Rectangle& rRect ) void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { // toolbox images are exchanged in CommandToolBox::DataChanged Invalidate(); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 8213ef96fade..50f3144be245 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -330,7 +330,7 @@ int ScTablePage::DeactivatePage( SfxItemSet* pSetP ) void ScTablePage::DataChanged( const DataChangedEvent& rDCEvt ) { - if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) ShowImage(); SfxTabPage::DataChanged( rDCEvt ); } diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 860a48769c1d..e163d4dd3aef 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1531,13 +1531,13 @@ void ScGridWindow::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::FONTS && eWhich == pViewData->GetActivePart() ) pViewData->GetDocShell()->UpdateFontList(); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { if ( eWhich == pViewData->GetActivePart() ) // only once for the view { diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 757d20092ba0..4752e567f4de 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -498,7 +498,7 @@ void ScOutlineWindow::Resize() void ScOutlineWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { InitSettings(); Invalidate(); diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 1dadb1fbb3f3..455534c230ae 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -938,7 +938,7 @@ void ScPreview::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::FONTS ) pDocShell->UpdateFontList(); @@ -948,7 +948,7 @@ void ScPreview::DataChanged( const DataChangedEvent& rDCEvt ) if ( !bInPaint ) { if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { // scroll bar size may have changed pViewShell->InvalidateBorder(); // calls OuterResizePixel 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 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: diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index ca19bfa88969..a5f59e0dd6a9 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -399,7 +399,7 @@ void SmFontDialog::InitColor_Impl() void SmFontDialog::DataChanged( const DataChangedEvent& rDCEvt ) { if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) InitColor_Impl(); ModalDialog::DataChanged( rDCEvt ); @@ -1504,7 +1504,7 @@ void SmSymbolDialog::InitColor_Impl() void SmSymbolDialog::DataChanged( const DataChangedEvent& rDCEvt ) { if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) InitColor_Impl(); ModalDialog::DataChanged( rDCEvt ); @@ -2069,7 +2069,7 @@ void SmSymDefineDialog::InitColor_Impl() void SmSymDefineDialog::DataChanged( const DataChangedEvent& rDCEvt ) { if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) InitColor_Impl(); ModalDialog::DataChanged( rDCEvt ); diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 1d487812046f..1092d251d815 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -192,7 +192,7 @@ void SmToolBoxWindow::ApplyImageLists( sal_uInt16 nCategoryRID ) void SmToolBoxWindow::DataChanged( const DataChangedEvent &rEvt ) { - if ( (rEvt.GetType() == DataChangedEventType::SETTINGS) && (rEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rEvt.GetType() == DataChangedEventType::SETTINGS) && (rEvt.GetFlags() & AllSettingsFlags::STYLE) ) ApplyImageLists( nActiveCategoryRID ); SfxFloatingWindow::DataChanged( rEvt ); diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 2578c12d4407..c5a9ae217590 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -284,7 +284,7 @@ void BrowserDataWin::Update() void BrowserDataWin::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { if( !bOwnDataChangedHdl ) { diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 026a2fb8d083..bcb227145ec2 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -804,7 +804,7 @@ namespace svt if ((( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE )) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index c79a34e640f1..d816876af614 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -350,7 +350,7 @@ IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent ) { DataChangedEvent* pData = (DataChangedEvent*)(pEvent->GetData()); if ( (pData->GetType() == DataChangedEventType::SETTINGS) && - (pData->GetFlags() & SETTINGS_STYLE) ) + (pData->GetFlags() & AllSettingsFlags::STYLE) ) { SettingsChanged(); return 1L; diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index dd6eb881915c..069d8a26b8c0 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -546,7 +546,7 @@ IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, { DataChangedEvent* pData = (DataChangedEvent*)(pEvent->GetData()); if ( (pData->GetType() == DataChangedEventType::SETTINGS) && - (pData->GetFlags() & SETTINGS_STYLE) ) + (pData->GetFlags() & AllSettingsFlags::STYLE) ) { SettingsChanged(); return 1L; diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index ae82f24e5a30..e60e62f50cb7 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -369,7 +369,7 @@ void SvtIconChoiceCtrl::DataChanged( const DataChangedEvent& rDCEvt ) if ( ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || (rDCEvt.GetType() == DataChangedEventType::FONTS) ) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { _pImp->InitSettings(); Invalidate(INVALIDATE_NOCHILDREN); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index d131137712c0..d3d36146cb52 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3771,7 +3771,7 @@ void SvTreeListBox::ShowFocusRect( const SvTreeListEntry* pEntry ) void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt ) { - if( (rDCEvt.GetType()==DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if( (rDCEvt.GetType()==DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { nEntryHeight = 0; // _together_ with true of 1. par (bFont) of InitSettings() a zero-height // forces complete recalc of heights! diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index ed609788ca71..0ddd26ae5728 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -1769,7 +1769,7 @@ void Calendar::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings(); Invalidate(); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 0fb5c06b4598..903d18ae1260 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -949,7 +949,7 @@ void LineListBox::DataChanged( const DataChangedEvent& rDCEvt ) { ListBox::DataChanged( rDCEvt ); - if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) UpdateEntries( m_nWidth ); } diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 8f5df1b0faea..80e0b320f0c9 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -1196,7 +1196,7 @@ void HeaderBar::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index a9a28134e6ad..e54d7e1bdddf 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -196,7 +196,7 @@ namespace svt FixedText::DataChanged( rDCEvt ); if ((( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE )) { const Color& rGBColor = GetControlBackground(); if (rGBColor == COL_TRANSPARENT) diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 1007e27f6c78..dcd6d6b497c6 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -654,7 +654,7 @@ namespace svt { if ((( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE )) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) ); @@ -861,7 +861,7 @@ namespace svt FixedText::DataChanged( rDCEvt ); if ((( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) || ( rDCEvt.GetType() == DataChangedEventType::DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE )) { const Color& rGBColor = GetControlBackground(); if (rGBColor == COL_TRANSPARENT) diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 249c4add7c46..fa16f47e60f1 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2242,7 +2242,7 @@ void Ruler::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetType() == DataChangedEventType::DISPLAY) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { mbFormat = true; ImplInitSettings( true, true, true ); diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index e638002a5eb9..7f5941ee41d1 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -80,7 +80,7 @@ void ScrollableWindow::Command( const CommandEvent& rCEvt ) void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { Resize(); Invalidate(); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 65bd901f51e3..056ab910dada 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1605,7 +1605,7 @@ void TabBar::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true ); Invalidate(); diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index d7404dcbd611..1896c2b28b71 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1516,7 +1516,7 @@ void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { initWindow(); Invalidate(); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index d0f1d7cd830a..6a41e0b7e14e 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1536,7 +1536,7 @@ void ValueSet::DataChanged( const DataChangedEvent& rDataChangedEvent ) rDataChangedEvent.GetType() == DataChangedEventType::DISPLAY || rDataChangedEvent.GetType() == DataChangedEventType::FONTSUBSTITUTION || (rDataChangedEvent.GetType() == DataChangedEventType::SETTINGS && - rDataChangedEvent.GetFlags() & SETTINGS_STYLE) ) + rDataChangedEvent.GetFlags() & AllSettingsFlags::STYLE) ) { mbFormat = true; ImplInitSettings( true, true, true ); diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 484cc3cc9d5d..91c1304ddb80 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -1298,7 +1298,7 @@ namespace svt Control::DataChanged( i_rDataChanedEvent ); if ( ( i_rDataChanedEvent.GetType() == DataChangedEventType::SETTINGS ) - && ( ( i_rDataChanedEvent.GetFlags() & SETTINGS_STYLE ) != 0 ) + && ( i_rDataChanedEvent.GetFlags() & AllSettingsFlags::STYLE ) ) { Invalidate(); diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index d63840924903..d74545593d1c 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -258,7 +258,7 @@ namespace svt switch ( i_rEvent.GetType() ) { case DataChangedEventType::SETTINGS: - if ( ( i_rEvent.GetFlags() & SETTINGS_STYLE ) == 0 ) + if ( !( i_rEvent.GetFlags() & AllSettingsFlags::STYLE ) ) break; SetSettings( Application::GetSettings() ); m_pPaintDevice.reset( new VirtualDevice( *this ) ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index cfc9fbc2a933..26f6df234b64 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -120,7 +120,7 @@ void SvxShowCharSet::StateChanged( StateChangedType nType ) void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) - && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitSettings( true, true ); else Control::DataChanged( rDCEvt ); diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 3d8666160080..6cb31753ab37 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -316,7 +316,7 @@ void SvxXConnectionPreview::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) ) { SetStyles(); } diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index d020bad2711e..d317c872f0dc 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -314,7 +314,7 @@ void DialControl::StateChanged( StateChangedType nStateChange ) void DialControl::DataChanged( const DataChangedEvent& rDCEvt ) { - if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { Init( mpImpl->maWinSize, mpImpl->maWinFont ); InvalidateControl(); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 93babc456237..2ecdcf8e7d38 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -374,7 +374,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType ) void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitSettings( true, true ); else Window::DataChanged( rDCEvt ); @@ -1914,7 +1914,7 @@ void SvxPreviewBase::DataChanged(const DataChangedEvent& rDCEvt) { SetDrawMode(GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR); - if((DataChangedEventType::SETTINGS == rDCEvt.GetType()) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) + if((DataChangedEventType::SETTINGS == rDCEvt.GetType()) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) { InitSettings(true, true); } diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index fa40867eb408..98a054b417d8 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -535,7 +535,7 @@ void SvxFontPrevWindow::StateChanged( StateChangedType nType ) void SvxFontPrevWindow::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitSettings( true, true ); else Window::DataChanged( rDCEvt ); diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 9977b60ef788..911a09a1919a 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1229,7 +1229,7 @@ void FrameSelector::LoseFocus() void FrameSelector::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) ) mxImpl->InitVirtualDevice(); } diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index a3a0a3f0e4fa..109955906a00 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -159,7 +159,7 @@ void SvxXMeasurePreview::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) ) { SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); } diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 0185826436f8..c4cb82ac7a32 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -742,7 +742,7 @@ void SvxRubyDialog::DataChanged( const DataChangedEvent& rDCEvt ) { SfxModelessDialog::DataChanged( rDCEvt ); - if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) UpdateColors(); } diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index ae5ab7b81015..236e5d6cd766 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -90,7 +90,7 @@ void SvxSwFrameExample::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); - if( rDCEvt.GetType() == DataChangedEventType::SETTINGS && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if( rDCEvt.GetType() == DataChangedEventType::SETTINGS && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitColors_Impl(); } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 60bae53b51d7..37d1b41b766b 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1006,7 +1006,7 @@ void DbGridControl::DataChanged( const DataChangedEvent& rDCEvt ) { DbGridControl_Base::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitWindow( InitAll ); Invalidate(); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 75bcc0f7c578..607ae18c1a58 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -82,7 +82,7 @@ void GalleryThemeListBox::InitSettings() void GalleryThemeListBox::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitSettings(); else ListBox::DataChanged( rDCEvt ); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 6e13cf1596c9..52574c269ee5 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -507,7 +507,7 @@ void GalleryBrowser2::InitSettings() void GalleryBrowser2::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitSettings(); else Control::DataChanged( rDCEvt ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index f3c440359beb..90537acc6913 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -92,7 +92,7 @@ void GalleryPreview::InitSettings() void GalleryPreview::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitSettings(); else Window::DataChanged( rDCEvt ); @@ -303,7 +303,7 @@ void GalleryIconView::InitSettings() void GalleryIconView::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitSettings(); else ValueSet::DataChanged( rDCEvt ); @@ -445,7 +445,7 @@ void GalleryListView::InitSettings() void GalleryListView::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if ( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitSettings(); else BrowseBox::DataChanged( rDCEvt ); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 50f78bed8e72..cafd700302df 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -108,7 +108,7 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) { ToolbarMenu::DataChanged( rDCEvt ); - if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) { for( sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { @@ -656,7 +656,7 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) { ToolbarMenu::DataChanged( rDCEvt ); - if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) { implSetDirection( mnDirection, mbDirectionEnabled ); setEntryImage( 0, maImgBright ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 89f98d1d39aa..7633b6a88b78 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -881,7 +881,7 @@ void FillControl::Resize() void FillControl::DataChanged(const DataChangedEvent& rDCEvt) { if((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) { Size aTypeSize(LogicToPixel(maLogicalFillSize,MAP_APPFONT)); Size aAttrSize(LogicToPixel(maLogicalAttrSize,MAP_APPFONT)); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index fb35ef0b4db2..92a017f4c25f 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -232,7 +232,7 @@ void SvxLineBox::ReleaseFocus_Impl() void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT)); Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); @@ -409,7 +409,7 @@ bool SvxMetricField::Notify( NotifyEvent& rNEvt ) void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT)); } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 2b1abe607f7c..27e44e0895bd 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -522,7 +522,7 @@ bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) void SvxStyleBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT)); Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); @@ -989,7 +989,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT)); Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT); @@ -1520,7 +1520,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { SfxPopupWindow::DataChanged( rDCEvt ); - if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) { aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); @@ -1830,7 +1830,7 @@ void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { SfxPopupWindow::DataChanged( rDCEvt ); #if 0 - if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if( ( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) { CreateBitmaps(); Invalidate(); diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 0e089f234c09..680e9a32040d 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -273,7 +273,7 @@ void SvxFontSizeBox_Impl::SetOptimalSize() void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { SetOptimalSize(); } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5847c8f9b091..19b1ebeac4fa 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1517,7 +1517,7 @@ void SwMarkPreview::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); - if( rDCEvt.GetType() == DataChangedEventType::SETTINGS && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) + if( rDCEvt.GetType() == DataChangedEventType::SETTINGS && ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) InitColors(); } diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index a19251bf127c..dd3213404c87 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1384,7 +1384,7 @@ void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt ) void ColumnValueSet::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { Format(); } diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index f41265e78f1c..a68bee53f26f 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -631,7 +631,7 @@ const sal_uInt16* SwWrapTabPage::GetRanges() void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) ApplyImageList(); SfxTabPage::DataChanged( rDCEvt ); diff --git a/sw/source/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx index 7b56e3583487..0f7fc2a24ba9 100644 --- a/sw/source/uibase/docvw/edtwin3.cxx +++ b/sw/source/uibase/docvw/edtwin3.cxx @@ -140,7 +140,7 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt ) // the ScrollBar size can have change. For that, in the reset // handler, the size of the ScrollBars also has to be queried // from the settings. - if( rDCEvt.GetFlags() & SETTINGS_STYLE ) + if( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) { pSh->LockPaint(); bUnlockPaint = true; diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 586b931c55da..ea2edbde88b1 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -304,7 +304,7 @@ void SwSrcEditWindow::DataChanged( const DataChangedEvent& rDCEvt ) // ScrollBar size could have changed. For this, in the // Resize handler the size of ScrollBars has to be queried // from the settings as well. - if( rDCEvt.GetFlags() & SETTINGS_STYLE ) + if( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) Resize(); break; default: break; @@ -371,7 +371,7 @@ void TextViewOutWin::DataChanged( const DataChangedEvent& rDCEvt ) { case DataChangedEventType::SETTINGS: // query settings - if( rDCEvt.GetFlags() & SETTINGS_STYLE ) + if( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) { const Color &rCol = GetSettings().GetStyleSettings().GetWindowColor(); SetBackground( rCol ); diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index d9b2b281eb2a..c6a5f3d7d76f 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -161,7 +161,7 @@ void SwInputWindow::CleanupUglyHackWithUndo() void SwInputWindow::DataChanged( const DataChangedEvent& rDCEvt ) { - if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { // update item images SwModule *pMod = SW_MOD(); diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index c97682a5dbf9..5317632688d3 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -450,7 +450,7 @@ SwScrollNaviPopup::~SwScrollNaviPopup() void SwScrollNaviPopup::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) ApplyImageList(); Window::DataChanged( rDCEvt ); diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index d5ad1f28c52e..4ca5825d6966 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -575,7 +575,7 @@ void SwPagePreviewWin::DataChanged( const DataChangedEvent& rDCEvt ) // size of the scrollbars may have be changed. Also the // size of the scrollbars has to be retrieved from the settings // out of the resize handler. - if( rDCEvt.GetFlags() & SETTINGS_STYLE ) + if( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) mrView.InvalidateBorder(); // Scrollbar widths // zoom has to be disabled if Accessibility support is switched on lcl_InvalidateZoomSlots(mrView.GetViewFrame()->GetBindings()); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 24042b5e2cc9..129626425fd5 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3527,7 +3527,7 @@ void SwContentLBoxString::Paint( void SwContentTree::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { FindActiveTypeAndRemoveUserData(); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index f03e4ef14a91..9b40f9d4f312 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -1247,7 +1247,7 @@ void SwLBoxString::Paint( void SwGlobalTree::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP)); Update(true); diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 674481f6e0ea..be7b4c2cc975 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -1349,7 +1349,7 @@ void SwNavigationPI::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { InitImageList(); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index c65024971664..360e1618d51f 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -76,7 +76,7 @@ namespace toolkit const DataChangedEvent* pDataChangedEvent = static_cast< const DataChangedEvent* >( i_pEvent->GetData() ); if ( !pDataChangedEvent || ( pDataChangedEvent->GetType() != DataChangedEventType::SETTINGS ) ) return 0L; - if ( ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE ) == 0 ) + if ( !( pDataChangedEvent->GetFlags() & AllSettingsFlags::STYLE ) ) return 0L; EventObject aEvent( *pOwningWindow ); diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 7a7e4259d667..95308ef0686a 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -240,7 +240,7 @@ struct ImplAllSettingsData MiscSettings maMiscSettings; HelpSettings maHelpSettings; LanguageTag maLocale; - sal_uLong mnWindowUpdate; + AllSettingsFlags mnWindowUpdate; LanguageTag maUILocale; LocaleDataWrapper* mpLocaleDataWrapper; LocaleDataWrapper* mpUILocaleDataWrapper; @@ -2640,7 +2640,7 @@ ImplAllSettingsData::ImplAllSettingsData() maLocale( LANGUAGE_SYSTEM ), maUILocale( LANGUAGE_SYSTEM ) { - mnWindowUpdate = SETTINGS_ALLSETTINGS; + mnWindowUpdate = AllSettingsFlags::STYLE | AllSettingsFlags::MISC | AllSettingsFlags::LOCALE; mpLocaleDataWrapper = NULL; mpUILocaleDataWrapper = NULL; mpI18nHelper = NULL; @@ -2699,87 +2699,56 @@ void AllSettings::CopyData() } -sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet ) +AllSettingsFlags AllSettings::Update( AllSettingsFlags nFlags, const AllSettings& rSet ) { - sal_uLong nChangeFlags = 0; + AllSettingsFlags nChangeFlags = AllSettingsFlags::NONE; - if ( nFlags & SETTINGS_MOUSE ) - { - if ( mpData->maMouseSettings != rSet.mpData->maMouseSettings ) - { - CopyData(); - mpData->maMouseSettings = rSet.mpData->maMouseSettings; - nChangeFlags |= SETTINGS_MOUSE; - } - } - - if ( nFlags & SETTINGS_STYLE ) + if ( nFlags & AllSettingsFlags::STYLE ) { if ( mpData->maStyleSettings != rSet.mpData->maStyleSettings ) { CopyData(); mpData->maStyleSettings = rSet.mpData->maStyleSettings; - nChangeFlags |= SETTINGS_STYLE; + nChangeFlags |= AllSettingsFlags::STYLE; } } - if ( nFlags & SETTINGS_MISC ) + if ( nFlags & AllSettingsFlags::MISC ) { if ( mpData->maMiscSettings != rSet.mpData->maMiscSettings ) { CopyData(); mpData->maMiscSettings = rSet.mpData->maMiscSettings; - nChangeFlags |= SETTINGS_MISC; - } - } - - if ( nFlags & SETTINGS_HELP ) - { - if ( mpData->maHelpSettings != rSet.mpData->maHelpSettings ) - { - CopyData(); - mpData->maHelpSettings = rSet.mpData->maHelpSettings; - nChangeFlags |= SETTINGS_HELP; + nChangeFlags |= AllSettingsFlags::MISC; } } - if ( nFlags & SETTINGS_LOCALE ) + if ( nFlags & AllSettingsFlags::LOCALE ) { if ( mpData->maLocale != rSet.mpData->maLocale ) { SetLanguageTag( rSet.mpData->maLocale ); - nChangeFlags |= SETTINGS_LOCALE; + nChangeFlags |= AllSettingsFlags::LOCALE; } } - if ( nFlags & SETTINGS_UILOCALE ) - { - // UILocale can't be changed - } - return nChangeFlags; } -sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const +AllSettingsFlags AllSettings::GetChangeFlags( const AllSettings& rSet ) const { - sal_uLong nChangeFlags = 0; - - if ( mpData->maMouseSettings != rSet.mpData->maMouseSettings ) - nChangeFlags |= SETTINGS_MOUSE; + AllSettingsFlags nChangeFlags = AllSettingsFlags::NONE; if ( mpData->maStyleSettings != rSet.mpData->maStyleSettings ) - nChangeFlags |= SETTINGS_STYLE; + nChangeFlags |= AllSettingsFlags::STYLE; if ( mpData->maMiscSettings != rSet.mpData->maMiscSettings ) - nChangeFlags |= SETTINGS_MISC; - - if ( mpData->maHelpSettings != rSet.mpData->maHelpSettings ) - nChangeFlags |= SETTINGS_HELP; + nChangeFlags |= AllSettingsFlags::MISC; if ( mpData->maLocale != rSet.mpData->maLocale ) - nChangeFlags |= SETTINGS_LOCALE; + nChangeFlags |= AllSettingsFlags::LOCALE; return nChangeFlags; } @@ -3076,7 +3045,7 @@ AllSettings::GetHelpSettings() const return mpData->maHelpSettings; } -sal_uLong +AllSettingsFlags AllSettings::GetWindowUpdate() const { return mpData->mnWindowUpdate; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 55cc90811299..c02f0a93a138 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -511,8 +511,8 @@ void Application::SetSettings( const AllSettings& rSettings ) } ResMgr::SetDefaultLocale( rSettings.GetUILanguageTag() ); *pSVData->maAppData.mpSettings = rSettings; - sal_uLong nChangeFlags = aOldSettings.GetChangeFlags( *pSVData->maAppData.mpSettings ); - if ( nChangeFlags ) + AllSettingsFlags nChangeFlags = aOldSettings.GetChangeFlags( *pSVData->maAppData.mpSettings ); + if ( bool(nChangeFlags) ) { DataChangedEvent aDCEvt( DataChangedEventType::SETTINGS, &aOldSettings, nChangeFlags ); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index a2ad12efd1c1..be4b464d0574 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1485,7 +1485,7 @@ void PushButton::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true, true ); Invalidate(); @@ -2600,7 +2600,7 @@ void RadioButton::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true, true ); Invalidate(); @@ -3534,7 +3534,7 @@ void CheckBox::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index d3998e2ffb82..44be889f717d 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -669,7 +669,7 @@ void ComboBox::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { if ( mpBtn ) { diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 9aefbd513f90..d525fe83992b 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2296,7 +2296,7 @@ void Edit::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { if ( !mpSubEdit ) { diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 874b2d90d770..23681d6a1c52 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -798,7 +798,7 @@ void NumericField::DataChanged( const DataChangedEvent& rDCEvt ) { SpinField::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); @@ -935,7 +935,7 @@ void NumericBox::DataChanged( const DataChangedEvent& rDCEvt ) { ComboBox::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); @@ -1681,7 +1681,7 @@ void MetricField::DataChanged( const DataChangedEvent& rDCEvt ) { SpinField::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); @@ -1782,7 +1782,7 @@ void MetricBox::DataChanged( const DataChangedEvent& rDCEvt ) { ComboBox::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); @@ -2012,7 +2012,7 @@ void CurrencyField::DataChanged( const DataChangedEvent& rDCEvt ) { SpinField::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); @@ -2094,7 +2094,7 @@ void CurrencyBox::DataChanged( const DataChangedEvent& rDCEvt ) { ComboBox::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { OUString sOldDecSep = ImplGetLocaleDataWrapper().getNumDecimalSep(); OUString sOldThSep = ImplGetLocaleDataWrapper().getNumThousandSep(); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 6cff1c002490..759b3f6b405e 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1794,9 +1794,9 @@ void DateField::DataChanged( const DataChangedEvent& rDCEvt ) { SpinField::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & (SETTINGS_LOCALE|SETTINGS_MISC)) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & (AllSettingsFlags::LOCALE|AllSettingsFlags::MISC)) ) { - if ( IsDefaultLocale() && ( rDCEvt.GetFlags() & SETTINGS_LOCALE ) ) + if ( IsDefaultLocale() && ( rDCEvt.GetFlags() & AllSettingsFlags::LOCALE ) ) ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); ReformatAll(); } @@ -1861,7 +1861,7 @@ void DateBox::DataChanged( const DataChangedEvent& rDCEvt ) { ComboBox::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { if ( IsDefaultLocale() ) ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); @@ -2574,7 +2574,7 @@ void TimeField::DataChanged( const DataChangedEvent& rDCEvt ) { SpinField::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { if ( IsDefaultLocale() ) ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); @@ -2704,7 +2704,7 @@ void TimeBox::DataChanged( const DataChangedEvent& rDCEvt ) { ComboBox::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_LOCALE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::LOCALE) ) { if ( IsDefaultLocale() ) ImplGetLocaleDataWrapper().setLanguageTag( GetSettings().GetLanguageTag() ); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 1f0bc50e0216..0f1bb2a7911d 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -329,7 +329,7 @@ void FixedText::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true, true ); Invalidate(); @@ -693,7 +693,7 @@ void FixedLine::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true, true ); Invalidate(); @@ -832,7 +832,7 @@ void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt ) Control::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); @@ -1020,7 +1020,7 @@ void FixedImage::DataChanged( const DataChangedEvent& rDCEvt ) Control::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 61d72a38aa1a..209bd14d9a9b 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -262,7 +262,7 @@ void GroupBox::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 0c0051ca7037..8b6af6a6f2ba 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2103,7 +2103,7 @@ void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplClearLayoutData(); ImplInitSettings( true, true, true ); diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 217d5ebea621..4b91eddf0d83 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -533,7 +533,7 @@ void ListBox::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { SetBackground(); // Due to a hack in Window::UpdateSettings the background must be reset // otherwise it will overpaint NWF drawn listboxes diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 07ce086184e7..d6443cd16515 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -210,7 +210,7 @@ void ProgressBar::StateChanged( StateChangedType nType ) void ProgressBar::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 5901a8dc85fd..98d753363f18 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1221,7 +1221,7 @@ void ScrollBar::DataChanged( const DataChangedEvent& rDCEvt ) Control::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { mbCalcSize = true; ImplCalc( false ); @@ -1489,7 +1489,7 @@ void ScrollBarBox::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 56fbd46c9059..4ef2adcb1ae2 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -876,7 +876,7 @@ void Slider::DataChanged( const DataChangedEvent& rDCEvt ) Control::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 1842f7a9b632..85aa37b07769 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -835,7 +835,7 @@ void SpinField::DataChanged( const DataChangedEvent& rDCEvt ) Edit::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { Resize(); Invalidate(); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index ec333e5f02b2..27f517990c7c 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1504,7 +1504,7 @@ void TabControl::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitSettings( true, true, true ); Invalidate(); diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 89e4933cd3ff..d27d72328780 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1286,7 +1286,7 @@ void VclMultiLineEdit::StateChanged( StateChangedType nType ) void VclMultiLineEdit::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings( true, true, true ); Resize(); diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index f771a15c683f..85dce0ffeb5b 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1988,7 +1988,7 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { if ( !mpWindowImpl->mbFrame || (GetStyle() & (WB_OWNERDRAWDECORATION | WB_POPUP)) ) UpdateView( true, ImplGetWindow()->GetOutputSizePixel() ); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index a403126f9c6c..90260bfc9827 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -655,7 +655,7 @@ void Dialog::DataChanged( const DataChangedEvent& rDCEvt ) SystemWindow::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 66c3681e8d17..0348709d34f4 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -99,7 +99,7 @@ void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitBackground( this ); Invalidate(); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 6bd629d36230..cdc6084511ba 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -765,7 +765,7 @@ void DockingWindow::StateChanged( StateChangedType nType ) void DockingWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 2bfc01e30ced..ed0e3c147535 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -556,7 +556,7 @@ void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt ) SystemWindow::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 0beffbaf7854..d051bea37b12 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -50,7 +50,7 @@ void DecoToolBox::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); - if ( rDCEvt.GetFlags() & SETTINGS_STYLE ) + if ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) { calcMinSize(); SetBackground(); @@ -1038,7 +1038,7 @@ void MenuBarWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitStyleSettings(); LayoutChanged(); diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index e1ee5f7a857a..36479605fdd5 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -1173,7 +1173,7 @@ void MenuFloatingWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { ImplInitMenuWindow( this, false, false ); Invalidate(); 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 ); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index b488d63978fc..ab313f9d6aa9 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2623,7 +2623,7 @@ void SplitWindow::StateChanged( StateChangedType nType ) void SplitWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 82c49d4b7bf6..0eebdbe737d6 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -851,7 +851,7 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) || (rDCEvt.GetType() == DataChangedEventType::FONTS ) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) - && (rDCEvt.GetFlags() & SETTINGS_STYLE ) + && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE ) ) ) { diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index b001bb4512ac..d55496412e2b 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -108,7 +108,7 @@ void TabPage::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { ImplInitSettings(); Invalidate(); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 1f7c694fbabf..4d2ff5fdcc90 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4455,7 +4455,7 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetType() == DataChangedEventType::FONTS) || (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) || ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) + (rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) ) { mbCalc = true; mbFormat = true; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index c4dc9afda607..0182a6c2b69e 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3689,7 +3689,7 @@ void Window::EnableNativeWidget( bool bEnable ) // send datachanged event to allow for internal changes required for NWF // like clipmode, transparency, etc. - DataChangedEvent aDCEvt( DataChangedEventType::SETTINGS, mxSettings.get(), SETTINGS_STYLE ); + DataChangedEvent aDCEvt( DataChangedEventType::SETTINGS, mxSettings.get(), AllSettingsFlags::STYLE ); DataChanged( aDCEvt ); // sometimes the borderwindow is queried, so keep it in sync |