diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-07 04:46:39 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-07 04:48:17 +0200 |
| commit | 9ea3e3a2fbe9c200a2b7fe11e48765d1d8389eb3 (patch) | |
| tree | 920be6cb6d26c8e7e831bc05604d6081bb690d3a /sc | |
| parent | 86f8772131a0588f3bfa4f09cc03746a2afe8cc8 (diff) | |
column storage might be changed, related lp#990868
Change-Id: Ibd196484c8c5199e7398726a250082c266a89229
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/column.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 7d6ebb1e2dfc..f0dc03af9be9 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1709,7 +1709,6 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) { // This is the scenario table, the data is copied into it - sc::CopyToDocContext aCxt(*pDocument); ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW ); SCROW nStart = -1, nEnd = -1; const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd ); @@ -1718,6 +1717,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) { DeleteArea( nStart, nEnd, IDF_CONTENTS ); + sc::CopyToDocContext aCxt(*pDocument); ((ScColumn&)rSrcCol). CopyToColumn(aCxt, nStart, nEnd, IDF_CONTENTS, false, *this); @@ -1741,7 +1741,6 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const { // This is the scenario table, the data is copied to the other - sc::CopyToDocContext aCxt(*rDestCol.pDocument); ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW ); SCROW nStart = -1, nEnd = -1; const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd ); @@ -1750,6 +1749,7 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) { rDestCol.DeleteArea( nStart, nEnd, IDF_CONTENTS ); + sc::CopyToDocContext aCxt(*rDestCol.pDocument); CopyToColumn(aCxt, nStart, nEnd, IDF_CONTENTS, false, rDestCol); // UpdateUsed not needed, is already done in TestCopyScenario (obsolete comment ?) |