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

[Kohei Yoshida]

 patches/dev300/calc-multi-range-copy-paste.diff |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 471ad9fef922a056c94cc65f52c4a09360c57afd
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Aug 28 13:12:27 2009 -0400

    Ported fixes from upstream.
    
    * patches/dev300/calc-multi-range-copy-paste.diff: fixed note
      corruption bug on undo after multi-range copy & paste (i#104553),
      and also fixed incorrect evaluation of multi-marked ranges when
      copying to clipboard (i#104550).

diff --git a/patches/dev300/calc-multi-range-copy-paste.diff b/patches/dev300/calc-multi-range-copy-paste.diff
index 822cb12..3eb5fff 100644
--- a/patches/dev300/calc-multi-range-copy-paste.diff
+++ b/patches/dev300/calc-multi-range-copy-paste.diff
@@ -1636,7 +1636,7 @@ index 0a97b2a..31fca76 100644
          if ( !pDoc->HasSelectedBlockMatrixFragment(
                          aRange.aStart.Col(), aRange.aStart.Row(),
                          aRange.aEnd.Col(),   aRange.aEnd.Row(),
-@@ -380,6 +381,122 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
+@@ -380,6 +381,123 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
                  ErrorMessage(STR_MATRIXFRAGMENTERR);
          }
      }
@@ -1645,6 +1645,7 @@ index 0a97b2a..31fca76 100644
 +        bool bSuccess = false;
 +        ScClipParam aClipParam;
 +        aClipParam.mbCutMode = false;
++        rMark.MarkToSimple();
 +        rMark.FillRangeListWithMarks(&aClipParam.maRanges, false);
 +
 +        do
@@ -1936,7 +1937,7 @@ index 0a97b2a..31fca76 100644
 +    {
 +        pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO));
 +        pUndoDoc->InitUndoSelected(pDoc, aMark, false, false);
-+        pDoc->CopyToDocument(aMarkedRange, IDF_ALL, false, pUndoDoc.get(), &aMark, true);
++        pDoc->CopyToDocument(aMarkedRange, nUndoFlags, false, pUndoDoc.get(), &aMark, true);
 +    }
 +
 +    ::std::auto_ptr<ScDocument> pMixDoc;