diff options
| author | Krisztian Pinter <pin.terminator@gmail.com> | 2014-07-04 22:36:29 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2014-09-17 10:19:37 +0200 |
| commit | 9ab1a4a0306c81c282225f1ddcb5a1c4678e9311 (patch) | |
| tree | d57ace8a3b3303b62dcf2a868ec57312aec7c319 /svx | |
| parent | d262cf190069fe9bb369e05c9a63c27ea9515b0f (diff) | |
Fix variable and method names
Change-Id: I2f02dbeaa61e959d9420410100c6e958580a6567
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/colorwindow.hxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index a05556e5d831..46ff92eed05c 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -45,7 +45,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 05044cf4fb11..0e3d601403be 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1068,11 +1068,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); @@ -1148,14 +1148,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; } @@ -1180,7 +1180,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co { if (( nSID == SID_COLOR_TABLE ) && ( pState->ISA( SvxColorListItem ))) { - Update(); + UpdateGUI(); } else if ( SfxItemState::DEFAULT <= eState ) { @@ -2238,7 +2238,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( m_aCommandURL, - mrPaletteManager, + mPaletteManager, GetSlotId(), m_xFrame, SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ), @@ -2367,7 +2367,7 @@ SfxPopupWindow* SvxLineColorToolBoxControl::CreatePopupWindow() SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( m_aCommandURL, - mrPaletteManager, + mPaletteManager, GetSlotId(), m_xFrame, SVX_RESSTR( RID_SVXSTR_LINECOLOR ), |