From 5333782d090a9e147c0c431f0f741863d1d8cf8e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 12 Jan 2015 12:55:32 +0200 Subject: convert SETTINGS_ #defines to 'enum class' and dump the ones that nothing is listening to Change-Id: I253ef284df785812a439dd160edba1b07fdbaac4 --- framework/source/uielement/addonstoolbarmanager.cxx | 2 +- framework/source/uielement/statusbarmanager.cxx | 2 +- framework/source/uielement/toolbarmanager.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'framework/source') 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(); } -- cgit