diff options
| author | Mathias Bauer <mba@openoffice.org> | 2001-07-10 10:34:26 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2001-07-10 10:34:26 +0000 |
| commit | 72f46f2691a0589027bfaeee6859ea807545080d (patch) | |
| tree | 98587c2bc005d51d254bb4c9ec67f23f0942aa0d | |
| parent | d30ac49be26623725c428492893690d47f98a086 (diff) | |
#88409#: OpenClient_Impl
| -rw-r--r-- | desktop/inc/app.hxx | 8 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index a96f20b3d7..c076d2dca6 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -2,9 +2,9 @@ * * $RCSfile: app.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: cd $ $Date: 2001-07-06 15:51:53 $ + * last change: $Author: mba $ $Date: 2001-07-10 11:33:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ public: virtual void Main(); virtual void SystemSettingsChanging( AllSettings& rSettings, Window* pFrame ); - DECL_LINK( OpenClients, void* ); + DECL_LINK( OpenClients_Impl, void* ); private: void ParseCommandLine(); @@ -88,7 +88,7 @@ private: sal_Bool m_bInvisible; USHORT m_nAppEvents; ResMgr* m_pLabelResMgr; - IntroWindow_Impl* m_pIntro; + IntroWindow_Impl* m_pIntro; }; #endif diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 06c2cc53b2..f177405123 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: cd $ $Date: 2001-07-10 05:29:45 $ + * last change: $Author: mba $ $Date: 2001-07-10 11:34:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -240,9 +240,9 @@ void Desktop::Main() OfficeWrapper* pWrapper = new OfficeWrapper( ::comphelper::getProcessServiceFactory() ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "end create OfficeWrapper::OfficeWrapper()" ); // Reference < XComponent > xWrapper( ::utl::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.office.OfficeWrapper" ) ), UNO_QUERY ); - + // Post user event to startup first application component window - Application::PostUserEvent( LINK( this, Desktop, OpenClients ) ); + Application::PostUserEvent( LINK( this, Desktop, OpenClients_Impl ) ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "start call SfxApplicationClass::Main()" ); SfxApplicationClass::Main(); RTL_LOGFILE_CONTEXT_TRACE( aLog, "end call SfxApplicationClass::Main()" ); @@ -269,9 +269,9 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* pFrame ) OFF_APP()->SystemSettingsChanging( rSettings, pFrame ); } -IMPL_LINK( Desktop, OpenClients, void*, pvoid ) +IMPL_LINK( Desktop, OpenClients_Impl, void*, pvoid ) { - SFX_APP()->OpenClients(); + SfxApplicationClass::OpenClients(); CloseStartupScreen(); return 0; @@ -297,7 +297,7 @@ void Desktop::OpenStartupScreen( const char* pLabelPrefix ) // Intro nur anzeigen, wenn normaler Start (kein Print/Server etc.) ParseCommandLine(); - if ( !m_bInvisible && !m_bMinimized && + if ( !m_bInvisible && !m_bMinimized && m_nAppEvents != DISPATCH_PRINT && m_nAppEvents != DISPATCH_SERVER ) { const USHORT nResId = RID_DEFAULTINTRO; @@ -308,7 +308,7 @@ void Desktop::OpenStartupScreen( const char* pLabelPrefix ) } void Desktop::CloseStartupScreen() -{ +{ RTL_LOGFILE_CONTEXT( aLog, "Desktop::CloseStartupScreen()" ); delete m_pIntro; m_pIntro = 0; @@ -366,7 +366,7 @@ void Desktop::ParseCommandLine() else if ( bPrintEvent ) { // Print Event anhaengen - m_nAppEvents |= DISPATCH_PRINT; + m_nAppEvents |= DISPATCH_PRINT; } } } |