[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                          |    2 -
 patches/dev300/ooo67658.sfx2.reloadcrash.diff |   29 --------------------------
 2 files changed, 31 deletions(-)

New commits:
commit b0149f20093e62c41cc163e910a22a24edfa6ec2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Mar 31 21:14:45 2011 +0200

    bin obsolete ooo67658.sfx2.reloadcrash.diff
    
    the root of the problem has been fixed in the meantime (i#67658)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c6da7e5..0681acd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1214,8 +1214,6 @@ unxlngi6-notune.diff, doko
 human-icons-i18n.diff, mklose
 
 [ FedoraCommonFixes ]
-ooo67658.sfx2.reloadcrash.diff
-
 oooXXXXX.vcl.x86_64.impressatk.diff
 
 ooo73201.sw.a11yloadcrash.diff
diff --git a/patches/dev300/ooo67658.sfx2.reloadcrash.diff b/patches/dev300/ooo67658.sfx2.reloadcrash.diff
deleted file mode 100644
index 2652cd7..0000000
--- a/patches/dev300/ooo67658.sfx2.reloadcrash.diff
+++ /dev/null
@@ -1,29 +0,0 @@
----
- sfx2/source/doc/objxtor.cxx |   11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git sfx2/source/doc/objxtor.cxx sfx2/source/doc/objxtor.cxx
-index 2298b93..8684942 100644
---- sfx2/source/doc/objxtor.cxx
-+++ sfx2/source/doc/objxtor.cxx
-@@ -364,7 +364,16 @@ SfxObjectShell::~SfxObjectShell()
-     }
- 
-     if ( pImp->bOwnsStorage && pImp->m_xDocStorage.is() )
--        pImp->m_xDocStorage->dispose();
-+    {
-+    try
-+    {
-+            pImp->m_xDocStorage->dispose();
-+    }
-+    catch( Exception& )
-+    {
-+            /* what to do ? */
-+    }
-+    }
- 
-     if ( pMedium )
-     {
--- 
-1.7.0.1
-