From 455c6437b55a9de4478d0c9488b6d6a6368a43cd Mon Sep 17 00:00:00 2001
From: Krisztian Pinter <pin.terminator@gmail.com>
Date: Fri, 4 Jul 2014 22:36:29 +0200
Subject: Fix variable and method names

Change-Id: I2f02dbeaa61e959d9420410100c6e958580a6567
---
 svx/source/tbxctrls/colorwindow.hxx |  2 +-
 svx/source/tbxctrls/tbcontrl.cxx    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'svx/source/tbxctrls')

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 ),
-- 
cgit v1.2.3