From 8fca0c44e8f21fa2ee1000665856292d5a1c44e9 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 5 May 2015 13:46:44 +0200 Subject: vcl: rename other members of StateChangedType for consistency Change-Id: Ifd3339813e5d3dfb54566fd226aaf2d2a199d59a --- framework/source/uielement/addonstoolbarmanager.cxx | 2 +- framework/source/uielement/toolbarmanager.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'framework') diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index a5f76ecc5696..3c2c716a8c59 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -458,7 +458,7 @@ IMPL_LINK_NOARG(AddonsToolBarManager, Deactivate) IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedType ) { - if ( *pStateChangedType == StateChangedType::CONTROLBACKGROUND ) + if ( *pStateChangedType == StateChangedType::ControlBackground ) { CheckAndUpdateImages(); } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 5a57484d259f..7913c8d68845 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -2044,18 +2044,18 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType ) if ( m_bDisposed ) return 1; - if ( *pStateChangedType == StateChangedType::CONTROLBACKGROUND ) + if ( *pStateChangedType == StateChangedType::ControlBackground ) { CheckAndUpdateImages(); } - else if ( *pStateChangedType == StateChangedType::VISIBLE ) + else if ( *pStateChangedType == StateChangedType::Visible ) { if ( m_pToolBar->IsReallyVisible() ) { m_aAsyncUpdateControllersTimer.Start(); } } - else if ( *pStateChangedType == StateChangedType::INITSHOW ) + else if ( *pStateChangedType == StateChangedType::InitShow ) { m_aAsyncUpdateControllersTimer.Start(); } -- cgit