summaryrefslogtreecommitdiff
path: root/svtools
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 /svtools
parenta5b5ad9f9306d868430ed9efd210b95c24a15161 (diff)
convert SETTINGS_ #defines to 'enum class'
and dump the ones that nothing is listening to Change-Id: I253ef284df785812a439dd160edba1b07fdbaac4
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/datwin.cxx2
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx2
-rw-r--r--svtools/source/config/colorcfg.cxx2
-rw-r--r--svtools/source/config/extcolorcfg.cxx2
-rw-r--r--svtools/source/contnr/ivctrl.cxx2
-rw-r--r--svtools/source/contnr/treelistbox.cxx2
-rw-r--r--svtools/source/control/calendar.cxx2
-rw-r--r--svtools/source/control/ctrlbox.cxx2
-rw-r--r--svtools/source/control/headbar.cxx2
-rw-r--r--svtools/source/control/hyperlabel.cxx2
-rw-r--r--svtools/source/control/roadmap.cxx4
-rw-r--r--svtools/source/control/ruler.cxx2
-rw-r--r--svtools/source/control/scrwin.cxx2
-rw-r--r--svtools/source/control/tabbar.cxx2
-rw-r--r--svtools/source/control/toolbarmenu.cxx2
-rw-r--r--svtools/source/control/valueset.cxx2
-rw-r--r--svtools/source/toolpanel/paneltabbar.cxx2
-rw-r--r--svtools/source/toolpanel/toolpaneldrawer.cxx2
18 files changed, 19 insertions, 19 deletions
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 ) );