[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/ui/view/gridwin.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 7d30f57b73c3b6658bc9a4d86ddc2610848ce3e9
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Dec 22 12:45:47 2010 -0500

    Actually the object doesn't have to be a cell note.
    
    The same problem happens even when the object is not a cell note,
    but, say, a regular text box.  Let's not check whether or not the
    object is a cell note.

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6826829..5481822 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4307,13 +4307,10 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel )
         for (ULONG i = 0; i < nCount; ++i)
         {
             SdrObject* pObj = pDrawView->GetMarkedObjectByIndex(i);
-            if (pObj && ScDrawLayer::IsNoteCaption(pObj))
+            if (pObj && pObj->GetLogicRect().IsInside(aLogicPos))
             {
-                if (pObj->GetLogicRect().IsInside(aLogicPos))
-                {
-                    // Inside an active note object.  Bail out.
-                    return;
-                }
+                // Inside an active drawing object.  Bail out.
+                return;
             }
         }
     }