[ooo-build-commit] patches/dev300

[Pei Feng Lin]

 patches/dev300/apply                                  |    2 ++
 patches/dev300/writer-uno-numberingrule-bulletid.diff |   13 +++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit a25ba09b0784c0c81fd6b054ae49fd4fad6ce28d
Author: Fong Lin <pflin at novell.com>
Date:   Wed Jun 24 13:33:07 2009 +0800

    Fixed for i#103021. The property value "BulletId" could be great than 255.
    
    * patches/dev300/apply:
    * patches/dev300/writer-uno-numberingrule-bulletid.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 258d044..87bf343 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1846,6 +1846,8 @@ 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
+writer-uno-numberingrule-bulletid.diff, i#103021, Fong
 [VBAUntested]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/dev300/writer-uno-numberingrule-bulletid.diff b/patches/dev300/writer-uno-numberingrule-bulletid.diff
new file mode 100644
index 0000000..89fb7a5
--- /dev/null
+++ b/patches/dev300/writer-uno-numberingrule-bulletid.diff
@@ -0,0 +1,13 @@
+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;