diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-05-21 13:25:28 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-21 13:25:28 +0000 |
commit | 173f40192f3bfd1cfcb7e0ac9a4c87c602b08089 (patch) | |
tree | b5598d6112aaabd76b3e7129892f697deb472cd9 /desktop | |
parent | 7f0e110fba5bbb90aa6e1dd333c6400dfa1ba1ac (diff) |
INTEGRATION: CWS bmpres01 (1.133.36); FILE MERGED
2004/05/07 13:28:36 ka 1.133.36.1: call RegisterServices just after creation of user tree to allow usage of UCB for new image resource helper classes in VCL
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 66853f3b413b..8b1be9f4c26c 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.135 $ + * $Revision: 1.136 $ * - * last change: $Author: hr $ $Date: 2004-05-10 13:00:30 $ + * last change: $Author: rt $ $Date: 2004-05-21 14:25:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -557,6 +557,7 @@ Desktop::Desktop() : m_pIntro( 0 ) , m_aBootstrapError( BE_OK ) , m_pLockfile( NULL ) +, m_bServicesRegistered( false ) { RTL_LOGFILE_TRACE( "desktop (cd100003) ::Desktop::Desktop" ); } @@ -1244,7 +1245,7 @@ void Desktop::Main() // Startup screen OpenSplashScreen(); - UserInstall::UserInstallError instErr = UserInstall::finalize(); + UserInstall::UserInstallError instErr = UserInstall::finalize( *this ); if ( instErr != UserInstall::E_None ) { // problems with user installation... |