diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:12:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:12:08 +0000 |
| commit | c3c29886de7965e0d121751a2528a88a720073e6 (patch) | |
| tree | c101eadb2f00c54b35a6f8cb8663fc7c8b660123 /desktop | |
| parent | a3ba683b3dbc74ca7bcd90e372f9285da17f8292 (diff) | |
INTEGRATION: CWS fwk86 (1.215.8); FILE MERGED
2008/04/30 15:49:55 pb 1.215.8.3: RESYNC: (1.216-1.220); FILE MERGED
2008/03/12 17:26:44 pb 1.215.8.2: RESYNC: (1.215-1.216); FILE MERGED
2008/03/06 09:28:20 cd 1.215.8.1: #i86384# Remove unused code from desktop
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 02ccfb1fbb17..6e7d36f08e43 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: app.cxx,v $ - * $Revision: 1.220 $ + * $Revision: 1.221 $ * * This file is part of OpenOffice.org. * @@ -313,12 +313,6 @@ void FatalError(OUString const & aMessage) aBootstrapFailedBox.Execute(); } -void FatalErrorExit(OUString const & aMessage) -{ - FatalError(aMessage); - _exit( ExitHelper::E_FATAL_ERROR ); -} - static bool ShouldSuppressUI(CommandLineArgs* pCmdLine) { return pCmdLine->IsInvisible() || @@ -440,7 +434,6 @@ void ReplaceStringHookProc( UniString& rStr ) Desktop::Desktop() : m_bServicesRegistered( false ) -, m_pIntro( 0 ) , m_aBootstrapError( BE_OK ) , m_pLockfile( NULL ) { @@ -1967,16 +1960,6 @@ IMPL_LINK( Desktop, AsyncInitFirstRun, void*, EMPTYARG ) // ======================================================================== -IMPL_STATIC_LINK_NOINSTANCE( Desktop, AsyncTerminate, void*, EMPTYARG ) -{ - Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory(); - Reference< XDesktop > xDesktop( rFactory->createInstance( - OUString::createFromAscii("com.sun.star.frame.Desktop")), - UNO_QUERY ); - xDesktop.is() && xDesktop->terminate(); - return 0L; -} - class ExitTimer : public Timer { public: |