merged placeholder handles into one to avoid display errors due to pixel rounding in some zoom levels

3 files changed, 5 insertions, 4 deletions

diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 7255f933fd65..f96b650d2be4 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -55,6 +55,7 @@ class SdrHdlList;
 class SdrMarkView;
 class SdrObject;
 class SdrPageView;
+class MouseEvent;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -247,7 +248,7 @@ public:
 
     /** is called when the mouse enters the area of this handle. If the handle changes his
         visualisation during mouse over it must override this method and call Touch(). */
-    virtual void onMouseEnter();
+    virtual void onMouseEnter(const MouseEvent& rMEvt);
 
     /** is called when the mouse leaves the area of this handle. If the handle changes his
         visualisation during mouse over it must override this method and call Touch(). */
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 76b0e44a6b2f..47a04241e5bb 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -948,7 +948,7 @@ BOOL SdrHdl::IsFocusHdl() const
     }
 }
 
-void SdrHdl::onMouseEnter()
+void SdrHdl::onMouseEnter(const MouseEvent& /*rMEvt*/)
 {
 }
 
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 64c996e5843c..a15cf8c8b2ac 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1089,10 +1089,10 @@ BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
         }
 
         // notify current mouse over handle
-        if( pMouseOverHdl && !pMouseOverHdl->mbMouseOver )
+        if( pMouseOverHdl /* && !pMouseOverHdl->mbMouseOver */ )
         {
             pMouseOverHdl->mbMouseOver = true;
-            pMouseOverHdl->onMouseEnter();
+            pMouseOverHdl->onMouseEnter(rMEvt);
         }
     }
     return SdrSnapView::MouseMove(rMEvt, pWin);