renaissance01: #i107213# further layout work, initial support for new layout toolbox control

2 files changed, 4 insertions, 64 deletions

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 12c94fbf9f8f..4486df11d6b7 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -147,34 +147,15 @@ void FuInsertGraphic::DoExecute( SfxRequest&  )
             if( mpViewShell && mpViewShell->ISA(DrawViewShell))
             {
                 sal_Int8    nAction = DND_ACTION_COPY;
-                SdrGrafObj* pEmptyGrafObj = NULL;
-
-                if ( mpView->AreObjectsMarked() )
-                {
-                    /**********************************************************
-                    * Is an empty graphic object available?
-                    **********************************************************/
-                    const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
-
-                    if (rMarkList.GetMarkCount() == 1)
-                    {
-                        SdrMark* pMark = rMarkList.GetMark(0);
-                        SdrObject* pObj = pMark->GetMarkedSdrObj();
-
-                        if (pObj->GetObjInventor() == SdrInventor &&
-                            pObj->GetObjIdentifier() == OBJ_GRAF)
-                        {
-                            nAction = DND_ACTION_LINK;
-                            pEmptyGrafObj = (SdrGrafObj*) pObj;
-                        }
-                    }
-                }
+                SdrObject* pPickObj = mpView->GetEmptyPresentationObject( PRESOBJ_GRAPHIC );
+                if( pPickObj )
+                    nAction = DND_ACTION_LINK;
 
                 Point aPos;
                 Rectangle aRect(aPos, mpWindow->GetOutputSizePixel() );
                 aPos = aRect.Center();
                 aPos = mpWindow->PixelToLogic(aPos);
-                SdrGrafObj* pGrafObj = mpView->InsertGraphic(aGraphic, nAction, aPos, pEmptyGrafObj, NULL);
+                SdrGrafObj* pGrafObj = mpView->InsertGraphic(aGraphic, nAction, aPos, pPickObj, NULL);
 
                 if(pGrafObj && aDlg.IsAsLink())
                 {
diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx
index 99212adc12f1..c07fabbfe962 100644
--- a/sd/source/ui/func/smarttag.cxx
+++ b/sd/source/ui/func/smarttag.cxx
@@ -156,18 +156,6 @@ void SmartTag::CheckPossibilities()
 {
 }
 
-// --------------------------------------------------------------------
-
-void SmartTag::onMouseEnter(SmartHdl& rHdl)
-{
-}
-
-// --------------------------------------------------------------------
-
-void SmartTag::onMouseLeave()
-{
-}
-
 // ====================================================================
 
 SmartTagSet::SmartTagSet( View& rView )
@@ -284,35 +272,6 @@ bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt )
 
 // --------------------------------------------------------------------
 
-void SmartTagSet::MouseMove(const MouseEvent& rMEvt)
-{
-    SmartTagReference xTag;
-
-    SmartHdl* pSmartHdl = 0;
-    if( !rMEvt.IsLeaveWindow() )
-    {
-        Point aMDPos( mrView.GetViewShell()->GetActiveWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
-        SdrHdl* pHdl = mrView.PickHandle(aMDPos);
-
-        pSmartHdl = dynamic_cast< SmartHdl* >( pHdl );
-        if( pSmartHdl )
-            xTag = pSmartHdl->getTag();
-    }
-
-    if( xTag != mxMouseOverTag )
-    {
-        if( mxMouseOverTag.is() )
-            mxMouseOverTag->onMouseLeave();
-
-        mxMouseOverTag = xTag;
-
-        if( mxMouseOverTag.is() )
-            mxMouseOverTag->onMouseEnter(*pSmartHdl);
-    }
-}
-
-// --------------------------------------------------------------------
-
 bool SmartTagSet::KeyInput( const KeyEvent& rKEvt )
 {
     if( mxSelectedTag.is() )