diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-12 17:28:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-13 20:03:39 +0100 |
| commit | 0a83a11a5324333150dccd3faaeecbd2ec8d2aba (patch) | |
| tree | 09764685a202f20ea1161c8895023ab033c6296d | |
| parent | ofz#29461 flatten SetAttrSet recursion (diff) | |
| download | core-0a83a11a5324333150dccd3faaeecbd2ec8d2aba.tar.gz core-0a83a11a5324333150dccd3faaeecbd2ec8d2aba.zip | |
rename Ruler::GetType to drop using Window::GetType
Change-Id: I78da4bb35f5f3e7253737ddc3be1460fbf605ad8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110831
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/svtools/ruler.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/sdruler.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/ruler.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/svxruler.cxx | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 5c7cc2f6ba8c..27d52b220635 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -759,8 +759,7 @@ public: const RulerSelection& GetHoverSelection() const { return maHoverSelection; } - using Window::GetType; - RulerType GetType( const Point& rPos, sal_uInt16* pAryPos = nullptr ); + RulerType GetRulerType( const Point& rPos, sal_uInt16* pAryPos = nullptr ); void SetNullOffset( tools::Long nPos ); tools::Long GetNullOffset() const; diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index a3892acfd957..8490a05d2bd0 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -106,7 +106,7 @@ void Ruler::dispose() void Ruler::MouseButtonDown(const MouseEvent& rMEvt) { Point aMPos = rMEvt.GetPosPixel(); - RulerType eType = GetType(aMPos); + RulerType eType = GetRulerType(aMPos); if ( !pDrViewShell->GetView()->IsTextEdit() && rMEvt.IsLeft() && rMEvt.GetClicks() == 1 && diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 2caa18a0f3bc..170769684ba1 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2309,7 +2309,7 @@ void Ruler::CancelDrag() } } -RulerType Ruler::GetType( const Point& rPos, sal_uInt16* pAryPos ) +RulerType Ruler::GetRulerType( const Point& rPos, sal_uInt16* pAryPos ) { RulerSelection aHitTest; diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 55b575d4a4ca..d24de90e2a7a 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3297,7 +3297,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent ) bool bRTL = mxRulerImpl->pTextRTLItem && mxRulerImpl->pTextRTLItem->GetValue(); if ( !mpTabs.empty() && RulerType::Tab == - GetType( rCommandEvent.GetMousePosPixel(), &mxRulerImpl->nIdx ) && + GetRulerType( rCommandEvent.GetMousePosPixel(), &mxRulerImpl->nIdx ) && mpTabs[mxRulerImpl->nIdx + TAB_GAP].nStyle < RULER_TAB_DEFAULT ) { ScopedVclPtrInstance<PopupMenu> aMenu; |