diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-12 12:55:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-12 12:57:05 +0200 |
commit | 5333782d090a9e147c0c431f0f741863d1d8cf8e (patch) | |
tree | efff4a9394099568688559d52a36c8d9fe94ebd2 /sc/source | |
parent | a5b5ad9f9306d868430ed9efd210b95c24a15161 (diff) |
convert SETTINGS_ #defines to 'enum class'
and dump the ones that nothing is listening to
Change-Id: I253ef284df785812a439dd160edba1b07fdbaac4
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/app/inputwin.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/dbgui/csvgrid.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/csvruler.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/csvtablebox.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/formdlg/privsplt.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/navipi/navipi.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tptable.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/olinewin.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/preview.cxx | 4 |
10 files changed, 15 insertions, 15 deletions
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 |