1 files changed, 8 insertions, 34 deletions
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index b3d2c8db4df6..60ab7eb0ed2d 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -209,7 +209,6 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt )
     if( ( rHEvt.GetMode() & HelpEventMode::QUICK ) &&
         m_pWindowController )
     {
-//         Point aLogicHitPos = PixelToLogic( rHEvt.GetMousePosPixel()); // old chart: GetPointerPosPixel()
         Point aLogicHitPos = PixelToLogic( GetPointerPosPixel());
         OUString aQuickHelpText;
         awt::Rectangle aHelpRect;
@@ -218,12 +217,14 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt )
 
         if( bHelpHandled )
         {
+            tools::Rectangle aPixelRect(LogicToPixel(lcl_AWTRectToVCLRect(aHelpRect)));
+            tools::Rectangle aScreenRect(OutputToScreenPixel(aPixelRect.TopLeft()),
+                                         OutputToScreenPixel(aPixelRect.BottomRight()));
+
             if( bIsBalloonHelp )
-                Help::ShowBalloon(
-                    this, rHEvt.GetMousePosPixel(), lcl_AWTRectToVCLRect( aHelpRect ), aQuickHelpText );
+                Help::ShowBalloon(this, rHEvt.GetMousePosPixel(), aScreenRect, aQuickHelpText);
             else
-                Help::ShowQuickHelp(
-                    this, lcl_AWTRectToVCLRect( aHelpRect ), aQuickHelpText );
+                Help::ShowQuickHelp(this, aScreenRect, aQuickHelpText);
         }
     }
 
@@ -231,21 +232,6 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt )
         vcl::Window::RequestHelp( rHEvt );
 }
 
-void ChartWindow::LogicMouseButtonDown(const MouseEvent& rEvent)
-{
-    MouseButtonDown(rEvent);
-}
-
-void ChartWindow::LogicMouseButtonUp(const MouseEvent& rEvent)
-{
-    MouseButtonUp(rEvent);
-}
-
-void ChartWindow::LogicMouseMove(const MouseEvent& rEvent)
-{
-    MouseMove(rEvent);
-}
-
 void ChartWindow::adjustHighContrastMode()
 {
     static const DrawModeFlags nContrastMode =
@@ -260,23 +246,11 @@ void ChartWindow::ForceInvalidate()
 {
     vcl::Window::Invalidate();
 }
-void ChartWindow::Invalidate( InvalidateFlags nFlags )
-{
-    if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
-        return;
-    vcl::Window::Invalidate( nFlags );
-}
-void ChartWindow::Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags )
-{
-    if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
-        return;
-    vcl::Window::Invalidate( rRect, nFlags );
-}
-void ChartWindow::Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags )
+void ChartWindow::ImplInvalidate( const vcl::Region* rRegion, InvalidateFlags nFlags )
 {
     if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
         return;
-    vcl::Window::Invalidate( rRegion, nFlags );
+    vcl::Window::ImplInvalidate( rRegion, nFlags );
 }
 
 void ChartWindow::LogicInvalidate(const tools::Rectangle* pRectangle)