diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-07-05 22:13:44 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-07-06 10:49:06 +0200 |
| commit | a997c5fa1b7a82f1b7d494bbc80857a2bbb89142 (patch) | |
| tree | ab31eb171bad287a0bed30ccda87450640d20a40 /sc | |
| parent | 30ff578d04c0e7eef6a7bbbf20f6405895ba14d5 (diff) | |
fdo#80813 - avoid FMR by re-fetch pattern after a potential re-calculation.
Change-Id: Ib197f4cd74cd2c444a5f7c207fe2e5be14eea65d
Reviewed-on: https://gerrit.libreoffice.org/10095
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/column2.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 18aee248a752..63c5e0f02fb1 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -131,11 +131,15 @@ long ScColumn::GetNeededSize( return 0; } - // conditional formatting + // conditional formatting const SfxItemSet* pCondSet = pDocument->GetCondResult( nCol, nRow, nTab ); - // line break? + // fdo#80813 - fetching conditional result (GetCondResult) above can cause + // a re-calculate which can delete and re-set the pattern we fetched. + if (!rOptions.pPattern) + pPattern = pAttrArray->GetPattern( nRow ); + // line break? const SfxPoolItem* pCondItem; SvxCellHorJustify eHorJust; if (pCondSet && |