diff options
| author | Eike Rathke <erack@redhat.com> | 2014-12-20 23:48:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-12 15:11:22 +0000 |
| commit | c3e1708ca41148daa717baa38a4e21cc5b15d971 (patch) | |
| tree | 02c7606bb50f3de8de43e7decc49daafc92ea0e9 | |
| parent | db897383b4034cd4b5e00d0b954a8075b43ed8bd (diff) | |
fdo#86215 pool new ScPatternAttr if source and destination are different docs
(cherry picked from commit d9c15867e914d91a7e86c499ffb6ee62f5b443f6)
Conflicts:
sc/source/core/data/column4.cxx
Change-Id: Icdb68af83a0b208f9a427ee61ae18020c8835a41
Reviewed-on: https://gerrit.libreoffice.org/13428
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/core/data/column4.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index aeaecb09390b..19c2c2ca7d9a 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -148,6 +148,8 @@ void ScColumn::CopyOneCellFromClip( sc::CopyFromClipContext& rCxt, SCROW nRow1, if (!pBlockPos) return; + bool bSameDocPool = (rCxt.getClipDoc()->GetPool() == pDocument->GetPool()); + ScCellValue& rSrcCell = rCxt.getSingleCell(); sal_uInt16 nFlags = rCxt.getInsertFlag(); @@ -156,7 +158,8 @@ void ScColumn::CopyOneCellFromClip( sc::CopyFromClipContext& rCxt, SCROW nRow1, { if (!rCxt.isSkipAttrForEmptyCells() || rSrcCell.meType != CELLTYPE_NONE) { - const ScPatternAttr* pAttr = rCxt.getSingleCellPattern(); + const ScPatternAttr* pAttr = (bSameDocPool ? rCxt.getSingleCellPattern() : + rCxt.getSingleCellPattern()->PutInPool( pDocument, rCxt.getClipDoc())); pAttrArray->SetPatternArea(nRow1, nRow2, pAttr, true); } } @@ -181,8 +184,7 @@ void ScColumn::CopyOneCellFromClip( sc::CopyFromClipContext& rCxt, SCROW nRow1, { // Compare the ScDocumentPool* to determine if we are copying within the // same document. If not, re-intern shared strings. - svl::SharedStringPool* pSharedStringPool = (rCxt.getClipDoc()->GetPool() != pDocument->GetPool()) ? - &pDocument->GetSharedStringPool() : NULL; + svl::SharedStringPool* pSharedStringPool = (bSameDocPool ? NULL : &pDocument->GetSharedStringPool()); svl::SharedString aStr = (pSharedStringPool ? pSharedStringPool->intern( rSrcCell.mpString->getString()) : *rSrcCell.mpString); |