[libreoffice/f20] Resolves: rhbz#1030009 SwXTextDocument crash at exit

[sbergmann]

commit 66ce9a02c3c745a2f6c870b0d7109617bb0d4381
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 25 18:12:09 2013 +0100

    Resolves: rhbz#1030009 SwXTextDocument crash at exit

 0001-rhbz-1030009-Remove-global-XModel-ref.patch |   58 ++++++++++++++++++++++
 libreoffice.spec                                 |    5 ++-
 2 files changed, 62 insertions(+), 1 deletions(-)
---
diff --git a/0001-rhbz-1030009-Remove-global-XModel-ref.patch b/0001-rhbz-1030009-Remove-global-XModel-ref.patch
new file mode 100644
index 0000000..4670558
--- /dev/null
+++ b/0001-rhbz-1030009-Remove-global-XModel-ref.patch
@@ -0,0 +1,58 @@
+From 117463102379bfb419e4f9ac1975cbbcd6bbd7a6 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Mon, 25 Nov 2013 18:01:22 +0100
+Subject: [PATCH] rhbz#1030009 Remove global XModel ref
+
+...that is apparently effectively unused since
+2627bdaddc6f694dc7fc6ba347a305af0f88ee2c "INTEGRATION: CWS fwk02ea: #i28639#
+always used supplied status indicator" anyway but causes crashes during exit
+when it holds an SwXTextDocument ref.
+
+Change-Id: I542545c793855b41731de72650bf07d5748fcb9f
+(cherry picked from commit a7464edb0a4368db02b1298b5710cf98b17e282b)
+---
+ filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+index c0b017c..a486cdf 100644
+--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
++++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+@@ -36,7 +36,6 @@
+ #include <com/sun/star/frame/XConfigManager.hpp>
+ #include <com/sun/star/xml/XImportFilter.hpp>
+ #include <com/sun/star/xml/XExportFilter.hpp>
+-#include <com/sun/star/frame/XModel.hpp>
+ #include <com/sun/star/frame/XController.hpp>
+ #include <com/sun/star/task/XStatusIndicator.hpp>
+ #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
+@@ -66,8 +65,6 @@ using namespace ::com::sun::star::task;
+ 
+ #define MAP_LEN(x) x, sizeof(x) - 1
+ 
+-Reference< com::sun::star::frame::XModel > xModel;
+-
+ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+     throw (RuntimeException)
+ {
+@@ -341,9 +338,6 @@ void SAL_CALL XmlFilterAdaptor::setSourceDocument( const Reference< ::com::sun::
+ {
+     meType = FILTER_EXPORT;
+     mxDoc = xDoc;
+-        com::sun::star::uno::Reference< com::sun::star::frame::XModel >rModel ( com::sun::star::uno::Reference< com::sun::star::frame::XModel >::query( xDoc ) );
+-    xModel=rModel;
+-
+ }
+ 
+ // XImporter
+@@ -352,7 +346,6 @@ void SAL_CALL XmlFilterAdaptor::setTargetDocument( const Reference< ::com::sun::
+ {
+     meType = FILTER_IMPORT;
+     mxDoc = xDoc;
+-    //xModel = uno::Reference< frame::XModel >::query( xDoc );
+ }
+ // XInitialization
+ void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments )
+-- 
+1.8.3.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 08c54d9..27ad336 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -277,6 +277,7 @@ Patch36: 0001-fdo-69971-formula-dialog-crash-when-Paint-restores-E.patch
 Patch37: 0001-Related-fdo-41169-fix-GTK-non-Latin-keyboard-layout-.patch
 Patch38: 0001-Rewrite-Qt4-based-nested-yield-mutex-locking.patch
 Patch39: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.pat
+Patch40: 0001-rhbz-1030009-Remove-global-XModel-ref.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1051,6 +1052,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch37 -p1 -b .fdo-41169-fix-GTK-non-Latin-keyboard-layout-.patch
 %patch38 -p1 -b .Rewrite-Qt4-based-nested-yield-mutex-locking.patch
 %patch39 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.pat
+%patch40 -p1 -b .rhbz-1030009-Remove-global-XModel-ref.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2141,7 +2143,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %changelog
 * Mon Nov 25 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.3.2-8-UNBUILT
-  Related: rhbz#1032774 bodge around reported NULL
+- Related: rhbz#1032774 bodge around reported NULL
+- Resolves: rhbz#1030009 SwXTextDocument crash at exit
 
 * Fri Nov 22 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.3.2-7
 - Resolves: rhbz#958300 fix GTK non Latin keyboard layout shortcuts