rhbz#827695: sw: prevent crashes after incomplete print:

If the last page is not printed for whatever reason, then
SwXTextDocument's destructor will delete a SwViewOptionAdjust_Impl,
which accesses the document's ViewShell, which has already been
deleted at that point.  Add a horrible kludge to not crash for now.

Change-Id: I67fe37970d60782030b84f2badddd1e66ef3f9c6

2 files changed, 4 insertions, 3 deletions

diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 00e7fe544245..0f58d30d761f 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -42,7 +42,6 @@
 
 class SwDoc;
 class SwDocShell;
-class ViewShell;
 class _SetGetExpFlds;
 class SwViewOption;
 class OutputDevice;
@@ -277,6 +276,7 @@ public:
     void ViewOptionAdjustStart( ViewShell &rSh, const SwViewOption &rViewOptions);
     void ViewOptionAdjust( SwPrintData const* const pPrtOptions );
     void ViewOptionAdjustStop();
+    void ViewOptionAdjustCrashPreventionKludge();
 
     bool HasSwPrtOptions() const    { return m_pPrtOptions != 0; }
     SwPrintData const*  GetSwPrtOptions() const { return m_pPrtOptions.get(); }
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 443aa763a6eb..3182bd268156 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -579,7 +579,7 @@ public:
   -----------------------------------------------------------------------*/
 class SwViewOptionAdjust_Impl
 {
-    ViewShell &    m_rShell;
+    ViewShell *     m_pShell;
     SwViewOption    m_aOldViewOptions;
 
 public:
@@ -587,7 +587,8 @@ public:
     ~SwViewOptionAdjust_Impl();
     void AdjustViewOptions( SwPrintData const* const pPrtOptions );
     bool checkShell( const ViewShell& rCompare ) const
-    { return &rCompare == &m_rShell; }
+    { return &rCompare == m_pShell; }
+    void DontTouchThatViewShellItSmellsFunny() { m_pShell = 0; }
 };