[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-multi-range-copy-paste.diff |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00911962ed1d18a9cfaf4ac49810fb22f46298d4
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Aug 20 14:16:02 2009 -0400

    Fixed a silly typo that could have resulted in serious trouble.
    
    * patches/dev300/calc-multi-range-copy-paste.diff: fixed an obvious
      typo.  It's usually not a good practice to initialize a variable
      with itself, which is not yet initialized at the time of its
      initialization, not to mention doing that is plain silly.  Credit
      goes to Daniel Rentz for spotting this.

diff --git a/patches/dev300/calc-multi-range-copy-paste.diff b/patches/dev300/calc-multi-range-copy-paste.diff
index d7856d0..822cb12 100644
--- a/patches/dev300/calc-multi-range-copy-paste.diff
+++ b/patches/dev300/calc-multi-range-copy-paste.diff
@@ -309,7 +309,7 @@ index 7e29ed7..c0c17ce 100644
 +        {
 +            sal_uInt16 nIndex = p->GetIndex();
 +            ScRangeData::IndexMap::const_iterator itr = rMap.find(nIndex);
-+            sal_uInt16 nNewIndex = itr == rMap.end() ? nIndex : nNewIndex;
++            sal_uInt16 nNewIndex = itr == rMap.end() ? nIndex : itr->second;
 +            if ( nIndex != nNewIndex )
 +            {
 +                p->SetIndex( nNewIndex );