diff options
| author | Jesús Corrius <jcorrius@gmail.com> | 2013-08-14 16:04:31 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-08-18 10:43:27 +0000 |
| commit | b0041fd68ae1a9df91f8c3274e0b4003ef914a44 (patch) | |
| tree | 8af97e9848d0a381570e898270e2971fa987d44d /desktop/source/app/app.cxx | |
| parent | 54d8baf8ad4e17ae7367ffa69e74b4e4f367a653 (diff) | |
Revert "Fixing i#119950 warn about other running terminal sessions"
This reverts commit b218cbf59de4d7ae0a6962995fb0f719ed68b5d2.
The original patch just looks for another instance running which
of course can be in the same terminal session. The assumptions
the author makes are wrong.
The bug the patch tries to solve is real and we'll probably
have to solve it in the future, but not this way.
Conflicts:
desktop/source/app/officeipcthread.cxx
Change-Id: I1e645671aa09c6147163820c12d5efb3b3688bd1
Reviewed-on: https://gerrit.libreoffice.org/5415
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'desktop/source/app/app.cxx')
| -rw-r--r-- | desktop/source/app/app.cxx | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c4e972909099..b436adea9dfe 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -415,10 +415,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) // are allowed. Otherwise we will force a "crash inside a crash". // Thats why we have to use a special native message box here which does not use yield :-) //============================================================================= - -// #i119950# Add a option that not to display the "Fatal Error" on dialog title -void FatalError(const OUString& sMessage, const bool isDisplayErrorString = true); -void FatalError(const OUString& sMessage, const bool isDisplayErrorString) +void FatalError(const OUString& sMessage) { OUString sProductKey = ::utl::Bootstrap::getProductKey(); if ( sProductKey.isEmpty()) @@ -432,9 +429,8 @@ void FatalError(const OUString& sMessage, const bool isDisplayErrorString) OUStringBuffer sTitle (128); sTitle.append (sProductKey ); - if (isDisplayErrorString) { - sTitle.appendAscii (" - Fatal Error"); - } + sTitle.appendAscii (" - Fatal Error"); + Application::ShowNativeErrorBox (sTitle.makeStringAndClear (), sMessage); _exit(EXITHELPER_FATAL_ERROR); } @@ -626,10 +622,6 @@ void Desktop::Init() { SetBootstrapError( BE_PATHINFO_MISSING, OUString() ); } - else if ( aStatus == OfficeIPCThread::IPC_STATUS_MULTI_TS_ERROR ) - { - SetBootstrapError( BE_MULTISESSION_NOT_SUPPORTED, OUString() ); - } else if ( aStatus == OfficeIPCThread::IPC_STATUS_2ND_OFFICE ) { // 2nd office startup should terminate after sending cmdlineargs through pipe @@ -856,13 +848,7 @@ OUString Desktop::CreateErrorMsgString( void Desktop::HandleBootstrapErrors( BootstrapError aBootstrapError, OUString const & aErrorMessage ) { - if ( aBootstrapError == BE_MULTISESSION_NOT_SUPPORTED ) { - OUString aMessage; - aMessage = GetMsgString( STR_BOOTSTRAP_ERR_MULTISESSION, - OUString( RTL_CONSTASCII_USTRINGPARAM( "You have another instance running in a different terminal session. Close that instance and then try again." )) ); - FatalError(aMessage,sal_False); - - } else if ( aBootstrapError == BE_PATHINFO_MISSING ) + if ( aBootstrapError == BE_PATHINFO_MISSING ) { OUString aErrorMsg; OUString aBuffer; |