[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 7a8f1b95ac66b06865e5d31d525bf43e822fdd54
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Jun 25 23:14:43 2013 -0400

    Let's not forget to store the position afterward.
    
    Change-Id: Ia5067db46460e164643dd8cc6d21b68a05b3b33a

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 600eb58..2ff8780 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1275,6 +1275,7 @@ class CopyToClipHandler
     const ScColumn& mrSrcCol;
     ScColumn& mrDestCol;
     sc::ColumnBlockPosition maDestPos;
+    sc::ColumnBlockPosition* mpDestPos;
 
     void setDefaultAttrsToDest(size_t nRow, size_t nSize)
     {
@@ -1285,14 +1286,20 @@ class CopyToClipHandler
 
 public:
     CopyToClipHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, sc::ColumnBlockPosition* pDestPos) :
-        mrSrcCol(rSrcCol), mrDestCol(rDestCol)
+        mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos)
     {
-        if (pDestPos)
-            maDestPos = *pDestPos;
+        if (mpDestPos)
+            maDestPos = *mpDestPos;
         else
             mrDestCol.InitBlockPosition(maDestPos);
     }
 
+    ~CopyToClipHandler()
+    {
+        if (mpDestPos)
+            *mpDestPos = maDestPos;
+    }
+
     void operator() (const sc::CellStoreType::value_type& aNode, size_t nOffset, size_t nDataSize)
     {
         size_t nTopRow = aNode.position;