include/svx/tbcontrl.hxx | 4 ++-- svx/source/tbxctrls/colorwindow.hxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit ac6e95225340d92157278f8908b29e7cc4348e08 Author: Krisztian Pinter <[email protected]> Date: Fri Jul 4 22:36:29 2014 +0200 Fix variable and method names Change-Id: I2f02dbeaa61e959d9420410100c6e958580a6567 diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 6d9975f..1e9c4b1 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -222,7 +222,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > pBtnUpdater; Color mLastColor; - PaletteManager mrPaletteManager; + PaletteManager mPaletteManager; DECL_LINK( SelectedHdl, Color* ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -243,7 +243,7 @@ class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl { ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > pBtnUpdater; Color mLastColor; - PaletteManager mrPaletteManager; + PaletteManager mPaletteManager; DECL_LINK( SelectedHdl, Color* ); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 5a700c7..3e19796 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -52,7 +52,7 @@ private: const sal_uInt16 nNavButtonHeight; PaletteManager& mrPaletteManager; - void Update(); + void UpdateGUI(); DECL_LINK( SelectHdl, void * ); DECL_LINK( StepLeftClickHdl, void * ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b94a3cf..d13d2ca 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1143,11 +1143,11 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, AddStatusListener( OUString( ".uno:ColorTableState" )); AddStatusListener( maCommand ); - Update(); + UpdateGUI(); } -void SvxColorWindow_Impl::Update() +void SvxColorWindow_Impl::UpdateGUI() { mrPaletteManager.ReloadColorSet(aColorSet); @@ -1223,14 +1223,14 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl) IMPL_LINK_NOARG(SvxColorWindow_Impl, StepLeftClickHdl) { mrPaletteManager.PrevPalette(); - Update(); + UpdateGUI(); return 0; } IMPL_LINK_NOARG(SvxColorWindow_Impl, StepRightClickHdl) { mrPaletteManager.NextPalette(); - Update(); + UpdateGUI(); return 0; } @@ -1255,7 +1255,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co { if (( nSID == SID_COLOR_TABLE ) && ( pState->ISA( SvxColorListItem ))) { - Update(); + UpdateGUI(); } else if ( SFX_ITEM_DEFAULT <= eState ) { @@ -2395,7 +2395,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( m_aCommandURL, - mrPaletteManager, + mPaletteManager, GetSlotId(), m_xFrame, SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ), @@ -2529,7 +2529,7 @@ SfxPopupWindow* SvxLineColorToolBoxControl::CreatePopupWindow() SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( m_aCommandURL, - mrPaletteManager, + mPaletteManager, GetSlotId(), m_xFrame, SVX_RESSTR( RID_SVXSTR_LINECOLOR ), _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
