[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - sc/inc sc/source

[Eike Rathke]

 sc/inc/formulacell.hxx              |    2 +-
 sc/source/core/data/formulacell.cxx |    4 ++--
 sc/source/core/data/table3.cxx      |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 8073e91a9f89ab313ae4de86b5909ff3a16594e5
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jul 11 18:35:39 2014 +0200

    resolved fdo#79441 keep 3D references intact during sort
    
    Change-Id: I9e96d8e7cb99a3c280dd24495eefb9efd6d10888
    (cherry picked from commit e463de2a56453a0d2cb0b5b58e96f7639f37cdd1)
    Reviewed-on: https://gerrit.libreoffice.org/10239
    Reviewed-by: Muthu Subramanian K <muthusuba at gmail.com>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 11c5cb1..49b20b1 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -160,7 +160,7 @@ public:
                     virtual ~ScFormulaCell();
 
     ScFormulaCell* Clone() const;
-    ScFormulaCell* Clone( const ScAddress& rPos ) const;
+    ScFormulaCell* Clone( const ScAddress& rPos, int nCloneFlags ) const;
 
     ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos );
 
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index af6aed4..2ff6079 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -841,9 +841,9 @@ ScFormulaCell* ScFormulaCell::Clone() const
     return new ScFormulaCell(*this, *pDocument, aPos);
 }
 
-ScFormulaCell* ScFormulaCell::Clone( const ScAddress& rPos ) const
+ScFormulaCell* ScFormulaCell::Clone( const ScAddress& rPos, int nCloneFlags ) const
 {
-    return new ScFormulaCell(*this, *pDocument, rPos);
+    return new ScFormulaCell(*this, *pDocument, rPos, nCloneFlags);
 }
 
 size_t ScFormulaCell::GetHash() const
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index b544711..1b2f86c 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -683,7 +683,8 @@ void ScTable::SortReorderByRow( ScSortInfoArray* pArray, ScProgress* pProgress )
                 {
                     assert(rCell.mpAttr);
                     size_t n = rCellStore.size();
-                    sc::CellStoreType::iterator itBlk = rCellStore.push_back(rCell.maCell.mpFormula->Clone(aCellPos));
+                    sc::CellStoreType::iterator itBlk = rCellStore.push_back( rCell.maCell.mpFormula->Clone(
+                                aCellPos, SC_CLONECELL_DEFAULT | SC_CLONECELL_ADJUST3DREL));
 
                     // Join the formula cells as we fill the container.
                     size_t nOffset = n - itBlk->position;