#93980#: StopButtonTimer moved to topframe

3 files changed, 18 insertions, 9 deletions

diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 9747324ca7e5..1f425993a35a 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appdata.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: mba $ $Date: 2001-09-18 11:18:55 $
+ *  last change: $Author: mba $ $Date: 2001-11-15 15:03:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,7 +130,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) :
         pSfxPlugInObjectShellFactory( 0 ),
         pDefFocusWin( 0 ),
         pSfxFrameObjectFactoryPtr( 0 ),
-        pStopButtonTimer( 0 ),
         pCancelMgr( 0 ),
         nDocModalMode(0),
         pDisabledSlotList( 0 ),
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index ad8612784237..5be3b17ca24f 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appmisc.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: hr $ $Date: 2001-10-10 15:06:42 $
+ *  last change: $Author: mba $ $Date: 2001-11-15 15:03:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -865,3 +865,15 @@ SfxMenuBarManager* SfxApplication::GetMenuBarManager() const
     else
         return 0;
 }
+
+SfxCancelManager *SfxApplication::GetCancelManager() const
+{
+    if ( !pAppData_Impl->pCancelMgr )
+    {
+        pAppData_Impl->pCancelMgr = new SfxCancelManager;
+        pAppData_Impl->StartListening( *pAppData_Impl->pCancelMgr );
+    }
+    return pAppData_Impl->pCancelMgr;
+}
+
+
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index b42456c6e67c..640ef1735a20 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appquit.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: mba $ $Date: 2001-11-05 08:57:29 $
+ *  last change: $Author: mba $ $Date: 2001-11-15 15:03:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -270,8 +270,6 @@ void SfxApplication::Deinitialize()
 
     DELETEZ( pAppData_Impl->pTemplates );
 
-    delete pAppData_Impl->pStopButtonTimer;
-
     SvFactory::ClearDemandObjects();
     DELETEZ(pImp->pTemplateDlg);
     SetViewFrame(0);