diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/bastyp/helper.cxx | 14 |
3 files changed, 17 insertions, 6 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 03a31ac63db9..53cf115382e5 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -548,8 +548,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_CRASH : { - GetpApp()->Exception( EXC_SYSTEM ); - abort(); + // Provoke a crash: + char * crash = 0; + *crash = 0; + break; } case SID_SHOW_IME_STATUS_WINDOW: diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 26fb46ec8b17..9ef635ae4786 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -122,7 +122,8 @@ rtl::OUString HelpLocaleString() Any aLocale = ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( ::utl::ConfigManager::LOCALE ); - bool bOk = (aLocale >>= aLocaleStr); + aLocale >>= aLocaleStr; + bool bOk = aLocaleStr.getLength() != 0; if ( bOk ) { rtl::OUString aBaseInstallPath; diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index b128e305d655..091651fedbc2 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -549,9 +549,17 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL ) } } } - catch( uno::Exception& ) - { - DBG_ERRORFILE( "GetResultSet: Any other exception" ); + catch( uno::Exception& e ) + { + (void) e; + DBG_ERRORFILE( + rtl::OUStringToOString( + (rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "GetResultSet: Any other exception: ")) + + e.Message), + RTL_TEXTENCODING_UTF8). + getStr()); } if ( pList ) |