[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                  |    6 ------
 patches/dev300/writer-uno-numberingrule-bulletid.diff |   13 -------------
 2 files changed, 19 deletions(-)

New commits:
commit 222bfc0f8c345b3d9490f9935fdba30aa1dfe27c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 11 01:53:30 2009 +0300

    writer-uno-numberingrule-bulletid.diff is not needed
    
    * patches/dev300/writer-uno-numberingrule-bulletid.diff:
      Delete. Upstream has solved the problem using slightly different
      code now.
    
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6da25d1..3222ac5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1723,12 +1723,6 @@ vba-zoom-per-sheet.diff
 vba-fallback-to-calling-doc-context.diff
 # when selecting full range view is not scrolled back 
 vba-cursor-pos-for-selected-maxrange.diff
-
-# fix BulletId property in NumberingRules
-# FIXME: 2009-09-07: Seems to be fixed upstream slightly differently,
-# please verify. --tml
-# writer-uno-numberingrule-bulletid.diff, i#103021, Fong
-
 # fix combox binding data import in userform
 vba-combobox-rowsource-fix.diff, Fong
 # support workbook auto_open event
diff --git a/patches/dev300/writer-uno-numberingrule-bulletid.diff b/patches/dev300/writer-uno-numberingrule-bulletid.diff
deleted file mode 100644
index 89fb7a5..0000000
--- a/patches/dev300/writer-uno-numberingrule-bulletid.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git sw/source/core/unocore/unosett.cxx sw/source/core/unocore/unosett.cxx
-index f0b3396..a86a282 100644
---- sw/source/core/unocore/unosett.cxx
-+++ sw/source/core/unocore/unosett.cxx
-@@ -2044,7 +2044,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
- 				{
- 					sal_Int16 nSet = 0;
- 					pData->aVal >>= nSet;
--					if(nSet < 0xff)
-+					if(nSet < 0xffff)
- 						aFmt.SetBulletChar(nSet);
- 					else
- 						bWrongArg = sal_True;