diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-09 16:29:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-12 12:57:04 +0200 |
| commit | a5b5ad9f9306d868430ed9efd210b95c24a15161 (patch) | |
| tree | d028638ef38e1e7a062944923b0db1fd6f03d3f5 /framework | |
| parent | 4b8f1dc1c8635c412b4669101e8871fa0cf26ff9 (diff) | |
fdo#84938: replace DATACHANGED_ constants with 'enum class'
and drop DATACHANGED_DATETIME because no-one is using it
Change-Id: Id5ac9a7fbba0e35501ed82e5252f66858621f7ff
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/addonstoolbarmanager.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 8 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 467976dd2d7d..53f8f065f369 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -467,8 +467,8 @@ IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedT IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) { - if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || - ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && + if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS ) || + ( pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY )) && ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) { CheckAndUpdateImages(); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 23a630649cb2..44f189a140c3 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -552,10 +552,10 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt ) { SolarMutexClearableGuard aGuard; - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_FONTS ) || - ( rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + if ((( rDCEvt.GetType() == DataChangedEventType::SETTINGS ) || + ( rDCEvt.GetType() == DataChangedEventType::FONTS ) || + ( rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION ) || + ( rDCEvt.GetType() == DataChangedEventType::DISPLAY )) && ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 22ab0b10a373..3ef8de628af3 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -2064,8 +2064,8 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType ) IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) { - if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || - ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && + if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS ) || + ( pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY )) && ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) { CheckAndUpdateImages(); |