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

[Thomas Arnhold]

 sc/source/filter/html/htmlexp.cxx |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

New commits:
commit 6349540d939e3bc3a96cec2615352a4b056b7fa5
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Oct 7 12:02:33 2013 +0200

    really fix it
    
    arg. sorry...
    
    Change-Id: I57836c574f4f622296c38d7a0adb6adcbb768aa2

diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 0c93bcc..6217cd5 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1039,6 +1039,27 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
         aStrTD.append(lcl_makeHTMLColorTriplet(aBgColor));
     }
 
+    double fVal = 0.0;
+    if ( bValueData )
+    {
+        switch (aCell.meType)
+        {
+            case CELLTYPE_VALUE:
+                fVal = aCell.mfValue;
+                if ( bCalcAsShown && fVal != 0.0 )
+                    fVal = pDoc->RoundValueAsShown( fVal, nFormat );
+                break;
+            case CELLTYPE_FORMULA:
+                fVal = aCell.mpFormula->GetValue();
+                break;
+            default:
+                OSL_FAIL( "value data with unsupported cell type" );
+        }
+    }
+
+    aStrTD.append(HTMLOutFuncs::CreateTableDataOptionsValNum(bValueData, fVal,
+        nFormat, *pFormatter, eDestEnc, &aNonConvertibleChars));
+
     TAG_ON(aStrTD.makeStringAndClear().getStr());
 
     if ( bBold )        TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );