summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/filter/wmf/emfwr.cxx48
-rw-r--r--vcl/source/filter/wmf/wmfwr.cxx2
-rw-r--r--vcl/source/gdi/cvtsvm.cxx156
-rw-r--r--vcl/source/gdi/impgraph.cxx6
4 files changed, 106 insertions, 106 deletions
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 3a0972cea067..923593a37ffe 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -158,7 +158,7 @@ void EMFWriter::ImplBeginCommentRecord( sal_Int32 nCommentType )
{
ImplBeginRecord( WIN_EMR_GDICOMMENT );
m_rStm.SeekRel( 4 );
- m_rStm.WriteInt32( (sal_Int32) nCommentType );
+ m_rStm.WriteInt32( nCommentType );
}
void EMFWriter::ImplEndCommentRecord()
@@ -225,10 +225,10 @@ void EMFWriter::WriteEMFPlusHeader( const Size &rMtfSizePix, const Size &rMtfSiz
m_rStm.WriteInt16( EmfPlusHeader );
m_rStm.WriteInt16( 0x01 ) // Flags - Dual Mode // TODO: Check this
- .WriteInt32( (sal_Int32) 0x1C ) // Size
- .WriteInt32( (sal_Int32) 0x10 ) // Data Size
- .WriteInt32( (sal_Int32) 0xdbc01002 ) // (lower 12bits) 1-> v1 2-> v1.1 // TODO: Check this
- .WriteInt32( (sal_Int32) 0x01 ) // Video display
+ .WriteInt32( 0x1C ) // Size
+ .WriteInt32( 0x10 ) // Data Size
+ .WriteInt32( 0xdbc01002 ) // (lower 12bits) 1-> v1 2-> v1.1 // TODO: Check this
+ .WriteInt32( 0x01 ) // Video display
.WriteInt32( nDPIX )
.WriteInt32( nDPIY );
ImplEndCommentRecord();
@@ -314,23 +314,23 @@ bool EMFWriter::WriteEMF(const GDIMetaFile& rMtf)
// set 100th mm map mode in EMF
ImplBeginRecord( WIN_EMR_SETMAPMODE );
- m_rStm.WriteInt32( (sal_Int32) MM_ANISOTROPIC );
+ m_rStm.WriteInt32( MM_ANISOTROPIC );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETVIEWPORTEXTEX );
- m_rStm.WriteInt32( (sal_Int32) maVDev.GetDPIX() ).WriteInt32( (sal_Int32) maVDev.GetDPIY() );
+ m_rStm.WriteInt32( maVDev.GetDPIX() ).WriteInt32( maVDev.GetDPIY() );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETWINDOWEXTEX );
- m_rStm.WriteInt32( (sal_Int32) 2540 ).WriteInt32( (sal_Int32) 2540 );
+ m_rStm.WriteInt32( 2540 ).WriteInt32( 2540 );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETVIEWPORTORGEX );
- m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 );
+ m_rStm.WriteInt32( 0 ).WriteInt32( 0 );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETWINDOWORGEX );
- m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 );
+ m_rStm.WriteInt32( 0 ).WriteInt32( 0 );
ImplEndRecord();
ImplWriteRasterOp( ROP_OVERPAINT );
@@ -354,14 +354,14 @@ bool EMFWriter::WriteEMF(const GDIMetaFile& rMtf)
const sal_uLong nEndPos = m_rStm.Tell(); m_rStm.Seek( nHeaderPos );
m_rStm.WriteUInt32( (sal_uInt32) 0x00000001 ).WriteUInt32( (sal_uInt32) 108 ) //use [MS-EMF 2.2.11] HeaderExtension2 Object
- .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) ( aMtfSizePix.Width() - 1 ) ).WriteInt32( (sal_Int32) ( aMtfSizePix.Height() - 1 ) )
- .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() - 1 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() - 1 ) )
+ .WriteInt32( 0 ).WriteInt32( 0 ).WriteInt32( ( aMtfSizePix.Width() - 1 ) ).WriteInt32( ( aMtfSizePix.Height() - 1 ) )
+ .WriteInt32( 0 ).WriteInt32( 0 ).WriteInt32( ( aMtfSizeLog.Width() - 1 ) ).WriteInt32( ( aMtfSizeLog.Height() - 1 ) )
.WriteUInt32( (sal_uInt32) 0x464d4520 ).WriteUInt32( (sal_uInt32) 0x10000 ).WriteUInt32( (sal_uInt32) ( nEndPos - nHeaderPos ) )
.WriteUInt32( (sal_uInt32) mnRecordCount ).WriteUInt16( ( mnHandleCount + 1 ) ).WriteUInt16( 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 )
- .WriteInt32( (sal_Int32) aMtfSizePix.Width() ).WriteInt32( (sal_Int32) aMtfSizePix.Height() )
- .WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() / 100 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() / 100 ) )
+ .WriteInt32( aMtfSizePix.Width() ).WriteInt32( aMtfSizePix.Height() )
+ .WriteInt32( ( aMtfSizeLog.Width() / 100 ) ).WriteInt32( ( aMtfSizeLog.Height() / 100 ) )
.WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 )
- .WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() * 10 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() * 10 ) ); //use [MS-EMF 2.2.11] HeaderExtension2 Object
+ .WriteInt32( ( aMtfSizeLog.Width() * 10 ) ).WriteInt32( ( aMtfSizeLog.Height() * 10 ) ); //use [MS-EMF 2.2.11] HeaderExtension2 Object
m_rStm.Seek( nEndPos );
delete[] mpHandlesUsed;
@@ -512,7 +512,7 @@ void EMFWriter::ImplCheckTextAttr()
m_rStm.WriteUInt32( mnTextHandle );
ImplWriteExtent( -rFont.GetSize().Height() );
ImplWriteExtent( rFont.GetSize().Width() );
- m_rStm.WriteInt32( (sal_Int32) rFont.GetOrientation() ).WriteInt32( (sal_Int32) rFont.GetOrientation() );
+ m_rStm.WriteInt32( rFont.GetOrientation() ).WriteInt32( rFont.GetOrientation() );
switch( rFont.GetWeight() )
{
@@ -638,19 +638,19 @@ void EMFWriter::ImplWriteRasterOp( RasterOp eRop )
void EMFWriter::ImplWriteExtent( long nExtent )
{
nExtent = OutputDevice::LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width();
- m_rStm.WriteInt32( (sal_Int32) nExtent );
+ m_rStm.WriteInt32( nExtent );
}
void EMFWriter::ImplWritePoint( const Point& rPoint )
{
const Point aPoint( OutputDevice::LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode ));
- m_rStm.WriteInt32( (sal_Int32) aPoint.X() ).WriteInt32( (sal_Int32) aPoint.Y() );
+ m_rStm.WriteInt32( aPoint.X() ).WriteInt32( aPoint.Y() );
}
void EMFWriter::ImplWriteSize( const Size& rSize)
{
const Size aSize( OutputDevice::LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode ));
- m_rStm.WriteInt32( (sal_Int32) aSize.Width() ).WriteInt32( (sal_Int32) aSize.Height() );
+ m_rStm.WriteInt32( aSize.Width() ).WriteInt32( aSize.Height() );
}
void EMFWriter::ImplWriteRect( const Rectangle& rRect )
@@ -833,7 +833,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
ImplBeginRecord( WIN_EMR_STRETCHDIBITS );
ImplWriteRect( Rectangle( rPt, rSz ) );
ImplWritePoint( rPt );
- m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) aBmpSizePixel.Width() ).WriteInt32( (sal_Int32) aBmpSizePixel.Height() );
+ m_rStm.WriteInt32( 0 ).WriteInt32( 0 ).WriteInt32( aBmpSizePixel.Width() ).WriteInt32( aBmpSizePixel.Height() );
// write offset positions and sizes later
const sal_uLong nOffPos = m_rStm.Tell();
@@ -911,10 +911,10 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const OUString& rText, c
ImplWriteRect( Rectangle( rPos, Size( nNormWidth, maVDev.GetTextHeight() ) ) );
m_rStm.WriteUInt32( (sal_uInt32)1 );
- m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 );
+ m_rStm.WriteInt32( 0 ).WriteInt32( 0 );
ImplWritePoint( rPos );
m_rStm.WriteUInt32( (sal_uInt32) nLen ).WriteUInt32( (sal_uInt32) 76 ).WriteUInt32( (sal_uInt32) 2 );
- m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 );
+ m_rStm.WriteInt32( 0 ).WriteInt32( 0 ).WriteInt32( 0 ).WriteInt32( 0 );
m_rStm.WriteUInt32( (sal_uInt32) ( 76 + ( nLen << 1 ) + ( (nLen & 1 ) ? 2 : 0 ) ) );
// write text
@@ -1260,7 +1260,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
maVDev.Pop();
ImplBeginRecord( WIN_EMR_RESTOREDC );
- m_rStm.WriteInt32( (sal_Int32) -1 );
+ m_rStm.WriteInt32( -1 );
ImplEndRecord();
break;
}
@@ -1450,7 +1450,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
( (MetaAction*) pAction )->Execute( &maVDev );
ImplBeginRecord( WIN_EMR_RESTOREDC );
- m_rStm.WriteInt32( (sal_Int32) -1 );
+ m_rStm.WriteInt32( -1 );
ImplEndRecord();
ImplWriteRasterOp( maVDev.GetRasterOp() );
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 1fa62da67618..fb0d4b9950a4 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -777,7 +777,7 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize,
// we first write the bitmap at the right position
// and overwrite later the FILEHEADER with the parameters.
nPosAnf=pWMF->Tell(); // remember position, where parameters should be stored
- pWMF->WriteInt32( (sal_Int32)0 ).WriteInt32( (sal_Int32)0 ); // replenish 8 bytes (these 8 bytes +
+ pWMF->WriteInt32( 0 ).WriteInt32( 0 ); // replenish 8 bytes (these 8 bytes +
// 14 bytes superfluous FILEHEADER
// = 22 bytes parameter)
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index f622ddf8a9f1..2b1ae14a0dc5 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -85,8 +85,8 @@ void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly )
nPoints = sal::static_int_cast<sal_uInt16>(nPoints + rPolyPoly[ n ].GetSize());
rOStm.WriteInt16( GDI_POLYPOLYGON_ACTION );
- rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoly << 2 ) + ( nPoints << 3 ) ) );
- rOStm.WriteInt32( (sal_Int32) nPoly );
+ rOStm.WriteInt32( ( 8 + ( nPoly << 2 ) + ( nPoints << 3 ) ) );
+ rOStm.WriteInt32( nPoly );
for( n = 0; n < nPoly; n++ )
{
@@ -97,7 +97,7 @@ void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly )
rPolyPoly[n].AdaptiveSubdivide(aSimplePoly);
const sal_uInt16 nSize(aSimplePoly.GetSize());
- rOStm.WriteInt32( (sal_Int32) nSize );
+ rOStm.WriteInt32( nSize );
for( sal_uInt16 j = 0; j < nSize; j++ )
WritePair( rOStm, aSimplePoly[ j ] );
@@ -146,22 +146,22 @@ void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode )
{
rOStm.WriteInt16( rMapMode.GetMapUnit() );
WritePair( rOStm, rMapMode.GetOrigin() );
- rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetNumerator() );
- rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetDenominator() );
- rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleY().GetNumerator() );
- rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleY().GetDenominator() );
+ rOStm.WriteInt32( rMapMode.GetScaleX().GetNumerator() );
+ rOStm.WriteInt32( rMapMode.GetScaleX().GetDenominator() );
+ rOStm.WriteInt32( rMapMode.GetScaleY().GetNumerator() );
+ rOStm.WriteInt32( rMapMode.GetScaleY().GetDenominator() );
}
void ImplWritePushAction( SvStream& rOStm )
{
rOStm.WriteInt16( GDI_PUSH_ACTION );
- rOStm.WriteInt32( (sal_Int32) 4 );
+ rOStm.WriteInt32( 4 );
}
void ImplWritePopAction( SvStream& rOStm )
{
rOStm.WriteInt16( GDI_POP_ACTION );
- rOStm.WriteInt32( (sal_Int32) 4 );
+ rOStm.WriteInt32( 4 );
}
void ImplWriteLineColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle, sal_Int32 nWidth = 0 )
@@ -170,7 +170,7 @@ void ImplWriteLineColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle,
nStyle = 0;
rOStm.WriteInt16( GDI_PEN_ACTION );
- rOStm.WriteInt32( (sal_Int32) 16 );
+ rOStm.WriteInt32( 16 );
ImplWriteColor( rOStm, rColor );
rOStm.WriteInt32( nWidth );
rOStm.WriteInt16( nStyle );
@@ -179,7 +179,7 @@ void ImplWriteLineColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle,
void ImplWriteFillColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle )
{
rOStm.WriteInt16( GDI_FILLBRUSH_ACTION );
- rOStm.WriteInt32( (sal_Int32) 20 );
+ rOStm.WriteInt32( 20 );
ImplWriteColor( rOStm, rColor );
if( rColor.GetTransparency() > 127 )
@@ -235,7 +235,7 @@ void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont,
}
rOStm.WriteInt16( GDI_FONT_ACTION );
- rOStm.WriteInt32( (sal_Int32) 78 );
+ rOStm.WriteInt32( 78 );
rActualCharSet = GetStoreCharSet( rFont.GetCharSet() );
ImplWriteColor( rOStm, rFont.GetColor() );
@@ -261,7 +261,7 @@ void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont,
void ImplWriteRasterOpAction( SvStream& rOStm, sal_Int16 nRasterOp )
{
- rOStm.WriteInt16( GDI_RASTEROP_ACTION ).WriteInt32( (sal_Int32) 6 ).WriteInt16( nRasterOp );
+ rOStm.WriteInt16( GDI_RASTEROP_ACTION ).WriteInt32( 6 ).WriteInt16( nRasterOp );
}
bool ImplWriteUnicodeComment( SvStream& rOStm, const OUString& rString )
@@ -1361,8 +1361,8 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf )
rOStm.WriteCharPtr( "SVGDI" ); // Identifier
rOStm.WriteInt16( 42 ); // HeaderSize
rOStm.WriteInt16( 200 ); // VERSION
- rOStm.WriteInt32( (sal_Int32) aPrefSize.Width() );
- rOStm.WriteInt32( (sal_Int32) aPrefSize.Height() );
+ rOStm.WriteInt32( aPrefSize.Width() );
+ rOStm.WriteInt32( aPrefSize.Height() );
ImplWriteMapMode( rOStm, rMtf.GetPrefMapMode() );
// ActionCount will be written later
@@ -1402,7 +1402,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaPixelAction* pAct = (MetaPixelAction*) pAction;
rOStm.WriteInt16( GDI_PIXEL_ACTION );
- rOStm.WriteInt32( (sal_Int32) 18 );
+ rOStm.WriteInt32( 18 );
WritePair( rOStm, pAct->GetPoint() );
ImplWriteColor( rOStm, pAct->GetColor() );
nCount++;
@@ -1414,7 +1414,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaPointAction* pAct = (MetaPointAction*) pAction;
rOStm.WriteInt16( GDI_POINT_ACTION );
- rOStm.WriteInt32( (sal_Int32) 12 );
+ rOStm.WriteInt32( 12 );
WritePair( rOStm, pAct->GetPoint() );
nCount++;
}
@@ -1437,14 +1437,14 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
if(bLineJoin)
{
rOStm.WriteInt16( GDI_LINEJOIN_ACTION );
- rOStm.WriteInt32( (sal_Int32) 6 );
+ rOStm.WriteInt32( 6 );
rOStm.WriteInt16( rInfo.GetLineJoin() );
}
if(bLineCap)
{
rOStm.WriteInt16( GDI_LINECAP_ACTION );
- rOStm.WriteInt32( (sal_Int32) 6 );
+ rOStm.WriteInt32( 6 );
rOStm.WriteInt16( rInfo.GetLineCap() );
}
}
@@ -1452,16 +1452,16 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
if(bLineDashDot)
{
rOStm.WriteInt16( GDI_LINEDASHDOT_ACTION );
- rOStm.WriteInt32( (sal_Int32) 4 + 16 );
+ rOStm.WriteInt32( 4 + 16 );
rOStm.WriteInt16( rInfo.GetDashCount() );
- rOStm.WriteInt32( (sal_Int32)rInfo.GetDashLen() );
+ rOStm.WriteInt32( rInfo.GetDashLen() );
rOStm.WriteInt16( rInfo.GetDotCount() );
- rOStm.WriteInt32( (sal_Int32)rInfo.GetDotLen() );
- rOStm.WriteInt32( (sal_Int32)rInfo.GetDistance() );
+ rOStm.WriteInt32( rInfo.GetDotLen() );
+ rOStm.WriteInt32( rInfo.GetDistance() );
}
rOStm.WriteInt16( GDI_LINE_ACTION );
- rOStm.WriteInt32( (sal_Int32) 20 );
+ rOStm.WriteInt32( 20 );
WritePair( rOStm, pAct->GetStartPoint() );
WritePair( rOStm, pAct->GetEndPoint() );
nCount++;
@@ -1494,10 +1494,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaRectAction* pAct = (MetaRectAction*) pAction;
rOStm.WriteInt16( GDI_RECT_ACTION );
- rOStm.WriteInt32( (sal_Int32) 28 );
+ rOStm.WriteInt32( 28 );
ImplWriteRect( rOStm, pAct->GetRect() );
- rOStm.WriteInt32( (sal_Int32) 0 );
- rOStm.WriteInt32( (sal_Int32) 0 );
+ rOStm.WriteInt32( 0 );
+ rOStm.WriteInt32( 0 );
nCount++;
}
break;
@@ -1507,10 +1507,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaRoundRectAction* pAct = (MetaRoundRectAction*) pAction;
rOStm.WriteInt16( GDI_RECT_ACTION );
- rOStm.WriteInt32( (sal_Int32) 28 );
+ rOStm.WriteInt32( 28 );
ImplWriteRect( rOStm, pAct->GetRect() );
- rOStm.WriteInt32( (sal_Int32) pAct->GetHorzRound() );
- rOStm.WriteInt32( (sal_Int32) pAct->GetVertRound() );
+ rOStm.WriteInt32( pAct->GetHorzRound() );
+ rOStm.WriteInt32( pAct->GetVertRound() );
nCount++;
}
break;
@@ -1520,7 +1520,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaEllipseAction* pAct = (MetaEllipseAction*) pAction;
rOStm.WriteInt16( GDI_ELLIPSE_ACTION );
- rOStm.WriteInt32( (sal_Int32) 20 );
+ rOStm.WriteInt32( 20 );
ImplWriteRect( rOStm, pAct->GetRect() );
nCount++;
}
@@ -1531,7 +1531,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaArcAction* pAct = (MetaArcAction*) pAction;
rOStm.WriteInt16( GDI_ARC_ACTION );
- rOStm.WriteInt32( (sal_Int32) 36 );
+ rOStm.WriteInt32( 36 );
ImplWriteRect( rOStm, pAct->GetRect() );
WritePair( rOStm, pAct->GetStartPoint() );
WritePair( rOStm, pAct->GetEndPoint() );
@@ -1544,7 +1544,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaPieAction* pAct = (MetaPieAction*) pAction;
rOStm.WriteInt16( GDI_PIE_ACTION );
- rOStm.WriteInt32( (sal_Int32) 36 );
+ rOStm.WriteInt32( 36 );
ImplWriteRect( rOStm, pAct->GetRect() );
WritePair( rOStm, pAct->GetStartPoint() );
WritePair( rOStm, pAct->GetEndPoint() );
@@ -1560,8 +1560,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
const sal_uInt16 nPoints = aChordPoly.GetSize();
rOStm.WriteInt16( GDI_POLYGON_ACTION );
- rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) );
- rOStm.WriteInt32( (sal_Int32) nPoints );
+ rOStm.WriteInt32( ( 8 + ( nPoints << 3 ) ) );
+ rOStm.WriteInt32( nPoints );
for( sal_uInt16 n = 0; n < nPoints; n++ )
WritePair( rOStm, aChordPoly[ n ] );
@@ -1593,14 +1593,14 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
if(bLineJoin)
{
rOStm.WriteInt16( GDI_LINEJOIN_ACTION );
- rOStm.WriteInt32( (sal_Int32) 6 );
+ rOStm.WriteInt32( 6 );
rOStm.WriteInt16( rInfo.GetLineJoin() );
}
if(bLineCap)
{
rOStm.WriteInt16( GDI_LINECAP_ACTION );
- rOStm.WriteInt32( (sal_Int32) 6 );
+ rOStm.WriteInt32( 6 );
rOStm.WriteInt16( rInfo.GetLineCap() );
}
}
@@ -1608,17 +1608,17 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
if(bLineDashDot)
{
rOStm.WriteInt16( GDI_LINEDASHDOT_ACTION );
- rOStm.WriteInt32( (sal_Int32) 4 + 16 );
+ rOStm.WriteInt32( 4 + 16 );
rOStm.WriteInt16( rInfo.GetDashCount() );
- rOStm.WriteInt32( (sal_Int32)rInfo.GetDashLen() );
+ rOStm.WriteInt32( rInfo.GetDashLen() );
rOStm.WriteInt16( rInfo.GetDotCount() );
- rOStm.WriteInt32( (sal_Int32)rInfo.GetDotLen() );
- rOStm.WriteInt32( (sal_Int32)rInfo.GetDistance() );
+ rOStm.WriteInt32( rInfo.GetDotLen() );
+ rOStm.WriteInt32( rInfo.GetDistance() );
}
rOStm.WriteInt16( GDI_POLYLINE_ACTION );
- rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) );
- rOStm.WriteInt32( (sal_Int32) nPoints );
+ rOStm.WriteInt32( ( 8 + ( nPoints << 3 ) ) );
+ rOStm.WriteInt32( nPoints );
for( sal_uInt16 n = 0; n < nPoints; n++ )
{
@@ -1667,8 +1667,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
const sal_uInt16 nPoints(aSimplePoly.GetSize());
rOStm.WriteInt16( GDI_POLYGON_ACTION );
- rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) );
- rOStm.WriteInt32( (sal_Int32) nPoints );
+ rOStm.WriteInt32( ( 8 + ( nPoints << 3 ) ) );
+ rOStm.WriteInt32( nPoints );
for( sal_uInt16 n = 0; n < nPoints; n++ )
WritePair( rOStm, aSimplePoly[ n ] );
@@ -1779,7 +1779,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
rOStm.WriteInt32( pAct->GetIndex() );
rOStm.WriteInt32( pAct->GetLen() );
rOStm.WriteInt32( nStrLen );
- rOStm.WriteInt32( (sal_Int32) pAct->GetWidth() );
+ rOStm.WriteInt32( pAct->GetWidth() );
rOStm.Write( aText.getStr(), nStrLen + 1 );
nCount++;
}
@@ -1790,7 +1790,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaBmpAction* pAct = (MetaBmpAction*) pAction;
rOStm.WriteInt16( GDI_BITMAP_ACTION );
- rOStm.WriteInt32( (sal_Int32) 12 );
+ rOStm.WriteInt32( 12 );
WritePair( rOStm, pAct->GetPoint() );
WriteDIB(pAct->GetBitmap(), rOStm, false, true);
nCount++;
@@ -1802,7 +1802,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction;
rOStm.WriteInt16( GDI_BITMAPSCALE_ACTION );
- rOStm.WriteInt32( (sal_Int32) 20 );
+ rOStm.WriteInt32( 20 );
WritePair( rOStm, pAct->GetPoint() );
WritePair( rOStm, pAct->GetSize() );
WriteDIB(pAct->GetBitmap(), rOStm, false, true);
@@ -1815,7 +1815,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction;
rOStm.WriteInt16( GDI_BITMAPSCALEPART_ACTION );
- rOStm.WriteInt32( (sal_Int32) 36 );
+ rOStm.WriteInt32( 36 );
WritePair( rOStm, pAct->GetDestPoint() );
WritePair( rOStm, pAct->GetDestSize() );
WritePair( rOStm, pAct->GetSrcPoint() );
@@ -1831,7 +1831,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
rOStm.WriteInt16( GDI_BITMAP_ACTION );
- rOStm.WriteInt32( (sal_Int32) 12 );
+ rOStm.WriteInt32( 12 );
WritePair( rOStm, pAct->GetPoint() );
WriteDIB(aBmp, rOStm, false, true);
nCount++;
@@ -1844,7 +1844,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
rOStm.WriteInt16( GDI_BITMAPSCALE_ACTION );
- rOStm.WriteInt32( (sal_Int32) 20 );
+ rOStm.WriteInt32( 20 );
WritePair( rOStm, pAct->GetPoint() );
WritePair( rOStm, pAct->GetSize() );
WriteDIB(aBmp, rOStm, false, true);
@@ -1858,7 +1858,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
rOStm.WriteInt16( GDI_BITMAPSCALEPART_ACTION );
- rOStm.WriteInt32( (sal_Int32) 36 );
+ rOStm.WriteInt32( 36 );
WritePair( rOStm, pAct->GetDestPoint() );
WritePair( rOStm, pAct->GetDestSize() );
WritePair( rOStm, pAct->GetSrcPoint() );
@@ -1874,7 +1874,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
const Gradient& rGrad = pAct->GetGradient();
rOStm.WriteInt16( GDI_GRADIENT_ACTION );
- rOStm.WriteInt32( (sal_Int32) 46 );
+ rOStm.WriteInt32( 46 );
ImplWriteRect( rOStm, pAct->GetRect() );
rOStm.WriteInt16( rGrad.GetStyle() );
ImplWriteColor( rOStm, rGrad.GetStartColor() );
@@ -1904,12 +1904,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// write data
WritePolyPolygon( rOStm, pA->GetPolyPolygon() );
WriteGradient( rOStm, pA->GetGradient() );
- rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
+ rOStm.WriteInt32( 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
+ rOStm.WriteInt32( ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
@@ -1926,10 +1926,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
ImplWriteFillColor( rOStm, rColor, 1 );
rOStm.WriteInt16( GDI_RECT_ACTION );
- rOStm.WriteInt32( (sal_Int32) 28 );
+ rOStm.WriteInt32( 28 );
ImplWriteRect( rOStm, pAct->GetRect() );
- rOStm.WriteInt32( (sal_Int32) 0 );
- rOStm.WriteInt32( (sal_Int32) 0 );
+ rOStm.WriteInt32( 0 );
+ rOStm.WriteInt32( 0 );
ImplWritePopAction( rOStm );
nCount += 5;
@@ -1943,7 +1943,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
Rectangle aClipRect;
rOStm.WriteInt16( GDI_CLIPREGION_ACTION );
- rOStm.WriteInt32( (sal_Int32) 24 );
+ rOStm.WriteInt32( 24 );
if( pAct->IsClipping() )
{
@@ -1968,7 +1968,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction;
rOStm.WriteInt16( GDI_ISECTCLIPREGION_ACTION );
- rOStm.WriteInt32( (sal_Int32) 20 );
+ rOStm.WriteInt32( 20 );
WriteRectangle( rOStm, pAct->GetRect() );
nCount++;
}
@@ -1979,9 +1979,9 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaMoveClipRegionAction* pAct = (MetaMoveClipRegionAction*) pAction;
rOStm.WriteInt16( GDI_MOVECLIPREGION_ACTION );
- rOStm.WriteInt32( (sal_Int32) 12 );
- rOStm.WriteInt32( (sal_Int32) pAct->GetHorzMove() );
- rOStm.WriteInt32( (sal_Int32) pAct->GetVertMove() );
+ rOStm.WriteInt32( 12 );
+ rOStm.WriteInt32( pAct->GetHorzMove() );
+ rOStm.WriteInt32( pAct->GetVertMove() );
nCount++;
}
break;
@@ -2053,7 +2053,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaMapModeAction* pAct = (MetaMapModeAction*) pAction;
rOStm.WriteInt16( GDI_MAPMODE_ACTION );
- rOStm.WriteInt32( (sal_Int32) 30 );
+ rOStm.WriteInt32( 30 );
ImplWriteMapMode( rOStm, pAct->GetMapMode() );
nCount++;
}
@@ -2160,12 +2160,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// write comment data
WritePolyPolygon( rOStm, rPolyPoly );
rOStm.WriteInt16( nTrans );
- rOStm.WriteInt32( (sal_Int32) 15 ); // number of actions that follow this comment
+ rOStm.WriteInt32( 15 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
+ rOStm.WriteInt32( ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
{
@@ -2227,7 +2227,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos + 4 ) );
+ rOStm.WriteInt32( ( nNewPos - nOldPos + 4 ) );
rOStm.Seek( ( nOldPos = nNewPos ) + 4 );
{
@@ -2254,7 +2254,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
nAddCount = ImplWriteActions( rOStm, aMtf, rSaveVDev, rRop_0_1, rLineCol, rLineColStack, rActualCharSet );
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) nAddCount );
+ rOStm.WriteInt32( nAddCount );
rOStm.Seek( nNewPos );
nCount += nAddCount;
@@ -2285,7 +2285,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos + 4 ) );
+ rOStm.WriteInt32( ( nNewPos - nOldPos + 4 ) );
rOStm.Seek( ( nOldPos = nNewPos ) + 4 );
{
@@ -2297,7 +2297,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
nAddCount = ImplWriteActions( rOStm, aTmpMtf, rSaveVDev, rRop_0_1, rLineCol, rLineColStack, rActualCharSet );
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) nAddCount );
+ rOStm.WriteInt32( nAddCount );
rOStm.Seek( nNewPos );
nCount += nAddCount;
@@ -2324,12 +2324,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// write data
WritePair( rOStm, rRefPoint );
rOStm.WriteUChar( bSet );
- rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
+ rOStm.WriteInt32( 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
+ rOStm.WriteInt32( ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
@@ -2353,12 +2353,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// write data
WriteColor( rOStm, rColor );
rOStm.WriteUChar( bSet );
- rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
+ rOStm.WriteInt32( 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
+ rOStm.WriteInt32( ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
@@ -2384,12 +2384,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// write data
WritePair( rOStm, rStartPt );
rOStm.WriteInt32( nWidth ).WriteUInt32( eStrikeout ).WriteUInt32( eUnderline );
- rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
+ rOStm.WriteInt32( 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
+ rOStm.WriteInt32( ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
@@ -2419,12 +2419,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
if( nDataSize )
rOStm.Write( pA->GetData(), nDataSize );
- rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
+ rOStm.WriteInt32( 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
+ rOStm.WriteInt32( ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index bdae727e9ec2..711229b92272 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1228,7 +1228,7 @@ bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
// data size is updated later
nDataFieldPos = rOStm.Tell();
- rOStm.WriteInt32( (sal_Int32) 0 );
+ rOStm.WriteInt32( 0 );
WritePair( rOStm, aSize );
WriteMapMode( rOStm, aMapMode );
@@ -1238,11 +1238,11 @@ bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
else
{
// write old style (<=4.0) header
- rOStm.WriteInt32( (sal_Int32) meType );
+ rOStm.WriteInt32( meType );
// data size is updated later
nDataFieldPos = rOStm.Tell();
- rOStm.WriteInt32( (sal_Int32) 0 );
+ rOStm.WriteInt32( 0 );
rOStm.WriteInt32( aSize.Width() );
rOStm.WriteInt32( aSize.Height() );
rOStm.WriteInt32( aMapMode.GetMapUnit() );
generated by cgit (git 2.34.1) at 2025-02-03 22:06:54 +0000