diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/calendar.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/control/calendar.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/treelist/headbar.cxx | 8 |
3 files changed, 10 insertions, 11 deletions
diff --git a/vcl/inc/calendar.hxx b/vcl/inc/calendar.hxx index fe49ec69b0d0..8948220cce0a 100644 --- a/vcl/inc/calendar.hxx +++ b/vcl/inc/calendar.hxx @@ -166,8 +166,7 @@ class Calendar final : public Control virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; void ImplFormat(); - using Window::ImplHitTest; - sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const; + sal_uInt16 ImplDoHitTest( const Point& rPos, Date& rDate ) const; void ImplDrawSpin(vcl::RenderContext& rRenderContext); void ImplDrawDate(vcl::RenderContext& rRenderContext, tools::Long nX, tools::Long nY, sal_uInt16 nDay, sal_uInt16 nMonth, sal_Int16 nYear, diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index efcfc0c63800..7b8f9a061eb8 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -326,7 +326,7 @@ void Calendar::ImplFormat() mbFormat = false; } -sal_uInt16 Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const +sal_uInt16 Calendar::ImplDoHitTest( const Point& rPos, Date& rDate ) const { if ( mbFormat ) return 0; @@ -928,7 +928,7 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate ) void Calendar::ImplTracking( const Point& rPos, bool bRepeat ) { Date aTempDate = maCurDate; - sal_uInt16 nHitTest = ImplHitTest( rPos, aTempDate ); + sal_uInt16 nHitTest = ImplDoHitTest( rPos, aTempDate ); if ( mbSpinDown ) { @@ -1006,7 +1006,7 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.IsLeft() && !mbMenuDown ) { Date aTempDate = maCurDate; - sal_uInt16 nHitTest = ImplHitTest( rMEvt.GetPosPixel(), aTempDate ); + sal_uInt16 nHitTest = ImplDoHitTest( rMEvt.GetPosPixel(), aTempDate ); if ( nHitTest ) { if ( nHitTest & CALENDAR_HITTEST_MONTHTITLE ) @@ -1200,7 +1200,7 @@ void Calendar::Command( const CommandEvent& rCEvt ) if ( rCEvt.IsMouseEvent() ) { Date aTempDate = maCurDate; - sal_uInt16 nHitTest = ImplHitTest( rCEvt.GetMousePosPixel(), aTempDate ); + sal_uInt16 nHitTest = ImplDoHitTest( rCEvt.GetMousePosPixel(), aTempDate ); if ( nHitTest & CALENDAR_HITTEST_MONTHTITLE ) { ImplShowMenu( rCEvt.GetMousePosPixel(), aTempDate ); @@ -1369,7 +1369,7 @@ sal_uInt16 Calendar::GetMonthCount() const bool Calendar::GetDate( const Point& rPos, Date& rDate ) const { Date aDate = maCurDate; - sal_uInt16 nHitTest = ImplHitTest( rPos, aDate ); + sal_uInt16 nHitTest = ImplDoHitTest( rPos, aDate ); if ( nHitTest & CALENDAR_HITTEST_DAY ) { rDate = aDate; diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx index 2f75257f5625..882015e02a84 100644 --- a/vcl/source/treelist/headbar.cxx +++ b/vcl/source/treelist/headbar.cxx @@ -160,7 +160,7 @@ tools::Rectangle HeaderBar::ImplGetItemRect( sal_uInt16 nPos ) const return aRect; } -sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos, +sal_uInt16 HeaderBar::ImplDoHitTest( const Point& rPos, tools::Long& nMouseOff, sal_uInt16& nPos ) const { size_t nCount = static_cast<sal_uInt16>(mvItemList.size()); @@ -600,7 +600,7 @@ void HeaderBar::ImplUpdate(sal_uInt16 nPos, bool bEnd) void HeaderBar::ImplStartDrag( const Point& rMousePos, bool bCommand ) { sal_uInt16 nPos; - sal_uInt16 nHitTest = ImplHitTest( rMousePos, mnMouseOff, nPos ); + sal_uInt16 nHitTest = ImplDoHitTest( rMousePos, mnMouseOff, nPos ); if ( !nHitTest ) return; @@ -807,7 +807,7 @@ void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt ) { tools::Long nTemp; sal_uInt16 nPos; - sal_uInt16 nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp, nPos ); + sal_uInt16 nHitTest = ImplDoHitTest( rMEvt.GetPosPixel(), nTemp, nPos ); if ( nHitTest ) { auto& pItem = mvItemList[ nPos ]; @@ -830,7 +830,7 @@ void HeaderBar::MouseMove( const MouseEvent& rMEvt ) tools::Long nTemp1; sal_uInt16 nTemp2; PointerStyle eStyle = PointerStyle::Arrow; - sal_uInt16 nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp1, nTemp2 ); + sal_uInt16 nHitTest = ImplDoHitTest( rMEvt.GetPosPixel(), nTemp1, nTemp2 ); if ( nHitTest & HEAD_HITTEST_DIVIDER ) eStyle = PointerStyle::HSizeBar; |