summaryrefslogtreecommitdiffstats
path: root/desktop/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-06-07 10:50:18 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-06-07 11:05:21 +0200
commitb5ad981518f4407243f89507b2561dd0b1ef28ee (patch)
tree6cd43135bc6d0044f63b2177e2b5451fc289209c /desktop/inc
parentn#757905 fix VML import of mso-wrap-style:none (diff)
downloadcore-b5ad981518f4407243f89507b2561dd0b1ef28ee.tar.gz
core-b5ad981518f4407243f89507b2561dd0b1ef28ee.zip
bnc#524250: Show backing component after cancelled recovery
...instead of an empty Writer document, which is non-intuitive when the user had worked on something other than a Writer document before the crash. f8e1d2438199c4a76ceeb36352678c415e25272c "win32-dont-attempt-restart.diff: Don't attempt to restart OOo after crash" had previously attempted to fix this with a sledgehammer approach of not restarting at all after a crash on Windows, under the wrong assumption that there would be no restart after crash at all on Linux either (which was apparently rather a bug caused by the newly introduced oosplash at that time). Change-Id: If65d2e21640d56262c486d887c4a29137cabcd0a
Diffstat (limited to 'desktop/inc')
-rw-r--r--desktop/inc/app.hxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 0dfa7ca82ed2..ea107e801ff2 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -191,6 +191,8 @@ class Desktop : public Application
/// does initializations which are necessary for the first run of the office
void DoFirstRunInitializations();
+ static void ShowBackingComponent(Desktop * progress);
+
static sal_Bool SaveTasks();
static void retrieveCrashReporterState();