summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2023-05-25 13:54:37 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2023-05-25 16:44:54 +0200
commitf447cb9bc8ab43a5f737d27dfa61bf0e71667bbb (patch)
treeae83bc30fd66d13d281f5f1969c47b9abb1c92af
parente4261e4733f795da33fe8e263cf092b509ff7b4b (diff)
tdf#107965: partially revert fix for tdf#91312
This commit partially reverts 8a11d34c7e08218b5ff9da4870c460297f312332. tdf#91312 is not reproducible after the revert because the conditional format logic has changed since then and now conditions are grouped. Change-Id: I5ae86c8c3b8611e3fdfed6adbcac7b481bc7217f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152273 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r--sc/source/core/data/column4.cxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index d4fe7abdbf23..412e5b2e9627 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -268,12 +268,7 @@ void ScColumn::CopyOneCellFromClip( sc::CopyFromClipContext& rCxt, SCROW nRow1,
const ScPatternAttr* pAttr = (bSameDocPool ? rCxt.getSingleCellPattern(nColOffset) :
rCxt.getSingleCellPattern(nColOffset)->PutInPool( &rDocument, rCxt.getClipDoc()));
- auto pNewPattern = std::make_unique<ScPatternAttr>(*pAttr);
- sal_uInt16 pItems[2];
- pItems[0] = ATTR_CONDITIONAL;
- pItems[1] = 0;
- pNewPattern->ClearItems(pItems);
- pAttrArray->SetPatternArea(nRow1, nRow2, std::move(pNewPattern), true);
+ pAttrArray->SetPatternArea(nRow1, nRow2, pAttr, true);
}
}