[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                       |    1 +
 patches/dev300/svx-validate-paradepth.diff |   15 +++++++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit 18201fd2c760902ab4d0c1258a0b698a9c9cb03b
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Feb 3 13:06:36 2010 +0100

    Make sure paradepth is properly initialised
    
    * patches/dev300/apply: added the patch
    * patches/dev300/svx-validate-paradepth.diff: fix a not-so-properly
      initialized paradepth in svdfppt.cxx

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b4bf73d..150640f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3526,6 +3526,7 @@ evaluation-row-limit.diff
 # TODO: split up into the original patches were this belongs
 valgrind-fixes.diff, thorsten
 sd-avoid-looping-fix.diff, thorsten
+svx-validate-paradepth.diff, thorsten
 
 [ Fixes < ooo320-m12 ]
 vcl-drawtransparent-fix.diff, i#107763, thorsten
diff --git a/patches/dev300/svx-validate-paradepth.diff b/patches/dev300/svx-validate-paradepth.diff
new file mode 100644
index 0000000..9b74c5b
--- /dev/null
+++ b/patches/dev300/svx-validate-paradepth.diff
@@ -0,0 +1,15 @@
+diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx
+index 02d2044..c452472 100644
+--- svx/source/svdraw/svdfppt.cxx
++++ svx/source/svdraw/svdfppt.cxx
+@@ -5099,6 +5099,10 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport&
+             rIn >> nCharCount
+                 >> aParaPropSet.pParaSet->mnDepth;	// Einruecktiefe
+ 
++            aParaPropSet.pParaSet->mnDepth = 
++                std::min(sal_uInt16(9),
++                         aParaPropSet.pParaSet->mnDepth);
++
+             nCharCount--;
+ 
+             rIn >> nMask;