commit 6df45ae3a85b21d984605a6656282e5feaf8dea9
author Markus Mohrhard <markus.mohrhard@googlemail.com> Sat Jul 14 23:56:44 2018 +0200
committer Markus Mohrhard <markus.mohrhard@googlemail.com> Sun Jul 15 23:05:15 2018 +0200
tree 3592a45240090d8c128a617cf7121421d56927e6
parent 729ea6464f41cdae1c6daef9fb60029ea3a81de5

related tdf#117816, add more work arounds for MS Excel bugs

Another set of cases where MS Excel needs the formula.

Change-Id: I58344a540ad69ff9b8c56aa817730079bd011acd
Reviewed-on: https://gerrit.libreoffice.org/57443
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

sc/source/filter/excel/xecontent.cxx

diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 6d025f0..4e0863d 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -937,6 +937,50 @@ bool IsTextRule(ScConditionMode eMode)
    return false;
}

bool RequiresFixedFormula(ScConditionMode eMode)
{
    switch(eMode)
    {
        case ScConditionMode::NoError:
        case ScConditionMode::Error:
        case ScConditionMode::BeginsWith:
        case ScConditionMode::EndsWith:
        case ScConditionMode::ContainsText:
        case ScConditionMode::NotContainsText:
            return true;
        default:
        break;
    }

    return false;
}

OString GetFixedFormula(ScConditionMode eMode, const ScAddress& rAddress, const OString& rText)
{
    OStringBuffer aBuffer;
    OStringBuffer aPosBuffer = XclXmlUtils::ToOString(aBuffer, rAddress);
    OString aPos = aPosBuffer.makeStringAndClear();
    switch (eMode)
    {
        case ScConditionMode::Error:
            return "";
        case ScConditionMode::NoError:
            return "";
        case ScConditionMode::BeginsWith:
            return OString("LEFT(" + aPos + ",LEN(\"" + rText + "\"))=\"" + rText + "\"");
        case ScConditionMode::EndsWith:
            return OString("RIGHT(" + aPos +",LEN(\"" + rText + "\"))=\"" + rText + "\"");
        case ScConditionMode::ContainsText:
            return OString("NOT(ISERROR(SEARCH(\"" + rText + "\"," + aPos + ")))");
        case ScConditionMode::NotContainsText:
            return OString("ISERROR(SEARCH(\"" +  rText + "\"," + aPos + "))");
        default:
        break;
    }

    return OString("");
}

}

void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
@@ -982,7 +1026,15 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
            XML_text, aText.getStr(),
            XML_dxfId, OString::number( GetDxfs().GetDxfId( mrFormatEntry.GetStyle() ) ).getStr(),
            FSEND );
    if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation))

    if (RequiresFixedFormula(eOperation))
    {
        rWorksheet->startElement( XML_formula, FSEND );
        OString aFormula = GetFixedFormula(eOperation, mrFormatEntry.GetValidSrcPos(), aText);
        rWorksheet->writeEscaped(aFormula.getStr());
        rWorksheet->endElement( XML_formula );
    }
    else if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation))
    {
        rWorksheet->startElement( XML_formula, FSEND );
        std::unique_ptr<ScTokenArray> pTokenArray(mrFormatEntry.CreateFlatCopiedTokenArray(0));
@@ -998,16 +1050,6 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
            rWorksheet->endElement( XML_formula );
        }
    }
    else if (IsTextRule(eOperation))
    {
        OStringBuffer aBufferOld;
        OStringBuffer aBuffer = XclXmlUtils::ToOString(aBufferOld, mrFormatEntry.GetValidSrcPos());
        OString aTextTopCell = aBuffer.makeStringAndClear();
        OString aFormula = "NOT(ISERROR(SEARCH(\"" + aText + "\"," + aTextTopCell + ")))";
        rWorksheet->startElement( XML_formula, FSEND );
        rWorksheet->writeEscaped(aFormula.getStr());
        rWorksheet->endElement( XML_formula );
    }
    // OOXTODO: XML_extLst
    rWorksheet->endElement( XML_cfRule );
}