summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-09 16:29:43 +0200
committerNoel Grandin <noel@peralex.com>2015-01-12 12:57:04 +0200
commita5b5ad9f9306d868430ed9efd210b95c24a15161 (patch)
treed028638ef38e1e7a062944923b0db1fd6f03d3f5 /sc
parent4b8f1dc1c8635c412b4669101e8871fa0cf26ff9 (diff)
fdo#84938: replace DATACHANGED_ constants with 'enum class'
and drop DATACHANGED_DATETIME because no-one is using it Change-Id: Id5ac9a7fbba0e35501ed82e5252f66858621f7ff
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/app/inputwin.cxx6
-rw-r--r--sc/source/ui/dbgui/csvgrid.cxx2
-rw-r--r--sc/source/ui/dbgui/csvruler.cxx2
-rw-r--r--sc/source/ui/dbgui/csvtablebox.cxx2
-rw-r--r--sc/source/ui/formdlg/privsplt.cxx2
-rw-r--r--sc/source/ui/navipi/navipi.cxx4
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx2
-rw-r--r--sc/source/ui/view/gridwin4.cxx14
-rw-r--r--sc/source/ui/view/olinewin.cxx2
-rw-r--r--sc/source/ui/view/preview.cxx14
10 files changed, 25 insertions, 25 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 937888eb757e..80296637bbd5 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() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
+ if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & SETTINGS_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( DATACHANGED_SETTINGS, NULL, SETTINGS_STYLE );
+ DataChangedEvent aFakeUpdate( DataChangedEventType::SETTINGS, NULL, SETTINGS_STYLE );
// this basically will trigger the reposititioning of the
// items in the toolbar from ImplFormat ( which is controlled by
@@ -2032,7 +2032,7 @@ void ScTextWnd::RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextDat
void ScTextWnd::DataChanged( const DataChangedEvent& rDCEvt )
{
- if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
+ if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
ImplInitSettings();
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 37a8f1e20ef4..78c9ea0175c6 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() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
+ if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
InitColors();
InitFonts();
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index ae6edcebd416..c04a7d46ecba 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() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
+ if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
InitColors();
Repaint();
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index c78aabaeab67..5deb5834d422 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() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
+ if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
InitControls();
ScCsvControl::DataChanged( rDCEvt );
}
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index 683d3d6285f0..e80a88b9c49d 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -391,7 +391,7 @@ void ScPrivatSplit::StateChanged( StateChangedType nType )
void ScPrivatSplit::DataChanged( const DataChangedEvent& rDCEvt )
{
- if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
+ if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
ImplInitSettings( true, true, true );
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index fc4fbbdf5ced..74be9381cc05 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() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
+ if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
// update item images
@@ -735,7 +735,7 @@ void ScNavigatorDlg::Paint( const Rectangle& rRect )
void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt )
{
- if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
+ if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & SETTINGS_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 591b324b7d23..8213ef96fade 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() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
+ if( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
ShowImage();
SfxTabPage::DataChanged( rDCEvt );
}
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 545e071d4086..860a48769c1d 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1526,17 +1526,17 @@ void ScGridWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged(rDCEvt);
- if ( (rDCEvt.GetType() == DATACHANGED_PRINTER) ||
- (rDCEvt.GetType() == DATACHANGED_DISPLAY) ||
- (rDCEvt.GetType() == DATACHANGED_FONTS) ||
- (rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION) ||
- ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
+ if ( (rDCEvt.GetType() == DataChangedEventType::PRINTER) ||
+ (rDCEvt.GetType() == DataChangedEventType::DISPLAY) ||
+ (rDCEvt.GetType() == DataChangedEventType::FONTS) ||
+ (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) ||
+ ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE)) )
{
- if ( rDCEvt.GetType() == DATACHANGED_FONTS && eWhich == pViewData->GetActivePart() )
+ if ( rDCEvt.GetType() == DataChangedEventType::FONTS && eWhich == pViewData->GetActivePart() )
pViewData->GetDocShell()->UpdateFontList();
- if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
+ if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_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 89ee877e3b7a..757d20092ba0 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -497,7 +497,7 @@ void ScOutlineWindow::Resize()
void ScOutlineWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
- if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
+ if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
InitSettings();
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index e7977eacfa29..1dadb1fbb3f3 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -933,21 +933,21 @@ void ScPreview::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged(rDCEvt);
- if ( (rDCEvt.GetType() == DATACHANGED_PRINTER) ||
- (rDCEvt.GetType() == DATACHANGED_DISPLAY) ||
- (rDCEvt.GetType() == DATACHANGED_FONTS) ||
- (rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION) ||
- ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
+ if ( (rDCEvt.GetType() == DataChangedEventType::PRINTER) ||
+ (rDCEvt.GetType() == DataChangedEventType::DISPLAY) ||
+ (rDCEvt.GetType() == DataChangedEventType::FONTS) ||
+ (rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) ||
+ ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE)) )
{
- if ( rDCEvt.GetType() == DATACHANGED_FONTS )
+ if ( rDCEvt.GetType() == DataChangedEventType::FONTS )
pDocShell->UpdateFontList();
// #i114518# Paint of form controls may modify the window's settings.
// Ignore the event if it is called from within Paint.
if ( !bInPaint )
{
- if ( rDCEvt.GetType() == DATACHANGED_SETTINGS &&
+ if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
// scroll bar size may have changed