SFX_BINDINGS/SFX_DISPATCHER macros removed

author: Kai Ahrens <ka@openoffice.org> 2000-09-21 15:12:50 +0000
committer: Kai Ahrens <ka@openoffice.org> 2000-09-21 15:12:50 +0000
commit: abfcdf776c3d9111ac311f15fbbbf5c3d3a7c7c3 (patch)
tree: 70903a71534a928323dd35ec8bd0df1ec7b7d82b /sd/source/ui
parent: 9112386dd35c3a51c5b5a29a180d1626c50fdcad (diff)
55 files changed, 430 insertions, 371 deletions
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 2cd5e3c0d4d1..8b227c7c8be6 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: optsitem.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:30 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,7 +107,6 @@
 |* SdOptionsLayout
 |*
 \************************************************************************/
-#pragma SEG_FUNCDEF(optsitem_01)
 
 SdOptionsLayout::SdOptionsLayout() :
             bRuler              ( 1 ),
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index bdd51f532f62..3218077a6732 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdmod1.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:31 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -326,10 +326,14 @@ void SdModule::Execute(SfxRequest& rReq)
                             SfxStringItem aReferer( SID_REFERER, UniString() );
                             SfxStringItem aPassword( SID_PASSWORD, aPasswrd );
 
-                            const SfxObjectShellItem* pRet = (SfxObjectShellItem*)
-                                                              SFX_DISPATCHER().Execute( SID_OPENDOC,
-                                                                                SFX_CALLMODE_SYNCHRON,
-                                                                                &aFile, &aReferer, &aPassword, 0L );
+                            SdDrawDocShell*             pDocShell = PTR_CAST(SdDrawDocShell, SfxObjectShell::Current());
+                            SdViewShell*                pViewShell = pDocShell ? pDocShell->GetViewShell() : NULL;
+                            const SfxObjectShellItem*   pRet = (SfxObjectShellItem*)
+                                                                 ( ( pViewShell && pViewShell->GetViewFrame() ) ?
+                                                                  pViewShell->GetViewFrame() :
+                                                                  SfxViewFrame::Current() )->
+                                                                GetDispatcher()->Execute( SID_OPENDOC,
+                                                                SFX_CALLMODE_SYNCHRON, &aFile, &aReferer, &aPassword, 0L );
                         }
 
                         pOpt->SetStartWithTemplate(bStartWithTemplate);
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 6e6d4acd6e84..ee6cc4c97593 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdmod2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:31 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -732,7 +732,9 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
             pViewShell->SetDefTabHRuler( nDefTab );
         }
     }
-    SFX_BINDINGS().InvalidateAll( TRUE );
+
+    ( ( pViewShell && pViewShell->GetViewFrame() ) ? pViewShell->GetViewFrame() : SfxViewFrame::Current() )->
+        GetBindings().InvalidateAll( TRUE );
 }
 SfxTabPage*  SdModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet )
 {
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 8efd286d1aa0..c44ae0760526 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: animobjs.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:31 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -234,8 +234,8 @@ __EXPORT SdAnimationWin::SdAnimationWin( SfxBindings* pInBindings,
 
     // Initiierung der Initialisierung der ColorLB
     SfxBoolItem aItem( SID_ANIMATOR_INIT, TRUE );
-    SFX_DISPATCHER().Execute( SID_ANIMATOR_INIT, SFX_CALLMODE_ASYNCHRON |
-                                SFX_CALLMODE_RECORD, &aItem, 0L );
+    GetBindings().GetDispatcher()->Execute(
+        SID_ANIMATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
 }
 
 // -----------------------------------------------------------------------
@@ -448,8 +448,8 @@ IMPL_LINK( SdAnimationWin, ClickGetObjectHdl, void *, pBtn )
     // Code jetzt in AddObj()
     SfxBoolItem aItem( SID_ANIMATOR_ADD, TRUE );
 
-    SFX_DISPATCHER().Execute( SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT |
-                              SFX_CALLMODE_RECORD, &aItem, 0L );
+    GetBindings().GetDispatcher()->Execute(
+        SID_ANIMATOR_ADD, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
     return( 0L );
 }
 
@@ -551,8 +551,8 @@ IMPL_LINK( SdAnimationWin, ClickCreateGroupHdl, void *, EMPTYARG )
     // Code jetzt in CreatePresObj()
     SfxBoolItem aItem( SID_ANIMATOR_CREATE, TRUE );
 
-    SFX_DISPATCHER().Execute( SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT |
-                              SFX_CALLMODE_RECORD, &aItem, 0L );
+    GetBindings().GetDispatcher()->Execute(
+        SID_ANIMATOR_CREATE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
     return( 0L );
 }
 
@@ -851,8 +851,8 @@ BOOL __EXPORT SdAnimationWin::Close()
 {
     SfxBoolItem aItem( SID_ANIMATION_OBJECTS, FALSE );
 
-    SFX_DISPATCHER().Execute( SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON |
-                                SFX_CALLMODE_RECORD, &aItem, 0L );
+    GetBindings().GetDispatcher()->Execute(
+        SID_ANIMATION_OBJECTS, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
 
     SfxDockingWindow::Close();
 
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index a10128b30220..09121576104b 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: diactrl.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:32 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,6 +78,9 @@
 #ifndef _SFXDISPATCH_HXX //autogen
 #include <sfx2/dispatch.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 
 #ifndef _SFXAPP_HXX //autogen
 #include <sfx2/app.hxx>
@@ -94,8 +97,9 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages,  SfxUInt16Item )
 |*
 \************************************************************************/
 
-DiaEffectControl::DiaEffectControl( Window* pParent, WinBits nStyle ) :
+DiaEffectControl::DiaEffectControl( Window* pParent, SfxBindings& rBdx, WinBits nStyle ) :
         Window          ( pParent, nStyle ),
+        rBindings       ( rBdx ),
         aFtDescr        ( this, 0 ),
         aLbEffect       ( this, WinBits( WB_BORDER | WB_DROPDOWN ) )
 {
@@ -159,8 +163,8 @@ IMPL_LINK( DiaEffectControl, SelectDiaEffectHdl, void *, p )
  */
 
     if( p )
-        SFX_DISPATCHER().Execute( SID_DIA, SFX_CALLMODE_ASYNCHRON |
-                    SFX_CALLMODE_RECORD, &aDiaEffectItem, (void*) NULL, 0L );
+        rBindings.GetDispatcher()->Execute(
+            SID_DIA, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aDiaEffectItem, (void*) NULL, 0L );
     return( 0L );
 }
 
@@ -172,8 +176,9 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaSpeed, DiaSpeedItem )
 |*
 \************************************************************************/
 
-DiaSpeedControl::DiaSpeedControl( Window* pParent, WinBits nStyle ) :
+DiaSpeedControl::DiaSpeedControl( Window* pParent, SfxBindings& rBdx, WinBits nStyle ) :
         Window          ( pParent, nStyle ),
+        rBindings       ( rBdx ),
         aLbSpeed        ( this, WinBits( WB_BORDER | WB_DROPDOWN ) )
 {
     String  aStrSlow( SdResId( STR_SLOW ) );
@@ -219,8 +224,8 @@ IMPL_LINK( DiaSpeedControl, SelectDiaSpeedHdl, void *, p )
     DiaSpeedItem aDiaSpeedItem( eFS );
 
     if( p )
-        SFX_DISPATCHER().Execute( SID_DIA, SFX_CALLMODE_ASYNCHRON |
-                    SFX_CALLMODE_RECORD, &aDiaSpeedItem, (void*) NULL, 0L );
+        rBindings.GetDispatcher()->Execute(
+            SID_DIA, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aDiaSpeedItem, (void*) NULL, 0L );
     return( 0L );
 }
 
@@ -232,8 +237,9 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaAuto, DiaAutoItem )
 |*
 \************************************************************************/
 
-DiaAutoControl::DiaAutoControl( Window* pParent, WinBits nStyle ) :
+DiaAutoControl::DiaAutoControl( Window* pParent, SfxBindings& rBdx, WinBits nStyle ) :
         Window          ( pParent, nStyle ),
+        rBindings       ( rBdx ),
         aFtDescr        ( this, 0 ),
         aLbAuto         ( this, WinBits( WB_BORDER | WB_DROPDOWN ) )
 {
@@ -314,8 +320,8 @@ IMPL_LINK( DiaAutoControl, SelectDiaAutoHdl, void *, p )
 */
 
     if( p )
-        SFX_DISPATCHER().Execute( SID_DIA, SFX_CALLMODE_ASYNCHRON |
-                    SFX_CALLMODE_RECORD, &aDiaAutoItem, (void*) NULL, 0L );
+        rBindings.GetDispatcher()->Execute(
+            SID_DIA, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aDiaAutoItem, (void*) NULL, 0L );
     return( 0L );
 }
 
@@ -327,8 +333,9 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaTime, DiaTimeItem )
 |*
 \************************************************************************/
 
-DiaTimeControl::DiaTimeControl( Window* pParent, WinBits nStyle ) :
-        TimeField       ( pParent, nStyle )
+DiaTimeControl::DiaTimeControl( Window* pParent, SfxBindings& rBdx, WinBits nStyle ) :
+        TimeField   ( pParent, nStyle ),
+        rBindings   ( rBdx )
 {
     SetModifyHdl( LINK( this, DiaTimeControl, ModifyDiaTimeHdl ) );
     SetGetFocusHdl( LINK( this, DiaTimeControl, GetFocusHdl ) );
@@ -353,8 +360,9 @@ DiaTimeControl::DiaTimeControl( Window* pParent, WinBits nStyle ) :
 |*
 \************************************************************************/
 
-DiaTimeControl::DiaTimeControl( Window* pParent, ResId nRId ) :
-        TimeField       ( pParent, nRId )
+DiaTimeControl::DiaTimeControl( Window* pParent, SfxBindings& rBdx, ResId nRId ) :
+        TimeField       ( pParent, nRId ),
+        rBindings       ( rBdx )
 {
     SetGetFocusHdl( LINK( this, DiaTimeControl, GetFocusHdl ) );
 }
@@ -374,8 +382,8 @@ IMPL_LINK( DiaTimeControl, ModifyDiaTimeHdl, void *, p )
     DiaTimeItem aDiaTimeItem( lTime );
 
     if( p )
-        SFX_DISPATCHER().Execute( SID_DIA, SFX_CALLMODE_ASYNCHRON |
-                    SFX_CALLMODE_RECORD, &aDiaTimeItem, (void*) NULL, 0L );
+        rBindings.GetDispatcher()->Execute(
+            SID_DIA, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aDiaTimeItem, (void*) NULL, 0L );
     return( 0L );
 }
 
@@ -421,8 +429,9 @@ void DiaTimeControl::Up()
 // SdPagesField
 //========================================================================
 
-SdPagesField::SdPagesField( Window* pParent, SfxBindings& rBindings, WinBits nBits ) :
-    SvxMetricField( pParent, rBindings, nBits )
+SdPagesField::SdPagesField( Window* pParent, SfxBindings& rBdx, WinBits nBits ) :
+    SvxMetricField  ( pParent, rBdx, nBits ),
+    rBindings       ( rBdx )
 {
     String aStr( SdResId( STR_SLIDE_PLURAL ) );
     SetCustomUnitText( aStr );
@@ -473,8 +482,8 @@ void __EXPORT SdPagesField::Update( const SfxUInt16Item* pItem )
 void __EXPORT SdPagesField::Modify()
 {
     SfxUInt16Item aItem( SID_PAGES_PER_ROW, (UINT16) GetValue() );
-    SFX_DISPATCHER().Execute( SID_PAGES_PER_ROW, SFX_CALLMODE_SLOT |
-                                SFX_CALLMODE_RECORD, &aItem, 0L, 0L );
+    rBindings.GetDispatcher()->Execute(
+        SID_PAGES_PER_ROW, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L, 0L );
 }
 
 /*************************************************************************
@@ -529,7 +538,7 @@ Window* __EXPORT SdTbxCtlDiaEffect::CreateItemWindow( Window *pParent )
 {
     if( GetId() == SID_DIA_EFFECT )
     {
-        return( new DiaEffectControl( pParent ) );
+        return( new DiaEffectControl( pParent, GetBindings() ) );
     }
 
     return( NULL );
@@ -580,7 +589,7 @@ Window* __EXPORT SdTbxCtlDiaSpeed::CreateItemWindow( Window *pParent )
 {
     if( GetId() == SID_DIA_SPEED )
     {
-        return( new DiaSpeedControl( pParent ) );
+        return( new DiaSpeedControl( pParent, GetBindings() ) );
     }
 
     return( NULL );
@@ -637,7 +646,7 @@ Window* __EXPORT SdTbxCtlDiaAuto::CreateItemWindow( Window *pParent )
 {
     if( GetId() == SID_DIA_AUTO )
     {
-        return( new DiaAutoControl( pParent ) );
+        return( new DiaAutoControl( pParent, GetBindings() ) );
     }
 
     return( NULL );
@@ -702,7 +711,7 @@ Window* __EXPORT SdTbxCtlDiaTime::CreateItemWindow( Window *pParent )
 {
     if( GetId() == SID_DIA_TIME )
     {
-        return( new DiaTimeControl( pParent,
+        return( new DiaTimeControl( pParent, GetBindings(),
                 WinBits( WB_BORDER | WB_SPIN | WB_REPEAT ) ) );
     }
 
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 73dcbd72b3d4..01346f00b8fa 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgass.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:32 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1658,10 +1658,8 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
             SfxObjectShell* pShell = NULL;
 
             const SfxObjectShellItem* pRet = (SfxObjectShellItem*)
-                                      SFX_DISPATCHER().Execute( SID_OPENDOC,
-                                                                SFX_CALLMODE_SYNCHRON,
-                                                                &aFile, &aReferer,
-                                                                &aView, &aPreview, 0L );
+                                      SfxViewFrame::Current()->GetDispatcher()->Execute(
+                                        SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aFile, &aReferer, &aView, &aPreview, 0L );
 
             if( pRet && pRet->GetObjectShell() )
                 xDocShell = pRet->GetObjectShell();
@@ -1706,10 +1704,8 @@ void AssistentDlgImpl::UpdatePreview( BOOL bDocPreview )
             SfxObjectShell* pShell = NULL;
 
             const SfxObjectShellItem* pRet = (SfxObjectShellItem*)
-                                      SFX_DISPATCHER().Execute( SID_OPENDOC,
-                                                                SFX_CALLMODE_SYNCHRON,
-                                                                &aFile, &aReferer,
-                                                                &aView, &aPreview, 0L );
+                                      SfxViewFrame::Current()->GetDispatcher()->Execute(
+                                        SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aFile, &aReferer, &aView, &aPreview, 0L );
 
             if( pRet && pRet->GetObjectShell() )
                 xDocShell = pRet->GetObjectShell();
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 840753aa419e..e38058b01511 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gluectrl.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:32 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,6 +79,9 @@
 #ifndef _SV_TOOLBOX_HXX //autogen
 #include <vcl/toolbox.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 
 #include "strings.hrc"
 #include "gluectrl.hxx"
@@ -147,8 +150,8 @@ void __EXPORT GlueEscDirLB::Select()
     SfxUInt16Item aItem( SID_GLUE_ESCDIR, aEscDirArray[ nPos ] );
 
 
-    SFX_DISPATCHER().Execute( SID_GLUE_ESCDIR, SFX_CALLMODE_ASYNCHRON |
-                SFX_CALLMODE_RECORD, &aItem, (void*) NULL, 0L );
+    SfxViewFrame::Current()->GetDispatcher()->Execute( SID_GLUE_ESCDIR, SFX_CALLMODE_ASYNCHRON |
+                                                       SFX_CALLMODE_RECORD, &aItem, (void*) NULL, 0L );
 }
 
 /*************************************************************************
@@ -264,6 +267,9 @@ UINT16 SdTbxCtlGlueEscDir::GetEscDirPos( UINT16 nEscDir )
       Source Code Control System - History
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 16:48:32  hr
+      initial import
+
       Revision 1.12  2000/09/17 15:23:35  willem.vandorp
       OpenOffice header added.
 
@@ -399,5 +405,3 @@ UINT16 SdTbxCtlGlueEscDir::GetEscDirPos( UINT16 nEscDir )
 
 *************************************************************************/
 
-#pragma SEG_EOFMODULE
-
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 586953e988ac..eeb6d65f565f 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: navigatr.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:33 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -158,8 +158,8 @@ __EXPORT SdNavigatorWin::SdNavigatorWin( Window* pParent,
 
     // InitTlb; Wird ueber Slot initiiert
     SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE );
-    SFX_DISPATCHER().Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON |
-                              SFX_CALLMODE_RECORD, &aItem, 0L );
+    pBindings->GetDispatcher()->Execute(
+        SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
 }
 
 // -----------------------------------------------------------------------
@@ -209,7 +209,10 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
         }
     }
 
-    SFX_BINDINGS().Invalidate(SID_NAVIGATOR_PAGENAME, TRUE, TRUE);
+    SdViewShell* pViewShell = pDocShell->GetViewShell();
+
+    ( ( pViewShell && pViewShell->GetViewFrame() ) ? pViewShell->GetViewFrame() : SfxViewFrame::Current() )->
+        GetBindings().Invalidate(SID_NAVIGATOR_PAGENAME, TRUE, TRUE);
 }
 
 /*************************************************************************
@@ -265,8 +268,8 @@ IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG )
             if( nSId > 0 )
             {
                 SfxBoolItem aItem( nSId, TRUE );
-                SFX_DISPATCHER().Execute( nSId, SFX_CALLMODE_SLOT |
-                                          SFX_CALLMODE_RECORD, &aItem, 0L );
+                pBindings->GetDispatcher()->Execute(
+                    nSId, SFX_CALLMODE_SLOT |SFX_CALLMODE_RECORD, &aItem, 0L );
             }
         }
         break;
@@ -288,8 +291,8 @@ IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG )
             if( ePage != PAGE_NONE )
             {
                 SfxUInt16Item aItem( SID_NAVIGATOR_PAGE, ePage );
-                SFX_DISPATCHER().Execute( SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT |
-                                          SFX_CALLMODE_RECORD, &aItem, 0L );
+                pBindings->GetDispatcher()->Execute(
+                    SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
             }
         }
         break;
@@ -366,8 +369,8 @@ IMPL_LINK( SdNavigatorWin, ClickObjectHdl, void *, p )
             if( aStr.Len() > 0 )
             {
                 SfxStringItem aItem( SID_NAVIGATOR_OBJECT, aStr );
-                SFX_DISPATCHER().Execute( SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT |
-                                            SFX_CALLMODE_RECORD, &aItem, 0L );
+                pBindings->GetDispatcher()->Execute(
+                    SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
             }
         }
     }
@@ -894,8 +897,8 @@ void __EXPORT SdNavigatorControllerItem::StateChanged( USHORT nSId,
             {
                 // InitTlb; Wird ueber Slot initiiert
                 SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE );
-                SFX_DISPATCHER().Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON |
-                                                SFX_CALLMODE_RECORD, &aItem, 0L );
+                GetBindings().GetDispatcher()->Execute(
+                    SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
             }
         }
     }
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index c37a49d6500a..12d0378dd5c4 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docshel4.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:34 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -830,7 +830,9 @@ BOOL SdDrawDocShell::SaveCompleted( SvStorage * pStor )
         bRet = TRUE;
 
         // Damit der Navigator nach dem Speichern updaten kann!
-        SFX_BINDINGS().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
+        ( ( pViewShell && pViewShell->GetViewFrame() ) ?
+          pViewShell->GetViewFrame() : SfxViewFrame::Current() )->
+          GetBindings().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
     }
     return bRet;
 }
@@ -968,9 +970,9 @@ BOOL SdDrawDocShell::GotoBookmark(const String& rBookmark)
             {
                 // Arbeitsbereich wechseln
                 GetFrameView()->SetPageKind(eNewPageKind);
-                SFX_DISPATCHER().Execute(SID_VIEWSHELL0,
-                                         SFX_CALLMODE_SYNCHRON |
-                                         SFX_CALLMODE_RECORD);
+                ( ( pViewShell && pViewShell->GetViewFrame() ) ?
+                  pViewShell->GetViewFrame() : SfxViewFrame::Current() )->
+                  GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
 
                 // Die aktuelle ViewShell hat sich geaendert!
                 pDrViewSh = (SdDrawViewShell*) pViewShell;
@@ -1003,8 +1005,11 @@ BOOL SdDrawDocShell::GotoBookmark(const String& rBookmark)
             }
         }
 
-        SFX_BINDINGS().Invalidate(SID_NAVIGATOR_STATE, TRUE, FALSE);
-        SFX_BINDINGS().Invalidate(SID_NAVIGATOR_PAGENAME);
+        SfxBindings& rBindings = ( ( pViewShell && pViewShell->GetViewFrame() ) ?
+                                 pViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings();
+
+        rBindings.Invalidate(SID_NAVIGATOR_STATE, TRUE, FALSE);
+        rBindings.Invalidate(SID_NAVIGATOR_PAGENAME);
     }
 
     return (bFound);
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 4a11515bff61..56df52ebc748 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docshell.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:34 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -270,9 +270,15 @@ __EXPORT  SdDrawDocShell::~SdDrawDocShell()
     delete pDoc;
 
     // damit der Navigator das Verschwinden des Dokuments mitbekommt
-    SfxBoolItem aItem(SID_NAVIGATOR_INIT, TRUE);
-    SFX_DISPATCHER().Execute(SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON |
-                             SFX_CALLMODE_RECORD, &aItem, 0L);
+    SfxBoolItem     aItem(SID_NAVIGATOR_INIT, TRUE);
+    SfxViewFrame*   pFrame = pViewShell ? pViewShell->GetFrame() : GetFrame();
+
+    if( !pFrame )
+        pFrame = SfxViewFrame::GetFirst( this );
+
+    if( pFrame )
+        pFrame->GetDispatcher()->Execute(
+            SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L);
 }
 
 /*************************************************************************
@@ -481,7 +487,8 @@ void SdDrawDocShell::ApplySlotFilter() const
     else
         pDispatcher->SetSlotFilter();
 
-    SFX_BINDINGS().InvalidateAll(TRUE);
+    if( pFrame )
+        pFrame->GetBindings().InvalidateAll(TRUE);
 }
 
 
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index c792f2c7e011..13037eeb7c5d 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuarea.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,6 +77,9 @@
 #ifndef _SFXREQUEST_HXX //autogen
 #include <sfx2/request.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 #ifndef _SFX_BINDINGS_HXX //autogen
 #include <sfx2/bindings.hxx>
 #endif
@@ -135,7 +138,7 @@ FuArea::FuArea(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
                         SID_ATTR_FILL_BITMAP,
                         0 };
 
-        SFX_BINDINGS().Invalidate( SidArray );
+        pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
 
         delete pDlg;
         delete pNewAttr;
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 1facd3a2569c..59963e4ec60a 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuchar.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,7 +144,7 @@ FuChar::FuChar(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
                     SID_SET_SUB_SCRIPT,
                     0 };
 
-    SFX_BINDINGS().Invalidate( SidArray );
+    pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
 }
 
 
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index e093d3d3f6d9..6aba67f48197 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuconbez.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -374,7 +374,7 @@ void FuConstBezPoly::SetEditMode(USHORT nMode)
     nEditMode = nMode;
     ForcePointer();
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
     rBindings.Invalidate(SID_BEZIER_MOVE);
     rBindings.Invalidate(SID_BEZIER_INSERT);
 }
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index be9cfb0bdd83..6e95674ab4e9 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fucushow.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,9 @@
 #ifndef _SFXDISPATCH_HXX //autogen
 #include <sfx2/dispatch.hxx>
 #endif
-
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 
 TYPEINIT1( FuCustomShowDlg, FuPoor );
 
@@ -112,7 +114,7 @@ FuCustomShowDlg::FuCustomShowDlg( SdViewShell* pViewSh, SdWindow*    pWin,
         {
             pViewSh->SetStartShowWithDialog();
 
-            SFX_DISPATCHER().Execute( SID_PRESENTATION,
+            pViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION,
                     SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
         }
     }
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index a5cd5296d088..4f72b58d4cfc 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fudraw.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -508,7 +508,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
                 pView->EndTextEdit();
                 bReturn = TRUE;
 
-                SfxBindings& rBindings = SFX_BINDINGS();
+                SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
                 rBindings.Invalidate( SID_PARASPACE_INCREASE );
                 rBindings.Invalidate( SID_PARASPACE_DECREASE );
             }
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 29301749bc52..57d1bfd117d7 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuline.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,7 +86,9 @@
 #ifndef _SFX_BINDINGS_HXX //autogen
 #include <sfx2/bindings.hxx>
 #endif
-
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 #ifndef _SD_VIEWSHEL_HXX
 #include "viewshel.hxx"
 #endif
@@ -169,7 +171,7 @@ FuLine::FuLine(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
                         SID_ATTR_LINE_COLOR,
                         0 };
 
-        SFX_BINDINGS().Invalidate( SidArray );
+        pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
 
         delete pDlg;
         delete pNewAttr;
diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx
index 1b323669137c..b368b48cef74 100644
--- a/sd/source/ui/func/fulink.cxx
+++ b/sd/source/ui/func/fulink.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fulink.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,9 @@
 #ifndef _SFX_BINDINGS_HXX //autogen
 #include <sfx2/bindings.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 
 #include "fulink.hxx"
 #include "sdwindow.hxx"
@@ -98,8 +101,7 @@ FuLink::FuLink( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
     SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
     SvBaseLinksDialog aLinkDlg( NULL, pLinkManager );
     aLinkDlg.Execute();
-
-    SFX_BINDINGS().Invalidate( SID_MANAGE_LINKS );
+    pViewShell->GetViewFrame()->GetBindings().Invalidate( SID_MANAGE_LINKS );
 }
 
 
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 4db8a187a5c2..a93b3d5e0bc2 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuoltext.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -199,7 +199,7 @@ BOOL FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt)
     if (bReturn)
     {
         // Attributierung der akt. Textstelle kann jetzt anders sein
-        SFX_BINDINGS().Invalidate( SidArray );
+        pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
     }
     else
     {
@@ -257,7 +257,7 @@ BOOL FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt)
     if (bReturn)
     {
         // Attributierung der akt. Textstelle kann jetzt anders sein
-        SFX_BINDINGS().Invalidate( SidArray );
+        pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
     }
     else
     {
@@ -321,7 +321,7 @@ BOOL FuOutlineText::KeyInput(const KeyEvent& rKEvt)
         if (bReturn)
         {
             // Attributierung der akt. Textstelle kann jetzt anders sein
-            SFX_BINDINGS().Invalidate( SidArray );
+            pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
         }
         else
         {
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index a2e5ce53ade8..ef4835f0359b 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuparagr.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,6 +81,9 @@
 #ifndef _SFXREQUEST_HXX //autogen
 #include <sfx2/request.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 #include <svx/hyznitem.hxx>
 #include <svx/brkitem.hxx>
 #include <svx/spltitem.hxx>
@@ -99,6 +102,7 @@
 #include "paragr.hxx"
 #include "sdview.hxx"
 #include "fuparagr.hxx"
+#include "viewshel.hxx"
 #include "drawdoc.hxx"
 
 TYPEINIT1( FuParagraph, FuPoor );
@@ -189,7 +193,7 @@ FuParagraph::FuParagraph( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
                             SID_PARASPACE_DECREASE,
                             0 };
 
-    SFX_BINDINGS().Invalidate( SidArray );
+    pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
 }
 
 
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index b383e2f94f1f..139ab312e72a 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuscale.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -196,7 +196,7 @@ FuScale::FuScale(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
 
                 pViewShell->SetZoom( nValue );
 
-                SFX_BINDINGS().Invalidate( SidArrayZoom );
+                pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArrayZoom );
             }
             break;
 
@@ -234,7 +234,7 @@ FuScale::FuScale(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
         SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, FALSE);
         pViewShell->SetZoom (pScale->GetValue ());
 
-        SFX_BINDINGS().Invalidate( SidArrayZoom );
+        pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArrayZoom );
     }
 
 }
diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index 2666e0ac1c3d..70aadd3d5cb9 100644
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fusearch.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,7 +99,7 @@ FuSearch::FuSearch( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
     pSdOutliner(NULL),
     bOwnOutliner(FALSE)
 {
-    SFX_BINDINGS().Invalidate( SidArraySpell );
+    pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArraySpell );
 
     if ( pViewShell->ISA(SdDrawViewShell) )
     {
@@ -123,11 +123,10 @@ FuSearch::FuSearch( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
 |* Destruktor
 |*
 \************************************************************************/
-#pragma SEG_FUNCDEF(fusearch_02)
 
 FuSearch::~FuSearch()
 {
-    SFX_BINDINGS().Invalidate( SidArraySpell );
+    pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArraySpell );
 
     if (pSdOutliner)
         pSdOutliner->EndSpelling();
@@ -142,7 +141,6 @@ FuSearch::~FuSearch()
 |* Suchen&Ersetzen
 |*
 \************************************************************************/
-#pragma SEG_FUNCDEF(fusearch_03)
 
 void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem )
 {
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index a3daec5da404..1fb1cdef3f2e 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fusel.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1128,7 +1128,7 @@ void FuSelection::SetEditMode(USHORT nMode)
 
     ForcePointer();
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
     rBindings.Invalidate(SID_BEZIER_MOVE);
     rBindings.Invalidate(SID_BEZIER_INSERT);
 }
diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx
index 53048228701e..464185fa77b5 100644
--- a/sd/source/ui/func/fuspell.cxx
+++ b/sd/source/ui/func/fuspell.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuspell.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,7 +102,7 @@ FuSpell::FuSpell( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
     pSdOutliner(NULL),
     bOwnOutliner(FALSE)
 {
-    SFX_BINDINGS().Invalidate( SidArraySpell );
+    pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArraySpell );
 
     if ( pViewShell->ISA(SdDrawViewShell) )
     {
@@ -129,7 +129,7 @@ FuSpell::FuSpell( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
 
 FuSpell::~FuSpell()
 {
-    SFX_BINDINGS().Invalidate( SidArraySpell );
+    pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArraySpell );
 
     if (pSdOutliner)
         pSdOutliner->EndSpelling();
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index cebedcad6359..98dd1547ee73 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: futempl.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -230,7 +230,7 @@ FuTemplate::FuTemplate( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
                 {
                     pView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet);
                     pDoc->SetChanged(TRUE);
-                    SFX_BINDINGS().Invalidate( SID_STYLE_FAMILY2 );
+                    pViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
                 }
             }
             pWin->GrabFocus();
@@ -514,7 +514,7 @@ FuTemplate::FuTemplate( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
                     ( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
                     pDoc->SetChanged(TRUE);
 
-                    SFX_BINDINGS().Invalidate( SID_STYLE_FAMILY2 );
+                    pViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
                 }
             }
         }
@@ -541,7 +541,7 @@ FuTemplate::FuTemplate( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
 
                     ( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
                     pDoc->SetChanged(TRUE);
-                    SFX_BINDINGS().Invalidate( SID_STYLE_FAMILY2 );
+                    pViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
                 }
             }
         }
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 1fc97e061ed7..aec7808136cb 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: futext.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -496,8 +496,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
     if (!bIsInDragMode)
     {
         ForcePointer(&rMEvt);
-
-        SFX_BINDINGS().Invalidate(SidArray);
+        pViewShell->GetViewFrame()->GetBindings().Invalidate(SidArray);
     }
 
     return (bReturn);
@@ -551,7 +550,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
         bIsInDragMode = FALSE;
     }
 
-    SFX_BINDINGS().Invalidate( SidArray );
+    pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
 
     Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
 
@@ -803,7 +802,7 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt)
     {
         bReturn = TRUE;
 
-        SFX_BINDINGS().Invalidate( SidArray );
+        pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
 
         if ( pTextObj )
         {
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index 03d7159c020e..27cfcc3a06b9 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuzoom.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:36 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,7 +66,9 @@
 #ifndef _SFX_BINDINGS_HXX //autogen
 #include <sfx2/bindings.hxx>
 #endif
-
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 #include "app.hrc"
 
 #ifndef _SVDPAGV_HXX //autogen
@@ -115,7 +117,6 @@ FuZoom::FuZoom(SdViewShell*     pViewSh,
 |* Destruktor
 |*
 \************************************************************************/
-#pragma SEG_FUNCDEF(fuzoom_02)
 
 FuZoom::~FuZoom()
 {
@@ -134,7 +135,6 @@ FuZoom::~FuZoom()
 |* MouseButtonDown-event
 |*
 \************************************************************************/
-#pragma SEG_FUNCDEF(fuzoom_03)
 
 BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
 {
@@ -168,7 +168,6 @@ BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
 |* MouseMove-event
 |*
 \************************************************************************/
-#pragma SEG_FUNCDEF(fuzoom_04)
 
 BOOL FuZoom::MouseMove(const MouseEvent& rMEvt)
 {
@@ -233,7 +232,6 @@ BOOL FuZoom::MouseMove(const MouseEvent& rMEvt)
 |* MouseButtonUp-event
 |*
 \************************************************************************/
-#pragma SEG_FUNCDEF(fuzoom_05)
 
 BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
 {
@@ -293,7 +291,6 @@ BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
 |* Function aktivieren
 |*
 \************************************************************************/
-#pragma SEG_FUNCDEF(fuzoom_06)
 
 void FuZoom::Activate()
 {
@@ -314,13 +311,9 @@ void FuZoom::Activate()
 |* Function deaktivieren
 |*
 \************************************************************************/
-#pragma SEG_FUNCDEF(fuzoom_07)
 
 void FuZoom::Deactivate()
 {
     pWindow->SetPointer( aPtr );
-    // Updaten der StatusBar
-    SFX_BINDINGS().Invalidate( SidArrayZoom );
+    pViewShell->GetViewFrame()->GetBindings().Invalidate( SidArrayZoom );
 }
-
-
diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx
index 8849257922ca..c5cb6739d58e 100644
--- a/sd/source/ui/func/undopage.cxx
+++ b/sd/source/ui/func/undopage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: undopage.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:37 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,6 +68,9 @@
 #ifndef _SFXDISPATCH_HXX //autogen
 #include <sfx2/dispatch.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 
 #include "sdpage.hxx"
 #include "drviewsh.hxx"
@@ -127,10 +130,8 @@ void __EXPORT SdPageFormatUndoAction::Undo()
 
         pDrViewShell->UpdateScrollBars();
         pDrViewShell->GetView()->GetPageViewPvNum(0)->SetPageOrigin(Point(0,0));
-        SFX_BINDINGS().Invalidate(SID_RULER_NULL_OFFSET);
-
-        // auf (neue) Seitengroesse zoomen
-        SFX_DISPATCHER().Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+        pViewShell->GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
+        pViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
     }
 }
 
@@ -167,10 +168,8 @@ void __EXPORT SdPageFormatUndoAction::Redo()
 
         pDrViewShell->UpdateScrollBars();
         pDrViewShell->GetView()->GetPageViewPvNum(0)->SetPageOrigin(Point(0,0));
-        SFX_BINDINGS().Invalidate(SID_RULER_NULL_OFFSET);
-
-        // auf (neue) Seitengroesse zoomen
-        SFX_DISPATCHER().Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+        pViewShell->GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
+        pViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
     }
 }
 
diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx
index 58f8c6a72562..ade4cbdfb1df 100644
--- a/sd/source/ui/inc/diactrl.hxx
+++ b/sd/source/ui/inc/diactrl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: diactrl.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:37 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,13 +106,17 @@
 
 class DiaTimeControl : public TimeField
 {
+private:
+
+    SfxBindings&    rBindings;
+
 protected:
     virtual void    Up();
     virtual void    Down();
 
 public:
-                DiaTimeControl( Window* pParent, WinBits nStyle = 0 );
-                DiaTimeControl( Window* pParent, ResId nRId );
+                DiaTimeControl( Window* pParent, SfxBindings& rBindings, WinBits nStyle = 0 );
+                DiaTimeControl( Window* pParent, SfxBindings& rBindings, ResId nRId );
                 ~DiaTimeControl();
 
     DECL_LINK( ModifyDiaTimeHdl, void * );
@@ -127,12 +131,13 @@ public:
 class DiaEffectControl : public Window
 {
 private:
+    SfxBindings&    rBindings;
     FixedText       aFtDescr;
 public:
     FadeEffectLB    aLbEffect;
 
 public:
-                DiaEffectControl( Window* pParent, WinBits nStyle = 0 );
+                DiaEffectControl( Window* pParent, SfxBindings& rBindings, WinBits nStyle = 0 );
                 ~DiaEffectControl();
 
     DECL_LINK( SelectDiaEffectHdl, void * );
@@ -143,11 +148,14 @@ public:
 
 class DiaSpeedControl : public Window
 {
+private:
+    SfxBindings&    rBindings;
+
 public:
     ListBox         aLbSpeed;
 
 public:
-                DiaSpeedControl( Window* pParent, WinBits nStyle = 0 );
+                DiaSpeedControl( Window* pParent, SfxBindings& rBindings, WinBits nStyle = 0 );
                 ~DiaSpeedControl();
 
     DECL_LINK( SelectDiaSpeedHdl, void * );
@@ -159,12 +167,13 @@ public:
 class DiaAutoControl : public Window
 {
 private:
+    SfxBindings&    rBindings;
     FixedText       aFtDescr;
 public:
     ListBox         aLbAuto;
 
 public:
-                DiaAutoControl( Window* pParent, WinBits nStyle = 0 );
+                DiaAutoControl( Window* pParent, SfxBindings& rBindings, WinBits nStyle = 0 );
                 ~DiaAutoControl();
 
     DECL_LINK( SelectDiaAutoHdl, void * );
@@ -175,6 +184,8 @@ public:
 
 class SdPagesField : public SvxMetricField
 {
+private:
+    SfxBindings&    rBindings;
 protected:
     virtual void    Modify();
 
diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx
index 310f83de2db5..12fd69082b78 100644
--- a/sd/source/ui/inc/inspagob.hxx
+++ b/sd/source/ui/inc/inspagob.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: inspagob.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:40 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,6 +108,3 @@ public:
 
 
 #endif // _SD_INSPAGOB_HXX
-
-
-#pragma SEG_EOFMODULE
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 89a79595bd5f..8bacc95075a8 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoobj.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:42 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,23 +78,19 @@
 #ifndef _VOS_MUTEX_HXX_
 #include <vos/mutex.hxx>
 #endif
-
 #ifndef _SFX_ITEMPROP_HXX
 #include <svtools/itemprop.hxx>
 #endif
 #ifndef _SFXSTYLE_HXX
 #include <svtools/style.hxx>
 #endif
-
 #ifndef _SFX_BINDINGS_HXX
 #include <sfx2/bindings.hxx>
 #endif
 #ifndef _SFXSIDS_HRC
 #include <sfx2/sfxsids.hrc>
 #endif
-
 #include <cppuhelper/extract.hxx>
-
 #include <svx/unoprov.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/svditer.hxx>
@@ -109,11 +105,14 @@
 #include "unomodel.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
+#include "viewshel.hxx"
 #include "unokywds.hxx"
 #include "unostyls.hxx"
 #include "unopsfm.hxx"
 #include "unogsfm.hxx"
 #include "unopstyl.hxx"
+#include "viewshel.hxx"
+#include "docshell.hxx"
 #include "helpids.h"
 #include "glob.hxx"
 
@@ -907,7 +906,17 @@ void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumen
         throw lang::IllegalArgumentException();
 
     pObj->SetStyleSheet( (SfxStyleSheet*)pStyleSheet->getStyleSheet(), sal_False );
-    SFX_BINDINGS().Invalidate( SID_STYLE_FAMILY2 );
+
+    SdDrawDocument* pDoc = mpModel? mpModel->GetDoc() : NULL;
+
+    if( pDoc )
+    {
+        SdDrawDocShell* pDocSh = pDoc->GetDocSh();
+        SdViewShell*    pViewSh = pDocSh ? pDocSh->GetViewShell() : NULL;
+
+        if( pViewSh )
+            pViewSh->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
+    }
 }
 
 uno::Any SdXShape::GetStyleSheet() const throw( beans::UnknownPropertyException  )
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 141a3da22357..3f8630cbe1dc 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/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:48:43 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1183,7 +1183,7 @@ void SdDrawView::SetPixelMode(BOOL bOn)
         Point aPageOrg = Point(aPageSize.Width(), aPageSize.Height() / 2);
         Size aViewSize = Size(aPageSize.Width() * 3, aPageSize.Height() * 2);
         pViewSh->InitWindows(aPageOrg, aViewSize, Point(-1, -1));
-        SFX_DISPATCHER().Execute(SID_SIZE_PAGE);
+        pViewSh->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE);
     }
 }
 
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index b919199e794e..ac99299ac528 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drtxtob1.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:43 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -184,7 +184,7 @@ void SdDrawTextObjectBar::Execute( SfxRequest &rReq )
                     delete pFuActual;
 
                     if( rReq.GetSlot() == SID_STYLE_APPLY )
-                        SFX_BINDINGS().Invalidate( SID_STYLE_APPLY );
+                        pViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_APPLY );
                 }
             }
             else
@@ -288,7 +288,7 @@ void SdDrawTextObjectBar::Execute( SfxRequest &rReq )
             Invalidate();
             // Um die Preview (im Gliederungsmodus) zu aktualisieren muss
             // der Slot invalidiert werden:
-            SFX_BINDINGS().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
+            pViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
         }
         break;
 
@@ -528,7 +528,7 @@ void SdDrawTextObjectBar::Execute( SfxRequest &rReq )
 
             // Um die Preview (im Gliederungsmodus) zu aktualisieren muss
             // der Slot invalidiert werden:
-            SFX_BINDINGS().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
+            pViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
         }
         break;
     }
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 5db810229b86..d2548cf0f46b 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews1.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:43 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -198,8 +198,8 @@ void __EXPORT SdDrawViewShell::Activate(BOOL bIsMDIActivate)
             bPreview = pFrameView->IsShowPreviewInMasterPageMode();
 
         SfxBoolItem aItem(SID_PREVIEW_WIN, bPreview);
-        SFX_DISPATCHER().Execute(SID_PREVIEW_WIN, SFX_CALLMODE_ASYNCHRON |
-                                 SFX_CALLMODE_RECORD, &aItem, 0L);
+        GetViewFrame()->GetDispatcher()->Execute(
+            SID_PREVIEW_WIN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L);
     }
 }
 
@@ -227,13 +227,12 @@ void SdDrawViewShell::SelectionHasChanged()
     Invalidate();
 
     // Damit das Effekte-Window auch einen aktuellen Status bekommt
-    //SFX_BINDINGS().Invalidate( SID_EFFECT_STATE, TRUE, FALSE );
     UpdateEffectWindow();
 
     //Update3DWindow(); // 3D-Controller
     SfxBoolItem aItem( SID_3D_STATE, TRUE );
-    SFX_DISPATCHER().Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON |
-                                SFX_CALLMODE_RECORD, &aItem, 0L );
+    GetViewFrame()->GetDispatcher()->Execute(
+        SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
 
     SdrOle2Obj* pOleObj = NULL;
     SdrGrafObj* pGrafObj = NULL;
@@ -375,7 +374,7 @@ void SdDrawViewShell::SelectionHasChanged()
 void SdDrawViewShell::SetZoom( long nZoom )
 {
     SdViewShell::SetZoom( nZoom );
-    SFX_BINDINGS().Invalidate( SID_ATTR_ZOOM );
+    GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM );
 }
 
 /*************************************************************************
@@ -387,7 +386,7 @@ void SdDrawViewShell::SetZoom( long nZoom )
 void SdDrawViewShell::SetZoomRect( const Rectangle& rZoomRect )
 {
     SdViewShell::SetZoomRect( rZoomRect );
-    SFX_BINDINGS().Invalidate( SID_ATTR_ZOOM );
+    GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM );
 }
 
 /*************************************************************************
@@ -577,8 +576,8 @@ void SdDrawViewShell::ChangeEditMode(EditMode eEMode, BOOL bLMode)
             SwitchPage(nActualPageNum);
 
             SfxBoolItem aItem(SID_PREVIEW_WIN, pFrameView->IsShowPreviewInPageMode());
-            SFX_DISPATCHER().Execute(SID_PREVIEW_WIN, SFX_CALLMODE_ASYNCHRON |
-                                     SFX_CALLMODE_RECORD, &aItem, 0L);
+            GetViewFrame()->GetDispatcher()->Execute(
+                SID_PREVIEW_WIN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
         }
         else
         {
@@ -620,8 +619,8 @@ void SdDrawViewShell::ChangeEditMode(EditMode eEMode, BOOL bLMode)
             SwitchPage(nActualMasterPageNum);
 
             SfxBoolItem aItem(SID_PREVIEW_WIN, pFrameView->IsShowPreviewInMasterPageMode());
-            SFX_DISPATCHER().Execute(SID_PREVIEW_WIN, SFX_CALLMODE_ASYNCHRON |
-                                     SFX_CALLMODE_RECORD, &aItem, 0L);
+            GetViewFrame()->GetDispatcher()->Execute(
+                SID_PREVIEW_WIN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
         }
 
         if (bLayerMode)
@@ -1261,8 +1260,9 @@ BOOL SdDrawViewShell::SwitchPage(USHORT nSelectedPage)
         pDrView->VisAreaChanged(pWindow);
 
         // Damit der Navigator (und das Effekte-Window) das mitbekommt (/-men)
-        SFX_BINDINGS().Invalidate(SID_NAVIGATOR_PAGENAME, TRUE, FALSE);
-        SFX_BINDINGS().Invalidate(SID_EFFECT_STATE, TRUE, FALSE);
+        SfxBindings& rBindings = GetViewFrame()->GetBindings();
+        rBindings.Invalidate(SID_NAVIGATOR_PAGENAME, TRUE, FALSE);
+        rBindings.Invalidate(SID_EFFECT_STATE, TRUE, FALSE);
         UpdateSlideChangeWindow();
 
         // ggfs. Preview den neuen Kontext mitteilen
@@ -1397,7 +1397,7 @@ void SdDrawViewShell::ResetActualLayer()
     }
 
     aLayerTab.SetCurPageId(nActiveLayer + 1);
-    SFX_BINDINGS().Invalidate( SID_MODIFYLAYER );
+    GetViewFrame()->GetBindings().Invalidate( SID_MODIFYLAYER );
 }
 
 /*************************************************************************
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index c6bad15c9b8d..bf7d21315343 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:43 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -943,9 +943,11 @@ void SdDrawViewShell::FuTemporary(SfxRequest& rReq)
                     if (CHECK_RANGE (10, pScale->GetValue (), 1000))
                     {
                         SetZoom (pScale->GetValue ());
-                        SFX_BINDINGS().Invalidate( SID_ATTR_ZOOM );
-                        SFX_BINDINGS().Invalidate( SID_ZOOM_IN );
-                        SFX_BINDINGS().Invalidate( SID_ZOOM_OUT );
+
+                        SfxBindings& rBindings = GetViewFrame()->GetBindings();
+                        rBindings.Invalidate( SID_ATTR_ZOOM );
+                        rBindings.Invalidate( SID_ZOOM_IN );
+                        rBindings.Invalidate( SID_ZOOM_OUT );
                     }
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 978582ce84db..c812cbd17121 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews4.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:43 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -426,7 +426,7 @@ void SdDrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, SdWindow* pWin)
                 pDrView->EndAction();
 
                 if (bIsSetPageOrg)
-                    SFX_BINDINGS().Invalidate(SID_RULER_NULL_OFFSET);
+                    GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
             }
             else if (rMEvt.IsLeft() && bIsSetPageOrg)
             {
@@ -434,7 +434,7 @@ void SdDrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, SdWindow* pWin)
                 SdPage* pPage = (SdPage*) pDrView->GetPageViewPvNum(0)->GetPage();
                 Point aOrg(pPage->GetLftBorder(), pPage->GetUppBorder());
                 pDrView->GetPageViewPvNum(0)->SetPageOrigin(aOrg);
-                SFX_BINDINGS().Invalidate(SID_RULER_NULL_OFFSET);
+                GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
             }
             else
             {
@@ -778,10 +778,12 @@ void SdDrawViewShell::ShowMousePosInfo(const Rectangle& rRect, SdWindow* pWin)
 //        GetStatusBarState(aSet);  nicht performant bei gedrueckter Modifiertaste!!
 
         aSet.Put( SfxStringItem( SID_CONTEXT, pDrView->GetStatusText() ) );
-        SFX_BINDINGS().SetState(aSet);
-        SFX_BINDINGS().Invalidate(SID_CONTEXT);
-        SFX_BINDINGS().Invalidate(SID_ATTR_POSITION);
-        SFX_BINDINGS().Invalidate(SID_ATTR_SIZE);
+
+        SfxBindings& rBindings = GetViewFrame()->GetBindings();
+        rBindings.SetState(aSet);
+        rBindings.Invalidate(SID_CONTEXT);
+        rBindings.Invalidate(SID_ATTR_POSITION);
+        rBindings.Invalidate(SID_ATTR_SIZE);
     }
 }
 
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 91c8b4b26977..4ffe1b8639d4 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews5.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:43 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,16 +121,15 @@ void SdDrawViewShell::ModelHasChanged()
 {
     Invalidate();
     // Damit der Navigator auch einen aktuellen Status bekommt
-    SFX_BINDINGS().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
+    GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
 
     // Damit das Effekte-Window die Reihenfolge updaten kann
-    //SFX_BINDINGS().Invalidate( SID_EFFECT_STATE, TRUE, FALSE );
     UpdateEffectWindow();
 
     //Update3DWindow();
     SfxBoolItem aItem( SID_3D_STATE, TRUE );
-    SFX_DISPATCHER().Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON |
-                                SFX_CALLMODE_RECORD, &aItem, 0L );
+    GetViewFrame()->GetDispatcher()->Execute(
+        SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
 
     // jetzt den von der Drawing Engine neu erzeugten TextEditOutliner
     // initialisieren
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index f4db9d0ec042..7266d54eea5b 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews6.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:43 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -560,7 +560,7 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
                 GetViewFrame()->ToggleChildWindow( SvxFontWorkChildWindow::GetChildWindowId() );
             }
 
-            SFX_BINDINGS().Invalidate(SID_FONTWORK);
+            GetViewFrame()->GetBindings().Invalidate(SID_FONTWORK);
             Cancel();
             rReq.Ignore ();
         }
@@ -575,7 +575,7 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
             else
                 GetViewFrame()->ToggleChildWindow(SvxColorChildWindow::GetChildWindowId() );
 
-            SFX_BINDINGS().Invalidate(SID_COLOR_CONTROL);
+            GetViewFrame()->GetBindings().Invalidate(SID_COLOR_CONTROL);
             Cancel();
             rReq.Ignore ();
         }
@@ -584,7 +584,7 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
         case SID_BMPMASK:
         {
             GetViewFrame()->ToggleChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() );
-            SFX_BINDINGS().Invalidate( SID_BMPMASK );
+            GetViewFrame()->GetBindings().Invalidate( SID_BMPMASK );
 
             Cancel();
             rReq.Ignore ();
@@ -594,7 +594,7 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
         case SID_GALLERY:
         {
             GetViewFrame()->ToggleChildWindow( GalleryChildWindow::GetChildWindowId() );
-            SFX_BINDINGS().Invalidate( SID_GALLERY );
+            GetViewFrame()->GetBindings().Invalidate( SID_GALLERY );
 
             Cancel();
             rReq.Ignore ();
@@ -610,7 +610,7 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
             else
                 GetViewFrame()->ToggleChildWindow( SID_NAVIGATOR );
 
-            SFX_BINDINGS().Invalidate(SID_NAVIGATOR);
+            GetViewFrame()->GetBindings().Invalidate(SID_NAVIGATOR);
             Cancel();
             rReq.Ignore ();
         }
@@ -625,7 +625,7 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
             else
                 GetViewFrame()->ToggleChildWindow(SdAnimationChildWindow::GetChildWindowId() );
 
-            SFX_BINDINGS().Invalidate(SID_ANIMATION_OBJECTS);
+            GetViewFrame()->GetBindings().Invalidate(SID_ANIMATION_OBJECTS);
             Cancel();
             rReq.Ignore ();
         }
@@ -654,10 +654,11 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
             else
                 pFrameView->SetShowPreviewInMasterPageMode(bPreview);
 
-            SFX_BINDINGS().Invalidate(SID_PREVIEW_WIN);
-            SFX_BINDINGS().Invalidate(SID_PREVIEW_QUALITY_COLOR);
-            SFX_BINDINGS().Invalidate(SID_PREVIEW_QUALITY_GRAYSCALE);
-            SFX_BINDINGS().Invalidate(SID_PREVIEW_QUALITY_BLACKWHITE);
+            SfxBindings& rBindings = GetViewFrame()->GetBindings();
+            rBindings.Invalidate(SID_PREVIEW_WIN);
+            rBindings.Invalidate(SID_PREVIEW_QUALITY_COLOR);
+            rBindings.Invalidate(SID_PREVIEW_QUALITY_GRAYSCALE);
+            rBindings.Invalidate(SID_PREVIEW_QUALITY_BLACKWHITE);
 
             Cancel();
             rReq.Ignore ();
@@ -673,7 +674,7 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
             else
                 GetViewFrame()->ToggleChildWindow(SdEffectChildWindow::GetChildWindowId() );
 
-            SFX_BINDINGS().Invalidate(SID_EFFECT_WIN);
+            GetViewFrame()->GetBindings().Invalidate(SID_EFFECT_WIN);
             Cancel();
             rReq.Ignore ();
         }
@@ -688,7 +689,7 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
             else
                 GetViewFrame()->ToggleChildWindow(SdSlideChangeChildWindow::GetChildWindowId() );
 
-            SFX_BINDINGS().Invalidate(SID_SLIDE_CHANGE_WIN);
+            GetViewFrame()->GetBindings().Invalidate(SID_SLIDE_CHANGE_WIN);
             Cancel();
             rReq.Ignore ();
         }
@@ -703,7 +704,7 @@ void SdDrawViewShell::FuTemp04(SfxRequest& rReq)
             else
                 GetViewFrame()->ToggleChildWindow( Svx3DChildWindow::GetChildWindowId() );
 
-            SFX_BINDINGS().Invalidate( SID_3D_WIN );
+            GetViewFrame()->GetBindings().Invalidate( SID_3D_WIN );
             Cancel();
             rReq.Ignore ();
         }
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 5521bcca87da..baeb906ddeb8 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews8.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:43 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,9 @@
 #ifndef _SFXREQUEST_HXX //autogen
 #include <sfx2/request.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 #pragma hdrstop
 
 #include "app.hrc"
@@ -455,8 +458,9 @@ void SdDrawViewShell::FuTemp01(SfxRequest& rReq)
             }
             else
             {
-                SFX_BINDINGS().Invalidate( SID_TWAIN_SELECT );
-                SFX_BINDINGS().Invalidate( SID_TWAIN_TRANSFER );
+                SfxBindings& rBindings = GetViewFrame()->GetBindings();
+                rBindings.Invalidate( SID_TWAIN_SELECT );
+                rBindings.Invalidate( SID_TWAIN_TRANSFER );
             }
         }
         break;
@@ -519,8 +523,9 @@ void SdDrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& r
         }
     }
 
-    SFX_BINDINGS().Invalidate( SID_TWAIN_SELECT );
-    SFX_BINDINGS().Invalidate( SID_TWAIN_TRANSFER );
+    SfxBindings& rBindings = GetViewFrame()->GetBindings();
+    rBindings.Invalidate( SID_TWAIN_SELECT );
+    rBindings.Invalidate( SID_TWAIN_TRANSFER );
 }
 
 
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 2b7ae2aff8f8..c1bc5b0adf94 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews9.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:43 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -373,10 +373,11 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
     if (pFuActual && pFuActual->    GetSlotID() == SID_PRESENTATION)
         return;
 
-
     CheckLineTo (rReq);
 
-    SfxItemSet* pAttr = new SfxItemSet ( pDoc->GetPool() );
+    SfxBindings&    rBindings = GetViewFrame()->GetBindings();
+    SfxItemSet*     pAttr = new SfxItemSet ( pDoc->GetPool() );
+
     pView->GetAttributes( *pAttr );
     const SfxItemSet* pArgs = rReq.GetArgs();
 
@@ -392,7 +393,7 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                     {
                         pAttr->ClearItem (XATTR_FILLSTYLE);
                         pAttr->Put (XFillStyleItem ((XFillStyle) pFillStyle->GetValue ()), XATTR_FILLSTYLE);
-                        SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_STYLE);
+                        rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 
@@ -412,7 +413,7 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                     {
                         pAttr->ClearItem (XATTR_LINESTYLE);
                         pAttr->Put (XLineStyleItem ((XLineStyle) pLineStyle->GetValue ()), XATTR_LINESTYLE);
-                        SFX_BINDINGS ().Invalidate (SID_ATTR_LINE_STYLE);
+                        rBindings.Invalidate (SID_ATTR_LINE_STYLE);
                     }
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 
@@ -430,7 +431,7 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                     SFX_REQUEST_ARG (rReq, pLineWidth, SfxUInt32Item, ID_VAL_WIDTH, FALSE);
                     pAttr->ClearItem (XATTR_LINEWIDTH);
                     pAttr->Put (XLineWidthItem (pLineWidth->GetValue ()), XATTR_LINEWIDTH);
-                    SFX_BINDINGS ().Invalidate (SID_ATTR_LINE_WIDTH);
+                    rBindings.Invalidate (SID_ATTR_LINE_WIDTH);
                     break;
                 }
 
@@ -451,8 +452,8 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                                                            (short) pBlue->GetValue ())),
                                 XATTR_FILLCOLOR);
                     pAttr->Put (XFillStyleItem (XFILL_SOLID), XATTR_FILLSTYLE);
-                    SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_COLOR);
-                    SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_STYLE);
+                    rBindings.Invalidate (SID_ATTR_FILL_COLOR);
+                    rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     break;
                 }
 
@@ -471,7 +472,7 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                     pAttr->Put (XLineColorItem (-1, Color ((short) pRed->GetValue (), (short) pGreen->GetValue (),
                                                            (short) pBlue->GetValue ())),
                                 XATTR_LINECOLOR);
-                    SFX_BINDINGS ().Invalidate (SID_ATTR_LINE_COLOR);
+                    rBindings.Invalidate (SID_ATTR_LINE_COLOR);
                     break;
                 }
 
@@ -531,8 +532,8 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                         pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
                     }
 
-                    SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_STYLE);
-                    SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_GRADIENT);
+                    rBindings.Invalidate (SID_ATTR_FILL_STYLE);
+                    rBindings.Invalidate (SID_ATTR_FILL_GRADIENT);
                     break;
                 }
 
@@ -584,8 +585,8 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                         pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
                     }
 
-                    SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_HATCH);
-                    SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_STYLE);
+                    rBindings.Invalidate (SID_ATTR_FILL_HATCH);
+                    rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     break;
                 }
 
@@ -627,8 +628,8 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
 
                         pAttr->Put (XLineDashItem (pName->GetValue (), aNewDash), XATTR_LINEDASH);
                         pAttr->Put (XLineStyleItem (XLINE_DASH), XATTR_LINESTYLE);
-                        SFX_BINDINGS ().Invalidate (SID_ATTR_LINE_DASH);
-                        SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_STYLE);
+                        rBindings.Invalidate (SID_ATTR_LINE_DASH);
+                        rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 
@@ -703,8 +704,8 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                             pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
                         }
 
-                        SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_GRADIENT);
-                        SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_STYLE);
+                        rBindings.Invalidate (SID_ATTR_FILL_GRADIENT);
+                        rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 
@@ -764,8 +765,8 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                             pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
                         }
 
-                        SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_HATCH);
-                        SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_STYLE);
+                        rBindings.Invalidate (SID_ATTR_FILL_HATCH);
+                        rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }
                     else StarBASIC::FatalError (SbERR_BAD_PROP_VALUE);
 
@@ -797,8 +798,8 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                             pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
                             pAttr->Put (XFillGradientItem (pName->GetValue (), pEntry->GetGradient ()), XATTR_FILLGRADIENT);
 
-                            SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_GRADIENT);
-                            SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_STYLE);
+                            rBindings.Invalidate (SID_ATTR_FILL_GRADIENT);
+                            rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                             break;
                         }
                     }
@@ -831,8 +832,8 @@ void SdDrawViewShell::AttrExec (SfxRequest &rReq)
                             pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
                             pAttr->Put (XFillHatchItem (pName->GetValue (), pEntry->GetHatch ()), XATTR_FILLHATCH);
 
-                            SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_HATCH);
-                            SFX_BINDINGS ().Invalidate (SID_ATTR_FILL_STYLE);
+                            rBindings.Invalidate (SID_ATTR_FILL_HATCH);
+                            rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                             break;
                         }
                     }
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index b29e92397ab5..6fdec4a7b95c 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviewsa.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -734,7 +734,7 @@ void SdDrawViewShell::SetupPage (Size &rSize,
     Point aNewOrigin(pActualPage->GetLftBorder(), pActualPage->GetUppBorder());
     GetView()->GetPageViewPvNum(0)->SetPageOrigin(aNewOrigin);
 
-    SFX_BINDINGS().Invalidate(SID_RULER_NULL_OFFSET);
+    GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
 
     // auf (neue) Seitengroesse zoomen
     GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE,
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 3cd5bfab8ad2..2eef5e12f6da 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviewsb.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -432,7 +432,7 @@ void SdDrawViewShell::FuTemp02(SfxRequest& rReq)
 
         case SID_EDIT_HYPERLINK :
         {
-            SFX_DISPATCHER().Execute( SID_HYPERLINK_DIALOG );
+            GetViewFrame()->GetDispatcher()->Execute( SID_HYPERLINK_DIALOG );
 
             Cancel();
             rReq.Done ();
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 252c4c50751b..73af374c34f3 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviewsc.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -216,8 +216,10 @@ void SdDrawViewShell::FuTemp03(SfxRequest& rReq)
             }
 
             // In der Hoffnung, dass Dieter die nachfolgende Zeile stehen laesst
-            SFX_BINDINGS().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
-            SFX_BINDINGS().Invalidate( SID_CONTEXT );
+            SfxBindings& rBindings = GetViewFrame()->GetBindings();
+            rBindings.Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
+            rBindings.Invalidate( SID_CONTEXT );
+
             Cancel();
             rReq.Ignore ();
         }
@@ -639,7 +641,7 @@ void SdDrawViewShell::FuTemp03(SfxRequest& rReq)
             {
                 pFuActual = new FuTemplate( this, pWindow, pDrView, pDoc, rReq );
                 if( rReq.GetSlot() == SID_STYLE_APPLY )
-                    SFX_BINDINGS().Invalidate( SID_STYLE_APPLY );
+                    GetViewFrame()->GetBindings().Invalidate( SID_STYLE_APPLY );
                 Cancel();
             }
             else if( rReq.GetSlot() == SID_STYLE_APPLY )
@@ -654,7 +656,7 @@ void SdDrawViewShell::FuTemp03(SfxRequest& rReq)
             USHORT      nId = SvxIMapDlgChildWindow::GetChildWindowId();
 
             GetViewFrame()->ToggleChildWindow( nId );
-            SFX_BINDINGS().Invalidate( SID_IMAP );
+            GetViewFrame()->GetBindings().Invalidate( SID_IMAP );
 
             if ( GetViewFrame()->HasChildWindow( nId ) && ( ( pDlg = SVXIMAPDLG() ) != NULL ) )
             {
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index bcfdba7bba53..8e17d15af318 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviewsd.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -225,7 +225,7 @@ void SdDrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
                             &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
             }
 
-            SfxBindings& rBindings = SFX_BINDINGS();
+            SfxBindings& rBindings = GetViewFrame()->GetBindings();
             rBindings.Invalidate( SID_NAVIGATOR_STATE );
             rBindings.Invalidate( SID_NAVIGATOR_PAGENAME );
         }
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 363da0f2a7de..c7bc56dae810 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviewse.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -235,7 +235,7 @@ void SdDrawViewShell::FuPermanent(SfxRequest& rReq)
         delete pFuActual;
         pFuActual = NULL;
 
-        SfxBindings& rBind = SFX_BINDINGS();
+        SfxBindings& rBind = GetViewFrame()->GetBindings();
         rBind.Invalidate(nOldSId);
         rBind.Update(nOldSId);
     }
@@ -253,8 +253,9 @@ void SdDrawViewShell::FuPermanent(SfxRequest& rReq)
             ( (FuText*) pFuActual)->DoExecute();
             // Das Setzen des Permanent-Status erfolgt weiter oben!
 
-            SFX_BINDINGS().Invalidate( SID_ATTR_CHAR );
-            SFX_BINDINGS().Invalidate( SID_TEXT_FITTOSIZE );
+            SfxBindings& rBindings = GetViewFrame()->GetBindings();
+            rBindings.Invalidate( SID_ATTR_CHAR );
+            rBindings.Invalidate( SID_TEXT_FITTOSIZE );
             rReq.Done();
         }
         break;
@@ -483,7 +484,7 @@ void SdDrawViewShell::FuPermanent(SfxRequest& rReq)
         delete pFuOld;
         pFuOld = NULL;
 
-        SfxBindings& rBind = SFX_BINDINGS();
+        SfxBindings& rBind = GetViewFrame()->GetBindings();
         rBind.Invalidate( nSId );
         rBind.Update( nSId );
     }
@@ -620,7 +621,7 @@ void SdDrawViewShell::FuSupport(SfxRequest& rReq)
             rReq.Ignore ();
 
             // sonst bleiben alle Draw-Slots disabled
-            SFX_BINDINGS().InvalidateAll( TRUE );
+            GetViewFrame()->GetBindings().InvalidateAll( TRUE );
         }
         break;
 
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 631ba9a64936..643fb770a03b 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviewsf.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -404,9 +404,6 @@ void __EXPORT SdDrawViewShell::GetAttrState( SfxItemSet& rSet )
                             }
                         }
                     }
-                    // Invalidieren mit ClearCache. Sollte (so bald verfuegbar) auf
-                    // 2 Parameter umgestellt werden (letzten einfach entfernen)
-                    //SFX_BINDINGS().Invalidate( nSlotId, TRUE, FALSE );
                 }
                 else
                 {   SfxTemplateItem aItem( nWhich, String() );
diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx
index 49febdccfdf2..b488ce2c99d1 100644
--- a/sd/source/ui/view/drviewsi.cxx
+++ b/sd/source/ui/view/drviewsi.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviewsi.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -714,7 +714,7 @@ void SdDrawViewShell::AssignFromEffectWindow()
     SfxChildWindow* pWindow = GetViewFrame()->GetChildWindow( nId );
     if( pWindow )
     {
-        SFX_BINDINGS().InvalidateAll( TRUE );
+        GetViewFrame()->GetBindings().InvalidateAll( TRUE );
 
         SdEffectWin* pEffectWin = (SdEffectWin*) pWindow->GetWindow();
         const SdrMarkList& rMarkList = pDrView->GetMarkList();
@@ -1185,7 +1185,7 @@ void SdDrawViewShell::AssignFromEffectWindow()
     }
 
     bInEffectAssignment = FALSE;
-    SFX_BINDINGS().InvalidateAll( TRUE );
+    GetViewFrame()->GetBindings().InvalidateAll( TRUE );
 }
 
 /*************************************************************************
@@ -1243,8 +1243,8 @@ void SdDrawViewShell::AssignFrom3DWindow()
                     // Text in 3D umwandeln
                     USHORT nSId = SID_CONVERT_TO_3D;
                     SfxBoolItem aItem( nSId, TRUE );
-                    SFX_DISPATCHER().Execute( nSId, SFX_CALLMODE_SYNCHRON |
-                                                SFX_CALLMODE_RECORD, &aItem, 0L );
+                    GetViewFrame()->GetDispatcher()->Execute(
+                        nSId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
 
                     // Feststellen, ob ein FILL_Attribut gesetzt ist.
                     // Falls nicht, Fuellattribut hart setzen
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index f471886d6896..b266e3fa08db 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outlnvs2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -334,8 +334,8 @@ void SdOutlineViewShell::FuTemporary(SfxRequest &rReq)
             pFrameView->SetPresentationViewShellId(SID_VIEWSHELL2);
             pFrameView->SetSlotId(SID_PRESENTATION);
             pFrameView->SetPageKind(PK_STANDARD);
-            SFX_DISPATCHER().Execute(SID_VIEWSHELL0,
-                        SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+            GetViewFrame()->GetDispatcher()->Execute(
+                SID_VIEWSHELL0, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
             rReq.Done();
         }
         break;
@@ -382,10 +382,11 @@ void SdOutlineViewShell::FuTemporary(SfxRequest &rReq)
 
             pFrameView->SetShowPreviewInOutlineMode(bPreview);
 
-            SFX_BINDINGS().Invalidate(SID_PREVIEW_WIN);
-            SFX_BINDINGS().Invalidate(SID_PREVIEW_QUALITY_COLOR);
-            SFX_BINDINGS().Invalidate(SID_PREVIEW_QUALITY_GRAYSCALE);
-            SFX_BINDINGS().Invalidate(SID_PREVIEW_QUALITY_BLACKWHITE);
+            SfxBindings& rBindings = GetViewFrame()->GetBindings();
+            rBindings.Invalidate(SID_PREVIEW_WIN);
+            rBindings.Invalidate(SID_PREVIEW_QUALITY_COLOR);
+            rBindings.Invalidate(SID_PREVIEW_QUALITY_GRAYSCALE);
+            rBindings.Invalidate(SID_PREVIEW_QUALITY_BLACKWHITE);
 
             Cancel();
             rReq.Ignore ();
@@ -641,10 +642,13 @@ void SdOutlineViewShell::FuTemporary(SfxRequest &rReq)
     Invalidate( SID_OUTLINE_COLLAPSE );
     Invalidate( SID_OUTLINE_EXPAND_ALL );
     Invalidate( SID_OUTLINE_EXPAND );
-    SFX_BINDINGS().Invalidate( SID_OUTLINE_LEFT );
-    SFX_BINDINGS().Invalidate( SID_OUTLINE_RIGHT );
-    SFX_BINDINGS().Invalidate( SID_OUTLINE_UP );
-    SFX_BINDINGS().Invalidate( SID_OUTLINE_DOWN );
+
+    SfxBindings& rBindings = GetViewFrame()->GetBindings();
+    rBindings.Invalidate( SID_OUTLINE_LEFT );
+    rBindings.Invalidate( SID_OUTLINE_RIGHT );
+    rBindings.Invalidate( SID_OUTLINE_UP );
+    rBindings.Invalidate( SID_OUTLINE_DOWN );
+
     Invalidate( SID_OUTLINE_FORMAT );
     Invalidate( SID_COLORVIEW );
     Invalidate(SID_CUT);
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index a60dd2941e30..8a4749f4f0c5 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outlnvsh.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dl $ $Date: 2000-09-20 15:54:01 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:21 $
  *
  *  Copyright according the GNU Public License.
  *
@@ -506,8 +506,8 @@ void SdOutlineViewShell::Activate( BOOL bIsMDIActivate )
         pOutl->UpdateFields();
 
         SfxBoolItem aItem(SID_PREVIEW_WIN, pFrameView->IsShowPreviewInOutlineMode());
-        SFX_DISPATCHER().Execute(SID_PREVIEW_WIN, SFX_CALLMODE_ASYNCHRON |
-                                 SFX_CALLMODE_RECORD, &aItem, 0L);
+        GetViewFrame()->GetDispatcher()->Execute(
+            SID_PREVIEW_WIN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L);
     }
 }
 
@@ -1562,8 +1562,6 @@ BOOL SdOutlineViewShell::KeyInput(const KeyEvent& rKEvt, SdWindow* pWin)
     if( aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS ||
         GetActualPage() != pLastPage )
     {
-        //UpdatePreview();
-        //SFX_BINDINGS().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
         Invalidate( SID_PREVIEW_STATE );
     }
 
@@ -1699,10 +1697,6 @@ void __EXPORT SdOutlineViewShell::GetAttrState( SfxItemSet& rSet )
                     {
                         SfxTemplateItem aItem( nWhich, pStyleSheet->GetName() );
                         aAllSet.Put( aItem, aItem.Which()  );
-
-                        // Invalidieren mit ClearCache. Sollte (so bald verfuegbar) auf
-                        // 2 Parameter umgestellt werden (letzten einfach entfernen)
-                        // SFX_BINDINGS().Invalidate( nSlotId, TRUE, FALSE );
                     }
                 }
 
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 93ac352dad5d..656502ac5d73 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outlview.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -399,7 +399,7 @@ BOOL SdOutlineView::Drop(const DropEvent& rDEvt, SdWindow* pWindow,
         bResult = pOlView->Drop(rDEvt);
     }
 
-    SFX_BINDINGS().Invalidate( SidArray );
+    ( pOutlineViewShell ? pOutlineViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings().Invalidate( SidArray );
 
     return bResult;
 }
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index f9d6123440c4..e93d573dfff0 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabcontr.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:45 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -408,8 +408,8 @@ void SdTabControl::EndRenaming()
 
         // Damit der Navigator das mitbekommt
         SfxBoolItem aItem(SID_NAVIGATOR_INIT, TRUE);
-        SFX_DISPATCHER().Execute(SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON |
-                                    SFX_CALLMODE_RECORD, &aItem, 0L);
+        pDrViewSh->GetViewFrame()->GetDispatcher()->Execute(
+            SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
     }
 }
 
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index 7c2797038788..d3aaf0b229de 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unmodpg.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:45 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,9 @@
 #ifndef _SFXDISPATCH_HXX
 #include <sfx2/dispatch.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 
 #pragma hdrstop
 
@@ -157,8 +160,8 @@ void __EXPORT ModifyPageUndoAction::Undo()
     }
 
     // Redisplay
-    SFX_DISPATCHER().Execute(SID_SWITCHPAGE,
-        SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+    SfxViewFrame::Current()->GetDispatcher()->Execute(
+        SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
 }
 
 /*************************************************************************
@@ -197,8 +200,8 @@ void __EXPORT ModifyPageUndoAction::Redo()
     }
 
     // Redisplay
-    SFX_DISPATCHER().Execute(SID_SWITCHPAGE,
-            SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
+    SfxViewFrame::Current()->GetDispatcher()->Execute(
+        SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
 }
 
 /*************************************************************************
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index b08816e2ded0..ffe6d63ffc0f 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewshe2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:45 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -900,7 +900,7 @@ void SdViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize,
         pView->GetPageViewPvNum(0)->SetPageOrigin(aNewOrigin);
     }
 
-    SFX_BINDINGS().Invalidate(SID_RULER_NULL_OFFSET);
+    GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
 
     // auf (neue) Seitengroesse zoomen
     GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE,
@@ -1234,7 +1234,7 @@ BOOL SdViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
             aErrCode = rIPObjRef->DoVerb(nVerb);
         }
 
-        SFX_BINDINGS().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
+        GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
     }
 
     pDocSh->SetWaitCursor( FALSE );
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 85862c25ccb2..fe4b5b59c10c 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewshe3.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:45 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -162,16 +162,12 @@
 #include "slidvish.hxx"
 #include "sdoutl.hxx"
 
-#include <segmentc.hxx>
-
 #ifndef _B3D_BASE3D_HXX
 #include "goodies/base3d.hxx"
 #endif
 
 using namespace ::com::sun::star;
 
-SEG_EOFGLOBALS()
-
 /*************************************************************************
 |*
 |* EffekteWindow updaten
@@ -434,7 +430,7 @@ void SdViewShell::AssignFromSlideChangeWindow()
                             SID_DIA_TIME,
                             0 };
 
-            SFX_BINDINGS().Invalidate( SidArray );
+            GetViewFrame()->GetBindings().Invalidate( SidArray );
 
             // Model geaendert
             pDoc->SetChanged();
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index b83595fd5caf..19470d024c67 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewshel.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:45 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -417,11 +417,12 @@ void __EXPORT SdViewShell::Activate(BOOL bIsMDIActivate)
     {
         // Damit der Navigator auch einen aktuellen Status bekommt
         SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE );
-        SFX_DISPATCHER().Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON |
-                                    SFX_CALLMODE_RECORD, &aItem, 0L );
+        GetViewFrame()->GetDispatcher()->Execute(
+            SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
 
-        SFX_BINDINGS().Invalidate( SID_EFFECT_STATE, TRUE, FALSE );
-        SFX_BINDINGS().Invalidate( SID_3D_STATE, TRUE, FALSE );
+        SfxBindings& rBindings = GetViewFrame()->GetBindings();
+        rBindings.Invalidate( SID_EFFECT_STATE, TRUE, FALSE );
+        rBindings.Invalidate( SID_3D_STATE, TRUE, FALSE );
 
         if (pFuSlideShow && !pFuSlideShow->IsTerminated() )
         {
@@ -673,7 +674,7 @@ void SdViewShell::Command(const CommandEvent& rCEvt, SdWindow* pWin)
                     nNewZoom = Min( (long) pWin->GetMaxZoom(), (long)(nOldZoom + DELTA_ZOOM) );
 
                 SetZoom( nNewZoom );
-                SFX_BINDINGS().Invalidate( SID_ATTR_ZOOM );
+                GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM );
                 bDone = TRUE;
             }
             else
diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx
index a63cff109b13..a171c6af9d62 100644
--- a/sd/source/ui/view/zoomlist.cxx
+++ b/sd/source/ui/view/zoomlist.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: zoomlist.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:45 $
+ *  last change: $Author: ka $ $Date: 2000-09-21 16:12:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,9 @@
 #ifndef _SFX_BINDINGS_HXX //autogen
 #include <sfx2/bindings.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
 
 #pragma hdrstop
 
@@ -132,7 +135,7 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect)
     Rectangle* pRect = new Rectangle(rRect);
     Insert(pRect, nCurPos);
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = SfxViewFrame::Current()->GetBindings();
     rBindings.Invalidate( SID_ZOOM_NEXT );
     rBindings.Invalidate( SID_ZOOM_PREV );
 }
@@ -166,7 +169,7 @@ Rectangle ZoomList::GetNextZoomRect()
         nCurPos = nCount - 1;
     }
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = SfxViewFrame::Current()->GetBindings();
     rBindings.Invalidate( SID_ZOOM_NEXT );
     rBindings.Invalidate( SID_ZOOM_PREV );
 
@@ -187,7 +190,7 @@ Rectangle ZoomList::GetPreviousZoomRect()
         nCurPos--;
     }
 
-    SfxBindings& rBindings = SFX_BINDINGS();
+    SfxBindings& rBindings = SfxViewFrame::Current()->GetBindings();
     rBindings.Invalidate( SID_ZOOM_NEXT );
     rBindings.Invalidate( SID_ZOOM_PREV );
author	Kai Ahrens <ka@openoffice.org>	2000-09-21 15:12:50 +0000
committer	Kai Ahrens <ka@openoffice.org>	2000-09-21 15:12:50 +0000
commit	abfcdf776c3d9111ac311f15fbbbf5c3d3a7c7c3 (patch)
tree	70903a71534a928323dd35ec8bd0df1ec7b7d82b /sd/source/ui
parent	9112386dd35c3a51c5b5a29a180d1626c50fdcad (diff)