[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                |    1 -
 patches/dev300/store-crash-fix.diff |   20 --------------------
 2 files changed, 21 deletions(-)

New commits:
commit c5967f8393e7df5d20b358674c5f760f588f542e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 29 14:12:00 2011 +0200

    bin obsolete store-crash-fix.diff
    
    was needed to keep compatibility with older Go-oo builds; LO uses
    another directory for user configuration, so the problems with
    incompatible .rdb files should not longer happen

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 703c369..f1a6476 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1256,7 +1256,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
 [ Fixes ]
 # FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
 
-store-crash-fix.diff, thorsten
 sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
 # FIXME ooo330-m2: does not apply: configure-fix-lpsolve-depends.diff, janneke
 
diff --git a/patches/dev300/store-crash-fix.diff b/patches/dev300/store-crash-fix.diff
deleted file mode 100644
index 3088e35..0000000
--- a/patches/dev300/store-crash-fix.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- store/source/storbase.hxx |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git store/source/storbase.hxx store/source/storbase.hxx
-index e2d23d8..334c967 100644
---- store/source/storbase.hxx
-+++ store/source/storbase.hxx
-@@ -680,7 +680,7 @@ class PageHolderObject
-     template< class U >
-     static bool isA (PageData const * p)
-     {
--        return ((p != 0) && (p->type() == U::theTypeId));
-+        return p != 0;
-     }
- 
-     template< class U >
--- 
-1.7.0.1
-