[openoffice.org/f14/master] Resolves: fdo#33947 sd print crash

[Caolan McNamara]

commit 613f70090e51f0ff13bf449c11de052fcb4d72d2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 15 12:48:23 2011 +0000

    Resolves: fdo#33947 sd print crash

 libreoffice-fdo33947.sd.print.crash.patch |   13 +++++++++++++
 openoffice.org.spec                       |    5 ++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/libreoffice-fdo33947.sd.print.crash.patch b/libreoffice-fdo33947.sd.print.crash.patch
new file mode 100644
index 0000000..a080815
--- /dev/null
+++ b/libreoffice-fdo33947.sd.print.crash.patch
@@ -0,0 +1,13 @@
+diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
+index 0628f1c..2e930bf 100644
+--- a/sd/source/ui/view/DocumentRenderer.cxx
++++ b/sd/source/ui/view/DocumentRenderer.cxx
+@@ -1329,7 +1329,7 @@ public:
+             ::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
+ 
+         if ( ! mpPrintView)
+-            mpPrintView.reset(new DrawView(mrBase.GetDocShell(), &rPrinter, pDrawViewShell.get()));
++            mpPrintView.reset(new DrawView(mrBase.GetDocShell(), &rPrinter, NULL));
+ 
+         if (nIndex<0 || sal::static_int_cast<sal_uInt32>(nIndex)>=maPrinterPages.size())
+             return;
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 482ed9f..560355e 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -169,6 +169,7 @@ Patch85: 0001-Resolves-rhbz-681159-bandaid-for-crash.patch
 Patch86: 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch
 Patch87: 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
 Patch88: 0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch
+Patch89: libreoffice-fdo33947.sd.print.crash.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1754,6 +1755,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch86 -p0 -b .rhbz672818-bandaid-for-crash-in-SwTxtNode-.patch
 %patch87 -p1 -b .rhbz684477-make-sure-this-is-thread-safe.patch
 %patch88 -p1 -b .rhbz684620-crash-with-NULL-pTableBox.patch
+%patch89 -p1 -b .fdo33947.sd.print.crash.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3949,7 +3951,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Thu Mar 14 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
+* Tue Mar 15 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
 - Related: rhbz#610103 make this even more robust
 - Related: rhbz#672872 cancel gtk file dialog on terminate
 - Resolves: rhbz#673819 crash on changing position of header/footer drawing object
@@ -3963,6 +3965,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 - Resolves: rhbz#672818 crash in writer
 - Related: rhbz#684477 make sure this is thread safe
 - Resolves: rhbz#684620 crash with NULL pTableBox
+- Resolves: fdo#33947 sd print crash
 
 * Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.2
 - Resolves: rhbz#671540 fix lonely )