[Libreoffice-commits] .: sc/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Jun 8 06:51:10 PDT 2011


 sc/source/filter/html/htmlexp.cxx |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit 81563f97d5fc387102bf3eb96e896bbaec8d3a41
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 8 14:50:25 2011 +0100

    WaE: nWidthPixel is unused, lets drop it

diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 8197ec1..f334538 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -909,7 +909,6 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
     }
 
     const sal_Char* pChar;
-    sal_uInt16 nWidthPixel;
     sal_uInt16 nHeightPixel;
 
     const ScMergeAttr& rMergeAttr = (const ScMergeAttr&) pAttr->GetItem( ATTR_MERGE, pCondItemSet );
@@ -929,10 +928,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
             nC = nC + nCol;
             for ( jC=nCol, v=0; jC<nC; jC++ )
                 v += pDoc->GetColWidth( jC, nTab );
-            nWidthPixel = ToPixel( static_cast< sal_uInt16 >( v ) );
         }
-        else
-            nWidthPixel = ToPixel( pDoc->GetColWidth( nCol, nTab ) );
 
         if ( pGraphEntry )
             nR = Max( SCROW(pGraphEntry->aRange.aEnd.Row() - nRow + 1),
@@ -950,15 +946,8 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
             nHeightPixel = ToPixel( pDoc->GetRowHeight( nRow, nTab ) );
     }
     else
-    {
-        nWidthPixel = ToPixel( pDoc->GetColWidth( nCol, nTab ) );
         nHeightPixel = ToPixel( pDoc->GetRowHeight( nRow, nTab ) );
-    }
 
-#if 0 // No point - this is already defined in ColGroup
-    if ( bTableDataWidth )
-        ((((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_width) += "=\"") += ByteString::CreateFromInt32( nWidthPixel )) += '"';
-#endif
     if ( bTableDataHeight )
         ((((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += "=\"") += ByteString::CreateFromInt32( nHeightPixel )) += '"';
 


More information about the Libreoffice-commits mailing list