[openoffice.org/f13/master] Resolves: rhbz#620390 [abrt] crash in SfxViewFrame::GetFrame

[David Tardon]

commit 8aee96f3561a9e5cb4ddd6a11920ab3a1d783cd8
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Aug 2 14:25:17 2010 +0200

    Resolves: rhbz#620390 [abrt] crash in SfxViewFrame::GetFrame

 openoffice.org.spec       |    5 ++++-
 workspace.findbar01.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 7bb558e..0beab97 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -166,6 +166,7 @@ Patch95: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
 Patch96: openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch
 Patch97: openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 Patch98: openoffice.org-3.3.0.ooo113117.extensions.broken.scanner.shutdown.patch
+Patch99: workspace.findbar01.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1762,6 +1763,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch96 -p0 -b .ooo112567.vcl.embeddedbitmaps.patch
 %patch97 -p1 -b .ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 %patch98 -p0 -b .ooo113117.extensions.broken.scanner.shutdown.patch
+%patch99 -p1 -b .workspace.findbar01.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4247,10 +4249,11 @@ fi
 %endif
 
 %changelog
-* Tue Jul 13 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.27.UNBUILT
+* Tue Aug 02 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.27.UNBUILT
 - Resolves: rhbz#608114 cppu-lifecycle issues (caolanm)
 - Resolves: rhbz#566831 [abrt] crash in GetFrmSize (dtardon)
 - Resolves: rhbz#613278 [abrt] crash in SANE shutdown (caolanm)
+- Resolves: rhbz#620390 [abrt] crash in SfxViewFrame::GetFrame (dtardon)
 
 * Mon Jun 21 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.26
 - Resolves: rhbz#606021 openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch
diff --git a/workspace.findbar01.patch b/workspace.findbar01.patch
new file mode 100644
index 0000000..355bbaf
--- /dev/null
+++ b/workspace.findbar01.patch
@@ -0,0 +1,36 @@
+diff -r 331c22de59dc -r 7222222b05a3 sd/source/ui/unoidl/DrawController.cxx
+--- a/sd/source/ui/unoidl/DrawController.cxx	Thu Apr 22 18:47:26 2010 +0200
++++ b/sd/source/ui/unoidl/DrawController.cxx	Wed Apr 28 18:45:33 2010 +0800
+@@ -29,6 +29,7 @@
+ #include "precompiled_sd.hxx"
+ 
+ #include "DrawController.hxx"
++#include "DrawDocShell.hxx"
+ 
+ #include "DrawSubController.hxx"
+ #include "sdpage.hxx"
+@@ -54,6 +55,7 @@
+ #include <svx/fmshell.hxx>
+ #include <vos/mutex.hxx>
+ #include <vcl/svapp.hxx>
++#include <boost/shared_ptr.hpp>
+ 
+ using namespace ::std;
+ using ::rtl::OUString;
+@@ -164,6 +166,16 @@
+ 		{
+ 			mbDisposing = true;
+ 
++            boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
++            if ( pViewShell )
++            {
++                pViewShell->DeactivateCurrentFunction();
++                DrawDocShell* pDocShell = pViewShell->GetDocSh();
++                if ( pDocShell != NULL )
++                    pDocShell->SetDocShellFunction(0);                 
++            }                                                  
++            pViewShell.reset();
++
+             // When the controller has not been detached from its view
+             // shell, i.e. mpViewShell is not NULL, then tell PaneManager
+             // and ViewShellManager to clear the shell stack.