CWS-TOOLING: integrate CWS autorecovery

5 files changed, 52 insertions, 96 deletions

diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index cef0af899a33..40f6346de8ee 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -68,7 +68,7 @@
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/sfxuno.hxx>
-#include <sfx2/topfrm.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/msgpool.hxx>
 
@@ -719,7 +719,7 @@ void SfxBindings::InvalidateAll
         pImp->pCaches->GetObject(n)->Invalidate(bWithMsg);
 /*
     ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame
-        ( pDispatcher->GetFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY );
+        ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
 
     if ( bWithMsg && xFrame.is() )
         xFrame->contextChanged();
@@ -1381,7 +1381,7 @@ void SfxBindings::UpdateSlotServer_Impl()
         if ( !nRegLevel )
         {
             ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame
-                ( pDispatcher->GetFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY );
+                ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
             //if ( xFrame.is() )
             //    xFrame->contextChanged();
             pImp->bContextChanged = FALSE;
@@ -1923,7 +1923,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
             pImp->bContextChanged = FALSE;
             /*
             ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame
-                ( pDispatcher->GetFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY );
+                ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
             if ( xFrame.is() )
                 xFrame->contextChanged();*/
         }
@@ -2030,7 +2030,7 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp )
         ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchProvider > xProv;
         if ( pDisp )
             xProv = ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchProvider >
-                                        ( pDisp->GetFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY );
+                                        ( pDisp->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
 
         SetDispatchProvider_Impl( xProv );
         InvalidateAll( sal_True );
@@ -2313,7 +2313,7 @@ void SfxBindings::SetActiveFrame( const ::com::sun::star::uno::Reference< ::com:
         SetDispatchProvider_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > ( rFrame, ::com::sun::star::uno::UNO_QUERY ) );
     else
         SetDispatchProvider_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > (
-            pDispatcher->GetFrame()->GetFrame()->GetFrameInterface(), ::com::sun::star::uno::UNO_QUERY ) );
+            pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), ::com::sun::star::uno::UNO_QUERY ) );
 }
 
 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxBindings::GetActiveFrame() const
@@ -2322,7 +2322,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxBin
     if ( xFrame.is() || !pDispatcher )
         return xFrame;
     else
-        return pDispatcher->GetFrame()->GetFrame()->GetFrameInterface();
+        return pDispatcher->GetFrame()->GetFrame().GetFrameInterface();
 }
 
 void SfxBindings::SetDispatchProvider_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & rProv )
@@ -2349,8 +2349,8 @@ SystemWindow* SfxBindings::GetSystemWindow() const
     SfxViewFrame *pFrame = pDispatcher->GetFrame();
     while ( pFrame->GetParentViewFrame_Impl() )
         pFrame = pFrame->GetParentViewFrame_Impl();
-    SfxTopViewFrame* pTop = PTR_CAST( SfxTopViewFrame, pFrame->GetTopViewFrame() );
-    return pTop->GetTopFrame_Impl()->GetTopWindow_Impl();
+    SfxViewFrame* pTop = pFrame->GetTopViewFrame();
+    return pTop->GetFrame().GetTopWindow_Impl();
 }
 
 BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
@@ -2374,7 +2374,7 @@ BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
                     xServiceManager->createInstance(our_aModuleManagerName)
                     , ::com::sun::star::uno::UNO_QUERY_THROW);
                 ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame(
-                    pDispatcher->GetFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY_THROW);
+                    pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY_THROW);
                 sAppName = xModuleManager->identify(xFrame);
             } catch(::com::sun::star::uno::Exception&) {}
             Sequence<beans::PropertyValue> source;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 7037edb00178..e66dd2c56eaf 100755..100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -76,7 +76,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/module.hxx>
-#include <sfx2/topfrm.hxx>
+#include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/mnumgr.hxx>
@@ -239,14 +239,13 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
     SFX_STACK(SfxDispatcher::Call_Impl);
 
     // darf der Slot gerufen werden (i.S.v. enabled)
-    SfxApplication *pSfxApp = SFX_APP();
     if ( rSlot.IsMode(SFX_SLOT_FASTCALL) || rShell.CanExecuteSlot_Impl(rSlot) )
     {
         if ( GetFrame() )
         {
             // ggf. Recording anwerfen
             com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame(
-                    GetFrame()->GetFrame()->GetFrameInterface(),
+                    GetFrame()->GetFrame().GetFrameInterface(),
                     com::sun::star::uno::UNO_QUERY);
 
             com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
@@ -270,19 +269,6 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
         // Alles holen, was gebraucht wird, da der Slot den Execute evtl. nicht
         // "uberlebt, falls es ein 'Pseudoslot' f"ur Macros oder Verben ist
         sal_Bool bAutoUpdate = rSlot.IsMode(SFX_SLOT_AUTOUPDATE);
-        SFX_REQUEST_ARG(rReq, pOrigItem, SfxExecuteItem, SID_SUBREQUEST, sal_False);
-        SfxExecuteItem *pExecuteItem = pOrigItem
-                            ? (SfxExecuteItem*)pOrigItem->Clone()
-                            : 0;
-
-        // ggf. TabPage-ID setzen
-        SfxAppData_Impl *pAppData = pSfxApp->Get_Impl();
-        SFX_REQUEST_ARG(rReq, pTabPageItem, SfxUInt16Item, SID_TABPAGE, sal_False);
-        if ( pTabPageItem )
-        {
-            pAppData->nAutoTabPageId = pTabPageItem->GetValue();
-            rReq.RemoveItem( SID_TABPAGE ); // sonst ArgCount > 0 => Seiteneff.
-        }
 
         // API-Call-Klammerung und Document-Lock w"ahrend des Calls
         {
@@ -295,7 +281,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
             if ( !pView )
                 pView = SfxViewFrame::Current();
             if ( pView )
-              SfxHelp::OpenHelpAgent( pView->GetFrame(), rReq.GetSlot() );
+              SfxHelp::OpenHelpAgent( &pView->GetFrame(), rReq.GetSlot() );
 
             SfxExecFunc pFunc = rSlot.GetExecFnc();
             rShell.CallExec( pFunc, rReq );
@@ -316,16 +302,6 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
             }
         }
 
-        // TabPage-ID und Executing-SID zurueck setzen
-        if ( pTabPageItem )
-            pAppData->nAutoTabPageId = 0;
-
-        if( pExecuteItem )
-        {
-            Execute( *pExecuteItem );
-            delete pExecuteItem;
-        }
-
         if ( rReq.IsDone() )
         {
             SfxBindings *pBindings = GetBindings();
@@ -519,7 +495,7 @@ void SfxDispatcher::Pop
     SfxApplication *pSfxApp = SFX_APP();
 
 #ifdef DBG_UTIL
-    ByteString aMsg( "SfxDispatcher(" );
+    ByteString aMsg( "-SfxDispatcher(" );
     aMsg += ByteString::CreateFromInt64( (sal_uIntPtr) this );
     aMsg += bPush ? ")::Push(" : ")::Pop(";
     if ( rShell.GetInterface() )
@@ -527,6 +503,7 @@ void SfxDispatcher::Pop
     else
         aMsg += ByteString::CreateFromInt64( (sal_uIntPtr) &rShell );
     aMsg += bDelete ? ") with delete" : ")";
+    if ( bUntil ) aMsg += " (up to)";
     DbgTrace( aMsg.GetBuffer() );
 #endif
 
@@ -797,7 +774,7 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
         if ( pBindings )
         {
             pBindings->SetDispatcher(this);
-            pBindings->SetActiveFrame( pImp->pFrame->GetFrame()->GetFrameInterface() );
+            pBindings->SetActiveFrame( pImp->pFrame->GetFrame().GetFrameInterface() );
         }
     }
     else
@@ -817,7 +794,7 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
 
     if ( bMDI && pImp->pFrame )
     {
-        //SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame()->GetWorkWindow_Impl();
+        //SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
         SfxBindings *pBind = GetBindings();
         while ( pBind )
         {
@@ -825,7 +802,7 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
             pBind = pBind->GetSubBindings_Impl();
         }
 
-        pImp->pFrame->GetFrame()->GetWorkWindow_Impl()->HidePopups_Impl( FALSE, FALSE, 1 );
+        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( FALSE, FALSE, 1 );
     }
 
     if ( pImp->aToDoStack.Count() )
@@ -883,7 +860,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
 
         if ( pImp->pFrame && !(pImp->pFrame->GetObjectShell()->IsInPlaceActive() ) )
         {
-            SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame()->GetWorkWindow_Impl();
+            SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
             if ( pWorkWin )
             {
                 for (sal_uInt16 n=0; n<pImp->aChildWins.Count();)
@@ -911,10 +888,10 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
     if ( pNew && pImp->pFrame )
     {
         com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xOldFrame(
-            pNew->GetFrame()->GetFrameInterface()->getCreator(), com::sun::star::uno::UNO_QUERY );
+            pNew->GetFrame().GetFrameInterface()->getCreator(), com::sun::star::uno::UNO_QUERY );
 
         com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xMyFrame(
-            GetFrame()->GetFrame()->GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
+            GetFrame()->GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
 
         if ( xOldFrame == xMyFrame )
             bHidePopups = FALSE;
@@ -922,7 +899,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
 
     if ( bHidePopups )
     {
-        //SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame()->GetWorkWindow_Impl();
+        //SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
         SfxBindings *pBind = GetBindings();
         while ( pBind )
         {
@@ -930,7 +907,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
             pBind = pBind->GetSubBindings_Impl();
         }
 
-        pImp->pFrame->GetFrame()->GetWorkWindow_Impl()->HidePopups_Impl( TRUE, FALSE, 1 );
+        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( TRUE, FALSE, 1 );
     }
 
     Flush();
@@ -1673,13 +1650,13 @@ void SfxDispatcher::SetMenu_Impl()
 {
     if ( pImp->pFrame )
     {
-        SfxTopViewFrame* pTop= PTR_CAST( SfxTopViewFrame, pImp->pFrame->GetTopViewFrame() );
+        SfxViewFrame* pTop = pImp->pFrame->GetTopViewFrame();
         if ( pTop && pTop->GetBindings().GetDispatcher() == this )
         {
-            SfxTopFrame* pFrm = pTop->GetTopFrame_Impl();
-            if ( pFrm->IsMenuBarOn_Impl() )
+            SfxFrame& rFrame = pTop->GetFrame();
+            if ( rFrame.IsMenuBarOn_Impl() )
             {
-                com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > xPropSet( pFrm->GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
+                com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > xPropSet( rFrame.GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
                 if ( xPropSet.is() )
                 {
                     com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
@@ -1712,7 +1689,7 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce )
     sal_Bool bUpdate = bForce;
     while ( pDisp && pDisp->pImp->pFrame )
     {
-        SfxWorkWindow *pWork = pDisp->pImp->pFrame->GetFrame()->GetWorkWindow_Impl();
+        SfxWorkWindow *pWork = pDisp->pImp->pFrame->GetFrame().GetWorkWindow_Impl();
         SfxDispatcher *pAct = pWork->GetBindings().GetDispatcher_Impl();
         if ( pAct == pDisp || pAct == this )
         {
@@ -1726,10 +1703,10 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce )
         pDisp = pDisp->pImp->pParent;
     }
 
-    if ( !bUpdate || pImp->pFrame->GetFrame()->IsClosing_Impl() )
+    if ( !bUpdate || pImp->pFrame->GetFrame().IsClosing_Impl() )
         return 0;
 
-    SfxTopViewFrame* pTop = pImp->pFrame ? PTR_CAST( SfxTopViewFrame, pImp->pFrame->GetTopViewFrame() ) : NULL;
+    SfxViewFrame* pTop = pImp->pFrame ? pImp->pFrame->GetTopViewFrame() : NULL;
     sal_Bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this;
 
     if ( !bUIActive && pTop && GetBindings() == &pTop->GetBindings() )
@@ -1763,14 +1740,14 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce )
     if ( bUIActive && /* !bIsIPActive && */ ( !pClient || !pClient->IsObjectUIActive() ) )
         SetMenu_Impl();
 
-    SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame()->GetWorkWindow_Impl();
-    SfxWorkWindow *pTaskWin = pImp->pFrame->GetTopFrame()->GetWorkWindow_Impl();
+    SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
+    SfxWorkWindow *pTaskWin = pImp->pFrame->GetTopFrame().GetWorkWindow_Impl();
     pTaskWin->ResetStatusBar_Impl();
 
     SfxDispatcher *pDispat = this;
     while ( pDispat )
     {
-        SfxWorkWindow *pWork = pDispat->pImp->pFrame->GetFrame()->GetWorkWindow_Impl();
+        SfxWorkWindow *pWork = pDispat->pImp->pFrame->GetFrame().GetWorkWindow_Impl();
         SfxDispatcher *pAct = pWork->GetBindings().GetDispatcher_Impl();
         if ( pAct == pDispat || pAct == this )
         {
@@ -1808,7 +1785,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
 {
     sal_uInt32 nHelpId = 0;
     SFX_APP();
-    SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame()->GetWorkWindow_Impl();
+    SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
     sal_Bool bIsActive = sal_False;
     sal_Bool bIsTaskActive = sal_False;
     SfxDispatcher *pActDispat = pWorkWin->GetBindings().GetDispatcher_Impl();
@@ -1970,7 +1947,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
         {
             // internal frames also may control statusbar
             SfxBindings& rBindings = pImp->pFrame->GetBindings();
-            pImp->pFrame->GetFrame()->GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId, pStatusBarShell, rBindings );
+            pImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId, pStatusBarShell, rBindings );
         }
     }
 
@@ -2247,7 +2224,7 @@ sal_Bool SfxDispatcher::_TryIntercept_Impl
     sal_uInt16 nLevels = pImp->aStack.Count();
     while ( pParent && pParent->pImp->pFrame )
     {
-        if ( pParent->pImp->pFrame->GetFrame()->HasComponent() )
+        if ( pParent->pImp->pFrame->GetFrame().HasComponent() )
         {
             // Components d"urfen intercepten
             if ( pParent->_TryIntercept_Impl( nSlot, rServer, sal_True ) )
@@ -2321,7 +2298,7 @@ sal_Bool SfxDispatcher::_FindServer
 {
     SFX_STACK(SfxDispatcher::_FindServer);
 
-    // Dispatcher gelockt? (SID_BROWSE_STOP und SID_HELP_PI trotzdem durchlassen)
+    // Dispatcher gelockt? (SID_HELP_PI trotzdem durchlassen)
     SfxApplication *pSfxApp = SFX_APP();
     if ( IsLocked(nSlot) )
     {
@@ -2741,7 +2718,7 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, co
         nShLevel = rDisp.pImp->aStack.Count();
     }
 
-    Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame()->GetWorkWindow_Impl()->GetWindow();
+    Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow();
     for ( pSh = rDisp.GetShell(nShLevel); pSh; ++nShLevel, pSh = rDisp.GetShell(nShLevel) )
     {
         const ResId& rResId = pSh->GetInterface()->GetPopupMenuResId();
@@ -2781,7 +2758,7 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin
         nShLevel = rDisp.pImp->aStack.Count();
     }
 
-    Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame()->GetWorkWindow_Impl()->GetWindow();
+    Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow();
     for ( pSh = rDisp.GetShell(nShLevel); pSh; ++nShLevel, pSh = rDisp.GetShell(nShLevel) )
     {
         const ResId& rResId = pSh->GetInterface()->GetPopupMenuResId();
@@ -2804,7 +2781,7 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin
 //----------------------------------------------------------------------
 void SfxDispatcher::ExecutePopup( const ResId &rId, Window *pWin, const Point *pPos )
 {
-    Window *pWindow = pWin ? pWin : pImp->pFrame->GetFrame()->GetWorkWindow_Impl()->GetWindow();
+    Window *pWindow = pWin ? pWin : pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow();
 /*
     SfxPopupMenuManager aPop( rId, *GetBindings() );
     aPop.AddClipboardFunctions();
@@ -2908,13 +2885,13 @@ void SfxDispatcher::HideUI( sal_Bool bHide )
     pImp->bNoUI = bHide;
     if ( pImp->pFrame )
     {
-        SfxTopViewFrame* pTop= PTR_CAST( SfxTopViewFrame, pImp->pFrame->GetTopViewFrame() );
+        SfxViewFrame* pTop = pImp->pFrame->GetTopViewFrame();
         if ( pTop && pTop->GetBindings().GetDispatcher() == this )
         {
-            SfxTopFrame* pFrm = pTop->GetTopFrame_Impl();
-            if ( pFrm->IsMenuBarOn_Impl() )
+            SfxFrame& rFrame = pTop->GetFrame();
+            if ( rFrame.IsMenuBarOn_Impl() )
             {
-                com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > xPropSet( pFrm->GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
+                com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > xPropSet( rFrame.GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
                 if ( xPropSet.is() )
                 {
                     com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
@@ -3157,27 +3134,6 @@ void SfxDispatcher::InvalidateBindings_Impl( sal_Bool bModify )
                 pFrame;
                 pFrame = SfxViewFrame::GetNext( *pFrame ) )
             pFrame->GetBindings().InvalidateAll(bModify);
-/*
-        // alle Bindings sind betroffen
-        for ( SfxInPlaceFrame *pIPFrame = (SfxInPlaceFrame*)
-                    SfxViewFrame::GetFirst(0, TYPE(SfxInPlaceFrame));
-                pIPFrame;
-                pIPFrame = (SfxInPlaceFrame*)
-                    SfxViewFrame::GetNext(*pIPFrame, 0, TYPE(SfxInPlaceFrame)) )
-            pIPFrame->GetBindings().InvalidateAll(bModify);
-
-        for ( SfxPlugInFrame *pPIFrame = (SfxPlugInFrame*)
-                    SfxViewFrame::GetFirst(0, TYPE(SfxPlugInFrame));
-                pPIFrame;
-                pPIFrame = (SfxPlugInFrame*)
-                    SfxViewFrame::GetNext(*pPIFrame, 0, TYPE(SfxPlugInFrame)) )
-            pPIFrame->GetBindings().InvalidateAll(bModify);
-
-        for ( SfxTask* pTask = SfxTask::GetFirst(); pTask;
-                pTask = SfxTask::GetNext( *pTask ) )
-            if ( !pTask->IsExternal() )
-                pTask->GetBindings()->InvalidateAll(bModify);
-*/
     }
     else
     {
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 9758f7e4d051..88a52d0ad0bf 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -866,7 +866,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe
     com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder;
 
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
-        (pView ? pView : SfxViewFrame::Current())->GetFrame()->GetFrameInterface(),
+        (pView ? pView : SfxViewFrame::Current())->GetFrame().GetFrameInterface(),
         com::sun::star::uno::UNO_QUERY);
 
     if(xSet.is())
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index baddd81ce4a1..3fdd14369856 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -342,7 +342,7 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons
             else if ( rDispat.GetFrame() )
             {
                 ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchProvider > xFrameProv(
-                        rDispat.GetFrame()->GetFrame()->GetFrameInterface(), ::com::sun::star::uno::UNO_QUERY );
+                        rDispat.GetFrame()->GetFrame().GetFrameInterface(), ::com::sun::star::uno::UNO_QUERY );
                 if ( xFrameProv != xProv )
                     return GetSlotServer( rDispat, xFrameProv );
             }
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 0e3209f6a05a..d2ad8c645eb7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -217,8 +217,8 @@ void SfxUnoControllerItem::GetNewDispatch()
     if ( !pBindings->GetDispatcher_Impl() || !pBindings->GetDispatcher_Impl()->GetFrame() )
         return;
 
-    SfxFrame *pFrame = pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame();
-    SfxFrame *pParent = pFrame->GetParentFrame();
+    SfxFrame& rFrame = pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame();
+    SfxFrame *pParent = rFrame.GetParentFrame();
     if ( pParent )
         // parent may intercept
         xDispatch = TryGetDispatch( pParent );
@@ -226,7 +226,7 @@ void SfxUnoControllerItem::GetNewDispatch()
     if ( !xDispatch.is() )
     {
         // no interception
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >  xFrame = pFrame->GetFrameInterface();
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >  xFrame = rFrame.GetFrameInterface();
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >  xProv( xFrame, ::com::sun::star::uno::UNO_QUERY );
         if ( xProv.is() )
             xDispatch = xProv->queryDispatch( aCommand, ::rtl::OUString(), 0 );
@@ -250,7 +250,7 @@ void SfxUnoControllerItem::GetNewDispatch()
     if ( !xDisp.is() && pFrame->HasComponent() )
     {
         // no interception
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >  xFrame = pFrame->GetFrameInterface();
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pFrame->GetFrameInterface();
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >  xProv( xFrame, ::com::sun::star::uno::UNO_QUERY );
         if ( xProv.is() )
             xDisp = xProv->queryDispatch( aCommand, ::rtl::OUString(), 0 );
@@ -752,11 +752,11 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
         {
             SfxViewFrame* pViewFrame = pDispatcher->GetFrame();
             if (pViewFrame)
-                xFrameRef = pViewFrame->GetFrame()->GetFrameInterface();
+                xFrameRef = pViewFrame->GetFrame().GetFrameInterface();
         }
         SfxAllItemSet aInternalSet( SFX_APP()->GetPool() );
         if (xFrameRef.is()) // an empty set is no problem ... but an empty frame reference can be a problem !
-            aInternalSet.Put( SfxUnoAnyItem( SID_FILLFRAME, css::uno::makeAny(xFrameRef) ) );
+            aInternalSet.Put( SfxUnoFrameItem( SID_FILLFRAME, xFrameRef ) );
 
         sal_Bool bSuccess = sal_False;
         sal_Bool bFailure = sal_False;