diff options
| author | Krisztian Pinter <pin.terminator@gmail.com> | 2014-07-04 22:36:29 +0200 |
|---|---|---|
| committer | Krisztian Pinter <pin.terminator@gmail.com> | 2014-07-25 17:14:13 +0200 |
| commit | 455c6437b55a9de4478d0c9488b6d6a6368a43cd (patch) | |
| tree | c4e045c0a96d79f09492ddb06fa7a8a25e5f4a64 | |
| parent | 52df93992a904c2206906240131a297b8526a361 (diff) | |
Fix variable and method names
Change-Id: I2f02dbeaa61e959d9420410100c6e958580a6567
| -rw-r--r-- | include/svx/tbcontrl.hxx | 4 | ||||
| -rw-r--r-- | svx/source/tbxctrls/colorwindow.hxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 6d9975f46110..1e9c4b1e5a23 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 5a700c7297a8..3e19796ad8af 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 81f024ea87d7..e41370c49e17 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1084,11 +1084,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); @@ -1164,14 +1164,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; } @@ -1196,7 +1196,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 ) { @@ -2254,7 +2254,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( m_aCommandURL, - mrPaletteManager, + mPaletteManager, GetSlotId(), m_xFrame, SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ), @@ -2383,7 +2383,7 @@ SfxPopupWindow* SvxLineColorToolBoxControl::CreatePopupWindow() SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( m_aCommandURL, - mrPaletteManager, + mPaletteManager, GetSlotId(), m_xFrame, SVX_RESSTR( RID_SVXSTR_LINECOLOR ), |