ooo-build r14912 - in branches/ooo-build-3-0-1: . patches/dev300

[challs svn gnome org]

Author: challs
Date: Mon Dec 22 18:40:15 2008
New Revision: 14912
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14912&view=rev

Log:
Fix crash on PDF export from page preview, iz#96167


Added:
   branches/ooo-build-3-0-1/patches/dev300/ooo96167.sw.pdfexportcrash.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Mon Dec 22 18:40:15 2008
@@ -494,6 +494,9 @@
 # fix truncated text on sslwarndlg in uui module
 i97329-sslwarndlg-truncation.diff, i#97329, atimar
 
+# fix crash on PDF export in page preview
+ooo96167.sw.pdfexportcrash.diff, i#96167, challs
+
 [ Fixes < ooo300-m14 ]
 i95118.diff, i#93994, i#95118
 

Added: branches/ooo-build-3-0-1/patches/dev300/ooo96167.sw.pdfexportcrash.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/ooo96167.sw.pdfexportcrash.diff	Mon Dec 22 18:40:15 2008
@@ -0,0 +1,19 @@
+--- sw/source/ui/uno/unotxdoc.cxx.old	2008-11-12 17:44:39.000000000 +0000
++++ sw/source/ui/uno/unotxdoc.cxx	2008-12-18 12:32:42.000000000 +0000
+@@ -2808,12 +2816,15 @@
+         // <--
+ 
+         pVwSh->SetPDFExportOption( sal_False );
++        // #i96167# haggai: delete pViewOptionsAdjust here because it makes use
++        // of the shell, which might get destroyed in lcl_DisposeView!
++        delete pViewOptionAdjust;
++
+         if( bLastPage && m_pHiddenViewFrame)
+         {
+             lcl_DisposeView( m_pHiddenViewFrame, pDocShell );
+             m_pHiddenViewFrame = 0;
+         }
+-        delete pViewOptionAdjust;
+     }
+ }
+ /* -----------------------------03.10.04 -------------------------------------