diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-19 09:09:29 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-19 09:14:12 +0100 |
| commit | 5c8e6ccaf6ea7a187e3d16f3d865cbed5eba0874 (patch) | |
| tree | 453bd037d3544b4da6708616e07784425eb5aded | |
| parent | e2170dd77ffbeda24aabb2b704deedd4440d7620 (diff) | |
copy styles from cond format between different docs, fdo#59159
Change-Id: I5472ab648b248d925f1f07cd4194c1201230ff20
| -rw-r--r-- | sc/source/core/data/table2.cxx | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 2d909c020fb8..2ad97a633c08 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -671,6 +671,7 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO { ScRange aOldRange( nCol1 - nDx, nRow1 - nDy, pTable->nTab, nCol2 - nDx, nRow2 - nDy, pTable->nTab); ScRange aNewRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ); + bool bSameDoc = pDocument == pTable->pDocument; for(ScConditionalFormatList::const_iterator itr = pTable->mpCondFormatList->begin(), itrEnd = pTable->mpCondFormatList->end(); itr != itrEnd; ++itr) @@ -695,6 +696,29 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO pNewFormat->SetKey(nMax + 1); mpCondFormatList->InsertNew(pNewFormat); + if(!bSameDoc) + { + for(size_t i = 0, n = pNewFormat->size(); + i < n; ++i) + { + OUString aStyleName; + const ScFormatEntry* pEntry = pNewFormat->GetEntry(i); + if(pEntry->GetType() == condformat::CONDITION) + aStyleName = static_cast<const ScCondFormatEntry*>(pEntry)->GetStyle(); + else if(pEntry->GetType() == condformat::DATE) + aStyleName = static_cast<const ScCondDateFormatEntry*>(pEntry)->GetStyleName(); + + if(!aStyleName.isEmpty()) + { + if(pDocument->GetStyleSheetPool()->Find(aStyleName, SFX_STYLE_FAMILY_PARA)) + continue; + + pDocument->GetStyleSheetPool()->CopyStyleFrom( + pTable->pDocument->GetStyleSheetPool(), aStyleName, SFX_STYLE_FAMILY_PARA ); + } + } + } + pDocument->AddCondFormatData( pNewFormat->GetRange(), nTab, pNewFormat->GetKey() ); } } @@ -980,7 +1004,9 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } if(pDestTab->pDocument->IsUndo() && (nFlags & IDF_ATTRIB)) + { pDestTab->mpCondFormatList.reset(new ScConditionalFormatList(pDestTab->pDocument, *mpCondFormatList)); + } if (pDBDataNoName) { |