[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/source

[Aron Budea (via logerrit)]

 sc/source/core/data/table2.cxx |    2 +-
 sc/source/ui/unoobj/fmtuno.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dec9dec4d2a51612c301019f4becd41227b56df4
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Sun Jul 28 05:51:40 2019 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Wed Jul 31 04:26:29 2019 +0200

    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 at collabora.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit 9ad8f83912e6cf14d7b3b3e1cb2a79d819247c82)
    Reviewed-on: https://gerrit.libreoffice.org/76705
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 632f53d43d99..d5217874a7c3 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2160,7 +2160,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 22dda7d06faf..84354f2b404f 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -159,7 +159,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;