From 40078b3ef32a60852f692d6ed222cb767133d7e0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 7 Feb 2014 17:22:02 +0000 Subject: remove the 4 send crash report tabpages and other logical consequences of officecfg::Office::Recovery::CrashReporter::Enabled == false because we have this disabled by default since the first LibreOffice release and we have no backend infrastucture to handle the submissions anyway and it's blocking conversion of legacy .src dialogs to .ui format Change-Id: Id5481af3ec970032b3728c0e6cc0c6a52d3ed3dc --- desktop/inc/app.hxx | 1 - desktop/source/app/app.cxx | 28 ++-------------------------- 2 files changed, 2 insertions(+), 27 deletions(-) (limited to 'desktop') diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index fb30a7a00502..efe4edc4a4b9 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -169,7 +169,6 @@ class Desktop : public Application static sal_Bool SaveTasks(); - static void retrieveCrashReporterState(); static sal_Bool isUIOnSessionShutdownAllowed(); // on-demand acceptors diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index e74c3dd99129..74f965054d29 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -156,7 +156,6 @@ namespace desktop { static oslSignalHandler pSignalHandler = 0; -static sal_Bool _bCrashReporterEnabled = sal_True; namespace { @@ -1071,27 +1070,12 @@ void Desktop::HandleBootstrapErrors( } -void Desktop::retrieveCrashReporterState() -{ - _bCrashReporterEnabled - = officecfg::Office::Recovery::CrashReporter::Enabled::get(); -} - sal_Bool Desktop::isUIOnSessionShutdownAllowed() { return officecfg::Office::Recovery::SessionShutdown::DocumentStoreUIEnabled ::get(); } -//----------------------------------------------- -/** @short check if crash reporter feature is enabled or - disabled. -*/ -sal_Bool Desktop::isCrashReporterEnabled() -{ - return _bCrashReporterEnabled; -} - //----------------------------------------------- /** @short check if recovery must be started or not. @@ -1129,13 +1113,11 @@ void impl_checkRecoveryState(sal_Bool& bCrashed , differs between EMERGENCY_SAVE and RECOVERY */ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave , - sal_Bool bCrashed , sal_Bool bExistsRecoveryData) { static OUString SERVICENAME_RECOVERYUI("com.sun.star.comp.svx.RecoveryUI"); static OUString COMMAND_EMERGENCYSAVE("vnd.sun.star.autorecovery:/doEmergencySave"); static OUString COMMAND_RECOVERY("vnd.sun.star.autorecovery:/doAutoRecovery"); - static OUString COMMAND_CRASHREPORT("vnd.sun.star.autorecovery:/doCrashReport"); css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -1151,8 +1133,6 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave , aURL.Complete = COMMAND_EMERGENCYSAVE; else if (bExistsRecoveryData) aURL.Complete = COMMAND_RECOVERY; - else if (bCrashed && Desktop::isCrashReporterEnabled() ) - aURL.Complete = COMMAND_CRASHREPORT; else return false; @@ -1176,7 +1156,6 @@ sal_Bool Desktop::SaveTasks() { return impl_callRecoveryUI( sal_True , // sal_True => force emergency save - sal_False, // 2. and 3. param not used if 1. = true! sal_False); } @@ -1475,10 +1454,8 @@ int Desktop::Main() SetSplashScreenProgress(30); - // set static variable to enabled/disable crash reporter - retrieveCrashReporterState(); - const bool bCrashReporterEnabled = isCrashReporterEnabled(); - osl_setErrorReporting( !bCrashReporterEnabled ); + // set static variable to disable crash reporting + osl_setErrorReporting( false ); // create title string LanguageTag aLocale( LANGUAGE_SYSTEM); @@ -2369,7 +2346,6 @@ void Desktop::OpenClients() { bRecovery = impl_callRecoveryUI( sal_False , // false => force recovery instead of emergency save - bCrashed , bExistsRecoveryData); } catch(const css::uno::Exception& e) -- cgit lue='distro/collabora/cp-6.2'>distro/collabora/cp-6.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/UnoControls
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2018-11-08 23:30:24 +0100
committerJulien Nabet <serval2412@yahoo.fr>2018-11-09 07:05:30 +0100
commit93a14053ad81a296c4542607f4a4e4acbda2fa38 (patch)
tree6596c3a720292f147cd6bc60766375ca4c1a4ead /UnoControls
parente3ff84aed5be8e0d2780d80b178fa8fc0e388859 (diff)
Fix typos