[ooo-build-commit] .: patches/dev300

[Thorsten Behrens]

 patches/dev300/svx-textpropreader-limit-fix.diff |   21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 6f109e77f61811dd7a812753f39319f7a448a2e2
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Feb 25 10:32:08 2010 +0100

    Actually catch the limit we're testing for
    
    * patches/dev300/svx-textpropreader-limit-fix.diff: improved fix

diff --git a/patches/dev300/svx-textpropreader-limit-fix.diff b/patches/dev300/svx-textpropreader-limit-fix.diff
index 688b32d..f1a9a40 100644
--- a/patches/dev300/svx-textpropreader-limit-fix.diff
+++ b/patches/dev300/svx-textpropreader-limit-fix.diff
@@ -1,12 +1,25 @@
-diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx
-index c452472..c25164a 100644
+Limit checking in the text property reader
+
+From: Thorsten Behrens <tbehrens at novell.com>
+
+
+---
+
+ svx/source/svdraw/svdfppt.cxx |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+
+diff --git svx/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx
+index c452472..ef047d3 100644
 --- svx/source/svdraw/svdfppt.cxx
 +++ svx/source/svdraw/svdfppt.cxx
-@@ -5337,7 +5337,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
+@@ -5336,8 +5336,8 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
+     DffRecordHeader aTextHd;
      rIn >> aTextHd;
      sal_uInt32 nMaxLen = aTextHd.nRecLen;
-     if ( nMaxLen > 0xFFFF )
+-    if ( nMaxLen > 0xFFFF )
 -        nMaxLen = 0xFFFF;
++    if ( nMaxLen >= 0xFFFF )
 +        nMaxLen = 0xFFFE;
  
      if( aTextHd.nRecType == PPT_PST_TextCharsAtom )