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

Thomas Arnhold thomas at arnhold.org
Mon Oct 7 03:01:13 PDT 2013


 sc/source/filter/html/htmlexp.cxx |   23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 618ade76fddc3feae37970a0ac9e366244cc3216
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Oct 7 12:00:03 2013 +0200

    fix build
    
    Change-Id: I105e9ab5177f99b9f3a6f49308e06f690e46bf0b

diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 4794cff..0c93bcc 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -732,7 +732,7 @@ void ScHTMLExport::WriteTables()
 
         // --- <COLGROUP> ----
         {
-            nCol = nStartCol;
+            SCCOL nCol = nStartCol;
             sal_Int32 nWidth = 0;
             sal_Int32 nSpan = 0;
             while( nCol <= nEndCol )
@@ -1039,27 +1039,6 @@ 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 );


More information about the Libreoffice-commits mailing list