summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-12 12:55:32 +0200
committerNoel Grandin <noel@peralex.com>2015-01-12 12:57:05 +0200
commit5333782d090a9e147c0c431f0f741863d1d8cf8e (patch)
treeefff4a9394099568688559d52a36c8d9fe94ebd2 /cui/source
parenta5b5ad9f9306d868430ed9efd210b95c24a15161 (diff)
convert SETTINGS_ #defines to 'enum class'
and dump the ones that nothing is listening to Change-Id: I253ef284df785812a439dd160edba1b07fdbaac4
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/cfg.cxx2
-rw-r--r--cui/source/dialogs/iconcdlg.cxx2
-rw-r--r--cui/source/options/optcolor.cxx4
-rw-r--r--cui/source/options/personalization.cxx2
-rw-r--r--cui/source/tabpages/align.cxx2
-rw-r--r--cui/source/tabpages/backgrnd.cxx2
-rw-r--r--cui/source/tabpages/border.cxx2
-rw-r--r--cui/source/tabpages/labdlg.cxx2
-rw-r--r--cui/source/tabpages/numfmt.cxx2
-rw-r--r--cui/source/tabpages/tphatch.cxx2
-rw-r--r--cui/source/tabpages/tpline.cxx2
-rw-r--r--cui/source/tabpages/tplnedef.cxx2
-rw-r--r--cui/source/tabpages/tplneend.cxx2
13 files changed, 14 insertions, 14 deletions
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();