Obsolete Objects/Classes removed

sfx2/source/appl/appmisc.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appmisc.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pb $ $Date: 2000-09-26 11:03:29 $
+ *  last change: $Author: mba $ $Date: 2000-09-28 11:37:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 // class SfxApplication: Interface, Array-Impls und allerlei anderes
 //
 // Copyright 2000 Sun Microsystems, Inc. All rights reserved.
-// $Author: pb $ $Date: 2000-09-26 11:03:29 $ $Revision: 1.2 $
+// $Author: mba $ $Date: 2000-09-28 11:37:29 $ $Revision: 1.3 $
 // $Logfile:   T:/sfx2/source/appl/appmisc.cxv  $ $Workfile:   APPMISC.CXX  $
 //------------------------------------------------------------------
 
@@ -438,7 +438,7 @@ void SfxApplication::OpenClients()
         return;
 
 //(mba/task): neu zu implementieren
-//  if ( pOptions->IsSaveWorkingSet() )
+//  if ( SvtSaveOptions().IsSaveWorkingSet() )
 //            SfxTaskManager::RestoreWorkingSet();
 //  else
     {
@@ -1046,32 +1046,18 @@ SfxModule* SfxApplication::GetActiveModule( SfxViewFrame *pFrame ) const
     return pSh ? pSh->GetModule() : 0;
 }
 
-class AppISfxModule : public ISfxModule
+SfxModule* SfxApplication::GetModule_Impl()
 {
-    SfxApplication* pApp;
-public:
-    AppISfxModule( SfxApplication* pAppP ) : pApp( pAppP ) {}
-
-    virtual SfxFileDialog*      CreateDocFileDialog(
-        sal_uInt32 nBits, const SfxObjectFactory& rFact, const SfxItemSet* pSet = NULL ) {
-        return pApp->CreateDocFileDialog( nBits, rFact, pSet );
-    }
-    virtual ModalDialog*        CreateAboutDialog() {
-        return pApp->CreateAboutDialog();
-    }
-    virtual ResMgr*             GetResMgr() {
-        return Resource::GetResManager();
-    }
-};
-
-ISfxModule* SfxApplication::GetISfxModule( SfxViewFrame *pFrame )
-{
-    SfxModule* pModule = GetActiveModule( pFrame );
+    SfxModule* pModule = GetActiveModule();
+    if ( !pModule )
+        pModule = GetActiveModule( SfxViewFrame::GetFirst( FALSE ) );
     if( pModule )
         return pModule;
-    ISfxModule*& rpI = pAppData_Impl->pISfxModule;
-    if( !rpI ) rpI = new AppISfxModule( this );
-    return rpI;
+    else
+    {
+        DBG_ERROR( "No module!" );
+        return NULL;
+    }
 }
 
 
@@ -1135,15 +1121,17 @@ PopupMenu* SfxAppData_Impl::GetPopupMenu( sal_uInt16 nSID, sal_Bool bBig, sal_Bo
     switch( nSID )
     {
         case SID_NEWDOCDIRECT:
-            ppMenu = &pNewMenu;         nKey = SFX_KEY_NEW_DIR;         break;
-        case SID_BOOKMARKS:
-            ppMenu = &pBookmarkMenu;    nKey = SFX_KEY_BOOKMARK_DIR;    break;
+            ppMenu = &pNewMenu;
+            nKey = SFX_KEY_NEW_DIR;
+            break;
         case SID_AUTOPILOTMENU:
-            ppMenu = &pAutoPilotMenu;   nKey = SFX_KEY_AUTOPILOT_DIR;   break;
-        case SID_STARTMENU:
-            ppMenu = &pStartMenu;       nKey = SFX_KEY_STARTMENU_DIR;   break;
+            ppMenu = &pAutoPilotMenu;
+            nKey = SFX_KEY_AUTOPILOT_DIR;
+            break;
         default:
             ppMenu = 0;
+            DBG_ERROR( "Menu ID unknown!" );
+            break;
     }
 
     if( ppMenu && ( !*ppMenu || bNew ) )

sfx2/source/appl/appquit.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appquit.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pb $ $Date: 2000-09-26 11:03:29 $
+ *  last change: $Author: mba $ $Date: 2000-09-28 11:38:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,13 +82,10 @@
 #endif
 
 #include <svtools/inethist.hxx>
+#include <svtools/saveopt.hxx>
 
 #pragma hdrstop
 
-#ifndef _UTL_CONFIGMGR_HXX_
-#include <unotools/configmgr.hxx>
-#endif
-
 #include "app.hrc"
 #include "app.hxx"
 #include "unoctitm.hxx"
@@ -125,6 +122,7 @@
 #include "doctempl.hxx"
 #include "viewfrm.hxx"
 #include "bmkmenu.hxx"
+#include "objsh.hxx"
 
 #ifndef PRODUCT
 DECLARE_LIST( SfxFrameWindowFactoryArray_Impl, SfxFrameWindowFactory* )
@@ -278,19 +276,11 @@ void SfxApplication::Deinitialize()
         SaveBasicManager();
 
     bDowning = TRUE; // wegen Timer aus DecAliveCount und QueryExit
-     // free Windows and Controllers
-    DELETEZ( pAppData_Impl->pExplorer );
 
     DELETEZ( pAppData_Impl->pTemplates );
 
-#ifdef TF_OFFLINEREADING
-    delete pAppData_Impl->pOfflineURLMgr;
-#endif
     delete pAppData_Impl->pStopButtonTimer;
-#if SUPD>603
-    utl::ConfigManager::RemoveConfigManager();
-#endif
-//(dv)    DELETEZ( pAppData_Impl->pAnchorJobList );
+
     SvFactory::ClearDemandObjects();
     DELETEZ(pImp->pTemplateDlg);
     SetViewFrame(0);
@@ -335,8 +325,6 @@ void SfxApplication::Deinitialize()
 
     // ab hier d"urfen keine SvObjects mehr existieren
     DELETEX(pAppData_Impl->pMatcher);
-    DELETEX(pAppData_Impl->pDataLockBytesFactory);
-    DELETEX(pAppData_Impl->pImageLockBytesFactory);
     DELETEX(pAppData_Impl->pSfxFrameObjectFactoryPtr);
     DELETEX(pAppData_Impl->pSfxPluginObjectFactoryPtr);
     SvFactory::DeInit();