diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-31 11:14:16 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-31 21:25:05 +0000 |
| commit | 0e2e312ced3503bba1bb69dbc9ec96d170791e14 (patch) | |
| tree | 080fd266c521dd6fd0f85317e64ae7cc615791ab /sc/source/filter/html | |
| parent | 530ad1ddcdbc08c4ee1ef6125083895794a98e52 (diff) | |
WaE: various new gcc 4.6.0 warnings
Diffstat (limited to 'sc/source/filter/html')
| -rw-r--r-- | sc/source/filter/html/htmlpars.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 3085aee80366..bdb3e60dd63d 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1131,9 +1131,9 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) ULONG nRowKey = nRow + j; SCROW nR = (SCROW)(ULONG)pTab1->Get( nRowKey ); if ( !nR ) - pTab1->Insert( nRowKey, (void*) nRowsPerRow1 ); + pTab1->Insert( nRowKey, (void*)(sal_IntPtr)nRowsPerRow1 ); else if ( nRowsPerRow1 > nR ) - pTab1->Replace( nRowKey, (void*) nRowsPerRow1 ); + pTab1->Replace( nRowKey, (void*)(sal_IntPtr)nRowsPerRow1 ); //2do: wie geht das noch besser? else if ( nRowsPerRow1 < nR && nRowSpan == 1 && nTable == nMaxTable ) @@ -1145,8 +1145,8 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) SCROW nR2 = (SCROW)(ULONG)pTab1->Get( nRowKey+1 ); if ( nR2 > nAdd ) { // nur wenn wirklich Platz - pTab1->Replace( nRowKey, (void*) nR ); - pTab1->Replace( nRowKey+1, (void*) (nR2 - nAdd) ); + pTab1->Replace( nRowKey, (void*)(sal_IntPtr)nR ); + pTab1->Replace( nRowKey+1, (void*)(sal_IntPtr)(nR2 - nAdd) ); nRowsPerRow2 = nR / nRows; } } @@ -1165,9 +1165,9 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) ULONG nRowKey = nRow + j; SCROW nR = (SCROW)(ULONG)pTab2->Get( nRowKey ); if ( !nR ) - pTab2->Insert( nRowKey, (void*) nRowsPerRow2 ); + pTab2->Insert( nRowKey, (void*)(sal_IntPtr)nRowsPerRow2 ); else if ( nRowsPerRow2 > nR ) - pTab2->Replace( nRowKey, (void*) nRowsPerRow2 ); + pTab2->Replace( nRowKey, (void*)(sal_IntPtr)nRowsPerRow2 ); } } } |