diff options
Diffstat (limited to 'sc/source/filter/html/htmlexp2.cxx')
| -rw-r--r-- | sc/source/filter/html/htmlexp2.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 341f9afbc739..a1c7aa6a8dc8 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -64,7 +64,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, SdrPage* pDrawPage = pDrawLayer->GetPage( static_cast<sal_uInt16>(nTab) ); if ( pDrawPage ) { - bTabHasGraphics = TRUE; + bTabHasGraphics = sal_True; FillGraphList( pDrawPage, nTab, nStartCol, nStartRow, nEndCol, nEndRow ); for ( ScHTMLGraphEntry* pE = aGraphList.First(); pE; @@ -72,7 +72,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, { if ( !pE->bInCell ) { // nicht alle in Zellen: einige neben Tabelle - bTabAlignedLeft = TRUE; + bTabAlignedLeft = sal_True; break; } } @@ -84,7 +84,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { - ULONG nObjCount = pPage->GetObjCount(); + sal_uLong nObjCount = pPage->GetObjCount(); if ( nObjCount ) { Rectangle aRect; @@ -109,7 +109,7 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, SCCOL nCol2 = aR.aEnd.Col(); SCROW nRow2 = aR.aEnd.Row(); // All cells empty under object? - BOOL bInCell = (pDoc->GetEmptyLinesInBlock( + sal_Bool bInCell = (pDoc->GetEmptyLinesInBlock( nCol1, nRow1, nTab, nCol2, nRow2, nTab, DIR_TOP ) == static_cast< SCSIZE >( nRow2 - nRow1 )); // rows-1 ! if ( bInCell ) @@ -155,11 +155,11 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) { const SdrGrafObj* pSGO = (SdrGrafObj*)pObject; const SdrGrafObjGeoData* pGeo = (SdrGrafObjGeoData*)pSGO->GetGeoData(); - USHORT nMirrorCase = (pGeo->aGeo.nDrehWink == 18000 ? + sal_uInt16 nMirrorCase = (pGeo->aGeo.nDrehWink == 18000 ? ( pGeo->bMirrored ? 3 : 4 ) : ( pGeo->bMirrored ? 2 : 1 )); - BOOL bHMirr = ( ( nMirrorCase == 2 ) || ( nMirrorCase == 4 ) ); - BOOL bVMirr = ( ( nMirrorCase == 3 ) || ( nMirrorCase == 4 ) ); - ULONG nXOutFlags = 0; + sal_Bool bHMirr = ( ( nMirrorCase == 2 ) || ( nMirrorCase == 4 ) ); + sal_Bool bVMirr = ( ( nMirrorCase == 3 ) || ( nMirrorCase == 4 ) ); + sal_uLong nXOutFlags = 0; if ( bHMirr ) nXOutFlags |= XOUTBMP_MIRROR_HORZ; if ( bVMirr ) @@ -168,7 +168,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) if ( pSGO->IsLinkedGraphic() ) aLinkName = pSGO->GetFileName(); WriteImage( aLinkName, pSGO->GetGraphic(), aOpt, nXOutFlags ); - pE->bWritten = TRUE; + pE->bWritten = sal_True; } break; case OBJ_OLE2: @@ -178,7 +178,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) { String aLinkName; WriteImage( aLinkName, *pGraphic, aOpt ); - pE->bWritten = TRUE; + pE->bWritten = sal_True; } } break; @@ -188,14 +188,14 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) pDoc->GetDrawLayer(), pObject ) ); String aLinkName; WriteImage( aLinkName, aGraph, aOpt ); - pE->bWritten = TRUE; + pE->bWritten = sal_True; } } } void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf, - const ByteString& rImgOptions, ULONG nXOutFlags ) + const ByteString& rImgOptions, sal_uLong nXOutFlags ) { // embeddete Grafik -> via WriteGraphic schreiben if( !rLinkName.Len() ) @@ -205,7 +205,7 @@ void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf, // Grafik als (JPG-)File speichern String aGrfNm( aStreamPath ); nXOutFlags |= XOUTBMP_USE_NATIVE_IF_POSSIBLE; - USHORT nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm, + sal_uInt16 nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm, CREATE_STRING( "JPG" ), nXOutFlags ); if( !nErr ) // sonst fehlerhaft, da ist nichts auszugeben { |