summaryrefslogtreecommitdiff
path: root/sw
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 /sw
parenta5b5ad9f9306d868430ed9efd210b95c24a15161 (diff)
convert SETTINGS_ #defines to 'enum class'
and dump the ones that nothing is listening to Change-Id: I253ef284df785812a439dd160edba1b07fdbaac4
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/config/optpage.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin3.cxx2
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx4
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx2
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx2
-rw-r--r--sw/source/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/uibase/utlui/content.cxx2
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/uibase/utlui/navipi.cxx2
11 files changed, 12 insertions, 12 deletions
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();