diff options
| author | Aron Budea <aron.budea@collabora.com> | 2019-07-28 05:51:40 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-07-31 11:43:26 +0200 |
| commit | d9957993160b8775e3f763fa7239dd82086e19ef (patch) | |
| tree | 568d670d74779692030a63620508b569e9ff7510 /sc | |
| parent | 857f68d68b3d0092f109845cfd93482871a0793d (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>
(cherry picked from commit 9ad8f83912e6cf14d7b3b3e1cb2a79d819247c82)
Reviewed-on: https://gerrit.libreoffice.org/76703
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
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 5edff4b4889b..98f316424cbd 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -2190,7 +2190,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 4cd31ca6aae9..46f4c227e424 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -162,7 +162,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; |