[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/filter/xml/XMLStylesExportHelper.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4e4d38faa41fb725bdff8bf4079418b5f1238d80
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Mar 11 13:33:41 2015 +0100

    correct b0rken logic that accidentally worked nevertheless
    
    ... because sFormula1 in such cases usually (?) is not empty.
    
    Change-Id: Idc0b71e258018b4728e3d7e7f8942e0c09b22e5c

diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index acb079e5..8c87f9f 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -220,9 +220,9 @@ OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy
         }
         if (aValidation.aValidationType != sheet::ValidationType_LIST &&
             (!aValidation.sFormula1.isEmpty() ||
-            (aValidation.aOperator == sheet::ConditionOperator_BETWEEN &&
-            aValidation.aOperator == sheet::ConditionOperator_NOT_BETWEEN &&
-            !aValidation.sFormula2.isEmpty())))
+             ((aValidation.aOperator == sheet::ConditionOperator_BETWEEN ||
+               aValidation.aOperator == sheet::ConditionOperator_NOT_BETWEEN) &&
+              !aValidation.sFormula2.isEmpty())))
         {
             if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN)
                 sCondition += " and ";