diff options
| author | Mathias Bauer <mba@openoffice.org> | 2000-11-30 07:47:40 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2000-11-30 07:47:40 +0000 |
| commit | 92b537c13aa745794ab0c4b54c4c97dbb10d5e9e (patch) | |
| tree | 57a88b1bea251ed1f8118d14254c626944ab8956 /desktop | |
| parent | a064667ebbc282434ce7c32bd97aa3b1bc62d136 (diff) | |
#80535#: delete ConfigManager later in desktop module
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 82807f21fab2..2351ce48c01b 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: cd $ $Date: 2000-10-23 08:26:10 $ + * last change: $Author: mba $ $Date: 2000-11-30 08:47:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,10 +71,12 @@ #include <offmgr/app.hxx> #include <comphelper/processfactory.hxx> +#ifndef _UTL_CONFIGMGR_HXX_ +#include <unotools/configmgr.hxx> +#endif -#if SUPD>592 #include <setup2/installer.hxx> -#endif +#include <svtools/pathoptions.hxx> #define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII##)) @@ -91,22 +93,25 @@ void Desktop::Main() { SetAppName( DEFINE_CONST_UNICODE("soffice") ); -#if SUPD>592 Installer* pInstaller = new Installer; pInstaller->InitializeInstallation( Application::GetAppFileName() ); delete pInstaller; -#endif + SvtPathOptions* pPathOptions = new SvtPathOptions; RegisterServices(); OfficeWrapper* pWrapper = new OfficeWrapper( ::comphelper::getProcessServiceFactory() ); // Reference < XComponent > xWrapper( ::utl::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.office.OfficeWrapper" ) ), UNO_QUERY ); SfxApplicationClass::Main(); // xWrapper->dispose(); + if( pWrapper!=NULL) { delete pWrapper; pWrapper=NULL; } + + delete pPathOptions; + utl::ConfigManager::RemoveConfigManager(); } void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* pFrame ) |