summaryrefslogtreecommitdiff
path: root/sc/source/filter/html/htmlexp2.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2011-03-10 16:55:21 -0500
committerKohei Yoshida <kyoshida@novell.com>2011-03-10 20:21:13 -0500
commit12343c15568dcc2c9209d8ca41fda2263122448f (patch)
tree3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/filter/html/htmlexp2.cxx
parent99745dbcbb25b61437914c9782475d0b67a4b0bd (diff)
parentce6308e4fad2281241bf4ca78280eba29f744d43 (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/filter/html/htmlexp2.cxx')
-rw-r--r--sc/source/filter/html/htmlexp2.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index ae072892e7d4..0100c1d9d258 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -65,7 +65,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
SdrPage* pDrawPage = pDrawLayer->GetPage( static_cast<sal_uInt16>(nTab) );
if ( pDrawPage )
{
- bTabHasGraphics = TRUE;
+ bTabHasGraphics = true;
FillGraphList( pDrawPage, nTab, nStartCol, nStartRow, nEndCol, nEndRow );
size_t ListSize = aGraphList.size();
for ( size_t i = 0; i < ListSize; ++i )
@@ -73,7 +73,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
ScHTMLGraphEntry* pE = &aGraphList[ i ];
if ( !pE->bInCell )
{ // nicht alle in Zellen: einige neben Tabelle
- bTabAlignedLeft = TRUE;
+ bTabAlignedLeft = sal_True;
break;
}
}
@@ -85,7 +85,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;
@@ -110,7 +110,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 )
@@ -156,11 +156,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 )
@@ -169,7 +169,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:
@@ -179,7 +179,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
{
String aLinkName;
WriteImage( aLinkName, *pGraphic, aOpt );
- pE->bWritten = TRUE;
+ pE->bWritten = sal_True;
}
}
break;
@@ -189,14 +189,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() )
@@ -206,7 +206,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
{