[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/uibase/inc/workctrl.hxx    |    4 +---
 sw/source/uibase/ribbar/workctrl.cxx |    6 +++---
 sw/source/uibase/utlui/navipi.cxx    |    4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit f7f312304ce716026d67ad555ad9a6fc491fa330
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 20 15:14:46 2016 +0000

    just give different things different names
    
    Change-Id: I7d9ca3812b1af35e6155ff269ee88cf4101de14b

diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index ba259bf..8e74863 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -96,8 +96,6 @@ class SwScrollNaviPopup : public SfxPopupWindow
 
     void            ApplyImageList();
 
-    using Window::GetQuickHelpText;
-
 protected:
         DECL_LINK(SelectHdl, ToolBox*, void);
         virtual void        DataChanged( const DataChangedEvent& rDCEvt ) override;
@@ -107,7 +105,7 @@ public:
     virtual ~SwScrollNaviPopup() override;
     virtual void dispose() override;
 
-    static OUString         GetQuickHelpText(bool bNext);
+    static OUString     GetToolTip(bool bNext);
 
     void                GrabFocus() { m_pToolBox->GrabFocus(); }
 };
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 5b05a35..9258bc0 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -337,12 +337,12 @@ void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
 
 void  SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
 {
-    SetItemText(NID_NEXT, SwScrollNaviPopup::GetQuickHelpText(true));
-    SetItemText(NID_PREV, SwScrollNaviPopup::GetQuickHelpText(false));
+    SetItemText(NID_NEXT, SwScrollNaviPopup::GetToolTip(true));
+    SetItemText(NID_PREV, SwScrollNaviPopup::GetToolTip(false));
     ToolBox::RequestHelp( rHEvt );
 }
 
-OUString SwScrollNaviPopup::GetQuickHelpText(bool bNext)
+OUString SwScrollNaviPopup::GetToolTip(bool bNext)
 {
     sal_uInt16 nResId = STR_IMGBTN_START;
     nResId += SwView::GetMoveType() - NID_START;
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 5dcd827..7ca4a7a 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -441,9 +441,9 @@ void SwNavHelpToolBox::RequestHelp(const HelpEvent& rHEvt)
     const sal_uInt16 nItemId = GetItemId(ScreenToOutputPixel(rHEvt.GetMousePosPixel()));
     const OUString sCommand(GetItemCommand(nItemId));
     if (sCommand == "back")
-        SetQuickHelpText(nItemId, SwScrollNaviPopup::GetQuickHelpText(false));
+        SetQuickHelpText(nItemId, SwScrollNaviPopup::GetToolTip(false));
     else if (sCommand == "forward")
-        SetQuickHelpText(nItemId, SwScrollNaviPopup::GetQuickHelpText(true));
+        SetQuickHelpText(nItemId, SwScrollNaviPopup::GetToolTip(true));
     ToolBox::RequestHelp(rHEvt);
 }