diff options
| author | Carsten Driesner <cd@openoffice.org> | 2000-10-23 07:26:10 +0000 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2000-10-23 07:26:10 +0000 |
| commit | 8011f260cdcedef9535fa4e7452b2f9e82c9b194 (patch) | |
| tree | 9c6cfdd68ef94c76c3473fc7a3ad5b7da45874e9 /desktop | |
| parent | fdfffefdc93822fb8b4364182b746c6e12027122 (diff) | |
Don't dispose global service manager in Main() and must change comphelper
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d910978b82fe..82807f21fab2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:15:12 $ + * last change: $Author: cd $ $Date: 2000-10-23 08:26:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ #endif #include <offmgr/app.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #if SUPD>592 #include <setup2/installer.hxx> @@ -98,7 +98,7 @@ void Desktop::Main() #endif RegisterServices(); - OfficeWrapper* pWrapper = new OfficeWrapper( ::utl::getProcessServiceFactory() ); + 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(); @@ -107,9 +107,6 @@ void Desktop::Main() delete pWrapper; pWrapper=NULL; } - Reference< XComponent > xSMGRComponent( ::utl::getProcessServiceFactory(), UNO_QUERY ); - if( xSMGRComponent.is()==sal_True ) - xSMGRComponent->dispose(); } void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* pFrame ) @@ -117,3 +114,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* pFrame ) OFF_APP()->SystemSettingsChanging( rSettings, pFrame ); } + + + |