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

[Thorsten Behrens]

 patches/dev300/apply                           |    1 
 patches/dev300/vcl-limit-iterator-advance.diff |   26 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

New commits:
commit f6a769c12ade54f4e894d9c2a28c1b2bbba0aeec
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Mon Apr 12 21:43:23 2010 +0200

    Fix stl iter advance in sallayout.cxx
    
    * patches/dev300/apply: added below patch
    * patches/dev300/vcl-limit-iterator-advance.diff: fix for i#110806
      from dtardon

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ab0aab6..d99b22b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3907,6 +3907,7 @@ vcl-stl-fix.diff, n#588957, thorsten
 vcl-default-wheel-behaviour.diff, n#591650, thorsten
 filled-tab-editeng.diff, n#564454, cbosdo
 chart-ui-fix.diff, i#110702, timar
+vcl-limit-iterator-advance.diff, i#110806, dtardon
 
 [ Features ]
 # embed generic media files inside odf docs, 2nd part
diff --git a/patches/dev300/vcl-limit-iterator-advance.diff b/patches/dev300/vcl-limit-iterator-advance.diff
new file mode 100644
index 0000000..1189df5
--- /dev/null
+++ b/patches/dev300/vcl-limit-iterator-advance.diff
@@ -0,0 +1,26 @@
+Patch from dtardon to fix iter advance in sallayout.cxx
+
+From: Thorsten Behrens <tbehrens at novell.com>
+
+
+---
+
+ vcl/source/gdi/sallayout.cxx |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+
+diff --git vcl/source/gdi/sallayout.cxx vcl/source/gdi/sallayout.cxx
+index bd91f20..a3f4ff5 100755
+--- vcl/source/gdi/sallayout.cxx
++++ vcl/source/gdi/sallayout.cxx
+@@ -1804,8 +1804,8 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
+     int nRunStart, nRunEnd;
+     while (rArgs.GetNextRun(&nRunStart, &nRunEnd, &bRtl))
+     {
+-        if (bRtl) std::fill(vRtl.begin() + nRunStart - rArgs.mnMinCharPos,
+-                            vRtl.begin() + nRunEnd - rArgs.mnMinCharPos, true);
++        if (bRtl) std::fill(vRtl.begin() + (nRunStart - rArgs.mnMinCharPos),
++                            vRtl.begin() + (nRunEnd - rArgs.mnMinCharPos), true);
+     }
+     rArgs.ResetPos();
+