On Wed, 2010-12-22 at 12:39 -0500, Kohei Yoshida wrote: > I just fixed this bug > > https://bugs.freedesktop.org/show_bug.cgi?id=32572 > > which originally came from Caolan. > > The fix is committed on master, but I think we can apply this to 3.3 > branch as well. > > I feel confident that this change won't introduce any regressions. > Could someone review this and give me a sign-off?
Here is the patch (that consists of two commits on master) that I'd like to port to 3.3. -- Kohei Yoshida, LibreOffice hacker, Calc <kyosh...@novell.com>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 0d32bae..5481822 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4298,6 +4298,23 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) SCsROW nPosY; pViewData->GetPosFromPixel( rPosPixel.X(), rPosPixel.Y(), eWhich, nPosX, nPosY ); + // If the mouse down was inside a visible note window, ignore it and + // leave it up to the ScPostIt to handle it + SdrView* pDrawView = pViewData->GetViewShell()->GetSdrView(); + if (pDrawView) + { + ULONG nCount = pDrawView->GetMarkedObjectCount(); + for (ULONG i = 0; i < nCount; ++i) + { + SdrObject* pObj = pDrawView->GetMarkedObjectByIndex(i); + if (pObj && pObj->GetLogicRect().IsInside(aLogicPos)) + { + // Inside an active drawing object. Bail out. + return; + } + } + } + ScSelectionTransferObj* pOwnSelection = SC_MOD()->GetSelectionTransfer(); if ( pOwnSelection ) {
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice