#90205# remove TF_SVDATA

9 files changed, 20 insertions, 535 deletions

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 9235ca5f4cb1..c46f0a839ff8 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: app.cxx,v $
  *
- *  $Revision: 1.51 $
+ *  $Revision: 1.52 $
  *
- *  last change: $Author: cd $ $Date: 2001-07-24 10:39:53 $
+ *  last change: $Author: dv $ $Date: 2001-07-26 12:02:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,11 +78,6 @@
 #ifndef _CONFIG_HXX //autogen
 #include <vcl/config.hxx>
 #endif
-#ifndef TF_SVDATA
-#ifndef _DRAG_HXX //autogen
-#include <vcl/drag.hxx>
-#endif
-#endif
 #ifndef _SYSTEM_HXX //autogen
 #include <vcl/system.hxx>
 #endif
@@ -1267,190 +1262,6 @@ short SfxApplication::QuerySave_Impl( SfxObjectShell& rDoc, sal_Bool bAutoSave )
 }
 
 //--------------------------------------------------------------------
-#ifndef TF_SVDATA
-sal_Bool Drop1_Impl( sal_uInt16 nSID, const String &rFile, sal_Bool bHidden,
-                 SfxExecuteItem *&rpExecItem, SfxExecuteItem *&rpPrintItem )
-{
-    // Parameter bestimmen
-    SfxStringItem aFileNameItem(SID_FILE_NAME, rFile);
-    SfxBoolItem aHiddenItem(SID_HIDDEN, bHidden);
-    SfxStringItem aRefererItem(SID_REFERER, DEFINE_CONST_UNICODE("private:user") );
-    SfxExecuteItem* pOld = rpExecItem;
-    if( !rpPrintItem )
-        rpExecItem = new SfxExecuteItem(
-            SID_SUBREQUEST, nSID, SFX_CALLMODE_SYNCHRON,
-            &aFileNameItem, &aHiddenItem, &aRefererItem,
-            (SfxPoolItem*)rpExecItem, 0L );
-    else
-        rpExecItem = new SfxExecuteItem(
-            SID_SUBREQUEST, nSID, SFX_CALLMODE_SYNCHRON,
-                &aFileNameItem, &aHiddenItem, &aRefererItem, rpPrintItem,
-            (SfxPoolItem*)rpExecItem, 0L );
-    delete pOld;
-    return sal_True;
-}
-
-//--------------------------------------------------------------------
-
-sal_Bool SfxApplication::Drop_Impl( sal_uInt16 nSID, DropEvent& rEvt )
-
-/*  [Beschreibung]
-
-    F"uhrt 'nSID' mit den Files aus, die im DragServer stehen.
-*/
-
-{
-    // Actions bestimmen
-    sal_uInt16 n2ndSID = 0;     // nach SID_OPENDOC auszuf"uhren
-    sal_Bool bHidden = sal_False;   // unsichtbar "offnen
-    switch ( nSID )
-    {
-        case SID_OPENDOC:
-        case SID_OPENURL:
-            break;
-
-        case SID_PRINTDOC:
-        case SID_PRINTDOCDIRECT:
-            n2ndSID = SID_PRINTDOCDIRECT;
-            bHidden = sal_True;
-            break;
-
-        case SID_NEWDOC:
-        case SID_NEWDOCDIRECT:
-            nSID = SID_NEWDOC;
-            break;
-
-        default:
-            // unbekannte SID
-            return sal_False;
-    }
-
-    // "uber die Items im DragServer iterieren
-    const sal_uInt16 nCount = DragServer::GetItemCount();
-    sal_Bool bSuccess = sal_False;
-
-    SfxExecuteItem* pExecItem = 0;
-    SfxExecuteItem* pPrintItem = n2ndSID ? new SfxExecuteItem(
-        SID_AFTEROPENEVENT, n2ndSID, SFX_CALLMODE_SYNCHRON ) : 0;
-
-    for ( sal_uInt16 i = 0; i < nCount; ++i )
-    {
-        // Format erkennen
-        String aFile;
-        INetBookmark aBmk;
-        if ( DragServer::HasFormat(i, FORMAT_FILE_LIST) )
-        {
-            // SvData basteln
-            SvData aData( FORMAT_FILE_LIST );
-            SvDataObjectRef xDataObj = SvDataObject::PasteDragServer( rEvt );
-            xDataObj->GetData( &aData );
-
-            // Daten holen
-            FileList aFileList;
-            FileList* pFileList = &aFileList;
-            aData.GetData( (SvDataCopyStream**)&pFileList, pFileList->Type() );
-            for ( sal_uInt16 n = (sal_uInt16)aFileList.Count(); n--; )
-                Drop1_Impl( nSID, aFileList.GetFile(n), bHidden,
-                            pExecItem, pPrintItem );
-        }
-        else if ( DragServer::HasFormat(i, FORMAT_FILE) )
-        {
-               String aFile = DragServer::PasteFile(i);
-            Drop1_Impl( nSID, aFile, bHidden, pExecItem, pPrintItem );
-        }
-        else if ( aBmk.PasteDragServer(i) )
-        {
-            // Format via ::com::sun::star::text::Bookmark rausholen
-            Drop1_Impl( nSID, aBmk.GetURL(), bHidden, pExecItem, pPrintItem );
-        }
-    }
-
-    if( pExecItem )
-    {
-        // Fuer Mac muss erstes Execute Asyncron kommen
-        pExecItem->SetCallMode( SFX_CALLMODE_ASYNCHRON );
-        pViewFrame->GetDispatcher()->Execute( *pExecItem );
-        delete pExecItem;
-    }
-
-
-    // scheinbar annehmen, sonst kommt zweites Drop im falschen Window
-    return DROP_COPY == rEvt.GetAction();
-}
-
-//--------------------------------------------------------------------
-
-sal_Bool SfxApplication::QueryDrop_Impl( sal_uInt16 nSID, DropEvent& rEvt )
-
-/*  [Beschreibung]
-
-    QueryDrop-Handler; wird in der Regel aus dem QueryDrop() an den
-    Windows gerufen;
-    er returned sal_True, wenn FORMAT_FILE im DragServer vorliegt.
-*/
-{
-    if ( nSID == SID_OPENDOC || nSID == SID_OPENURL ||
-         nSID == SID_PRINTDOC || nSID == SID_PRINTDOCDIRECT ||
-         nSID == SID_NEWDOC || nSID == SID_NEWDOCDIRECT )
-    {
-        const sal_uInt16 nCount = DragServer::GetItemCount();
-        for ( sal_uInt16 i = 0; i < nCount; ++i )
-        {
-            if ( INetBookmark::DragServerHasFormat( i ) ||
-                 DragServer::HasFormat(i, FORMAT_FILE) ||
-                 DragServer::HasFormat(i, FORMAT_FILE_LIST) )
-            {
-                // if ( rEvt.IsDefaultAction() )
-                {
-                    rEvt.SetAction( DROP_COPY );
-                    return sal_True;
-                }
-                if ( rEvt.GetAction() == DROP_COPY )
-                    return sal_True;
-            }
-        }
-    }
-    return sal_False;
-}
-
-//--------------------------------------------------------------------
-
-sal_Bool SfxApplication::Drop( DropEvent& rEvt )
-
-/*  [Beschreibung]
-
-    Dieser Drop-Handler kann von den Applikationen, die i.d.R. keine
-    Ableitug vom SfxApplicationWindow haben, "uberladen werden. Er wird in
-    der Regel aus dem Drop() an den Windows gerufen.
-
-    In der Basisimplementierung wird versucht, alle Elemente im DragServer
-    als Datei zu oeffnen, indem sie als Event ueber den Dispatcher verschickt
-    werden.
-*/
-
-{
-    return Drop_Impl( SID_OPENDOC, rEvt );
-}
-
-//--------------------------------------------------------------------
-
-sal_Bool SfxApplication::QueryDrop( DropEvent& rEvt )
-
-/*  [Beschreibung]
-
-    Dieser QueryDrop-Handler kann von den Applikationen, die i.d.R. keine
-    Ableitug vom SfxApplicationWindow haben, "uberladen werden. Er wird in
-    der Regel aus dem QueryDrop() an den Windows gerufen.
-
-    Die Basisimplementierung returned sal_True, wenn FORMAT_FILE im DragServer
-    vorliegt.
-*/
-
-{
-    return QueryDrop_Impl( SID_OPENDOC, rEvt );
-}
-#endif
-//--------------------------------------------------------------------
 
 sal_Bool SfxApplication::IsInException() const
 {
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index b99098f75d03..3ca761641882 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mieclip.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-18 10:05:33 $
+ *  last change: $Author: dv $ $Date: 2001-07-26 12:03:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,10 +66,6 @@
 #include <tools/cachestr.hxx>
 #endif
 
-#ifndef _SV_EXCHANGE_HXX //autogen
-#include <vcl/exchange.hxx>
-#endif
-
 #ifndef _SVSTOR_HXX //autogen
 #include <so3/svstor.hxx>
 #endif
@@ -88,26 +84,6 @@ MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
     delete pStrm;
 }
 
-#ifndef TF_SVDATA
-BOOL MSE40HTMLClipFormatObj::GetData( SotDataObject& rObj )
-{
-    SvData aData( SOT_FORMATSTR_ID_HTML_SIMPLE );
-    if( rObj.GetData( &aData ) )
-        return GetData( aData );
-    return FALSE;
-}
-
-BOOL MSE40HTMLClipFormatObj::GetData( SvData& rData )
-{
-    BOOL bRet = FALSE;
-    SvStorageStreamRef xStrm;
-    rData.GetData( (SvStorageStreamRef&)xStrm );
-    if( xStrm.Is() )
-        IsValid( *xStrm );
-    return 0 != pStrm;
-}
-#endif
-
 SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
 {
     BOOL bRet = FALSE;
@@ -160,46 +136,3 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
     return pStrm;
 }
 
-
-////////////////////////////////////////////////////////////////////////////////
-//
-/* $Log: not supported by cvs2svn $
-/* Revision 1.2  2001/02/02 13:41:23  jp
-/* new: IsValid - checks if the stream contains the correct headerdata
-/*
-/* Revision 1.1.1.1  2000/09/18 16:52:28  hr
-/* initial import
-/*
-/* Revision 1.9  2000/09/17 16:47:18  willem.vandorp
-/* OpenOffice header added.
-/*
-/* Revision 1.8  2000/09/06 14:49:46  willem.vandorp
-/* Header and footer replaced.
-/*
-/* Revision 1.7  2000/05/02 09:16:06  as
-/* unicode changes
-/*
-/* Revision 1.6  2000/03/02 19:08:47  jp
-/* Bug #73756#: GetData - Base URL may not be exist
-/*
-/* Revision 1.5  1999/12/16 19:33:27  er
-/* #60614# add: GetData with SvData
-/*
-/* Revision 1.4  1999/01/18 13:36:12  JP
-/* Task #59398#: unnoetiges RegisterClipb... gegen IDS ausgetauscht
-/*
-
-      Rev 1.3   18 Jan 1999 14:36:12   JP
-   Task #59398#: unnoetiges RegisterClipb... gegen IDS ausgetauscht
-
-      Rev 1.2   23 Nov 1998 12:14:26   MBA
-   Fix #56371#: Umstellung TF_ONE51
-
-      Rev 1.1   22 Jun 1998 21:20:44   JP
-   SvDataObject gegen SorDataObject ausgetauscht
-
-      Rev 1.0   18 Feb 1998 17:28:08   OK
-   NEW: MSE40HTMLClipFormatObj
-
-*/
-
diff --git a/sfx2/source/dialog/cfg.cxx b/sfx2/source/dialog/cfg.cxx
index 0d986d2e9e8a..681ed5c61128 100644
--- a/sfx2/source/dialog/cfg.cxx
+++ b/sfx2/source/dialog/cfg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfg.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: pb $ $Date: 2001-07-05 13:49:07 $
+ *  last change: $Author: dv $ $Date: 2001-07-26 12:04:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1234,22 +1234,11 @@ void SfxStatusBarConfigListBox::KeyInput( const KeyEvent& rKEvt )
         SvTreeListBox::KeyInput( rKEvt );
 }
 
-#ifndef TF_SVDATA
-
-BOOL SfxStatusBarConfigListBox::NotifyQueryDrop( SvLBoxEntry* pEntry )
-{
-    return SvTreeListBox::NotifyQueryDrop(pEntry);
-}
-
-#else
-
 BOOL SfxStatusBarConfigListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
 {
     return SvTreeListBox::NotifyAcceptDrop(pEntry);
 }
 
-#endif
-
 BOOL SfxStatusBarConfigListBox::NotifyMoving(SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
                                 SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos)
 {
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index da93c36adfa7..cecf14409c5b 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: splitwin.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-18 10:14:17 $
+ *  last change: $Author: dv $ $Date: 2001-07-26 12:04:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -146,9 +146,6 @@ friend class SfxSplitWindow;
                         }
 
     virtual void        MouseMove( const MouseEvent& );
-#ifndef TF_SVDATA
-    virtual BOOL        QueryDrop( DropEvent& rEvt );
-#endif
     virtual void        AutoHide();
     virtual void        FadeIn();
     void                Actualize();
@@ -196,24 +193,6 @@ void SfxEmptySplitWin_Impl::FadeIn()
     }
 }
 
-#ifndef TF_SVDATA
-BOOL SfxEmptySplitWin_Impl::QueryDrop( DropEvent& rEvt )
-{
-    bAutoHide = TRUE;
-    FadeIn();
-    return FALSE;
-}
-
-BOOL SfxSplitWindow::QueryDrop( DropEvent& rEvt )
-{
-    Point aMousePos( rEvt.GetPosPixel() );
-    Rectangle aRect( GetFadeOutRect() );
-    if ( aRect.IsInside( aMousePos ) && !bPinned )
-        FadeOut();
-    return FALSE;
-}
-#endif
-
 //-------------------------------------------------------------------------
 
 void SfxSplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index edd517534993..351ed0a83b04 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docvor.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: cd $ $Date: 2001-07-18 07:05:49 $
+ *  last change: $Author: dv $ $Date: 2001-07-26 12:08:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,11 +76,6 @@
 #ifndef _SV_MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#ifndef TF_SVDATA
-#ifndef _SV_DRAG_HXX //autogen
-#include <vcl/drag.hxx>
-#endif
-#endif
 #ifndef _SV_PRINT_HXX //autogen
 #include <vcl/print.hxx>
 #endif
@@ -964,159 +959,6 @@ BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rTe
 
 //-------------------------------------------------------------------------
 
-#ifndef TF_SVDATA
-
-DragDropMode SfxOrganizeListBox_Impl::NotifyBeginDrag(SvLBoxEntry *pSourceEntry)
-/*  [Beschreibung]
-
-    Was fuer DragActions sind an dieser Stelle erlaubt.
-    Fuer Dokumentinhalte darf nur kopiert, nicht verschoben werden.
-*/
-{
-    USHORT nSourceLevel = GetModel()->GetDepth(pSourceEntry);
-    if(VIEW_FILES == GetViewType())
-        ++nSourceLevel;
-    if(nSourceLevel>=2)
-    {
-        bDropMoveOk=FALSE;
-        return GetDragDropMode();
-    }
-    else
-    {
-        bDropMoveOk=TRUE;
-        return GetDragDropMode();
-    }
-
-}
-
-//-------------------------------------------------------------------------
-
-BOOL SfxOrganizeListBox_Impl::NotifyQueryDrop(SvLBoxEntry *pEntry)
-
-/* [Beschreibung]
-
-    QueryDrop-Handler (SV); Funktionsweise kann der Wahrheits,
-    tabelle unten entnommen werden.
-
-
-                    B       D       C1      C2      C3
-
-        Quelle      0       1       2       3       4
-    Ziel
-     0              -       +***    -       -       -
-     1              -       +***    [-]*    +       -
-     2              -       -       [-]     p=p +** -
-     3              -       -       -       p=p +** p=p && pp=pp +
-     4              -       -       -       -       p=p && pp=pp +
-    ----
-    *   Problem Move; logische Bereiche koennen nicht geloescht werden
-    **  p = Parent -> p=p: identische Parents
-        pp = ParentParent
-    *** geht bei Vorlagen
-*/
-{
-    if(!pEntry)
-        return FALSE;
-    SvLBox *pSource = GetSourceView();
-    SvLBoxEntry *pSourceEntry = pSource->FirstSelected();
-    if(pEntry == pSourceEntry)
-        return FALSE;
-    USHORT nSourceLevel = pSource->GetModel()->GetDepth(pSourceEntry);
-    if(VIEW_FILES == ((SfxOrganizeListBox_Impl *)pSource)->GetViewType())
-        ++nSourceLevel;
-    USHORT nTargetLevel = GetModel()->GetDepth(pEntry);
-    if(VIEW_FILES == GetViewType())
-        ++nTargetLevel;
-    Path aSource(pSource, pSourceEntry);
-    Path aTarget(this, pEntry);
-    const USHORT SL = ((SfxOrganizeListBox_Impl *)pSource)->GetDocLevel();
-    const USHORT TL = GetDocLevel();
-
-    return( (nSourceLevel == 1 && nTargetLevel == 0 &&
-            VIEW_TEMPLATES ==
-            ((SfxOrganizeListBox_Impl *)pSource)->GetViewType()) ||
-           (nSourceLevel == 1 && nTargetLevel == 1 &&
-            VIEW_TEMPLATES ==
-            ((SfxOrganizeListBox_Impl *)pSource)->GetViewType() &&
-            VIEW_TEMPLATES == GetViewType()) ||
-           (nSourceLevel == 3 && nTargetLevel == 1) ||
-           (nSourceLevel == 3 && nTargetLevel == 2 &&
-            aSource[1+SL] == aTarget[1+TL]) ||
-           (nSourceLevel == 3 && nTargetLevel == 3 &&
-            aSource[1+SL] == aTarget[1+TL]) ||
-           (nSourceLevel == 4 && nTargetLevel == 3 &&
-            aSource[1+SL] == aTarget[1+TL] &&
-            aSource[2+SL] == aTarget[2+TL]) ||
-           (nSourceLevel == 4 && nTargetLevel == 4 &&
-            aSource[1+SL] == aTarget[1+TL] &&
-            aSource[2+SL] == aTarget[2+TL]));
-}
-
-//-------------------------------------------------------------------------
-
-BOOL SfxOrganizeListBox_Impl::QueryDrop( DropEvent& rEvt )
-
-/*  [Beschreibung]
-
-    QueryDrop Handler; wird verwendet, um in der Dokumentenansicht weitere
-    Dokumente per Drag&Drop hinzuf"ugen zu k"onnen
-    (SV-Handler)
-
-    [Returnwert]
-
-    BOOL                Erfolg oder Mi"serfolg
-
-    [Querverweise]
-    <SfxOrganizeListBox_Impl::Drop(DropEvent& rEvt)>
-*/
-
-{
-
-/*  if(rEvt.GetAction()==DROP_MOVE && !bDropMoveOk)
-        return FALSE;*/
-    if( rEvt.IsDefaultAction() )
-        rEvt.SetAction( DROP_COPY );
-    return eViewType == VIEW_FILES && DragServer::HasFormat(0, FORMAT_FILE)
-        ? TRUE : SvTreeListBox::QueryDrop(rEvt);
-}
-
-//-------------------------------------------------------------------------
-
-BOOL SfxOrganizeListBox_Impl::Drop( const DropEvent& rEvt )
-
-/*  [Beschreibung]
-
-    Drop Handler; wird verwendet, um in der Dokumentenansicht weitere
-    Dokumente per Drag&Drop hinzuf"ugen zu k"onnen
-    (SV-Handler)
-
-    [Returnwert]
-
-    BOOL                Erfolg oder Mi"serfolg
-
-    [Querverweise]
-    <SfxOrganizeListBox_Impl::QueryDrop(DropEvent& rEvt)>
-*/
-
-{
-    const USHORT nCount = DragServer::GetItemCount();
-    BOOL bSuccess = FALSE;
-    for ( USHORT i = 0; i < nCount; ++i )
-    {
-        const String aFileName( DragServer::PasteFile(i) );
-        if ( !aFileName.Len() )
-            continue;
-        INetURLObject aObj( aFileName, INET_PROT_FILE );
-        bSuccess |= pMgr->InsertFile( this, aObj.GetMainURL() );
-    }
-    bDropMoveOk = TRUE;
-    return bSuccess ? bSuccess : SvTreeListBox::Drop( rEvt );
-}
-
-//-------------------------------------------------------------------------
-
-#else // TF_SVDATA
-
 DragDropMode SfxOrganizeListBox_Impl::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* pEntry )
 {
     USHORT nSourceLevel = GetModel()->GetDepth( pEntry );
@@ -1204,8 +1046,6 @@ sal_Int8 SfxOrganizeListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
     return bSuccess ? rEvt.mnAction : SvTreeListBox::ExecuteDrop( rEvt );
 }
 
-#endif // TF_SVDATA
-
 //-------------------------------------------------------------------------
 
 inline USHORT SfxOrganizeListBox_Impl::GetDocLevel() const
@@ -1425,9 +1265,7 @@ SfxOrganizeListBox_Impl::SfxOrganizeListBox_Impl(
 //  SetDragOptions(DROP_COPY);
     SetEntryHeight( 16 );
     SetSelectionMode(SINGLE_SELECTION);
-#ifndef TF_SVDATA
-    EnableDrop();
-#endif
+
     GetModel()->SetSortMode(SortNone);      // Bug in SvTools 303
 }
 
diff --git a/sfx2/source/inc/cfg.hxx b/sfx2/source/inc/cfg.hxx
index 0dcc0c1d5cf1..6daac42b859a 100644
--- a/sfx2/source/inc/cfg.hxx
+++ b/sfx2/source/inc/cfg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfg.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: pb $ $Date: 2001-07-05 13:47:56 $
+ *  last change: $Author: dv $ $Date: 2001-07-26 12:09:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -218,9 +218,6 @@ public :
                                                 SvLBoxItem* pItem, const Point& rMousePos );
     virtual BOOL                EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
     virtual void                MouseMove( const MouseEvent& rMEvt );
-#ifndef TF_SVDATA
-    virtual BOOL                QueryDrop( DropEvent& );
-#endif
     virtual sal_Int8            AcceptDrop( const AcceptDropEvent& rEvt );
     virtual BOOL                NotifyMoving(SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& );
     void                        Apply( SfxMenuManager* pMgr, SvLBoxEntry *pParent = NULL );
@@ -394,11 +391,7 @@ public:
                                 SfxStatusBarConfigListBox( Window* pParent,
                                         const ResId& );
 
-#ifndef TF_SVDATA
-    virtual BOOL                NotifyQueryDrop( SvLBoxEntry* pEntry );
-#else
     virtual BOOL                NotifyAcceptDrop( SvLBoxEntry* pEntry );
-#endif
     virtual BOOL                NotifyMoving(SvLBoxEntry*,
                                     SvLBoxEntry*,SvLBoxEntry*&,ULONG&);
     virtual void                CheckButtonHdl();
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index e0f806de472a..d5a25d90d4a4 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: splitwin.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-18 10:17:40 $
+ *  last change: $Author: dv $ $Date: 2001-07-26 12:09:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,9 +102,6 @@ protected:
     virtual void        Split();
     virtual void        Command ( const CommandEvent& rCEvt );
     virtual void        MouseButtonDown ( const MouseEvent& );
-#ifndef TF_SVDATA
-    virtual BOOL        QueryDrop( DropEvent& rEvt );
-#endif
 
 public:
                         SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 57b8c0336c7c..c8a903ae0db2 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templdgi.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-18 10:17:40 $
+ *  last change: $Author: dv $ $Date: 2001-07-26 12:09:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,18 +115,10 @@ protected:
 public:
     DropListBox_Impl( Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD ) :
         SvTreeListBox( pParent, rId ), pDialog( pD ), pPreDropEntry( NULL )
-#ifndef TF_SVDATA
-            { EnableDrop( TRUE ); }
-#else
             {}
-#endif
     DropListBox_Impl( Window* pParent, WinBits nWinBits, SfxCommonTemplateDialog_Impl* pD ) :
         SvTreeListBox( pParent, nWinBits ), pDialog( pD ), pPreDropEntry( NULL )
-#ifndef TF_SVDATA
-            { EnableDrop( TRUE ); }
-#else
             {}
-#endif
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 4eba735a7ba8..ddadac527e14 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxitem.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: mba $ $Date: 2001-07-10 11:31:56 $
+ *  last change: $Author: dv $ $Date: 2001-07-26 12:10:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,11 +60,7 @@
  ************************************************************************/
 
 #include <string>           // prevent conflict with STL includes
-#ifndef TF_SVDATA
-#ifndef _SV_DRAG_HXX
-#include <vcl/drag.hxx>
-#endif
-#endif
+
 #ifndef _SFXENUMITEM_HXX //autogen
 #include <svtools/eitem.hxx>
 #endif
@@ -250,49 +246,6 @@ void SfxToolBoxControl::StateChanged
     pBox->SetItemState( GetId(), eTri );
 }
 
-//------------------------------------------------------------------------
-#ifndef TF_SVDATA
-BOOL SfxToolBoxControl::Drop( DropEvent& rEvt )
-
-/*  [Beschreibung]
-
-    Diese virtuelle Methode kann "uberladen werden, um ein Drop auf ein
-    Toolbox-Control auszuf"uhren. Die Basisimplementierung braucht
-    i.d.R. nicht gerufen zu werden, da sie das Drop nur f"ur einige
-    spezielle SIDs implementiert, f"ur die es i.d.R. eigene Instanzen
-    von <SfxToolBoxControl> gibt.
-
-    Die Semantik ist wie in StarView, Positionen sind relativ zur
-    Toolbox.
-*/
-
-{
-//    return SFX_APP()->Drop_Impl( GetId(), rEvt );
-    return FALSE;
-}
-
-//------------------------------------------------------------------------
-
-BOOL SfxToolBoxControl::QueryDrop( DropEvent& rEvt )
-
-/*  [Beschreibung]
-
-    Diese virtuelle Methode kann "uberladen werden, um ein auf QueryDrop
-    auf ein Toolbox-Control auszuwerten. Die Basisimplementierung braucht
-    i.d.R. nicht gerufen zu werden, da sie das QueryDrop nur f"ur einige
-    spezielle SIDs implementiert, f"ur die es i.d.R. eigene Instanzen
-    von <SfxToolBoxControl> gibt.
-
-    Die Semantik ist wie in StarView, Positionen sind relativ zur
-    Toolbox.
-*/
-
-{
-//    return SFX_APP()->QueryDrop_Impl( GetId(), rEvt );
-    return FALSE;
-}
-#endif
-
 //--------------------------------------------------------------------
 
 void SfxToolBoxControl::Select( USHORT nModifier )