diff options
| author | Eike Rathke <erack@redhat.com> | 2014-07-11 18:35:39 +0200 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2014-07-14 13:38:31 +0000 |
| commit | caf35a3ab2fa19134a900dcfd2dcc86936e435a5 (patch) | |
| tree | b4558bdcde39f79ebbe3071b334cfd423066c3ac | |
| parent | a4fd1b2eafcc49486cb6a360d792f779659b68e2 (diff) | |
resolved fdo#79441 keep 3D references intact during sort
Change-Id: I9e96d8e7cb99a3c280dd24495eefb9efd6d10888
(cherry picked from commit e463de2a56453a0d2cb0b5b58e96f7639f37cdd1)
Reviewed-on: https://gerrit.libreoffice.org/10238
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
| -rw-r--r-- | sc/inc/formulacell.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/formulacell.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/table3.cxx | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 11c5cb1ecf3c..49b20b120f72 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 af6aed4f12f0..2ff6079e4e35 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 b5447116834e..1b2f86cc10e1 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; |