summaryrefslogtreecommitdiff
path: root/framework
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 /framework
parenta5b5ad9f9306d868430ed9efd210b95c24a15161 (diff)
convert SETTINGS_ #defines to 'enum class'
and dump the ones that nothing is listening to Change-Id: I253ef284df785812a439dd160edba1b07fdbaac4
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx2
-rw-r--r--framework/source/uielement/statusbarmanager.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 53f8f065f369..28b743674415 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -469,7 +469,7 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
{
if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS ) ||
( pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY )) &&
- ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE ))
+ ( pDataChangedEvent->GetFlags() & AllSettingsFlags::STYLE ))
{
CheckAndUpdateImages();
}
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 44f189a140c3..8728f5b1df4d 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -556,7 +556,7 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt )
( rDCEvt.GetType() == DataChangedEventType::FONTS ) ||
( rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION ) ||
( rDCEvt.GetType() == DataChangedEventType::DISPLAY )) &&
- ( rDCEvt.GetFlags() & SETTINGS_STYLE ))
+ ( rDCEvt.GetFlags() & AllSettingsFlags::STYLE ))
{
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
css::uno::Reference< css::beans::XPropertySet > xPropSet( m_xFrame, css::uno::UNO_QUERY );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 3ef8de628af3..0cfc9099f467 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -2066,7 +2066,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent )
{
if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS ) ||
( pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY )) &&
- ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE ))
+ ( pDataChangedEvent->GetFlags() & AllSettingsFlags::STYLE ))
{
CheckAndUpdateImages();
}