[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                      |    2 --
 patches/dev300/svtools-speed-itemset.diff |   11 -----------
 2 files changed, 13 deletions(-)

New commits:
commit 6be3b98773968534c2eb95afd26c1e20871dcd71
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 9 14:43:15 2009 +0300

    svtools-speed-itemset.diff is upstream
    
    * patches/dev300/svtools-speed-itemset.diff: Delete. Is
      upstream. i#100910 is verified and fixed.
    
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 129cbfe..d2b8447 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -753,8 +753,6 @@ calc-menu-manual-page-break.diff, kohei
 # make biffdumper build
 fix-biffdumper.diff, noelpwer
 
-# FIXME: enable me after 3.1 release ...
-# svtools-speed-itemset.diff, i#100910, michael
 
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
diff --git a/patches/dev300/svtools-speed-itemset.diff b/patches/dev300/svtools-speed-itemset.diff
deleted file mode 100644
index e7ef68c..0000000
--- a/patches/dev300/svtools-speed-itemset.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- svtools/source/items1/itemset.cxx
-+++ svtools/source/items1/itemset.cxx
-@@ -541,7 +541,7 @@
- 						// Unterschiedlich vorhanden
- 						return SFX_ITEM_DONTCARE;
- 
--					if ( (*ppFnd)->IsA(TYPE(SfxVoidItem)) )
-+					if ( (*ppFnd)->Type() == TYPE(SfxVoidItem) )
- 						return SFX_ITEM_DISABLED;
- 
- 					if (ppItem)