diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:34:50 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:34:50 +0000 |
| commit | c277608ee0fb25efb295f61e105a8697cfa4fad6 (patch) | |
| tree | a58ebd65ab4fa982266418fd2a8a48407bc13896 /desktop/inc/app.hxx | |
| parent | 01c3fb21f7a2d09c84c1852cee7fd20a9a4732de (diff) | |
INTEGRATION: CWS mav4 (1.16.2); FILE MERGED
2003/04/15 09:05:27 as 1.16.2.1: #108892# establish backing component on startup if no command line parameter exists
Diffstat (limited to 'desktop/inc/app.hxx')
| -rw-r--r-- | desktop/inc/app.hxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index d98df89da1..9f59496ce4 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -2,9 +2,9 @@ * * $RCSfile: app.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hr $ $Date: 2003-04-04 17:22:07 $ + * last change: $Author: rt $ $Date: 2003-04-24 13:34:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -137,7 +137,7 @@ class Desktop : public Application static void OpenDefault(); DECL_LINK( EnableAcceptors_Impl, void*); - + static void HandleAppEvent( const ApplicationEvent& rAppEvent ); static ResMgr* GetDesktopResManager(); static CommandLineArgs* GetCommandLineArgs(); @@ -164,23 +164,23 @@ class Desktop : public Application sal_Bool InitializeInstallation( const rtl::OUString& rAppFilename ); sal_Bool InitializeConfiguration(); sal_Bool InitializeQuickstartMode( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr ); - - void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const ::rtl::OUString& aMsg ); + + void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const ::rtl::OUString& aMsg ); void StartSetup( const ::rtl::OUString& aParameters ); - + // Get a resource message string securely e.g. if resource cannot be retrieved return aFaultBackMsg ::rtl::OUString GetMsgString( USHORT nId, const ::rtl::OUString& aFaultBackMsg ); // Create a error message depending on bootstrap failure code and an optional file url - ::rtl::OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, + ::rtl::OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, const ::rtl::OUString& aFileURL ); Reference<XStatusIndicator> m_rSplashScreen; void OpenSplashScreen(); void SetSplashScreenProgress(sal_Int32); void CloseSplashScreen(); - - void EnableOleAutomation(); + + void EnableOleAutomation(); DECL_LINK( AsyncInitFirstRun, void* ); /** checks if the office is run the first time <p>If so, <method>DoFirstRunInitializations</method> is called (asynchronously and delayed) and the @@ -208,6 +208,7 @@ class Desktop : public Application Timer m_firstRunTimer; static ResMgr* pResMgr; + static sal_Bool bSuppressOpenDefault; }; } |