From 7715f7e6b941a5b4bcde326c77647cd00c647a0b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 19 Dec 2013 12:01:58 +0000
Subject: CID#703891 RubyDialog::GetText orthogonal to Dialog::GetText

Change-Id: I131daae13b11b5242e9a32a94532463f6e0d925b
---
 include/svx/rubydialog.hxx       | 13 +++++--------
 svx/source/dialog/rubydialog.cxx | 16 ++++++++--------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index e8cf275ab7aa..0afca8cf2625 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -87,9 +87,6 @@ public:
 
 class SvxRubyDialog : public SfxModelessDialog
 {
-    using Dialog::SetText;
-    using Dialog::GetText;
-
     friend class RubyPreview;
 
     FixedText*          m_pLeftFT;
@@ -123,7 +120,7 @@ class SvxRubyDialog : public SfxModelessDialog
     long                nLastPos;
     long                nCurrentEdit;
 
-    sal_Bool                bModified;
+    sal_Bool            bModified;
 
     com::sun::star::uno::Reference<com::sun::star::view::XSelectionChangeListener> xImpl;
     SfxBindings*    pBindings;
@@ -140,18 +137,18 @@ class SvxRubyDialog : public SfxModelessDialog
     DECL_LINK(EditScrollHdl_Impl, sal_Int32*);
     DECL_LINK(EditJumpHdl_Impl, sal_Int32*);
 
-    void                SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight);
-    void                GetText();
+    void                SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight);
+    void                GetRubyText();
     void                ClearCharStyleList();
     void                AssertOneEntry();
 
     void                Update();
-    virtual sal_Bool        Close();
+    virtual sal_Bool    Close();
 
     long                GetLastPos() const {return nLastPos;}
     void                SetLastPos(long nSet) {nLastPos = nSet;}
 
-    sal_Bool                IsModified() const {return bModified;}
+    sal_Bool            IsModified() const {return bModified;}
     void                SetModified(sal_Bool bSet) {bModified = bSet;}
 
     void EnableControls(bool bEnable);
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index cb6db3cdb09f..2e113dc5d8b0 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -373,7 +373,7 @@ void    SvxRubyDialog::Deactivate()
     SfxModelessDialog::Deactivate();
 }
 
-void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
+void SvxRubyDialog::SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
 {
     OUString sLeft, sRight;
     const Sequence<PropertyValues>&  aRubyValues = pImpl->GetRubyValues();
@@ -400,7 +400,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
     rRight.SaveValue();
 }
 //-----------------------------------------------------------------------------
-void SvxRubyDialog::GetText()
+void SvxRubyDialog::GetRubyText()
 {
     long nTempLastPos = GetLastPos();
     for(int i = 0; i < 8; i+=2)
@@ -515,12 +515,12 @@ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll)
     long nPos = pScroll->GetThumbPos();
     if(GetLastPos() != nPos)
     {
-        GetText();
+        GetRubyText();
     }
-    SetText(nPos++, *m_pLeft1ED, *m_pRight1ED);
-    SetText(nPos++, *m_pLeft2ED, *m_pRight2ED);
-    SetText(nPos++, *m_pLeft3ED, *m_pRight3ED);
-    SetText(nPos, *m_pLeft4ED, *m_pRight4ED);
+    SetRubyText(nPos++, *m_pLeft1ED, *m_pRight1ED);
+    SetRubyText(nPos++, *m_pLeft2ED, *m_pRight2ED);
+    SetRubyText(nPos++, *m_pLeft3ED, *m_pRight3ED);
+    SetRubyText(nPos, *m_pLeft4ED, *m_pRight4ED);
     SetLastPos(nPos - 3);
     m_pPreviewWin->Invalidate();
     return 0;
@@ -536,7 +536,7 @@ IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl)
         AdjustHdl_Impl(m_pAdjustLB);
         CharStyleHdl_Impl(m_pCharStyleLB);
     }
-    GetText();
+    GetRubyText();
     //reset all edit fields - SaveValue is called
     ScrollHdl_Impl(m_pScrollSB);
 
-- 
cgit