TFD taskforce changes

9 files changed, 68 insertions, 282 deletions

diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 972db4d129cf..ef49605f3833 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws2.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: ka $ $Date: 2001-06-08 13:55:20 $
+ *  last change: $Author: ka $ $Date: 2001-06-22 15:42:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,7 +69,7 @@
 #include <svtools/intitem.hxx>
 #include <svtools/eitem.hxx>
 #include <svtools/transfer.hxx>
-#include <sfx2/exchobj.hxx>
+//#include <sfx2/exchobj.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index f0f8795e17b6..1fae19ecc009 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdedxv.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dl $ $Date: 2001-02-07 11:23:48 $
+ *  last change: $Author: ka $ $Date: 2001-06-22 15:43:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1184,42 +1184,6 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
     }
 }
 
-BOOL SdrObjEditView::QueryDrop(DropEvent& rDEvt, Window* pWin, ULONG nFormat, USHORT nItemNum)
-{
-    Point aPt(rDEvt.GetPosPixel());
-    if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
-    else if (pTextEditWin!=NULL) aPt=pTextEditWin->PixelToLogic(aPt);
-    if (IsTextEditHit(aPt,nHitTolLog)) {
-        OutlinerView* pNewView=ImpFindOutlinerView(pWin);
-        if (pNewView!=NULL) {
-            pNewView->QueryDrop(rDEvt);
-        } else {
-            if (pTextEditOutlinerView!=NULL) pTextEditOutlinerView->QueryDrop(rDEvt);
-        }
-        return TRUE;
-    }
-    return SdrGlueEditView::QueryDrop(rDEvt,pWin,nFormat,nItemNum);
-}
-
-BOOL SdrObjEditView::Drop(const DropEvent& rDEvt, Window* pWin, ULONG nFormat, USHORT nItemNum)
-{
-    Point aPt(rDEvt.GetPosPixel());
-    if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
-    else if (pTextEditWin!=NULL) aPt=pTextEditWin->PixelToLogic(aPt);
-    if (IsTextEditHit(aPt,nHitTolLog)) {
-        OutlinerView* pNewView=ImpFindOutlinerView(pWin);
-        if (pNewView!=NULL) {
-            pNewView->Drop(rDEvt);
-        } else {
-            if (pTextEditOutlinerView!=NULL)  pTextEditOutlinerView->Drop(rDEvt);
-        }
-        if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
-        ImpMakeTextCursorAreaVisible();
-        return TRUE;
-    }
-    return SdrGlueEditView::Drop(rDEvt,pWin,nFormat,nItemNum);
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 BOOL SdrObjEditView::ImpIsTextEditAllSelected() const
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index ac1ec17f60dd..0edf670bef86 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdmrkv.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: aw $ $Date: 2001-01-26 14:08:54 $
+ *  last change: $Author: ka $ $Date: 2001-06-22 15:43:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2110,12 +2110,12 @@ void SdrMarkView::SetDesignMode(BOOL bOn)
             const SdrPageViewWinList& rWinList = pPV->GetWinList();
             for (ULONG i = 0; i < rWinList.GetCount(); i++)
             {
-                const SdrPageViewWinRec& rWR = rWinList[i];
+                const SdrPageViewWinRec& rWR = rWinList[ (USHORT) i];
                 const SdrUnoControlList& rControlList = rWR.GetControlList();
 
                 for(UINT32 j = 0; j < rControlList.GetCount(); j++)
                 {
-                    rControlList[j].GetControl()->setDesignMode(bOn);
+                    rControlList[ (USHORT) j].GetControl()->setDesignMode(bOn);
                 }
             }
         }
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index c87c9702e82f..4180a9ac7bb0 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdograf.cxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: ka $ $Date: 2001-06-18 13:21:10 $
+ *  last change: $Author: ka $ $Date: 2001-06-22 15:43:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,7 +134,7 @@ public:
 // -----------------------------------------------------------------------------
 
 SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj):
-    so3::SvBaseLink( LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
+    ::so3::SvBaseLink( ::so3::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
     pGrafObj(pObj)
 {
     SetSynchron( FALSE );
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index d02f1a07ffcc..78ae2b7a990f 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdoole2.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: cl $ $Date: 2001-06-14 16:30:17 $
+ *  last change: $Author: ka $ $Date: 2001-06-22 15:45:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,15 +76,12 @@
 #include <sfx2/interno.hxx>
 #endif
 #endif
-
 #ifndef _SVDPAGV_HXX
 #include <svdpagv.hxx>
 #endif
-
 #ifndef _GLOBNAME_HXX
 #include <tools/globname.hxx>
 #endif
-
 #ifndef SVX_LIGHT
 #ifndef _IPCLIENT_HXX //autogen
 #include <so3/ipclient.hxx>
@@ -102,13 +99,16 @@
 #ifndef _IPENV_HXX //autogen
 #include <so3/ipenv.hxx>
 #endif
-
 #ifndef _PSEUDO_HXX
 #include <so3/pseudo.hxx>
 #endif
 #ifndef _SVXLINKMGR_HXX //autogen
 #include <linkmgr.hxx>
 #endif
+#ifndef SVTOOLS_TRANSFER_HXX
+#include <svtools/transfer.hxx>
+#endif
+
 
 #include "svdoole2.hxx"
 #include <svtools/solar.hrc>
@@ -846,15 +846,17 @@ const GDIMetaFile* SdrOle2Obj::GetGDIMetaFile() const
 
     if (rIPRef.Is())
     {
-        GDIMetaFile* pMtf=NULL;
-        SvData aSvData(FORMAT_GDIMETAFILE);
-        if (rIPRef->GetData(&aSvData))
+        GDIMetaFile*            pMtf=NULL;
+        TransferableDataHelper  aData(rIPRef->CreateTransferableSnapshot() );
+
+        if( aData.HasFormat( FORMAT_GDIMETAFILE ) )
         {
-            if (aSvData.GetData(&pMtf,TRANSFER_REFERENCE))
-            {
-                // kopieren, weil *pMtf mit ~SvData zerstoert wird!
-                ((SdrOle2Obj*)this)->mpImpl->pMetaFile = new GDIMetaFile(*pMtf);
-            }
+            GDIMetaFile* pNewMtf = new GDIMetaFile;
+
+            if( aData.GetGDIMetaFile( FORMAT_GDIMETAFILE, *pNewMtf ) )
+                ((SdrOle2Obj*)this)->pMetaFile = pNewMtf;
+            else
+                delete pNewMtf;
         }
     }
 #endif // SVX_LIGHT
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 33837609556c..852eb1813175 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdotxln.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2001-03-08 21:15:38 $
+ *  last change: $Author: ka $ $Date: 2001-06-22 15:43:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,7 +118,7 @@ class ImpSdrObjTextLink: public ::so3::SvBaseLink
 
 public:
     ImpSdrObjTextLink( SdrTextObj* pObj1 )
-        : ::so3::SvBaseLink( LINKUPDATE_ONCALL, FORMAT_FILE ),
+        : ::so3::SvBaseLink( ::so3::LINKUPDATE_ONCALL, FORMAT_FILE ),
             pSdrObj( pObj1 )
     {}
     virtual ~ImpSdrObjTextLink();
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index c52bccf1e7d1..a14001c3484a 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdview.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: aw $ $Date: 2001-06-11 11:17:51 $
+ *  last change: $Author: ka $ $Date: 2001-06-22 15:43:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -255,36 +255,6 @@ BOOL SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
 {
     SetActualWin(pWin);
     BOOL bRet=SdrCreateView::Command(rCEvt,pWin);
-    if (!bRet && !IsExtendedCommandEventDispatcherEnabled()) {
-        if (pWin!=NULL && rCEvt.GetCommand()==COMMAND_STARTDRAG && HasMarkedObj() &&
-            (eDragMode==SDRDRAG_MOVE || bMarkedHitMovesAlways))
-        {
-            SdrViewEvent aVEvt;
-            SdrHitKind eHit=PickAnything(pWin->PixelToLogic(rCEvt.GetMousePosPixel()),aVEvt);
-            if (eHit==SDRHIT_MARKEDOBJECT) {
-                pWin->ReleaseMouse();
-                DragDropMarked(*pWin);
-                bRet=TRUE;
-            }
-        }
-    }
-    return bRet;
-}
-
-BOOL SdrView::QueryDrop(DropEvent& rDEvt, Window* pWin, ULONG nFormat, USHORT nItemNum)
-{
-    SetActualWin(pWin);
-    return SdrCreateView::QueryDrop(rDEvt,pWin,nFormat,nItemNum);
-}
-
-BOOL SdrView::Drop(const DropEvent& rDEvt, Window* pWin, ULONG nFormat, USHORT nItemNum)
-{
-    SetActualWin(pWin);
-    BOOL bRet=SdrCreateView::Drop(rDEvt,pWin,nFormat,nItemNum);
-    if (bRet && pWin!=NULL) {
-        pWin->SetPointer(GetPreferedPointer(pWin->PixelToLogic(
-                         pWin->ScreenToOutputPixel(pWin->GetPointerPosPixel())),pWin));
-    }
     return bRet;
 }
 
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index d9810ad8afde..16d228294184 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdxcgv.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: sj $ $Date: 2001-05-22 10:27:34 $
+ *  last change: $Author: ka $ $Date: 2001-06-22 15:45:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,22 +60,8 @@
  ************************************************************************/
 
 #include "editeng.hxx"
-
 #include "xexch.hxx"
 #include "xflclit.hxx"
-
-#ifndef _SV_EXCHANGE_HXX //autogen
-#include <vcl/exchange.hxx>
-#endif
-
-#ifndef _SV_CLIP_HXX //autogen
-#include <vcl/clip.hxx>
-#endif
-
-#ifndef _SV_DRAG_HXX //autogen
-#include <vcl/drag.hxx>
-#endif
-
 #include "svdxcgv.hxx"
 #include "svdoutl.hxx"
 #include "svditext.hxx"
@@ -522,6 +508,8 @@ void SdrExchangeView::CutMarked(ULONG nFormat)
 
 void SdrExchangeView::ImpYank(ULONG nFormat, BOOL bClp) const
 {
+    DBG_ERROR( "ImpYank: Not supported anymore" );
+/*
     if(HasMarkedObj())
     {
         String aStrEditEngineFormat("EditEngineFormat", gsl_getSystemTextEncoding());
@@ -596,57 +584,40 @@ void SdrExchangeView::ImpYank(ULONG nFormat, BOOL bClp) const
             }
         }
     }
+*/
 }
 
 void SdrExchangeView::YankMarked(ULONG nFormat)
 {
-    if (HasMarkedObj()) {
+    DBG_ERROR( "YankMarked: Not supported anymore" );
+/*
+    if (HasMarkedObj())
+    {
         Clipboard::Clear();
         ImpYank(nFormat,TRUE);
     }
-}
-
-DropAction SdrExchangeView::DragDropMarked(Window& rWin, ULONG nFormat)
-{
-    if (HasMarkedObj()) {
-        DragServer::Clear();
-        BrkAction();
-        ImpYank(nFormat,FALSE);
-        SdrModel* pDragModel=NULL;
-        if (nFormat==SDR_ANYFORMAT || nFormat==FORMAT_PRIVATE) {
-            pDragModel=GetMarkedObjModel();
-            DragServer::CopyPrivateData(pDragModel);
-        }
-        Pointer aCopShape(POINTER_COPYDATA);
-        Pointer aMovShape(POINTER_MOVEDATA);
-        SdrMarkList aOldML(aMark); // alte Marklist merken
-
-        XubString aStr;
-        ImpTakeDescriptionStr(STR_ExchangeDD,aStr);
-        BegUndo(aStr);
-        DropAction eAct=rWin.ExecuteDrag(aMovShape,aCopShape);
-        if (pDragModel!=NULL) delete pDragModel;
-        if (eAct==DROP_MOVE || eAct==DROP_DISCARD) { // alle Objekte loeschen, die vorher markiert waren
-            DeleteMarked(aOldML);
-        }
-        EndUndo();
-        DragServer::Clear();
-        return eAct;
-    } else return DROP_NONE;
+*/
 }
 
 BOOL SdrExchangeView::PasteClipboard(OutputDevice* pOut, ULONG nFormat, UINT32 nOptions)
 {
+    DBG_ERROR( "PasteClipboard: Not supported anymore" );
+/*
+
     BOOL bRet=FALSE;
     if (!IsTextEdit()) UnmarkAllObj();
     BegUndo(ImpGetResStr(STR_ExchangeClpPaste));
     bRet=ImpPaste(nFormat,TRUE,0,GetViewCenter(pOut),nOptions);
     EndUndo();
     return bRet;
+*/
+    return FALSE;
 }
 
 BOOL SdrExchangeView::PasteDragDrop(const Point& rPos, ULONG nFormat, USHORT nItemNum, UINT32 nOptions)
 {
+    DBG_ERROR( "PasteDragDrop: Not supported anymore" );
+/*
     BOOL bRet=FALSE;
     if (!IsTextEdit()) UnmarkAllObj();
     BegUndo(ImpGetResStr(STR_ExchangeDDPaste));
@@ -662,10 +633,14 @@ BOOL SdrExchangeView::PasteDragDrop(const Point& rPos, ULONG nFormat, USHORT nIt
     }
     EndUndo();
     return bRet;
+*/
+    return FALSE;
 }
 
 BOOL SdrExchangeView::IsClipboardFormatSupported(ULONG nFormat) const
 {
+    DBG_ERROR( "IsClipboardFormatSupported: Not supported anymore" );
+/*
     BOOL bOk(FALSE);
 
     if(nFormat == SDR_ANYFORMAT)
@@ -684,12 +659,14 @@ BOOL SdrExchangeView::IsClipboardFormatSupported(ULONG nFormat) const
     {
         bOk = IsExchangeFormatSupported(nFormat);
     }
-
-    return bOk;
+*/
+    return TRUE;
 }
 
 BOOL SdrExchangeView::IsDragDropFormatSupported(ULONG nFormat, USHORT nItemNum) const
 {
+    DBG_ERROR( "IsDragDropFormatSupported: Not supported anymore" );
+/*
     BOOL bOk=FALSE;
     USHORT i=nItemNum;
     USHORT nMax=i;
@@ -725,6 +702,8 @@ BOOL SdrExchangeView::IsDragDropFormatSupported(ULONG nFormat, USHORT nItemNum)
     }
 
     return bOk;
+*/
+    return TRUE;
 }
 
 BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const
@@ -736,7 +715,7 @@ BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const
             nFormat == FORMAT_RTF         ||
             nFormat == FORMAT_STRING      ||
             nFormat == SOT_FORMATSTR_ID_DRAWING ||
-            nFormat == Exchange::RegisterFormatName(aStrEditEngineFormat));
+            nFormat == SotExchange::RegisterFormatName(aStrEditEngineFormat));
    return bOk;
 }
 
@@ -781,6 +760,9 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po
 
 BOOL SdrExchangeView::ImpPaste(ULONG nFormat, BOOL bClp, USHORT nItemNum, const Point& rPos, UINT32 nOptions)
 {
+    DBG_ERROR( "ImpPaste: Not supported anymore" );
+/*
+
     BOOL bRet(FALSE);
     String aStrEditEngineFormat("EditEngineFormat", gsl_getSystemTextEncoding());
     UINT32 nSdrFormat(SOT_FORMATSTR_ID_DRAWING);
@@ -949,6 +931,8 @@ BOOL SdrExchangeView::ImpPaste(ULONG nFormat, BOOL bClp, USHORT nItemNum, const
         bRet=Paste(aStr,rPos,NULL,nOptions);
     }
     return bRet;
+*/
+    return FALSE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1167,97 +1151,3 @@ BOOL SdrExchangeView::Paste(Window* pWin, ULONG nFormat)
     if (!bOk) bOk=PasteClipboard(pWin,nFormat);
     return bOk;
 }
-
-BOOL SdrExchangeView::QueryDrop(DropEvent& rDEvt, Window* pWin, ULONG nFormat, USHORT nItemNum)
-{
-    BOOL bOk(FALSE);
-
-    if(!bOk)
-    {
-        if(GetDragMode() == SDRDRAG_GRADIENT || GetDragMode() == SDRDRAG_TRANSPARENCE)
-        {
-            const SdrHdlList& rHdlList = GetHdlList();
-
-            for(UINT32 a=0;a<rHdlList.GetHdlCount();a++)
-            {
-                SdrHdl* pIAOHandle = rHdlList.GetHdl(a);
-
-                if(pIAOHandle && pIAOHandle->GetKind() == HDL_COLR)
-                {
-                    // what was hit?
-                    const B2dIAOGroup& rIAOGroup = pIAOHandle->GetIAOGroup();
-
-                    if(rIAOGroup.IsHit(rDEvt.GetPosPixel()))
-                    {
-                        bOk = TRUE;
-                        ((SdrHdlColor*)pIAOHandle)->SetSize(SDR_HANDLE_COLOR_SIZE_SELECTED);
-                    }
-                    else
-                    {
-                        ((SdrHdlColor*)pIAOHandle)->SetSize(SDR_HANDLE_COLOR_SIZE_NORMAL);
-                    }
-                }
-            }
-
-            // refresh IAO display
-            RefreshAllIAOManagers();
-        }
-    }
-
-    return bOk;
-}
-
-BOOL SdrExchangeView::Drop(const DropEvent& rDEvt, Window* pWin, ULONG nFormat, USHORT nItemNum)
-{
-    BOOL bOk(FALSE);
-
-#ifndef SVX_LIGHT
-    if(!bOk)
-    {
-        if(GetDragMode() == SDRDRAG_GRADIENT || GetDragMode() == SDRDRAG_TRANSPARENCE)
-        {
-            const SdrHdlList& rHdlList = GetHdlList();
-
-            for(UINT32 a=0;!bOk && a<rHdlList.GetHdlCount();a++)
-            {
-                SdrHdl* pIAOHandle = rHdlList.GetHdl(a);
-
-                if(pIAOHandle && pIAOHandle->GetKind() == HDL_COLR)
-                {
-                    // what was hit?
-                    const B2dIAOGroup& rIAOGroup = pIAOHandle->GetIAOGroup();
-
-                    if(rIAOGroup.IsHit(rDEvt.GetPosPixel()))
-                    {
-                        SvData aData(SOT_FORMATSTR_ID_XFA);
-                        XFillExchangeData* pFillData = NULL;
-                        SvDataObjectRef pDataObj = SvDataObject::PasteDragServer(rDEvt);
-                        const SvDataTypeList& rTypeList = pDataObj->GetTypeList();
-
-                        if(rTypeList.Get(SOT_FORMATSTR_ID_XFA) || nFormat == SDR_ANYFORMAT)
-                        {
-                            if(pDataObj->GetData(&aData))
-                            {
-                                if(aData.GetData((SvDataCopyStream**)&pFillData, XFillExchangeData::StaticType(), TRANSFER_MOVE))
-                                {
-                                    XFillAttrSetItem* pSetItem = pFillData->GetXFillAttrSetItem();
-                                    SfxItemSet rSet = pSetItem->GetItemSet();
-                                    const XFillColorItem& rColItem = (XFillColorItem&)rSet.Get(XATTR_FILLCOLOR);
-                                    Color aColor = rColItem.GetValue();
-
-                                    ((SdrHdlColor*)pIAOHandle)->SetColor(aColor, TRUE);
-
-                                    bOk = TRUE;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-#endif // SVX_LIGHT
-    return bOk;
-}
-
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 9e769406c31c..a385a18ec7c0 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xexch.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ka $ $Date: 2001-03-20 20:00:15 $
+ *  last change: $Author: ka $ $Date: 2001-06-22 15:46:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,12 +64,6 @@
 #include <sot/formats.hxx>
 #include <tools/vcompat.hxx>
 
-#ifndef _CLIP_HXX
-#include <vcl/clip.hxx>
-#endif
-#ifndef _DRAG_HXX
-#include <vcl/drag.hxx>
-#endif
 #ifndef _SVX_XFLASIT_HXX
 #include <xflasit.hxx>
 #endif
@@ -129,40 +123,6 @@ XFillExchangeData::~XFillExchangeData()
     delete pXFillAttrSetItem;
 }
 
-
-/*************************************************************************
-|*
-|* Laden
-|*
-*************************************************************************/
-void XFillExchangeData::Load( SvStream& rIStm )
-{
-    rIStm >> *this;
-}
-
-
-/*************************************************************************
-|*
-|* Speichern
-|*
-*************************************************************************/
-void XFillExchangeData::Save( SvStream& rOStm )
-{
-    rOStm << *this;
-}
-
-
-/*************************************************************************
-|*
-|* Zuweisen
-|*
-*************************************************************************/
-void XFillExchangeData::Assign( const SvDataCopyStream& rCopyStream )
-{
-    *this = (const XFillExchangeData& ) rCopyStream;
-}
-
-
 /*************************************************************************
 |*
 |*