bindings / dispatcher changes

39 files changed, 167 insertions, 438 deletions

diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index cd330264e3b2..0cc34d069a48 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: auditsh.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:33:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,9 +74,6 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 
-#define GLOBALOVERFLOW
-#include "segmentc.hxx"
-
 #include "auditsh.hxx"
 #include "tabvwsh.hxx"
 #include "scresid.hxx"
@@ -89,13 +86,6 @@
 
 //------------------------------------------------------------------------
 
-SEG_EOFGLOBALS()
-
-//------------------------------------------------------------------------
-
-#pragma SEG_SEGCLASS(SFXMACROS_SEG,STARTWORK_CODE)
-
-
 TYPEINIT1( ScAuditingShell, SfxShell );
 
 SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL))
@@ -105,7 +95,6 @@ SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL))
 
 
 //------------------------------------------------------------------------
-#pragma SEG_FUNCDEF(auditsh_01)
 
 ScAuditingShell::ScAuditingShell(ScViewData* pData) :
     SfxShell(pData->GetViewShell()),
@@ -119,18 +108,16 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) :
 }
 
 //------------------------------------------------------------------------
-#pragma SEG_FUNCDEF(auditsh_02)
 
 ScAuditingShell::~ScAuditingShell()
 {
 }
 
 //------------------------------------------------------------------------
-#pragma SEG_FUNCDEF(auditsh_03)
 
 void ScAuditingShell::Execute( SfxRequest& rReq )
 {
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = pViewData->GetBindings();
     USHORT nSlot = rReq.GetSlot();
     switch ( nSlot )
     {
@@ -188,55 +175,10 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
 }
 
 //------------------------------------------------------------------------
-#pragma SEG_FUNCDEF(auditsh_04)
 
 void ScAuditingShell::GetState( SfxItemSet& rSet )
 {
     rSet.Put( SfxBoolItem( nFunction, TRUE ) );         // aktive Funktion markieren
 }
 
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.11  2000/09/17 14:09:30  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.10  2000/08/31 16:38:44  willem.vandorp
-    Header and footer replaced
-
-    Revision 1.9  2000/05/09 18:30:15  nn
-    use IMPL_INTERFACE macro without IDL
-
-    Revision 1.8  2000/04/14 08:31:36  nn
-    unicode changes
-
-    Revision 1.7  1999/06/02 19:40:56  ANK
-    #66547# SubShells
-
-
-      Rev 1.6   02 Jun 1999 21:40:56   ANK
-   #66547# SubShells
-
-      Rev 1.5   24 Nov 1997 20:04:54   NN
-   includes
-
-      Rev 1.4   04 Sep 1997 19:51:46   RG
-   change header
-
-      Rev 1.3   05 Aug 1997 14:33:14   TJ
-   include svx/srchitem.hxx
-
-      Rev 1.2   29 Oct 1996 13:35:32   NN
-   ueberall ScResId statt ResId
-
-      Rev 1.1   09 Aug 1996 20:34:22   NN
-   Svx-Includes aus scitems.hxx raus
-
-      Rev 1.0   29 May 1996 19:41:46   NN
-   Initial revision.
-
-------------------------------------------------------------------------*/
-
-#pragma SEG_EOFMODULE
-
 
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 7156dd6e8c1f..805684166a7f 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cellsh2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:33:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -223,7 +223,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 #if 0
                 if( pScApp->GetSbaObject()->IsAddrPIOpen() )
                 {
-                    SFX_DISPATCHER().Execute( SID_SBA_ADDRPI,
+                    pViewData->GetDispatcher().Execute( SID_SBA_ADDRPI,
                                             SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
                 }
 #endif
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 78226b58a0ee..adf3dd275edb 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cellsh3.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:33:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -849,7 +849,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
         case SID_STATUS_DOCPOS:
             {
                 //! Navigator an-/ausschalten (wie im Writer) ???
-                //!SFX_DISPATCHER().Execute( SID_NAVIGATOR,
+                //!pViewData->GetDispatcher().Execute( SID_NAVIGATOR,
                 //!                       SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
             }
             break;
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 2c658013cc3f..03c2f3c4ae9e 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: colrowba.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:33:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -193,7 +193,6 @@
 //sfxsh.hxx
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 //#define _SFXDISPATCH_HXX
 //#define _SFXMSG_HXX
 #define _SFXOBJFACE_HXX
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 1cf910eba94e..5b523d2c1473 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbfunc.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:34:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -434,7 +434,7 @@ void ScDBFunc::HideAutoFilter()
 
     GetViewData()->GetDocShell()->PostPaint( nCol1,nRow1,nTab, nCol2,nRow1,nTab, PAINT_GRID );
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = GetViewData()->GetBindings();
     rBindings.Invalidate( SID_AUTO_FILTER );
     rBindings.Invalidate( SID_AUTOFILTER_HIDE );
 }
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 64f96ca22ba5..dcdaa2d29ea1 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbfunc3.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:34:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,17 +100,6 @@
 //          Outliner
 //
 
-void lcl_InvalidateOutliner()
-{
-    SfxBindings& rBindings = SFX_BINDINGS();
-    rBindings.Invalidate( SID_OUTLINE_SHOW );
-    rBindings.Invalidate( SID_OUTLINE_HIDE );
-    rBindings.Invalidate( SID_OUTLINE_REMOVE );
-
-    rBindings.Invalidate( SID_STATUS_SUM );         // wegen ein-/ausblenden
-    rBindings.Invalidate( SID_ATTR_SIZE );
-}
-
 //  Outline-Gruppierung erzeugen
 
 void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord )
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index 0e4b7dd6ed32..282841abc940 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbfunc4.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:34:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -203,7 +203,6 @@
 //sfxsh.hxx
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 //#define _SFXDISPATCH_HXX
 //#define _SFXMSG_HXX
 #define _SFXOBJFACE_HXX
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 95b5a316e2c3..f38e5a0bd082 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drawvie3.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:35:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,7 +120,6 @@
 //#define _SFXSH_HXX
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 #define _SFXDISPATCH_HXX
 #define _SFXMSG_HXX
 #define _SFXOBJFACE_HXX
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 74270f2c5d43..2d3b9f4a0b55 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drawvie4.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:35:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -200,7 +200,6 @@
 //sfxsh.hxx
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-#define _SFX_BINDINGS_HXX //???
 #define _SFXDISPATCH_HXX  //???
 //#define _SFXMSG_HXX
 //#define _SFXOBJFACE_HXX
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 6524c7711084..d5519c96956e 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drawview.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:35:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -204,7 +204,8 @@ void ScDrawView::AddCustomHdl()
 
 void ScDrawView::InvalidateAttribs()
 {
-    SfxBindings& rBindings = SFX_BINDINGS();
+    if (!pViewData) return;
+    SfxBindings& rBindings = pViewData->GetBindings();
 
         // echte Statuswerte:
 
@@ -264,7 +265,8 @@ void ScDrawView::InvalidateAttribs()
 
 void ScDrawView::InvalidateDrawTextAttrs()
 {
-    SfxBindings& rBindings = SFX_BINDINGS();
+    if (!pViewData) return;
+    SfxBindings& rBindings = pViewData->GetBindings();
 
     rBindings.Invalidate( SID_ATTR_CHAR_FONT );
     rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index f19358c0c2f9..4e01390433d8 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: editsh.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:36:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,10 +98,6 @@
 #include <vcl/sound.hxx>
 
 
-#define GLOBALOVERFLOW
-#include <segmentc.hxx>
-
-
 #define _EDITSH_CXX
 #include "editsh.hxx"
 
@@ -120,12 +116,8 @@
 #define ScEditShell
 #include "scslots.hxx"
 
-SEG_EOFGLOBALS()
-
-#pragma SEG_SEGCLASS(SFXMACROS_SEG,STARTWORK_CODE)
 
 TYPEINIT1( ScEditShell, SfxShell );
-#pragma SEG_FUNCDEF(editsh_0a)
 
 SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL))
 {
@@ -133,8 +125,6 @@ SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL))
 }
 
 
-#pragma SEG_FUNCDEF(editsh_01)
-
 ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) :
     pEditView       (pView),
     pViewData       (pData),
@@ -145,14 +135,10 @@ ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) :
     SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("EditCell")));
 }
 
-#pragma SEG_FUNCDEF(editsh_02)
-
 ScEditShell::~ScEditShell()
 {
 }
 
-#pragma SEG_FUNCDEF(editsh_08)
-
 void ScEditShell::SetEditView(EditView* pView)
 {
     pEditView = pView;
@@ -161,13 +147,11 @@ void ScEditShell::SetEditView(EditView* pView)
     SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() );
 }
 
-#pragma SEG_FUNCDEF(editsh_04)
-
 void ScEditShell::Execute( SfxRequest& rReq )
 {
     const SfxItemSet*   pReqArgs    = rReq.GetArgs();
     USHORT              nSlot       = rReq.GetSlot();
-    SfxBindings&        rBindings   = SFX_BINDINGS();
+    SfxBindings&        rBindings   = pViewData->GetBindings();
 
     ScInputHandler* pHdl = SC_MOD()->GetInputHdl();
     DBG_ASSERT(pHdl,"kein ScInputHandler");
@@ -189,7 +173,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
             pTableView->SetInsertMode( bIsInsertMode );
             if (pTopView)
                 pTopView->SetInsertMode( bIsInsertMode );
-            SFX_BINDINGS().Invalidate( SID_ATTR_INSERT );
+            rBindings.Invalidate( SID_ATTR_INSERT );
             break;
 
         case SID_ATTR_INSERT:
@@ -199,7 +183,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
                 pTableView->SetInsertMode( bIsInsertMode );
                 if (pTopView)
                     pTopView->SetInsertMode( bIsInsertMode );
-                SFX_BINDINGS().Invalidate( SID_ATTR_INSERT );
+                rBindings.Invalidate( SID_ATTR_INSERT );
             }
             break;
 
@@ -483,8 +467,6 @@ void ScEditShell::Execute( SfxRequest& rReq )
         pHdl->SetSelIsRef(TRUE);
 }
 
-#pragma SEG_FUNCDEF(editsh_05)
-
 void __EXPORT ScEditShell::GetState( SfxItemSet& rSet )
 {
     ScInputHandler* pHdl = SC_MOD()->GetInputHdl();
@@ -531,8 +513,6 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet )
     }
 }
 
-#pragma SEG_FUNCDEF(editsh_0c)
-
 const SvxURLField* ScEditShell::GetURLField()
 {
     ScInputHandler* pHdl = SC_MOD()->GetInputHdl();
@@ -551,8 +531,6 @@ const SvxURLField* ScEditShell::GetURLField()
     return NULL;
 }
 
-#pragma SEG_FUNCDEF(editsh_09)
-
 void __EXPORT ScEditShell::GetClipState( SfxItemSet& rSet )
 {
     BOOL bPaste = FALSE;
@@ -590,12 +568,10 @@ void lcl_InvalidateUnder( SfxBindings& rBindings )
     rBindings.Invalidate( SID_ULINE_VAL_DOTTED );
 }
 
-#pragma SEG_FUNCDEF(editsh_06)
-
 void ScEditShell::ExecuteAttr(SfxRequest& rReq)
 {
     SfxItemSet          aSet( pEditView->GetEmptyItemSet() );
-    SfxBindings&        rBindings   = SFX_BINDINGS();
+    SfxBindings&        rBindings   = pViewData->GetBindings();
     const SfxItemSet*   pArgs       = rReq.GetArgs();
     USHORT              nSlot       = rReq.GetSlot();
 
@@ -734,8 +710,6 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
     rReq.Done();
 }
 
-#pragma SEG_FUNCDEF(editsh_07)
-
 void ScEditShell::GetAttrState(SfxItemSet &rSet)
 {
     SfxItemSet aAttribs = pEditView->GetAttribs();
@@ -773,8 +747,6 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
         rSet.ClearItem( EE_CHAR_WEIGHT );   // hervorgehobene Klammern hier nicht
 }
 
-#pragma SEG_FUNCDEF(editsh_0b)
-
 String ScEditShell::GetSelectionText( BOOL bWholeWord )
 {
     String aStrSelection;
@@ -797,90 +769,4 @@ String ScEditShell::GetSelectionText( BOOL bWholeWord )
     return aStrSelection;
 }
 
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.85  2000/09/17 14:09:31  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.84  2000/08/31 16:38:45  willem.vandorp
-    Header and footer replaced
-
-    Revision 1.83  2000/07/21 18:21:23  nn
-    select url field after inserting
-
-    Revision 1.82  2000/07/21 10:35:15  nn
-    #75683# SID_HYPERLINK_GETLINK: use selection as text if no link selected
-
-    Revision 1.81  2000/05/09 18:30:15  nn
-    use IMPL_INTERFACE macro without IDL
-
-    Revision 1.80  2000/04/14 08:31:37  nn
-    unicode changes
-
-    Revision 1.79  2000/03/31 17:27:08  nn
-    #74687# after executing dialogs, check for edit mode
-
-    Revision 1.78  2000/02/11 12:37:23  hr
-    #70473# changes for unicode ( patched by automated patchtool )
-
-    Revision 1.77  1999/09/24 15:59:13  nn
-    hlnkitem.hxx moved to svx
-
-    Revision 1.76  1999/06/02 19:41:34  ANK
-    #66547# SubShells
-
-
-      Rev 1.75   02 Jun 1999 21:41:34   ANK
-   #66547# SubShells
-
-      Rev 1.74   14 Jan 1999 16:21:56   NN
-   #60725# SID_CHARMAP: SetAttribs an der EditEngine statt der View
-
-      Rev 1.73   13 Jan 1999 17:05:52   NN
-   #60811# SID_HYPERLINK_SETLINK: Adjust an der Selektion rufen
-
-      Rev 1.72   16 Nov 1998 20:48:28   NN
-   #57254# SID_HYPERLINK_SETLINK: auch TopView
-
-      Rev 1.71   05 Dec 1997 19:21:52   NN
-   Includes
-
-      Rev 1.70   02 Dec 1997 12:38:40   TJ
-   include
-
-      Rev 1.69   24 Nov 1997 20:06:08   NN
-   includes
-
-      Rev 1.68   11 Sep 1997 19:57:02   NN
-   Hyperlink ersetzen: Einfuegen auf Selektion
-
-      Rev 1.67   04 Sep 1997 19:44:22   RG
-   change header
-
-      Rev 1.66   27 Aug 1997 12:19:28   TRI
-   VCL Anpassung
-
-      Rev 1.65   05 Aug 1997 14:29:22   TJ
-   include svx/srchitem.hxx
-
-      Rev 1.64   01 Aug 1997 11:32:58   NN
-   #42327# RemoveAttribs(TRUE)
-
-      Rev 1.63   30 Jul 1997 17:27:10   HJS
-   includes
-
-      Rev 1.62   29 Jul 1997 21:23:02   MH
-   Syntax
-
-      Rev 1.61   29 Jul 1997 09:55:14   OM
-   Hyperlink Statusmethode
-
-      Rev 1.60   16 Jul 1997 21:04:26   NN
-   Hypo-Feature: Klammern hervorheben
-
-------------------------------------------------------------------------*/
-
-#pragma SEG_EOFMODULE
-
 
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 73d35153dc48..5e7a81b06284 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: formatsh.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:36:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -259,12 +259,12 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
     // Wenn ToolBar vertikal :
     if ( !rReq.GetArgs() )
     {
-        SFX_DISPATCHER().Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
+        pViewData->GetDispatcher().Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
         return;
     }
 
     //--------------------------------------------------------------------
-    SfxBindings&        rBindings   = SFX_BINDINGS();
+    SfxBindings&        rBindings   = pViewData->GetBindings();
     const SfxItemSet*   pArgs       = rReq.GetArgs();
     const USHORT        nSlotId     = rReq.GetSlot();
     const USHORT        nCurTab     = GetViewData()->GetTabNo();
@@ -914,7 +914,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
 void ScFormatShell::ExecuteAlignment( SfxRequest& rReq )
 {
     ScTabViewShell* pTabViewShell       = GetViewData()->GetViewShell();
-    SfxBindings&            rBindings   = SFX_BINDINGS();
+    SfxBindings&            rBindings   = pViewData->GetBindings();
     const SfxItemSet*       pSet        = rReq.GetArgs();
     USHORT                  nSlot       = rReq.GetSlot();
 
@@ -963,7 +963,7 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq )
 void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
 {
     ScTabViewShell* pTabViewShell       = GetViewData()->GetViewShell();
-    SfxBindings&            rBindings   = SFX_BINDINGS();
+    SfxBindings&            rBindings   = pViewData->GetBindings();
     const ScPatternAttr*    pAttrs      = pTabViewShell->GetSelectionPattern();
     const SfxItemSet*       pSet        = rReq.GetArgs();
     const SfxItemSet*       pReqArgs    = rReq.GetArgs();
@@ -1231,7 +1231,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
 void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 {
     ScTabViewShell* pTabViewShell       = GetViewData()->GetViewShell();
-    SfxBindings&        rBindings = SFX_BINDINGS();
+    SfxBindings&        rBindings = pViewData->GetBindings();
     const SfxItemSet*   pNewAttrs = rReq.GetArgs();
 
     pTabViewShell->HideListBox();                   // Autofilter-DropDown-Listbox
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 0d40b5551db2..187b8230b93c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gridwin.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:08 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:36:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -968,7 +968,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
         {
 //          lcl_StartFilterDialog( pViewData, aParam, Application::GetAppWindow() );
             pViewData->GetView()->SetCursor(nCol,nRow);     //! auch ueber Slot ??
-            SFX_DISPATCHER().Execute( SID_FILTER, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+            pViewData->GetDispatcher().Execute( SID_FILTER, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
         }
         else
         {
@@ -1247,7 +1247,7 @@ void __EXPORT ScGridWindow::MouseButtonDown( const MouseEvent& rMEvt )
 
             SfxInt16Item aPosXItem( SID_RANGE_COL, nPosX );
             SfxInt16Item aPosYItem( SID_RANGE_ROW, nPosY );
-            SFX_DISPATCHER().Execute( SID_FILL_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+            pViewData->GetDispatcher().Execute( SID_FILL_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
                                         &aPosXItem, &aPosYItem, (void*)0L );
 
         }
@@ -1538,7 +1538,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
     if (pScMod->IsModalMode(pViewData->GetSfxDocShell()))
         return;
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = pViewData->GetBindings();
     if (bEEMouse)
     {
         EditView*   pEditView;
@@ -1635,7 +1635,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
             }
         }
         else
-            SFX_DISPATCHER().Execute( FID_FILL_AUTO, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+            pViewData->GetDispatcher().Execute( FID_FILL_AUTO, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
     }
     else if (pViewData->GetFillMode() == SC_FILL_MATRIX)
     {
@@ -2698,7 +2698,7 @@ BOOL ScGridWindow::DropPrivate( const DropEvent& rEvt )
                 SfxStringItem aRangeItem( SID_CHART_SOURCE, aRangeName );
                 USHORT nId = (rEvt.GetAction() == DROP_COPY) ?
                             SID_CHART_ADDSOURCE : SID_CHART_SOURCE;
-                SFX_DISPATCHER().Execute( nId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                pViewData->GetDispatcher().Execute( nId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
                                             &aRangeItem, &aNameItem, (void*) NULL );
             }
             else if ( nDragStartX != rData.nStartX || nDragStartY != rData.nStartY ||
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 835cf4ca0757..f2be9f87f5fa 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gridwin3.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:36:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -464,7 +464,7 @@ void ScGridWindow::UpdateStatusPosSize()
             aSet.Put( SvxSizeItem( SID_ATTR_SIZE, Size( 0, 0 ) ) );
     }
 
-    SFX_BINDINGS().SetState(aSet);
+    pViewData->GetBindings().SetState(aSet);
 }
 
 BOOL ScGridWindow::DrawHasMarkedObj()
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index ee17cdb2129b..f39e1d451fe0 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: olkact.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:37:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -129,7 +129,6 @@
 //sfxsh.hxx
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 //#define _SFXDISPATCH_HXX
 //#define _SFXMSG_HXX ***
 //#define _SFXOBJFACE_HXX ***
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index f829f147f39c..3931ec5a6410 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: output3.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:37:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -200,7 +200,6 @@
 //sfxsh.hxx
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 //#define _SFXDISPATCH_HXX
 #define _SFXMSG_HXX //*
 #define _SFXOBJFACE_HXX
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 86b031242979..d2dd4b9bd9ae 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: preview.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:37:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -607,7 +607,14 @@ void ScPreview::DoInvalidate()
 
 void ScPreview::StaticInvalidate()
 {
-    SfxBindings& rBindings = SFX_BINDINGS();
+    //  static method, because it's called asynchronously
+    //  -> must use current viewframe
+
+    SfxViewFrame* pViewFrm = SfxViewFrame::Current();
+    if (!pViewFrm)
+        return;
+
+    SfxBindings& rBindings = pViewFrm->GetBindings();
     rBindings.Invalidate(SID_STATUS_DOCPOS);
     rBindings.Invalidate(SID_STATUS_PAGESTYLE);
     rBindings.Invalidate(SID_PREVIEW_PREVIOUS);
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index cba1b283f325..ff6cca13e473 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prevwsh2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:37:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -199,7 +199,6 @@
 //sfxsh.hxx
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 //#define _SFXDISPATCH_HXX
 //#define _SFXMSG_HXX ***
 //#define _SFXOBJFACE_HXX ***
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index f79d9f4d1e63..b25d71297859 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabcont.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:37:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -250,17 +250,18 @@ void __EXPORT ScTabControl::Select()
         pDoc->ExtendMarksFromTable( nPage );
 */
 
-    if (SFX_DISPATCHER().IsLocked())
+    SfxDispatcher& rDisp = pViewData->GetDispatcher();
+    if (rDisp.IsLocked())
         pViewData->GetView()->SetTabNo( nPage );
     else
     {
         //  Tabelle fuer Basic ist 1-basiert
         SfxUInt16Item aItem( SID_CURRENTTAB, nPage + 1 );
-        SFX_DISPATCHER().Execute( SID_CURRENTTAB, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+        rDisp.Execute( SID_CURRENTTAB, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
                                 &aItem, (void*) NULL );
     }
 
-    SfxBindings& rBind = SFX_BINDINGS();
+    SfxBindings& rBind = pViewData->GetBindings();
     rBind.Invalidate( FID_FILL_TAB );
 
     rBind.Invalidate( FID_INS_TABLE );
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 52e3abed6c7c..f1acbc33a552 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabview.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:32:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1117,7 +1117,7 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos )
             PaintGrid();
             PaintTop();
             PaintLeft();
-            SFX_BINDINGS().Invalidate( SID_ATTR_ZOOM );
+            aViewData.GetBindings().Invalidate( SID_ATTR_ZOOM );
         }
 
         bDone = TRUE;
@@ -2083,7 +2083,7 @@ void ScTabView::SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer )
 
 void ScTabView::InvalidateSplit()
 {
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = aViewData.GetBindings();
     rBindings.Invalidate( SID_WINDOW_SPLIT );
     rBindings.Invalidate( SID_WINDOW_FIX );
 
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 26d95223617c..a7f65a8b028b 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabview2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:32:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -459,7 +459,7 @@ void ScTabView::SelectAllTables()
 //      pDoc->ExtendMarksFromTable( nTab );
 
         aViewData.GetDocShell()->PostPaintExtras();
-        SFX_BINDINGS().Invalidate( FID_FILL_TAB );
+        aViewData.GetBindings().Invalidate( FID_FILL_TAB );
     }
 }
 
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 93532c92c15f..2de58d14b776 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabview3.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:09 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:32:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -288,7 +288,7 @@ void ScTabView::ShowCursor()
 
 void ScTabView::InvalidateAttribs()
 {
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = aViewData.GetBindings();
 
     rBindings.Invalidate( SID_STYLE_APPLY );
     rBindings.Invalidate( SID_STYLE_FAMILY2 );
@@ -366,7 +366,7 @@ void ScTabView::SetCursor( USHORT nPosX, USHORT nPosY, BOOL bNew )
 
 void ScTabView::CellContentChanged()
 {
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = aViewData.GetBindings();
 
     rBindings.Invalidate( SID_ATTR_SIZE );      // -> Fehlermeldungen anzeigen
     rBindings.Invalidate( SID_THESAURUS );
@@ -398,7 +398,7 @@ void ScTabView::SelectionChanged()
 
     UpdateAutoFillMark();
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = aViewData.GetBindings();
 
     rBindings.Invalidate( SID_CURRENTCELL );    // -> Navigator
     rBindings.Invalidate( SID_AUTO_FILTER );    // -> Menue
@@ -1476,7 +1476,7 @@ void ScTabView::SetTabNo( USHORT nTab, BOOL bNew )
                         pGridWin[i]->UpdateEditViewPos();
         }
 
-        SfxBindings& rBindings = SFX_BINDINGS();
+        SfxBindings& rBindings = aViewData.GetBindings();
         ScMarkData& rMark = aViewData.GetMarkData();
         if (!rMark.GetTableSelect(nTab))
         {
@@ -2458,7 +2458,7 @@ void ScTabView::ZoomChanged()
 
     InterpretVisible();     // #69343# have everything calculated before painting
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = aViewData.GetBindings();
     rBindings.Invalidate( SID_ATTR_ZOOM );
 }
 
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 6eea7194573d..cfe8f2f0efab 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabview5.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:32:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -550,7 +550,7 @@ void ScTabView::TabChanged()
                 pDrawView->VCAddWin(pGridWin[i]);       // fuer neue Page
     }
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = aViewData.GetBindings();
 
     //  Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren
     //  (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles...
@@ -619,7 +619,7 @@ void ScTabView::DrawDeselectAll()
             ( pViewSh->IsDrawTextShell() || pDrawActual->GetSlotID() == SID_DRAW_NOTEEDIT ) )
         {
             // end text edit (as if escape pressed, in FuDraw)
-            SFX_DISPATCHER().Execute( pDrawActual->GetSlotID(),
+            aViewData.GetDispatcher().Execute( pDrawActual->GetSlotID(),
                                         SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
         }
 
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 2f0f266ddb64..882a0d7087cb 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:28:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,7 +127,6 @@
 #define _SVDRAG_HXX
 #define _SVDLAYER_HXX
 
-//#define _SFX_BINDINGS_HXX
 #define _SFXFILEDLG_HXX
 #define _SFX_MACRO_HXX
 #define _SFXMNUITEM_HXX
@@ -166,9 +165,6 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#define GLOBALOVERFLOW
-#include <segmentc.hxx>
-
 #include "scitems.hxx"
 #include <basctl/idetemp.hxx>
 #include <svx/imapdlg.hxx>
@@ -191,10 +187,6 @@
 #define SearchSettings
 #include <svx/svxslots.hxx>
 
-SEG_EOFGLOBALS()
-
-#pragma SEG_SEGCLASS(SFXMACROS_SEG,STARTWORK_CODE)
-
 TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener);
 
 SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
@@ -237,90 +229,3 @@ SFX_IMPL_VIEWFACTORY( ScTabViewShell, ScResId(STR_NONAME) )
 //------------------------------------------------------------------
 
 
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.305  2000/09/17 14:09:35  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.304  2000/09/04 13:31:53  tbe
-    basicide, isetbrw, si, vcdlged moved from svx to basctl
-
-    Revision 1.303  2000/08/31 16:38:48  willem.vandorp
-    Header and footer replaced
-
-    Revision 1.302  2000/05/09 18:30:15  nn
-    use IMPL_INTERFACE macro without IDL
-
-    Revision 1.301  2000/05/09 17:37:21  nn
-    old Basic removed
-
-    Revision 1.300  2000/04/14 08:31:38  nn
-    unicode changes
-
-    Revision 1.299  2000/02/09 09:57:30  nn
-    #72165# child window registration for hyperlink dialog
-
-    Revision 1.298  1999/06/07 15:30:30  ANK
-    #66547# Searchsettings aktiviert
-
-
-      Rev 1.297   07 Jun 1999 17:30:30   ANK
-   #66547# Searchsettings aktiviert
-
-      Rev 1.296   02 Jun 1999 21:42:26   ANK
-   #66547# SubShells
-
-      Rev 1.295   09 Apr 1998 21:58:40   ANK
-   Redlining Erweiterungen
-
-      Rev 1.294   13 Mar 1998 12:58:24   ANK
-   Changes
-
-      Rev 1.293   08 Mar 1998 20:38:28   ANK
-   Redlining
-
-      Rev 1.292   05 Dec 1997 19:22:38   NN
-   Includes
-
-      Rev 1.291   20 Nov 1997 20:30:56   NN
-   includes angepasst
-
-      Rev 1.290   14 Oct 1997 19:58:56   ANK
-   Neue Funktionsbox
-
-      Rev 1.289   23 May 1997 20:32:30   NN
-   ScFormulaDlgWrapper registrieren
-
-      Rev 1.288   08 Apr 1997 17:34:42   HJS
-   includes, defines
-
-      Rev 1.287   18 Nov 1996 19:11:58   ER
-   new: ScColRowNameRangesDlg
-
-      Rev 1.286   14 Nov 1996 22:00:44   NN
-   CHILDWINDOW_CONTEXT_REGISTRATION fuer Navigator
-
-      Rev 1.285   29 Oct 1996 13:36:20   NN
-   ueberall ScResId statt ResId
-
-      Rev 1.284   16 Oct 1996 16:24:52   RJ
-   Einbindung des Dialogs fuer bedingte Formatierung
-
-      Rev 1.283   09 Aug 1996 20:35:02   NN
-   Svx-Includes aus scitems.hxx raus
-
-      Rev 1.282   10 Jul 1996 14:21:18   KA
-   gallery entfernt, da jetzt im Explorer
-
-      Rev 1.281   05 Jul 1996 17:25:26   NN
-   SearchSettings aus svxslots, bei GetSbxObject anlegen
-
-      Rev 1.280   20 Jun 1996 19:04:08   NN
-   Werkzeugleiste registrieren
-
-------------------------------------------------------------------------*/
-
-#pragma SEG_EOFMODULE
-
-
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 300ca094398f..eab84ff8fb85 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -162,7 +162,6 @@
 #define _SFX_PRNMON_HXX
 //#define _SFXDISPATCH_HXX
 //#define _SFXCTRLITEM_HXX
-//#define _SFX_BINDINGS_HXX
 #define _SFX_MINFITEM_HXX
 #define _SFX_MACRO_HXX
 #define _SFX_CHOR
@@ -318,7 +317,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 
     ScTabView* pTabView = GetViewData()->GetView();
     USHORT nTab = GetViewData()->GetTabNo();
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = GetViewFrame()->GetBindings();
 
     Window*     pWin    = pTabView->GetActiveWin();
     SdrView*    pView   = pTabView->GetSdrView();
@@ -421,8 +420,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
         //  #59280# Execute fuer die Form-Shell, um im Controller zu deselektieren
         if ( nNewId == SID_FM_CREATE_CONTROL )
         {
-            SFX_DISPATCHER().Execute(SID_FM_LEAVE_CREATE);
-            SFX_BINDINGS().InvalidateAll(FALSE);
+            GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE);
+            GetViewFrame()->GetBindings().InvalidateAll(FALSE);
             //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen????
         }
 
@@ -435,8 +434,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     if ( nDrawSfxId == SID_FM_CREATE_CONTROL && nNewId != nDrawSfxId )
     {
         //  Wechsel von Control- zu Zeichenfunktion -> im Control-Controller deselektieren
-        SFX_DISPATCHER().Execute(SID_FM_LEAVE_CREATE);
-        SFX_BINDINGS().InvalidateAll(FALSE);
+        GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE);
+        GetViewFrame()->GetBindings().InvalidateAll(FALSE);
         //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen????
     }
 
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index dd8848603a3d..c6e0e0553797 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh3.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -535,7 +535,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 else
                     pThisFrame->ToggleChildWindow(ScFunctionChildWindow::GetChildWindowId() );
 
-                SFX_BINDINGS().Invalidate(FID_FUNCTION_BOX);
+                GetViewFrame()->GetBindings().Invalidate(FID_FUNCTION_BOX);
                 rReq.Done ();
             }
             break;
@@ -766,7 +766,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
         case FID_CHG_ACCEPT:
             {
                 pThisFrame->ToggleChildWindow(ScAcceptChgDlgWrapper::GetChildWindowId());
-                SFX_BINDINGS().Invalidate(FID_CHG_ACCEPT);
+                GetViewFrame()->GetBindings().Invalidate(FID_CHG_ACCEPT);
                 rReq.Done ();
 
                 /*
@@ -818,7 +818,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
         case SID_STATUS_DOCPOS:
             {
                 //! Navigator an-/ausschalten (wie im Writer) ???
-                //!SFX_DISPATCHER().Execute( SID_NAVIGATOR,
+                //!GetViewData()->GetDispatcher().Execute( SID_NAVIGATOR,
                 //!                       SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
             }
             break;
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index ea6305982f0a..e074c6e8b2a4 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh4.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1215,10 +1215,10 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
                         if (nMode == SC_ENTER_NORMAL)
                         {
                             if( bShift )
-                                SFX_DISPATCHER().Execute( SID_CURSORENTERUP,
+                                GetViewData()->GetDispatcher().Execute( SID_CURSORENTERUP,
                                             SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
                             else
-                                SFX_DISPATCHER().Execute( SID_CURSORENTERDOWN,
+                                GetViewData()->GetDispatcher().Execute( SID_CURSORENTERDOWN,
                                             SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
                         }
                         else
@@ -1269,7 +1269,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
         }
         if ( nSlotId )
         {
-            SFX_DISPATCHER().Execute( nSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
+            GetViewData()->GetDispatcher().Execute( nSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
             bUsed = TRUE;
         }
     }
@@ -1679,7 +1679,7 @@ void ScTabViewShell::ExecTbx( SfxRequest& rReq )
         default:
             DBG_ERROR("Slot im Wald");
     }
-    SFX_BINDINGS().Invalidate( nSlot );
+    GetViewFrame()->GetBindings().Invalidate( nSlot );
 }
 
 void ScTabViewShell::GetTbxState( SfxItemSet& rSet )
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 8c76947bd5cb..cfe48c2c7828 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh5.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -163,7 +163,7 @@ void __EXPORT ScTabViewShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBC
                     bReadOnly = GetViewData()->GetSfxDocShell()->IsReadOnly();
 
                     SfxBoolItem aItem( SID_FM_DESIGN_MODE, !bReadOnly);
-                    SFX_DISPATCHER().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_ASYNCHRON,
+                    GetViewData()->GetDispatcher().Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_ASYNCHRON,
                                                 &aItem, 0L );
                 }
                 break;
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index f53b2038768f..eccae187f783 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh9.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -201,7 +201,6 @@
 //sfxsh.hxx
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 #define _SFXDISPATCH_HXX //???
 //#define _SFXMSG_HXX ***
 //#define _SFXOBJFACE_HXX ***
@@ -456,7 +455,7 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq )
             SfxViewFrame* pThisFrame = GetViewFrame();
             USHORT nId = ScIMapChildWindowId();
             pThisFrame->ToggleChildWindow( nId );
-            SFX_BINDINGS().Invalidate( SID_IMAP );
+            GetViewFrame()->GetBindings().Invalidate( SID_IMAP );
 
             if ( pThisFrame->HasChildWindow( nId ) )
             {
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 75d4d704b343..5a82af071cd5 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsha.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -550,7 +550,7 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */ )
         pHdl->NotifyChange( &aState, bForce );
     }
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = GetViewFrame()->GetBindings();
     rBindings.Invalidate( SID_STATUS_SUM );         // immer zusammen mit Eingabezeile
     rBindings.Invalidate( SID_ATTR_SIZE );
 }
@@ -589,7 +589,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq )
     ScViewOptions aViewOptions = GetViewData()->GetOptions();
     ScGridOptions aGridOptions = aViewOptions.GetGridOptions();
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = GetViewFrame()->GetBindings();
     const SfxItemSet* pArgs = rReq.GetArgs();
     const SfxPoolItem* pItem;
     USHORT nSlotId = rReq.GetSlot();
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index d4c1ccdfbce1..f491dd2df219 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwshb.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -313,7 +313,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
     //  Rahmen fuer Chart einfuegen wird abgebrochen:
     FuPoor* pPoor = GetDrawFuncPtr();
     if ( pPoor && pPoor->GetSlotID() == SID_DRAW_CHART )
-        SFX_DISPATCHER().Execute(SID_DRAW_CHART, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+        GetViewData()->GetDispatcher().Execute(SID_DRAW_CHART, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
 
     MakeDrawLayer();
 
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index e3f4174e1aaa..19f61fa2b783 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwshe.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -301,14 +301,14 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
                     //  Request ausfuehren (dabei wird das SearchItem gespeichert)
 
                     aSearchItem.SetWhich(SID_SEARCH_ITEM);
-                    SFX_DISPATCHER().Execute( FID_SEARCH_NOW,
+                    GetViewData()->GetDispatcher().Execute( FID_SEARCH_NOW,
                             rReq.IsAPI() ? SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON :
                                             SFX_CALLMODE_STANDARD,
                             &aSearchItem, 0L );
                 }
                 else
                 {
-                    SFX_DISPATCHER().Execute(
+                    GetViewData()->GetDispatcher().Execute(
                             SID_SEARCH_DLG, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD );
                 }
             }
@@ -319,7 +319,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
 
                 SvxSearchItem aSearchItem = ScGlobal::GetSearchItem();
                 aSearchItem.SetWhich(SID_SEARCH_ITEM);
-                SFX_DISPATCHER().Execute( FID_SEARCH_NOW,
+                GetViewData()->GetDispatcher().Execute( FID_SEARCH_NOW,
                         rReq.IsAPI() ? SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON :
                                         SFX_CALLMODE_STANDARD,
                         &aSearchItem, 0L );
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index cfe08523e006..34729e4c999c 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwshg.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -191,7 +191,6 @@
 ///#define _PLUGAPPL_HXX
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 //#define _SFXDISPATCH_HXX
 #define _SFXMSG_HXX
 #define _SFXOBJFACE_HXX
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index f72a550e7790..ba5981b8c00d 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwshh.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:30:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -201,7 +201,6 @@
 //sfxsh.hxx
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 //#define _SFXDISPATCH_HXX
 #define _SFXMSG_HXX
 #define _SFXOBJFACE_HXX
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index fc6674ac467c..9b488056cf46 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewdata.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1601,6 +1601,18 @@ SfxObjectShell* ScViewData::GetSfxDocShell() const
     return pDocShell;
 }
 
+SfxBindings& ScViewData::GetBindings()
+{
+    DBG_ASSERT( pViewShell, "GetBindings() without ViewShell" );
+    return pViewShell->GetViewFrame()->GetBindings();
+}
+
+SfxDispatcher& ScViewData::GetDispatcher()
+{
+    DBG_ASSERT( pViewShell, "GetDispatcher() without ViewShell" );
+    return *pViewShell->GetViewFrame()->GetDispatcher();
+}
+
 Window* ScViewData::GetDialogParent()
 {
     DBG_ASSERT( pViewShell, "GetDialogParent() ohne ViewShell" );
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 081da5158051..bb52f3758e74 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewfun2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -714,7 +714,7 @@ void ScViewFunc::SetPrintRanges( const String* pPrint,
 
     ScPrintFunc( pDocSh, pDocSh->GetPrinter(), nCurTab ).UpdatePages();
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = GetViewData()->GetBindings();
     rBindings.Invalidate( SID_DELETE_PRINTAREA );
 
     pDocSh->SetDocumentModified();
@@ -1441,7 +1441,7 @@ void ScViewFunc::MakeScenario( const String& rName, const String& rComment,
         SetTabNo( nNewTab, TRUE );          // SC_SCENARIO_COPYALL -> sichtbar
     else
     {
-        SfxBindings& rBindings = SFX_BINDINGS();
+        SfxBindings& rBindings = GetViewData()->GetBindings();
         rBindings.Invalidate( SID_STATUS_DOCPOS );      // Statusbar
         rBindings.Invalidate( SID_TABLES_COUNT );
         rBindings.Invalidate( SID_SELECT_SCENARIO );
@@ -1708,7 +1708,7 @@ BOOL ScViewFunc::DeleteTables(const SvUShorts &TheTabs, BOOL bRecord )
         if (bWasLinked)
         {
             pDocSh->UpdateLinks();              // Link-Manager updaten
-            SFX_BINDINGS().Invalidate(SID_LINKS);
+            GetViewData()->GetBindings().Invalidate(SID_LINKS);
         }
 
         pDocSh->PostPaintExtras();
@@ -1775,7 +1775,7 @@ void ScViewFunc::InsertAreaLink( const String& rFile,
     pLink->Update();            // kein SetInCreate -> Update ausfuehren
     pLink->SetDoInsert(TRUE);   // Default = TRUE
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = GetViewData()->GetBindings();
     rBindings.Invalidate( SID_LINKS );
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );     // Navigator
@@ -1925,7 +1925,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
             pLink->Update();
             pLink->SetInCreate( FALSE );
 
-            SfxBindings& rBindings = SFX_BINDINGS();
+            SfxBindings& rBindings = GetViewData()->GetBindings();
             rBindings.Invalidate( SID_LINKS );
         }
     }
@@ -1976,7 +1976,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, USHORT nDestTab, BOOL bCopy )
         String aUrl = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/"));
         aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP ));               // "scalc4"
         SfxStringItem aItem( SID_FILE_NAME, aUrl );
-        const SfxObjectItem* pObjItem = (const SfxObjectItem*) SFX_DISPATCHER().Execute(
+        const SfxObjectItem* pObjItem = (const SfxObjectItem*) GetViewData()->GetDispatcher().Execute(
                     SID_OPENDOC, SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON, &aItem, 0L );
         if (pObjItem)
         {
@@ -1994,7 +1994,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, USHORT nDestTab, BOOL bCopy )
         String aFactory = STRING_SCAPP;     // "scalc4"
         SfxStringItem aItem( SID_NEWDOCDIRECT, aFactory );
         const SfxViewFrameItem* pViewFrameItem = (const SfxViewFrameItem*)
-            SFX_DISPATCHER().Execute( SID_NEWDOCDIRECT, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
+            GetViewData()->GetDispatcher().Execute( SID_NEWDOCDIRECT, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
 
         if ( pViewFrameItem )
         {
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index e1c910c25a70..4d7ddedcb46c 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewfun4.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -252,7 +252,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
         GetViewData()->GetEditView(eWhich, pEditView, nCol, nRow);
         pEditSel = new ESelection(pEditView->GetSelection());
         SC_MOD()->InputEnterHandler();
-        SFX_BINDINGS().Update();            // sonst kommt der Sfx durcheinander...
+        GetViewData()->GetBindings().Update();          // sonst kommt der Sfx durcheinander...
     }
     else
     {
@@ -582,7 +582,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
         if ( pFlt && !nErr )
         {
             // Code aus dem SFX geklaut!
-            SfxDispatcher &rDispatcher = SFX_DISPATCHER();
+            SfxDispatcher &rDispatcher = GetViewData()->GetDispatcher();
             SfxStringItem aFileNameItem( SID_FILE_NAME, rFile );
             SfxStringItem aFilterItem( SID_FILTER_NAME, pFlt->GetName() );
 
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 3a53d795ae3d..1e315c5ec09b 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewfun5.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -203,7 +203,6 @@
 ///#define _PLUGAPPL_HXX
 //#define _SFX_SHELL_HXX
 //#define _SFXAPP_HXX
-//#define _SFX_BINDINGS_HXX
 //#define _SFXDISPATCH_HXX
 #define _SFXMSG_HXX
 #define _SFXOBJFACE_HXX
@@ -640,11 +639,8 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, SvDataObject* pObject,
         SfxBoolItem aAreaNew(FN_PARAM_2, bAreaIsNew);
 
         //  asynchron, damit nicht der ganze Import im Drop-Handler passiert
-        //  nicht SFX_DISPATCHER, weil die View beim Drag&Drop nicht aktiv sein muss
-        SfxDispatcher* pDisp =
-            GetViewData()->GetViewShell()->GetViewFrame()->GetDispatcher();
-        if (pDisp)
-            pDisp->Execute(SID_SBA_IMPORT, SFX_CALLMODE_ASYNCHRON,
+        SfxDispatcher& rDisp = GetViewData()->GetDispatcher();
+        rDisp.Execute(SID_SBA_IMPORT, SFX_CALLMODE_ASYNCHRON,
                                     &aDataDesc, &aTarget, &aAreaNew, 0L );
 
         bRet = TRUE;
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 59aa35282a42..5c29e5b55a3b 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewfun6.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:10 $
+ *  last change: $Author: nn $ $Date: 2000-09-22 18:26:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -324,7 +324,7 @@ void ScViewFunc::EditNote()
             //  Shown-Flag nicht veraendern
 
             //  Objekt aktivieren (wie in FuSelection::TestComment)
-            SFX_DISPATCHER().Execute(SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
+            GetViewData()->GetDispatcher().Execute(SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
             // jetzt den erzeugten FuText holen und in den EditModus setzen
             FuPoor* pPoor = GetDrawFuncPtr();
             if ( pPoor && pPoor->GetSlotID() == SID_DRAW_NOTEEDIT )  // hat keine RTTI