summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj/fmtuno.cxx
diff options
context:
space:
mode:
authorAron Budea <aron.budea@collabora.com>2019-07-28 05:51:40 +0200
committerAron Budea <aron.budea@collabora.com>2019-07-30 18:03:33 +0200
commit9ad8f83912e6cf14d7b3b3e1cb2a79d819247c82 (patch)
treef6542d8e76a685d6778ba2036f4dfae7e8131fc3 /sc/source/ui/unoobj/fmtuno.cxx
parent392fe03c2622a69c078adb9b993b5589e8b01d09 (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/source/ui/unoobj/fmtuno.cxx')
-rw-r--r--sc/source/ui/unoobj/fmtuno.cxx2
1 files changed, 1 insertions, 1 deletions
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;