diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-21 13:22:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-21 13:22:25 +0000 |
| commit | e11294f38f2c600ee7da992338ac8b56f34294fa (patch) | |
| tree | 35524b2d1d2670105f0ff493a852036286b58cc5 /desktop/inc | |
| parent | 3860ecd2c111afe9d4e7dadff307cabebae53bef (diff) | |
INTEGRATION: CWS bmpres01 (1.22.52); FILE MERGED
2004/05/07 13:28:35 ka 1.22.52.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/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 72cdf01cf9..a6de1215ff 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -2,9 +2,9 @@ * * $RCSfile: app.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: hr $ $Date: 2004-02-03 20:02:17 $ + * last change: $Author: rt $ $Date: 2004-05-21 14:22:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,6 +116,8 @@ class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {}; struct ConvertData; class Desktop : public Application { + friend class UserInstall; + public: enum BootstrapError { @@ -212,6 +214,7 @@ class Desktop : public Application sal_Bool m_bMinimized; sal_Bool m_bInvisible; + bool m_bServicesRegistered; USHORT m_nAppEvents; IntroWindow_Impl* m_pIntro; BootstrapError m_aBootstrapError; |