From f447cb9bc8ab43a5f737d27dfa61bf0e71667bbb Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Thu, 25 May 2023 13:54:37 +0200 Subject: 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 --- sc/source/core/data/column4.cxx | 7 +------ 1 file changed, 1 insertion(+), 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(*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); } } -- cgit