TF_SVDATA

9 files changed, 55 insertions, 53 deletions

diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index df7e5d25361b..da93c36adfa7 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: splitwin.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mba $ $Date: 2001-02-19 11:44:48 $
+ *  last change: $Author: mba $ $Date: 2001-06-18 10:14:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -133,7 +133,7 @@ friend class SfxSplitWindow;
                             aTimer.SetTimeoutHdl(
                                 LINK(pOwner, SfxSplitWindow, TimerHdl ) );
                             aTimer.SetTimeout( 200 );
-                            EnableDrop( TRUE );
+//                            EnableDrop( TRUE );
                             SetAlign( pOwner->GetAlign() );
                             Actualize();
                             ShowAutoHideButton( pOwner->IsAutoHideButtonVisible() );
@@ -146,7 +146,9 @@ 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();
@@ -194,29 +196,23 @@ void SfxEmptySplitWin_Impl::FadeIn()
     }
 }
 
+#ifndef TF_SVDATA
 BOOL SfxEmptySplitWin_Impl::QueryDrop( DropEvent& rEvt )
 {
-#ifndef OS2
     bAutoHide = TRUE;
     FadeIn();
-#endif
-
     return FALSE;
 }
 
-
 BOOL SfxSplitWindow::QueryDrop( DropEvent& rEvt )
 {
     Point aMousePos( rEvt.GetPosPixel() );
     Rectangle aRect( GetFadeOutRect() );
     if ( aRect.IsInside( aMousePos ) && !bPinned )
-    {
         FadeOut();
-        return FALSE;
-    }
-    else
-        return SplitWindow::QueryDrop( rEvt );
+    return FALSE;
 }
+#endif
 
 //-------------------------------------------------------------------------
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 4e032806a53d..f7f592c6d3d9 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabdlg.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: mba $ $Date: 2001-03-30 15:56:35 $
+ *  last change: $Author: mba $ $Date: 2001-06-18 10:14:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,9 +67,6 @@
 #ifndef _SV_MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#ifndef _SV_CLIP_HXX //autogen
-#include <vcl/clip.hxx>
-#endif
 #ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX
 #include <svtools/viewoptions.hxx>
 #endif
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 9cb1cd1d6138..e658edffa72a 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templdlg.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: pb $ $Date: 2001-06-15 11:00:22 $
+ *  last change: $Author: mba $ $Date: 2001-06-18 10:14:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -563,9 +563,8 @@ StyleTreeListBox_Impl::StyleTreeListBox_Impl(
     Konstruktor StyleTreeListBox_Impl
 
 */
-
 {
-    SetDragOptions(DROP_MOVE);
+//    SetDragOptions(DROP_MOVE);
 }
 
 
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 860244bc3dfc..beb80ddf2ab4 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objmisc.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-14 11:26:55 $
+ *  last change: $Author: mba $ $Date: 2001-06-18 10:16:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,14 +71,6 @@
 #ifndef _SVSTOR_HXX //autogen
 #include <so3/svstor.hxx>
 #endif
-#if SUPD<613//MUSTINI
-    #ifndef _SFXINIMGR_HXX //autogen
-    #include <svtools/iniman.hxx>
-    #endif
-#endif
-#ifndef _SV_DRAG_HXX //autogen
-#include <vcl/drag.hxx>
-#endif
 #include <so3/inetbnd.hxx>
 #include <vos/mutex.hxx>
 
@@ -1097,7 +1089,7 @@ void AutoReloadTimer_Impl::Timeout()
     if ( pFrame )
     {
         // momentan nicht m"oglich/sinnvoll?
-        if ( !pObjSh->CanReload_Impl() || pObjSh->IsAutoLoadLocked() || DragManager::GetDragManager() )
+        if ( !pObjSh->CanReload_Impl() || pObjSh->IsAutoLoadLocked() || Application::IsUICaptured() )
         {
             // erneuten Versuch erlauben
             Start();
diff --git a/sfx2/source/inc/cfg.hxx b/sfx2/source/inc/cfg.hxx
index 8ff2b85136c2..8de0ffe140d4 100644
--- a/sfx2/source/inc/cfg.hxx
+++ b/sfx2/source/inc/cfg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfg.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-11 10:05:59 $
+ *  last change: $Author: mba $ $Date: 2001-06-18 10:17:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -218,7 +218,7 @@ public :
                                                 SvLBoxItem* pItem, const Point& rMousePos );
     virtual BOOL                EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
     virtual void                MouseMove( const MouseEvent& rMEvt );
-    virtual BOOL                QueryDrop( DropEvent& );
+//    virtual BOOL                QueryDrop( DropEvent& );
     virtual BOOL                NotifyMoving(SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& );
     void                        Apply( SfxMenuManager* pMgr, SvLBoxEntry *pParent = NULL );
 };
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 3916142b2279..e0f806de472a 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: splitwin.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2001-02-19 11:54:08 $
+ *  last change: $Author: mba $ $Date: 2001-06-18 10:17:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,7 +102,9 @@ 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 1bec480c09ae..57b8c0336c7c 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templdgi.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pb $ $Date: 2001-06-15 10:58:51 $
+ *  last change: $Author: mba $ $Date: 2001-06-18 10:17:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,10 +115,18 @@ 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/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index bb335f0507ad..032e15e9d82e 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: inettbc.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-14 11:30:19 $
+ *  last change: $Author: mba $ $Date: 2001-06-18 10:18:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -617,7 +617,7 @@ SfxURLBox::SfxURLBox( Window* pParent, INetProtocol eSmart )
     pImp->pCompletions = NULL;
     SetHelpId( SID_OPENURL );
     EnableAutocomplete( FALSE );
-    EnableDrop();
+//  EnableDrop();
     if ( GetDesktopRectPixel().GetWidth() > 800 )
         SetSizePixel( Size( 300, 240 ) );
     else
@@ -643,7 +643,7 @@ SfxURLBox::SfxURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart
     pImp->pCompletions = NULL;
     SetHelpId( SID_OPENURL );
     EnableAutocomplete( FALSE );
-    EnableDrop();
+//  EnableDrop();
     // no automatic sizing if loaded from a resource (the size should be specified therein)
     SetText( String() );
 
@@ -691,19 +691,21 @@ void SfxURLBox::UpdatePicklistForSmartProtocol_Impl()
 }
 
 // **************************************************************************
-
+#ifndef TF_SVDATA
 BOOL SfxURLBox::QueryDrop( DropEvent &rEvt )
 {
-    return SFX_APP()->QueryDrop( rEvt );
+//    return SFX_APP()->QueryDrop( rEvt );
+    return FALSE;
 }
 
 // **************************************************************************
 
 BOOL SfxURLBox::Drop( const DropEvent &rEvt )
 {
-    return SFX_APP()->Drop( (DropEvent&) rEvt );
+//    return SFX_APP()->Drop( (DropEvent&) rEvt );
+    return FALSE;
 }
-
+#endif
 // **************************************************************************
 
 void SfxURLBox::OpenURL( const String& rName, BOOL bNew ) const
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index c438a1f9ad4b..5d712e2d4e5f 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxitem.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: pb $ $Date: 2001-05-14 10:11:42 $
+ *  last change: $Author: mba $ $Date: 2001-06-18 10:19:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,9 +60,11 @@
  ************************************************************************/
 
 #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
@@ -248,7 +250,7 @@ void SfxToolBoxControl::StateChanged
 }
 
 //------------------------------------------------------------------------
-
+#ifndef TF_SVDATA
 BOOL SfxToolBoxControl::Drop( DropEvent& rEvt )
 
 /*  [Beschreibung]
@@ -264,7 +266,8 @@ BOOL SfxToolBoxControl::Drop( DropEvent& rEvt )
 */
 
 {
-    return SFX_APP()->Drop_Impl( GetId(), rEvt );
+//    return SFX_APP()->Drop_Impl( GetId(), rEvt );
+    return FALSE;
 }
 
 //------------------------------------------------------------------------
@@ -284,8 +287,10 @@ BOOL SfxToolBoxControl::QueryDrop( DropEvent& rEvt )
 */
 
 {
-    return SFX_APP()->QueryDrop_Impl( GetId(), rEvt );
+//    return SFX_APP()->QueryDrop_Impl( GetId(), rEvt );
+    return FALSE;
 }
+#endif
 
 //--------------------------------------------------------------------
 
@@ -773,7 +778,7 @@ void SfxDragButton_Impl::Command ( const CommandEvent& rCEvt )
 {
     if( rCEvt.GetCommand() != COMMAND_STARTDRAG )
         return;
-
+ /*
     SfxViewFrame *pViewFrame = SfxViewFrame::Current();
     if ( pViewFrame )
     {
@@ -792,6 +797,7 @@ void SfxDragButton_Impl::Command ( const CommandEvent& rCEvt )
             ExecuteDrag( aMovePtr, aCopyPtr, aLinkPtr, DRAG_COPYABLE | DRAG_LINKABLE );
         }
     }
+  */
 }
 
 void SfxDragButton_Impl::MouseMove( const MouseEvent& rEvt )