CWS-TOOLING: integrate CWS aw065

2009-06-17 13:48:12 +0200 aw  r273068 : #99385# corrected small error in SCs selection visualisation
2009-06-16 15:45:28 +0200 wg  r273021 : i102838
2009-06-16 12:46:07 +0200 wg  r273016 : i102833
2009-06-11 17:40:29 +0200 aw  r272895 : #i98870# added implementation for getPageCount helper
2009-06-11 16:39:54 +0200 aw  r272885 : #i102663#, #i102667#, #i98870# incluide file typo corrected
2009-06-11 16:24:07 +0200 aw  r272881 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added
2009-06-11 16:23:52 +0200 aw  r272880 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added
2009-06-09 13:50:29 +0200 aw  r272769 : #i98917# added support for the OverlayHatchRectanglePrimitive to follow rotation with it's hatch; simplified OverlayHatchRect
2009-06-09 13:04:06 +0200 aw  r272766 : #i98870# re-added PageNumber identification in SdrTextPrimitive2D::get2DDecomposition
2009-06-08 18:56:05 +0200 aw  r272744 : #i99385# added some last corrections to OverlayObjects in SD (had to do some merges on resync, needed to optically check and correct)
2009-06-08 11:17:57 +0200 aw  r272725 : cws aw065: corrections after resync
2009-06-08 11:02:25 +0200 aw  r272723 : cws aw065: corrections after resync
2009-06-08 10:36:22 +0200 aw  r272722 : cws aw065: corrections after resync
2009-06-05 18:57:06 +0200 aw  r272712 : CWS-TOOLING: rebase CWS aw065 to trunk@272291 (milestone: DEV300:m49)
2009-06-05 14:56:34 +0200 aw  r272690 : #i89784# stripped old stuff no longer needed due to text-to-polygon conversion using primitives
2009-06-05 14:50:07 +0200 aw  r272688 : #102091# removed on-model-lock suppression for SdrObject::ActionChanged()
2009-06-05 14:47:29 +0200 aw  r272687 : #102091# corrected local value buffering in ScenePrimitive2D::get2DDecomposition
2009-06-03 17:53:32 +0200 aw  r272599 : #i89784# version before stripping
2009-06-03 17:52:18 +0200 aw  r272598 : #i89784# version before stripping
2009-05-28 17:15:47 +0200 aw  r272420 : #i101872# old stuff removed/stripped
2009-05-28 17:15:32 +0200 aw  r272419 : #i101872# old stuff removed/stripped
2009-05-28 17:15:15 +0200 aw  r272418 : #i101872# old stuff removed/stripped
2009-05-28 17:14:45 +0200 aw  r272417 : #i101872# old stuff removed/stripped
2009-05-28 12:13:56 +0200 aw  r272396 : #i101872# stable hybrid state
2009-05-28 12:13:46 +0200 aw  r272395 : #i101872# stable hybrid state
2009-05-28 12:13:35 +0200 aw  r272394 : #i101872# stable hybrid state
2009-05-28 12:13:20 +0200 aw  r272393 : #i101872# stable hybrid state
2009-05-28 12:13:05 +0200 aw  r272392 : #i101872# stable hybrid state
2009-05-28 12:12:51 +0200 aw  r272391 : #i101872# stable hybrid state
2009-05-15 16:56:02 +0200 aw  r271952 : #i101872# HitTest unifications
2009-05-15 16:55:22 +0200 aw  r271951 : #i101872# HitTest unifications
2009-05-15 16:55:12 +0200 aw  r271950 : #i101872# HitTest unifications
2009-05-15 16:55:01 +0200 aw  r271949 : #i101872# HitTest unifications
2009-05-15 16:54:51 +0200 aw  r271948 : #i101872# HitTest unifications
2009-05-15 16:54:35 +0200 aw  r271947 : #i101872# HitTest unifications
2009-05-15 16:54:22 +0200 aw  r271946 : #i101872# HitTest unifications
2009-05-12 19:08:38 +0200 aw  r271834 : #i101684# corrected AutoShape's preparation of text transformation due to different definitions in TextBounds
2009-05-12 15:44:49 +0200 aw  r271827 : #i89784# expanded TextLayouterDevice::getTextOutlines() to support DXArray and X-Font scaling
2009-05-11 19:40:40 +0200 aw  r271790 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
2009-05-11 19:40:25 +0200 aw  r271789 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
2009-05-11 19:40:12 +0200 aw  r271788 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
2009-05-11 13:01:53 +0200 aw  r271765 : #i99385# corrections and optimizations
2009-05-08 14:48:40 +0200 aw  r271718 : #i1016180# added optimizations in model operations when model is locked
2009-05-08 14:11:45 +0200 aw  r271716 : #i101679# added flush() calls to OverlayManager when interaction step is prepared
2009-05-07 17:44:03 +0200 aw  r271689 : #i99385# last corrections/changes
2009-05-07 17:43:47 +0200 aw  r271688 : #i99385# last corrections/changes
2009-05-07 13:20:09 +0200 aw  r271654 : #i99385# added changes from WFH
2009-05-07 13:19:38 +0200 aw  r271653 : #i99385# added changes from WFH
2009-05-07 13:19:11 +0200 aw  r271652 : #i99385# added changes from WFH
2009-05-07 11:33:17 +0200 aw  r271643 : #i99385# corrections after resync
2009-05-07 11:17:31 +0200 aw  r271642 : #i99385# corrections after resync
2009-05-06 18:46:53 +0200 aw  r271609 : CWS-TOOLING: rebase CWS aw065 to trunk@271427 (milestone: DEV300:m47)
2009-05-05 18:24:03 +0200 aw  r271548 : #i101443# force new text decomposition when TextBackgroundColor has changed
2009-05-05 17:44:42 +0200 aw  r271542 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 17:44:32 +0200 aw  r271541 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 17:44:20 +0200 aw  r271540 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 17:44:09 +0200 aw  r271539 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 15:48:38 +0200 aw  r271527 : #i99385# 2nd round, usages checked and corrected
2009-05-05 15:48:15 +0200 aw  r271526 : #i99385# 2nd round, usages checked and corrected
2009-05-05 15:48:03 +0200 aw  r271525 : #i99385# 2nd round, usages checked and corrected
2009-05-05 15:47:51 +0200 aw  r271524 : #i99385# 2nd round, usages checked and corrected
2009-04-27 18:33:10 +0200 aw  r271300 : #i99385# state commit after all implementations are done
2009-04-27 15:36:53 +0200 aw  r271283 : #i99385# state commit after all implementations are done
2009-04-27 15:27:49 +0200 aw  r271280 : #i99385# state commit after all implementations are done
2009-04-27 15:27:33 +0200 aw  r271279 : #i99385# state commit after all implementations are done
2009-04-27 15:27:00 +0200 aw  r271278 : #i99385# state commit after all implementations are done
2009-04-27 15:26:15 +0200 aw  r271277 : #i99385# state commit after all implementations are done
2009-04-27 15:25:40 +0200 aw  r271275 : #i99385# state commit after all implementations are done
2009-04-27 15:25:19 +0200 aw  r271274 : #i99385# state commit after all implementations are done
2009-04-27 15:24:00 +0200 aw  r271272 : #i99385# state commit after all implementations are done
2009-03-19 17:12:00 +0100 aw  r269757 : #i100360# corrected bitmap's PefSize calculation for bitmap filled objects when Bitmap is Pixel-based on it's mapping
2009-02-19 17:09:47 +0100 aw  r268298 : #i98917# corrected attributes
2009-02-19 17:09:30 +0100 aw  r268297 : #i98917# corrected attributes
2009-02-19 17:08:22 +0100 aw  r268296 : #i98917# corrected attributes
2009-02-19 11:56:25 +0100 aw  r268268 : #i98870# added extra code to react on PageNumber change
2009-02-18 16:57:24 +0100 aw  r268243 : #i98917# in OverlayHatchRect::getGeometry the rotation was not applied to the TopLeft of the centered rectangle, but to the already extended one, thus the visualisation was rotating around the wrong edge

3 files changed, 190 insertions, 96 deletions

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index e75670aa9525..6737517c48c3 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2576,16 +2576,6 @@ void SwDrawVirtObj::RecalcBoundRect()
     aOutRect = ReferencedObj().GetCurrentBoundRect() + aOffset;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-
-SdrObject* SwDrawVirtObj::CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const
-{
-    Point aPnt(rPnt - GetOffset());
-    BOOL bRet = rRefObj.CheckHit(aPnt, nTol, pVisiLayer) != NULL;
-
-    return bRet ? (SdrObject*)this : NULL;
-}
-
 basegfx::B2DPolyPolygon SwDrawVirtObj::TakeXorPoly() const
 {
     basegfx::B2DPolyPolygon aRetval(rRefObj.TakeXorPoly());
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 768cae90ce0a..15ca46ca2456 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -72,6 +72,9 @@ using namespace ::com::sun::star;
 #include <svx/sdr/contact/viewcontactofvirtobj.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <sw_primitivetypes2d.hxx>
+#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
+#include <drawinglayer/primitive2d/hittestprimitive2d.hxx>
 
 using namespace ::com::sun::star;
 
@@ -189,10 +192,6 @@ UINT16 __EXPORT SwFlyDrawObj::GetObjVersion() const
 //////////////////////////////////////////////////////////////////////////////////////
 // AW: Need own primitive to get the FlyFrame paint working
 
-// Unique PrimitiveID. If more will be needed, create an own file in SW following
-// the example in SD
-#define PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D                      (PRIMITIVE2D_ID_RANGE_SW| 0)
-
 namespace drawinglayer
 {
     namespace primitive2d
@@ -201,15 +200,19 @@ namespace drawinglayer
         {
         private:
             const SwVirtFlyDrawObj&                 mrSwVirtFlyDrawObj;
+            const basegfx::B2DRange                 maOuterRange;
 
         protected:
             // method which is to be used to implement the local decomposition of a 2D primitive
             virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
 
         public:
-            SwVirtFlyDrawObjPrimitive(const SwVirtFlyDrawObj& rSwVirtFlyDrawObj)
+            SwVirtFlyDrawObjPrimitive(
+                const SwVirtFlyDrawObj& rSwVirtFlyDrawObj,
+                const basegfx::B2DRange &rOuterRange)
             :   BasePrimitive2D(),
-                mrSwVirtFlyDrawObj(rSwVirtFlyDrawObj)
+                mrSwVirtFlyDrawObj(rSwVirtFlyDrawObj),
+                maOuterRange(rOuterRange)
             {
             }
 
@@ -219,6 +222,13 @@ namespace drawinglayer
             // get range
             virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const;
 
+            // overloaded to allow callbacks to wrap_DoPaintObject
+            virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+
+            // data read access
+            const SwVirtFlyDrawObj& getSwVirtFlyDrawObj() const { return mrSwVirtFlyDrawObj; }
+            const basegfx::B2DRange& getOuterRange() const { return maOuterRange; }
+
             // provide unique ID
             DeclPrimitrive2DIDBlock()
         };
@@ -229,13 +239,42 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
+        Primitive2DSequence SwVirtFlyDrawObjPrimitive::createLocalDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+        {
+            Primitive2DSequence aRetval;
+
+            if(!getOuterRange().isEmpty())
+            {
+                // currently this SW object has no primitive representation. As long as this is the case,
+                // create an invisible HitTestPrimitive to allow hitting the object. Use a filled primitive
+                // to get a HitTest which uses 'inside' as default object hit. The special cases from
+                // the old SwVirtFlyDrawObj::CheckHit implementation are handled now in SwDrawView::PickObj;
+                // this removed the 'hack' to get a view from inside model data or to react on noll-tolerance
+                // as it was done in the old implementation
+                const basegfx::B2DPolygon aOuterRangePolygon(basegfx::tools::createPolygonFromRect(getOuterRange()));
+                const basegfx::BColor aColor(0.0, 0.0, 0.0);
+                const Primitive2DReference aContentReference(
+                    new PolyPolygonColorPrimitive2D(
+                        basegfx::B2DPolyPolygon(aOuterRangePolygon),
+                        aColor));
+                const Primitive2DReference aHitTestReference(
+                    new HitTestPrimitive2D(
+                        Primitive2DSequence(&aContentReference, 1)));
+
+                aRetval = Primitive2DSequence(&aHitTestReference, 1);
+            }
+
+            return aRetval;
+        }
+
         bool SwVirtFlyDrawObjPrimitive::operator==(const BasePrimitive2D& rPrimitive) const
         {
             if(BasePrimitive2D::operator==(rPrimitive))
             {
                 const SwVirtFlyDrawObjPrimitive& rCompare = (SwVirtFlyDrawObjPrimitive&)rPrimitive;
 
-                return (&mrSwVirtFlyDrawObj == &rCompare.mrSwVirtFlyDrawObj);
+                return (&getSwVirtFlyDrawObj() == &rCompare.getSwVirtFlyDrawObj()
+                    && getOuterRange() == rCompare.getOuterRange());
             }
 
             return false;
@@ -243,23 +282,20 @@ namespace drawinglayer
 
         basegfx::B2DRange SwVirtFlyDrawObjPrimitive::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const
         {
-            // fallback on FlyFrame SnapRect
-            const Rectangle& rSnapRect = mrSwVirtFlyDrawObj.GetSnapRect();
-
-            return basegfx::B2DRange(rSnapRect.Left(), rSnapRect.Top(), rSnapRect.Right(), rSnapRect.Bottom());
+            return getOuterRange();
         }
 
-        Primitive2DSequence SwVirtFlyDrawObjPrimitive::createLocalDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+        Primitive2DSequence SwVirtFlyDrawObjPrimitive::get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const
         {
             // This is the callback to keep the FlyFrame painting in SW alive as long as it
             // is not changed to primitives. This is the method which will be called by the processors
             // when they do not know this primitive (and they do not). Inside wrap_DoPaintObject
             // there needs to be a test that paint is only done during SW repaints (see there).
             // Using this mechanism guarantees the correct Z-Order of the VirtualObject-based FlyFrames.
-            mrSwVirtFlyDrawObj.wrap_DoPaintObject();
+            getSwVirtFlyDrawObj().wrap_DoPaintObject();
 
             // call parent
-            return BasePrimitive2D::createLocalDecomposition(rViewInformation);
+            return BasePrimitive2D::get2DDecomposition(rViewInformation);
         }
 
         // provide unique ID
@@ -313,10 +349,19 @@ namespace sdr
 
             if(rReferencedObject.ISA(SwFlyDrawObj))
             {
-                // create an own specialized primitive which is used as repaint callpoint (see primitive
-                // implementation above)
-                const drawinglayer::primitive2d::Primitive2DReference xPrimitive(new drawinglayer::primitive2d::SwVirtFlyDrawObjPrimitive(GetSwVirtFlyDrawObj()));
-                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xPrimitive, 1);
+                // create an own specialized primitive which is used as repaint callpoint and HitTest
+                // for HitTest processor (see primitive implementation above)
+                const basegfx::B2DRange aOuterRange(GetSwVirtFlyDrawObj().getOuterBound());
+
+                if(!aOuterRange.isEmpty())
+                {
+                    const drawinglayer::primitive2d::Primitive2DReference xPrimitive(
+                        new drawinglayer::primitive2d::SwVirtFlyDrawObjPrimitive(
+                            GetSwVirtFlyDrawObj(),
+                            aOuterRange));
+
+                    xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xPrimitive, 1);
+                }
             }
 
             return xRetval;
@@ -330,6 +375,58 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////////////
 
+basegfx::B2DRange SwVirtFlyDrawObj::getOuterBound() const
+{
+    basegfx::B2DRange aOuterRange;
+    const SdrObject& rReferencedObject = GetReferencedObj();
+
+    if(rReferencedObject.ISA(SwFlyDrawObj))
+    {
+        const SwFlyFrm* pFlyFrame = GetFlyFrm();
+
+        if(pFlyFrame)
+        {
+            const Rectangle aOuterRectangle(pFlyFrame->Frm().Pos(), pFlyFrame->Frm().SSize());
+
+            if(!aOuterRectangle.IsEmpty()
+                && RECT_EMPTY != aOuterRectangle.Right()
+                && RECT_EMPTY != aOuterRectangle.Bottom())
+            {
+                aOuterRange.expand(basegfx::B2DTuple(aOuterRectangle.Left(), aOuterRectangle.Top()));
+                aOuterRange.expand(basegfx::B2DTuple(aOuterRectangle.Right(), aOuterRectangle.Bottom()));
+            }
+        }
+    }
+
+    return aOuterRange;
+}
+
+basegfx::B2DRange SwVirtFlyDrawObj::getInnerBound() const
+{
+    basegfx::B2DRange aInnerRange;
+    const SdrObject& rReferencedObject = GetReferencedObj();
+
+    if(rReferencedObject.ISA(SwFlyDrawObj))
+    {
+        const SwFlyFrm* pFlyFrame = GetFlyFrm();
+
+        if(pFlyFrame)
+        {
+            const Rectangle aInnerRectangle(pFlyFrame->Frm().Pos() + pFlyFrame->Prt().Pos(), pFlyFrame->Prt().SSize());
+
+            if(!aInnerRectangle.IsEmpty()
+                && RECT_EMPTY != aInnerRectangle.Right()
+                && RECT_EMPTY != aInnerRectangle.Bottom())
+            {
+                aInnerRange.expand(basegfx::B2DTuple(aInnerRectangle.Left(), aInnerRectangle.Top()));
+                aInnerRange.expand(basegfx::B2DTuple(aInnerRectangle.Right(), aInnerRectangle.Bottom()));
+            }
+        }
+    }
+
+    return aInnerRange;
+}
+
 sdr::contact::ViewContact* SwVirtFlyDrawObj::CreateObjectSpecificViewContact()
 {
     // need an own ViewContact (VC) to allow creation of a specialized primitive
@@ -425,74 +522,6 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject() const
 
 /*************************************************************************
 |*
-|*  SwVirtFlyDrawObj::CheckHit()
-|*  Beschreibung        Das Teil ist genau dann getroffen wenn
-|*                      1. der Point im Rand des Frm liegt.
-|*                      2. der Point im heissen Bereich liegt.
-|*                      3. der Point in der Flaeche liegt und es sich um
-|*                         einen Rahmen mit NoTxtFrm handelt und dieser
-|*                         keine URL traegt.
-|*                      3a nicht aber wenn ueber dem Fly noch ein Fly liegt,
-|*                         und der Point in dessen Flaeche nicht steht.
-|*                      4. der Point in der Flaeche liegt und der Rahmen
-|*                         selektiert ist.
-|*  Ersterstellung      MA 08. Dec. 94
-|*  Letzte Aenderung    JP 25.03.96
-|*
-*************************************************************************/
-
-SdrObject* __EXPORT SwVirtFlyDrawObj::CheckHit( const Point& rPnt, USHORT nTol,
-                                    const SetOfByte* ) const
-{
-    Rectangle aHitRect( pFlyFrm->Frm().Pos(), pFlyFrm->Frm().SSize() );
-    if ( nTol )
-    {
-        Rectangle aExclude( aHitRect );
-        aHitRect.Top()    -= nTol;
-        aHitRect.Bottom() += nTol;
-        aHitRect.Left()   -= nTol;
-        aHitRect.Right()  += nTol;
-        if( aHitRect.IsInside( rPnt ) )
-        {
-            if ( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTxtFrm() )
-            {
-                // #107513#
-                // This test needs to be done outside, since also drawing layer HitTest
-                // methods are called. Not all drawing objects are derived and the
-                // CheckHit() overloaded. That's an conceptual error here.
-                return (SdrObject*)this;
-            }
-            else
-            {
-                ViewShell *pShell = pFlyFrm->GetShell();
-
-                //4. Getroffen wenn das Objekt selektiert ist.
-                if ( pShell )
-                {
-                    const SdrMarkList &rMrkList = pShell->
-                                            Imp()->GetDrawView()->GetMarkedObjectList();
-                    for ( USHORT i = 0; i < rMrkList.GetMarkCount(); ++i )
-                        if ( long(this) == long(rMrkList.GetMark(i)->GetMarkedSdrObj()) )
-                            return (SdrObject*)this;
-                }
-
-                const Rectangle aPrtRect( pFlyFrm->Frm().Pos() + pFlyFrm->Prt().Pos(),
-                                          pFlyFrm->Prt().SSize() );
-                aExclude.Top()    += Max( long(nTol), aPrtRect.Top()   - aHitRect.Top() );
-                aExclude.Bottom() -= Max( long(nTol), aHitRect.Bottom()- aPrtRect.Bottom());
-                aExclude.Left()   += Max( long(nTol), aPrtRect.Left()  - aHitRect.Left() );
-                aExclude.Right()  -= Max( long(nTol), aHitRect.Right() - aPrtRect.Right() );
-                return aExclude.IsInside( rPnt ) ? 0 : (SdrObject*)this;
-            }
-        }
-    }
-    else
-        return aHitRect.IsInside( rPnt ) ? (SdrObject*)this : 0;
-    return 0;
-}
-
-/*************************************************************************
-|*
 |*  SwVirtFlyDrawObj::TakeObjInfo()
 |*
 |*  Ersterstellung      MA 03. May. 95
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 51ef762c63df..9843f8f8c34e 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -153,6 +153,81 @@ sal_Bool SwDrawView::IsAntiAliasing() const
 }
 // <--
 
+//////////////////////////////////////////////////////////////////////////////
+
+SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, USHORT nTol, const SdrMarkList &rMrkList)
+{
+    if(!nTol)
+    {
+        // the old method forced back to outer bounds test when nTol == 0, so
+        // do not try to correct when nTol is not set (used from HelpContent)
+    }
+    else
+    {
+        // rebuild logic from former SwVirtFlyDrawObj::CheckSdrObjectHit. This is needed since
+        // the SdrObject-specific CheckHit implementations are now replaced with primitives and
+        // 'tricks' like in the old implementation (e.g. using a view from a model-data class to
+        // detect if object is selected) are no longer valid.
+        // The standard primitive hit-test for SwVirtFlyDrawObj now is the outer bound. The old
+        // implementation reduced this excluding the inner bound when the object was not selected.
+        SwVirtFlyDrawObj* pSwVirtFlyDrawObj = dynamic_cast< SwVirtFlyDrawObj* >(pRetval);
+
+        if(pSwVirtFlyDrawObj)
+        {
+            if(pSwVirtFlyDrawObj->GetFlyFrm()->Lower() && pSwVirtFlyDrawObj->GetFlyFrm()->Lower()->IsNoTxtFrm())
+            {
+                // the old method used IsNoTxtFrm (should be for SW's own OLE and
+                // graphic's) to accept hit only based on outer bounds; nothing to do
+            }
+            else
+            {
+                // check if the object is selected in this view
+                const sal_uInt32 nMarkCount(rMrkList.GetMarkCount());
+                bool bSelected(false);
+
+                for(sal_uInt32 a(0); !bSelected && a < nMarkCount; a++)
+                {
+                    if(pSwVirtFlyDrawObj == rMrkList.GetMark(a)->GetMarkedSdrObj())
+                    {
+                        bSelected = true;
+                    }
+                }
+
+                if(!bSelected)
+                {
+                    // when not selected, the object is not hit when hit position is inside
+                    // inner range. Get and shrink inner range
+                    basegfx::B2DRange aInnerBound(pSwVirtFlyDrawObj->getInnerBound());
+
+                    aInnerBound.grow(-1.0 * nTol);
+
+                    if(aInnerBound.isInside(basegfx::B2DPoint(rPnt.X(), rPnt.Y())))
+                    {
+                        // exclude this hit
+                        pRetval = 0;
+                    }
+                }
+            }
+        }
+    }
+
+    return pRetval;
+}
+
+SdrObject* SwDrawView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
+{
+    // call parent
+    SdrObject* pRetval = FmFormView::CheckSingleSdrObjectHit(rPnt, nTol, pObj, pPV, nOptions, pMVisLay);
+
+    if(pRetval)
+    {
+        // overloaded to allow extra handling when picking SwVirtFlyDrawObj's
+        pRetval = impLocalHitCorrection(pRetval, rPnt, nTol, GetMarkedObjectList());
+    }
+
+    return pRetval;
+}
+
 /*************************************************************************
 |*
 |*  SwDrawView::AddCustomHdl()