diff options
| author | Aron Budea <aron.budea@collabora.com> | 2019-07-28 05:51:40 +0200 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2019-07-30 18:03:33 +0200 |
| commit | 9ad8f83912e6cf14d7b3b3e1cb2a79d819247c82 (patch) | |
| tree | f6542d8e76a685d6778ba2036f4dfae7e8131fc3 /sc | |
| parent | 392fe03c2622a69c078adb9b993b5589e8b01d09 (diff) | |
tdf#125800: accessing cond format props in UNO throws error
These conditions were always evaluated to true: OR should
become AND when negated.
Regression from 8c637b47d9de4b3a64c33a9c2ffe7ed220be2467
Change-Id: I87038319ed27eff2bed2412da49e01f73ec0a79c
Reviewed-on: https://gerrit.libreoffice.org/76493
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/table2.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/fmtuno.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 5b182c897b4b..09aa36d30f53 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -2191,7 +2191,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC for (size_t nEntry=0; nEntry<nEntryCount; nEntry++) { const ScFormatEntry* pEntry = pFormat->GetEntry(nEntry); - if(pEntry->GetType() != ScFormatEntry::Type::Condition || + if(pEntry->GetType() != ScFormatEntry::Type::Condition && pEntry->GetType() != ScFormatEntry::Type::ExtCondition) continue; diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 51f271d42b91..484b011d57b7 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -161,7 +161,7 @@ ScTableConditionalFormat::ScTableConditionalFormat( { ScCondFormatEntryItem aItem; const ScFormatEntry* pFrmtEntry = pFormat->GetEntry(i); - if(pFrmtEntry->GetType() != ScFormatEntry::Type::Condition || + if(pFrmtEntry->GetType() != ScFormatEntry::Type::Condition && pFrmtEntry->GetType() != ScFormatEntry::Type::ExtCondition) continue; |