New D&D and some Clipboard cleanups

6 files changed, 160 insertions, 272 deletions

diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx
index da15241c03e0..1aa78b854417 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/svx/source/editeng/editeng.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: editeng.cxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: mt $ $Date: 2001-05-14 13:09:45 $
+ *  last change: $Author: mt $ $Date: 2001-05-14 15:19:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,6 +103,8 @@
 #include <charscaleitem.hxx>
 #include <charreliefitem.hxx>
 
+#include <sot/exchange.hxx>
+#include <sot/formats.hxx>
 
 #ifndef _SV_SYSTEM_HXX
 #include <vcl/system.hxx>
@@ -718,33 +720,6 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
     {
         switch ( eFunc )
         {
-            case KEYFUNC_CUT:
-            {
-                if ( !bReadOnly )
-                {
-                    pImpEditEngine->UndoActionStart( EDITUNDO_CUT );
-                    aCurSel = pImpEditEngine->CutCopy( pEditView, sal_True );
-                    pImpEditEngine->UndoActionEnd( EDITUNDO_CUT );
-                    bModified = sal_True;
-                }
-            }
-            break;
-            case KEYFUNC_COPY:
-            {
-                aCurSel = pImpEditEngine->CutCopy( pEditView, sal_False );
-            }
-            break;
-            case KEYFUNC_PASTE:
-            {
-                if ( !bReadOnly && pEditView->IsPasteEnabled() )
-                {
-                    pImpEditEngine->UndoActionStart( EDITUNDO_PASTE );
-                    aCurSel = pImpEditEngine->Paste( pEditView, pImpEditEngine->GetStatus().AllowPasteSpecial() );
-                    pImpEditEngine->UndoActionEnd( EDITUNDO_PASTE );
-                    bModified = sal_True;
-                }
-            }
-            break;
             case KEYFUNC_UNDO:
             {
                 if ( !bReadOnly )
@@ -1912,88 +1887,6 @@ void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
     }
 }
 
-sal_Bool EditEngine::CopyDragServer() const
-{
-    return FALSE;
-}
-
-sal_Bool EditEngine::CopyDragServer( const ESelection& rSel ) const
-{
-    return FALSE;
-}
-
-sal_Bool EditEngine::PasteDragServer( sal_uInt16 )
-{
-    return FALSE;
-}
-
-
-sal_Bool EditEngine::CopyClipboard() const
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-
-    const EditDoc& rDoc = pImpEditEngine->GetEditDoc();
-    EditSelection aSel( rDoc.GetStartPaM(), rDoc.GetEndPaM() );
-    return CopyClipboard( pImpEditEngine->CreateESel( aSel ) );
-}
-
-sal_Bool EditEngine::CopyClipboard( const ESelection& rSel ) const
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-
-    EditSelection aSel( pImpEditEngine->
-        ConvertSelection( rSel.nStartPara, rSel.nStartPos, rSel.nEndPara, rSel.nEndPos ) );
-
-    if ( aSel.HasRange() )
-    {
-        uno::Reference< datatransfer::XTransferable > xData = pImpEditEngine->CreateTransferable( aSel );
-
-        uno::Reference< datatransfer::clipboard::XClipboard > xClipboard;
-
-        DBG_ASSERT( GetActiveView(), "CopyClipboard: No active view!" );
-        DBG_ASSERT( GetActiveView()->GetWindow(), "CopyClipboard: Active view has no window!" );
-
-        if( GetActiveView() && GetActiveView()->GetWindow() )
-            xClipboard = GetActiveView()->GetWindow()->GetClipboard();
-
-        if( xClipboard.is() )
-        {
-            const sal_uInt32 nRef = Application::ReleaseSolarMutex();
-            xClipboard->setContents( xData, NULL );
-            Application::AcquireSolarMutex( nRef );
-        }
-        return sal_True;
-    }
-    return sal_False;
-}
-
-sal_Bool EditEngine::PasteClipboard()
-{
-    DBG_CHKTHIS( EditEngine, 0 );
-
-    if ( !pImpEditEngine->HasData( EXCHANGE_CLIPBOARD ) )
-        return sal_False;
-
-    SetText( String() );
-
-    uno::Reference< datatransfer::XTransferable > xDataObj;
-    uno::Reference< datatransfer::clipboard::XClipboard > xClipboard;
-    if ( GetActiveView() )
-        xClipboard = GetActiveView()->GetWindow()->GetClipboard();
-
-    if ( xClipboard.is() )
-    {
-        const sal_uInt32 nRef = Application::ReleaseSolarMutex();
-        xDataObj = xClipboard->getContents();
-        Application::AcquireSolarMutex( nRef );
-    }
-
-    if ( xDataObj.is() )
-        pImpEditEngine->InsertText( xDataObj, pImpEditEngine->GetEditDoc().GetStartPaM(), TRUE );
-
-    return sal_True;
-}
-
 sal_Bool EditEngine::HasOnlineSpellErrors() const
 {
 #ifndef SVX_LIGHT
@@ -2418,4 +2311,19 @@ void EditEngine::ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLev
     }
 }
 
+BOOL EditEngine::HasValidData( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable )
+{
+    BOOL bValidData = FALSE;
+
+    if ( rTransferable.is() )
+    {
+        // Every application that copies rtf or any other text format also copies plain text into the clipboard....
+        datatransfer::DataFlavor aFlavor;
+        SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+        bValidData = rTransferable->isDataFlavorSupported( aFlavor );
+    }
+
+    return bValidData;
+}
+
 
diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx
index f87a66e64d3f..2f0874963358 100644
--- a/svx/source/editeng/editview.cxx
+++ b/svx/source/editeng/editview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: editview.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: mt $ $Date: 2001-05-14 13:09:45 $
+ *  last change: $Author: mt $ $Date: 2001-05-14 15:19:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -524,50 +524,25 @@ sal_uInt32 EditView::Write( SvStream& rOutput, EETextFormat eFormat )
 void EditView::Cut()
 {
     DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
-    PIMPEE->UndoActionStart( EDITUNDO_CUT );
-    EditSelection aCurSel ( PIMPEE->CutCopy( this, sal_True ) );
-    PIMPEE->UndoActionEnd( EDITUNDO_CUT );
-
-    pImpEditView->SetEditSelection( aCurSel );
-    PIMPEE->UpdateSelections();
-    PIMPEE->FormatAndUpdate( this );
+    pImpEditView->CutCopy( sal_True );
 }
 
 void EditView::Copy()
 {
     DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-    PIMPEE->CutCopy( this, sal_False );
+    pImpEditView->CutCopy( sal_False );
 }
 
 void EditView::Paste()
 {
     DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
-    PIMPEE->UndoActionStart( EDITUNDO_PASTE );
-    EditSelection aCurSel( PIMPEE->Paste( this, sal_False ) );
-    PIMPEE->UndoActionEnd( EDITUNDO_PASTE );
-
-    pImpEditView->SetEditSelection( aCurSel );
-    PIMPEE->UpdateSelections();
-    PIMPEE->FormatAndUpdate( this );
+    pImpEditView->Paste( sal_False );
 }
 
 void EditView::PasteSpecial()
 {
     DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-
-    PIMPEE->UndoActionStart( EDITUNDO_PASTE );
-    EditSelection aCurSel ( PIMPEE->Paste( this, sal_True ) );
-    PIMPEE->UndoActionEnd( EDITUNDO_PASTE );
-
-    pImpEditView->SetEditSelection( aCurSel );
-    PIMPEE->UpdateSelections();
-    PIMPEE->FormatAndUpdate( this );
+    pImpEditView->Paste( sal_True );
 }
 
 void EditView::EnablePaste( sal_Bool bEnable )
diff --git a/svx/source/editeng/impedit.cxx b/svx/source/editeng/impedit.cxx
index 6a32b313d473..cdbfbb892a5c 100644
--- a/svx/source/editeng/impedit.cxx
+++ b/svx/source/editeng/impedit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: mt $ $Date: 2001-05-14 13:09:45 $
+ *  last change: $Author: mt $ $Date: 2001-05-14 15:19:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,10 +112,18 @@
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #endif
 
+#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XCLIPBOARD_HPP_
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#endif
+
 #include <vos/mutex.hxx>
 
 #include <flditem.hxx>
 
+#include <sot/exchange.hxx>
+#include <sot/formats.hxx>
+
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::linguistic2;
@@ -970,7 +978,46 @@ Pair ImpEditView::Scroll( long ndX, long ndY, BYTE nRangeCheck )
 
 sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent )
 {
-    return pEditEngine->PostKeyEvent( rKeyEvent, GetEditViewPtr() );
+    BOOL bDone = FALSE;
+
+    KeyFuncType eFunc = rKeyEvent.GetKeyCode().GetFunction();
+    if ( eFunc != KEYFUNC_DONTKNOW )
+    {
+        switch ( eFunc )
+        {
+            case KEYFUNC_CUT:
+            {
+                if ( !bReadOnly )
+                {
+                    CutCopy( sal_True );
+                    bDone = sal_True;
+                }
+            }
+            break;
+            case KEYFUNC_COPY:
+            {
+                CutCopy( sal_False );
+                bDone = TRUE;
+            }
+            break;
+            case KEYFUNC_PASTE:
+            {
+                if ( !bReadOnly && IsPasteEnabled() )
+                {
+                    pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_PASTE );
+                    Paste( pEditEngine->pImpEditEngine->GetStatus().AllowPasteSpecial() );
+                    pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_PASTE );
+                    bDone = sal_True;
+                }
+            }
+            break;
+        }
+    }
+
+    if( !bDone )
+        bDone = pEditEngine->PostKeyEvent( rKeyEvent, GetEditViewPtr() );
+
+    return bDone;
 }
 
 sal_Bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent )
@@ -1098,7 +1145,7 @@ void ImpEditView::DeleteSelected()
     pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_DELETE );
 
     SetEditSelection( EditSelection( aPaM, aPaM ) );
-    pEditEngine->pImpEditEngine->FormatAndUpdate( pEditEngine->pImpEditEngine->GetActiveView() );
+    pEditEngine->pImpEditEngine->FormatAndUpdate( GetEditViewPtr() );
     ShowCursor( DoAutoScroll(), TRUE );
 }
 
@@ -1135,6 +1182,78 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_uInt16* pPara,
     return NULL;
 }
 
+void ImpEditView::CutCopy( BOOL bCut )
+{
+    if ( GetEditSelection().HasRange() )
+    {
+        uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow()->GetClipboard();
+        if( xClipboard.is() )
+        {
+            uno::Reference< datatransfer::XTransferable > xData = pEditEngine->pImpEditEngine->CreateTransferable( GetEditSelection() );
+            const sal_uInt32 nRef = Application::ReleaseSolarMutex();
+            xClipboard->setContents( xData, NULL );
+            Application::AcquireSolarMutex( nRef );
+
+            if ( bCut )
+            {
+                pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_CUT );
+                DeleteSelected();
+                pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_CUT );
+
+            }
+        }
+    }
+}
+
+void ImpEditView::Paste( BOOL bUseSpecial )
+{
+    uno::Reference< datatransfer::XTransferable > xDataObj;
+    uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow()->GetClipboard();
+
+    if ( xClipboard.is() )
+    {
+        const sal_uInt32 nRef = Application::ReleaseSolarMutex();
+        xDataObj = xClipboard->getContents();
+        Application::AcquireSolarMutex( nRef );
+    }
+
+    if ( xDataObj.is() && EditEngine::HasValidData( xDataObj ) )
+    {
+        pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_PASTE );
+
+        EditSelection aSel( GetEditSelection() );
+        if ( aSel.HasRange() )
+        {
+            DrawSelection();
+            aSel = pEditEngine->pImpEditEngine->ImpDeleteSelection( aSel );
+        }
+
+        if ( DoSingleLinePaste() )
+        {
+            datatransfer::DataFlavor aFlavor;
+            SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+            if ( xDataObj->isDataFlavorSupported( aFlavor ) )
+            {
+                uno::Any aData = xDataObj->getTransferData( aFlavor );
+                ::rtl::OUString aTmpText;
+                aData >>= aTmpText;
+                String aText( aTmpText );
+                aText.ConvertLineEnd( LINEEND_LF );
+                aText.SearchAndReplaceAll( LINE_SEP, ' ' );
+                aSel = pEditEngine->pImpEditEngine->ImpInsertText( aSel, aText );
+            }
+        }
+        else
+        {
+            aSel = pEditEngine->pImpEditEngine->InsertText( xDataObj, aSel.Min(), pEditEngine->pImpEditEngine->GetStatus().AllowPasteSpecial() );
+        }
+        pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_PASTE );
+        SetEditSelection( aSel );
+        pEditEngine->pImpEditEngine->UpdateSelections();
+        pEditEngine->pImpEditEngine->FormatAndUpdate( GetEditViewPtr() );
+    }
+}
+
 
 BOOL ImpEditView::IsInSelection( const EditPaM& rPaM )
 {
diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx
index 8b498d2e892e..14f8da8c7828 100644
--- a/svx/source/editeng/impedit.hxx
+++ b/svx/source/editeng/impedit.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit.hxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: mt $ $Date: 2001-05-14 13:09:45 $
+ *  last change: $Author: mt $ $Date: 2001-05-14 15:19:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -129,6 +129,8 @@ DBG_NAMEEX( EditEngine );
 #define GETCRSR_ENDOFLINE   0x0001
 #define GETCRSR_TXTONLY     0x0002
 
+#define LINE_SEP    0x0A
+
 class EditView;
 class EditEngine;
 class SvxFontTable;
@@ -141,8 +143,6 @@ class SvKeyValueIterator;
 class SvxForbiddenCharactersTable;
 
 
-enum ExchangeType { EXCHANGE_CLIPBOARD, EXCHANGE_DRAGSERVER };
-
 struct DragAndDropInfo
 {
     Rectangle           aCurCursor;
@@ -291,6 +291,9 @@ public:
     BOOL            MouseMove( const MouseEvent& rMouseEvent );
     void            Command( const CommandEvent& rCEvt );
 
+    void            CutCopy( sal_Bool bCut );
+    void            Paste( sal_Bool bUseSpecial = sal_False );
+
     void            SetVisDocStartPos( const Point& rPos ) { aVisDocStartPos = rPos; }
     const Point&    GetVisDocStartPos() const { return aVisDocStartPos; }
 
@@ -339,7 +342,7 @@ public:
     void            SetInsertMode( sal_Bool bInsert );
     sal_Bool            IsInsertMode() const            { return ( ( nControl & EV_CNTRL_OVERWRITE ) == 0 ); }
 
-    void            EnablePaste( sal_Bool bEnable )     { SetFlags( nControl, EV_CNTRL_ENABLEPASTE, bEnable ); }
+    void                EnablePaste( sal_Bool bEnable )     { SetFlags( nControl, EV_CNTRL_ENABLEPASTE, bEnable ); }
     sal_Bool            IsPasteEnabled() const          { return ( ( nControl & EV_CNTRL_ENABLEPASTE ) != 0 ); }
 
     sal_Bool            DoSingleLinePaste() const       { return ( ( nControl & EV_CNTRL_SINGLELINEPASTE ) != 0 ); }
@@ -614,8 +617,6 @@ private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CreateTransferable( const EditSelection& rSelection ) const;
 
-    sal_Bool            HasData( ExchangeType eExchange );
-
     void                SetValidPaperSize( const Size& rSz );
 
     ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator();
@@ -697,8 +698,6 @@ public:
     EditPaM         InsertTab( EditSelection aEditSelection );
     EditPaM         InsertField( EditSelection aEditSelection, const SvxFieldItem& rFld );
     sal_Bool        UpdateFields();
-    EditSelection   CutCopy( EditView* pView, sal_Bool bCut );
-    EditSelection   Paste( EditView* pView, sal_Bool bUseSpecial = sal_False );
 
     EditPaM         Read( SvStream& rInput, EETextFormat eFormat, EditSelection aSel, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
     void            Write( SvStream& rOutput, EETextFormat eFormat, EditSelection aSel );
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx
index 8d132e334d38..0ac6c9340685 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/svx/source/editeng/impedit2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit2.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: mt $ $Date: 2001-05-14 13:09:45 $
+ *  last change: $Author: mt $ $Date: 2001-05-14 15:19:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,18 +128,11 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #endif
 
-#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XCLIPBOARD_HPP_
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#endif
-
 #include <comphelper/processfactory.hxx>
 
-#include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 
 
-#define LINE_SEP    0x0A
-
 using namespace ::com::sun::star;
 
 USHORT lcl_CalcExtraSpace( ParaPortion* pPortion, const SvxLineSpacingItem& rLSItem )
@@ -654,73 +647,6 @@ BOOL ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView )
     return TRUE;
 }
 
-
-
-EditSelection ImpEditEngine::CutCopy( EditView* pView, BOOL bCut )
-{
-    EditSelection aSel( pView->pImpEditView->GetEditSelection() );
-    if ( !aSel.HasRange() )
-        return aSel;
-
-    GetEditEnginePtr()->CopyClipboard( CreateESel( aSel ) );
-
-    if ( bCut )
-    {
-        pView->pImpEditView->DrawSelection();
-        aSel = ImpDeleteSelection( aSel );
-    }
-    return aSel;
-}
-
-EditSelection ImpEditEngine::Paste( EditView* pView, BOOL bUseSpecial )
-{
-    EditSelection aSel( pView->pImpEditView->GetEditSelection() );
-
-    // Wenn keine Datan, dann auch nicht Selektion loeschen:
-    if ( !HasData( EXCHANGE_CLIPBOARD ) )
-        return aSel;
-
-    if ( aSel.HasRange() )
-    {
-        pView->pImpEditView->DrawSelection();
-        aSel = ImpDeleteSelection( aSel );
-    }
-
-    uno::Reference< datatransfer::XTransferable > xDataObj;
-    uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = pView->GetWindow()->GetClipboard();
-
-    if ( xClipboard.is() )
-    {
-        const sal_uInt32 nRef = Application::ReleaseSolarMutex();
-        xDataObj = xClipboard->getContents();
-        Application::AcquireSolarMutex( nRef );
-    }
-
-    if ( xDataObj.is() )
-    {
-        if ( pView->pImpEditView->DoSingleLinePaste() )
-        {
-            datatransfer::DataFlavor aFlavor;
-            SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
-            if ( xDataObj->isDataFlavorSupported( aFlavor ) )
-            {
-                uno::Any aData = xDataObj->getTransferData( aFlavor );
-                ::rtl::OUString aTmpText;
-                aData >>= aTmpText;
-                String aText( aTmpText );
-                aText.ConvertLineEnd( LINEEND_LF );
-                aText.SearchAndReplaceAll( LINE_SEP, ' ' );
-                aSel = ImpInsertText( aSel, aText );
-            }
-        }
-        else
-        {
-            aSel = InsertText( xDataObj, aSel.Min(), GetStatus().AllowPasteSpecial() );
-        }
-    }
-    return aSel;
-}
-
 EditPaM ImpEditEngine::InsertText( EditSelection aSel, const XubString& rStr )
 {
     EditPaM aPaM = ImpInsertText( aSel, rStr );
@@ -2677,41 +2603,6 @@ void ImpEditEngine::SetActiveView( EditView* pView )
     }
 }
 
-BOOL ImpEditEngine::HasData( ExchangeType eExchange )
-{
-    BOOL bData = FALSE;
-
-    if ( eExchange == EXCHANGE_CLIPBOARD )
-    {
-        uno::Reference< datatransfer::clipboard::XClipboard > xClipboard;
-
-        DBG_ASSERT( GetActiveView(), "HasData: No active view!" );
-        DBG_ASSERT( GetActiveView()->GetWindow(), "HasData: Active view has no window!" );
-
-        if( GetActiveView() && GetActiveView()->GetWindow() )
-            xClipboard = GetActiveView()->GetWindow()->GetClipboard();
-
-        if ( xClipboard.is() )
-        {
-            const sal_uInt32 nRef = Application::ReleaseSolarMutex();
-            uno::Reference< datatransfer::XTransferable > xDataObj = xClipboard->getContents();
-            Application::AcquireSolarMutex( nRef );
-            if ( xDataObj.is() )
-            {
-                datatransfer::DataFlavor aFlavor;
-                SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
-                bData = xDataObj->isDataFlavorSupported( aFlavor );
-            }
-        }
-    }
-    else
-    {
-        bData = DragServer::HasFormat ( 0, SOT_FORMAT_STRING );
-    }
-
-    return bData;
-}
-
 uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable( const EditSelection& rSelection ) const
 {
     EditSelection aSelection( rSelection );
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index 9a5c2bbd5b37..c0e33e12a724 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit3.cxx,v $
  *
- *  $Revision: 1.33 $
+ *  $Revision: 1.34 $
  *
- *  last change: $Author: mt $ $Date: 2001-05-14 13:09:45 $
+ *  last change: $Author: mt $ $Date: 2001-05-14 15:19:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,10 +109,6 @@
 #include <sfx2/sfxuno.hxx>
 #endif
 
-#ifndef _SV_DRAG_HXX //autogen
-#include <vcl/drag.hxx>
-#endif
-
 #ifndef _SV_METRIC_HXX //autogen
 #include <vcl/metric.hxx>
 #endif