[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sc/source

[Henry Castro (via logerrit)]

 sc/source/filter/oox/condformatbuffer.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit d696ffb6a7bc5d7b732a8b91b4eab672b40fda5f
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Tue Mar 28 11:28:05 2023 -0400
Commit:     Henry Castro <hcas...@collabora.com>
CommitDate: Fri Jun 16 20:23:49 2023 +0200

    sc: filter: oox: fix conditional color scale empty value \"\"
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: I115c3731db85267d115efd24739470bffaeace40
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149718
    Tested-by: Andras Timar <andras.ti...@collabora.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151976
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153178
    Tested-by: Jenkins
    (cherry picked from commit 60086685c91dd5d356b492b34dac613a06639b3c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153144

diff --git a/sc/source/filter/oox/condformatbuffer.cxx 
b/sc/source/filter/oox/condformatbuffer.cxx
index 2662b5213a34..3095879cc244 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -116,15 +116,18 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const 
AttributeList& rAttrib
     OUString aType = rAttribs.getString( XML_type, OUString() );
     OUString aVal = rAttribs.getString(XML_val, OUString());
 
-    double nVal = 0.0;
-    bool bVal = isValue(aVal, nVal);
-    if( !bVal || aType == "formula" )
-    {
-        pEntry->maFormula = aVal;
-    }
-    else
+    if (aVal != "\"\"")
     {
-        pEntry->mnVal = nVal;
+        double nVal = 0.0;
+        bool bVal = isValue(aVal, nVal);
+        if( !bVal || aType == "formula" )
+        {
+            pEntry->maFormula = aVal;
+        }
+        else
+        {
+            pEntry->mnVal = nVal;
+        }
     }
 
     if (aType == "num")