diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-25 20:16:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-26 15:27:17 +0200 |
| commit | 04fd62096fca2c0b917ac6172104399e65933585 (patch) | |
| tree | 3e1d4e9c8b9aed6b308103c5e235f71ec3b2cce1 | |
| parent | 5501c8d2220ee3cab703d09d348e99ba3e017dba (diff) | |
remove unnecessary casts in calls to SvStream.WriteInt32
left over from our conversion of the SvStream output operators
to more specific methods
Change-Id: I0c0172519479be0535a447e41a592fbf782751bd
23 files changed, 205 insertions, 205 deletions
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index fb0d12eccc1c..95694c09ae0b 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -86,7 +86,7 @@ bool SbiGood( SvStream& r ) sal_uIntPtr SbiOpenRecord( SvStream& r, sal_uInt16 nSignature, sal_uInt16 nElem ) { sal_Size nPos = r.Tell(); - r.WriteUInt16( nSignature ).WriteInt32( (sal_Int32) 0 ).WriteUInt16( nElem ); + r.WriteUInt16( nSignature ).WriteInt32( 0 ).WriteUInt16( nElem ); return nPos; } @@ -95,7 +95,7 @@ void SbiCloseRecord( SvStream& r, sal_Size nOff ) { sal_Size nPos = r.Tell(); r.Seek( nOff + 2 ); - r.WriteInt32( (sal_Int32) ( nPos - nOff - 8 ) ); + r.WriteInt32( ( nPos - nOff - 8 ) ); r.Seek( nPos ); } @@ -259,18 +259,18 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) eCharSet = GetSOStoreTextEncoding( eCharSet ); if ( bLegacy ) { - r.WriteInt32( (sal_Int32) B_LEGACYVERSION ); + r.WriteInt32( B_LEGACYVERSION ); } else { - r.WriteInt32( (sal_Int32) B_CURVERSION ); + r.WriteInt32( B_CURVERSION ); } - r .WriteInt32( (sal_Int32) eCharSet ) - .WriteInt32( (sal_Int32) nDimBase ) + r .WriteInt32( eCharSet ) + .WriteInt32( nDimBase ) .WriteInt16( nFlags ) .WriteInt16( 0 ) - .WriteInt32( (sal_Int32) 0 ) - .WriteInt32( (sal_Int32) 0 ); + .WriteInt32( 0 ) + .WriteInt32( 0 ); // Name? if( !aName.isEmpty() && SbiGood( r ) ) diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 36602241f006..1fe032f1a278 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1627,7 +1627,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxINT: { sal_uInt8 n = SAL_TYPES_SIZEOFINT; - r.WriteUChar( n ).WriteInt32( (sal_Int32)aData.nInt ); + r.WriteUChar( n ).WriteInt32( aData.nInt ); break; } case SbxUINT: diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 2b30c3d3f776..3f7d2e103c3f 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -104,7 +104,7 @@ namespace dbaui OFieldDescription* pFieldDesc = _rRow.GetActFieldDescr(); if(pFieldDesc) { - _rStr.WriteInt32( (sal_Int32)1 ); + _rStr.WriteInt32( 1 ); _rStr.WriteUniOrByteString(pFieldDesc->GetName(), _rStr.GetStreamCharSet()); _rStr.WriteUniOrByteString(pFieldDesc->GetDescription(), _rStr.GetStreamCharSet()); _rStr.WriteUniOrByteString(pFieldDesc->GetHelpText(), _rStr.GetStreamCharSet()); @@ -127,13 +127,13 @@ namespace dbaui _rStr.WriteInt32( pFieldDesc->GetScale() ); _rStr.WriteInt32( pFieldDesc->GetIsNullable() ); _rStr.WriteInt32( pFieldDesc->GetFormatKey() ); - _rStr.WriteInt32( (sal_Int32)pFieldDesc->GetHorJustify() ); + _rStr.WriteInt32( pFieldDesc->GetHorJustify() ); _rStr.WriteInt32( pFieldDesc->IsAutoIncrement() ? 1 : 0 ); _rStr.WriteInt32( pFieldDesc->IsPrimaryKey() ? 1 : 0 ); _rStr.WriteInt32( pFieldDesc->IsCurrency() ? 1 : 0 ); } else - _rStr.WriteInt32( (sal_Int32)0 ); + _rStr.WriteInt32( 0 ); return _rStr; } SvStream& ReadOTableRow( SvStream& _rStr, OTableRow& _rRow ) diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index e2acae64a14f..37e68dd35e6e 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -37,7 +37,7 @@ namespace dbaui ::std::vector< ::boost::shared_ptr<OTableRow> >* pRows = reinterpret_cast< ::std::vector< ::boost::shared_ptr<OTableRow> >* >(pUserObject); if(pRows) { - (*rxOStm).WriteInt32( (sal_Int32)pRows->size() ); // first stream the size + (*rxOStm).WriteInt32( pRows->size() ); // first stream the size ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end(); for(;aIter != aEnd;++aIter) diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 40104114550e..d93246141aff 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -358,8 +358,8 @@ void METWriter::WritePoint(Point aPt) { Point aNewPt = OutputDevice::LogicToLogic( aPt, aPictureMapMode, aTargetMapMode ); - pMET->WriteInt32( (sal_Int32) ( aNewPt.X() - aPictureRect.Left() ) ) - .WriteInt32( (sal_Int32) ( aPictureRect.Bottom() - aNewPt.Y() ) ); + pMET->WriteInt32( ( aNewPt.X() - aPictureRect.Left() ) ) + .WriteInt32( ( aPictureRect.Bottom() - aNewPt.Y() ) ); } @@ -1353,7 +1353,7 @@ void METWriter::METFullArc(Point aCenter, double fMultiplier) WillWriteOrder(14); pMET->WriteUChar( 0xc7 ).WriteUChar( 12 ); WritePoint(aCenter); - pMET->WriteInt32( (sal_Int32)(fMultiplier*65536.0+0.5) ); + pMET->WriteInt32( (fMultiplier*65536.0+0.5) ); } @@ -1369,9 +1369,9 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier, WillWriteOrder(22); pMET->WriteUChar( 0xa3 ).WriteUChar( 20 ); WritePoint(aCenter); - pMET->WriteInt32( (sal_Int32)(fMultiplier*65536.0+0.5) ); - pMET->WriteInt32( (sal_Int32)(fStartAngle*65536.0+0.5) ); - pMET->WriteInt32( (sal_Int32)(fSweepAngle*65536.0+0.5) ); + pMET->WriteInt32( (fMultiplier*65536.0+0.5) ); + pMET->WriteInt32( (fStartAngle*65536.0+0.5) ); + pMET->WriteInt32( (fSweepAngle*65536.0+0.5) ); } @@ -1450,7 +1450,7 @@ void METWriter::METSetChrCellSize(Size aSize) aMETChrCellSize=aSize; WillWriteOrder(10); if (aSize.Width()==0) aSize.Width()=aSize.Height(); - pMET->WriteUChar( 0x33 ).WriteUChar( 8 ).WriteInt32( (sal_Int32)aSize.Width() ).WriteInt32( (sal_Int32)aSize.Height() ); + pMET->WriteUChar( 0x33 ).WriteUChar( 8 ).WriteInt32( aSize.Width() ).WriteInt32( aSize.Height() ); } diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index f4a297dd3cfa..522e9b669775 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4549,8 +4549,8 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin nHeight = aPrefSize.Height() * 360; } rPicOutStrm.WriteUInt32( nUncompressedSize ) // WMFSize without FileHeader - .WriteInt32( (sal_Int32)0 ) // since we can't find out anymore what the original size of - .WriteInt32( (sal_Int32)0 ) // the WMF (without Fileheader) was we write 10cm / x + .WriteInt32( 0 ) // since we can't find out anymore what the original size of + .WriteInt32( 0 ) // the WMF (without Fileheader) was we write 10cm / x .WriteUInt32( nPrefWidth ) .WriteUInt32( nPrefHeight ) .WriteUInt32( nWidth ) @@ -5359,10 +5359,10 @@ void EscherEx::AddAtom( sal_uInt32 nAtomSize, sal_uInt16 nRecType, int nRecVersi void EscherEx::AddChildAnchor( const Rectangle& rRect ) { AddAtom( 16, ESCHER_ChildAnchor ); - mpOutStrm ->WriteInt32( (sal_Int32)rRect.Left() ) - .WriteInt32( (sal_Int32)rRect.Top() ) - .WriteInt32( (sal_Int32)rRect.Right() ) - .WriteInt32( (sal_Int32)rRect.Bottom() ); + mpOutStrm ->WriteInt32( rRect.Left() ) + .WriteInt32( rRect.Top() ) + .WriteInt32( rRect.Right() ) + .WriteInt32( rRect.Bottom() ); } void EscherEx::AddClientAnchor( const Rectangle& rRect ) @@ -5390,10 +5390,10 @@ sal_uInt32 EscherEx::EnterGroup( const OUString& rShapeName, const Rectangle* pB AddAtom( 16, ESCHER_Spgr, 1 ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); - mpOutStrm ->WriteInt32( (sal_Int32)aRect.Left() ) // Bounding box for the grouped shapes to which they will be attached - .WriteInt32( (sal_Int32)aRect.Top() ) - .WriteInt32( (sal_Int32)aRect.Right() ) - .WriteInt32( (sal_Int32)aRect.Bottom() ); + mpOutStrm ->WriteInt32( aRect.Left() ) // Bounding box for the grouped shapes to which they will be attached + .WriteInt32( aRect.Top() ) + .WriteInt32( aRect.Right() ) + .WriteInt32( aRect.Bottom() ); sal_uInt32 nShapeId = GenerateShapeId(); if ( !mnGroupLevel ) @@ -5440,10 +5440,10 @@ bool EscherEx::SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect sal_uInt32 nCurrentPos = mpOutStrm->Tell(); if ( DoSeek( ESCHER_Persist_Grouping_Snap | ( nGroupLevel - 1 ) ) ) { - mpOutStrm ->WriteInt32( (sal_Int32)rRect.Left() ) // Bounding box for the grouped shapes to which they will be attached - .WriteInt32( (sal_Int32)rRect.Top() ) - .WriteInt32( (sal_Int32)rRect.Right() ) - .WriteInt32( (sal_Int32)rRect.Bottom() ); + mpOutStrm ->WriteInt32( rRect.Left() ) // Bounding box for the grouped shapes to which they will be attached + .WriteInt32( rRect.Top() ) + .WriteInt32( rRect.Right() ) + .WriteInt32( rRect.Bottom() ); mpOutStrm->Seek( nCurrentPos ); } } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index d7b3c290e59e..9811a746f2ee 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -154,17 +154,17 @@ static sal_uInt32 nMSOleObjCntr = 0; void Impl_OlePres::Write( SvStream & rStm ) { WriteClipboardFormat( rStm, FORMAT_GDIMETAFILE ); - rStm.WriteInt32( (sal_Int32)(nJobLen +4) ); // a TargetDevice that's always empty + rStm.WriteInt32( (nJobLen +4) ); // a TargetDevice that's always empty if( nJobLen ) rStm.Write( pJob, nJobLen ); rStm.WriteUInt32( (sal_uInt32)nAspect ); - rStm.WriteInt32( (sal_Int32)-1 ); //L-Index always -1 - rStm.WriteInt32( (sal_Int32)nAdvFlags ); - rStm.WriteInt32( (sal_Int32)0 ); //Compression - rStm.WriteInt32( (sal_Int32)aSize.Width() ); - rStm.WriteInt32( (sal_Int32)aSize.Height() ); + rStm.WriteInt32( -1 ); //L-Index always -1 + rStm.WriteInt32( nAdvFlags ); + rStm.WriteInt32( 0 ); //Compression + rStm.WriteInt32( aSize.Width() ); + rStm.WriteInt32( aSize.Height() ); sal_uLong nPos = rStm.Tell(); - rStm.WriteInt32( (sal_Int32)0 ); + rStm.WriteInt32( 0 ); if( GetFormat() == FORMAT_GDIMETAFILE && pMtf ) { diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 856a65cdb320..9fbf5a37a257 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -362,7 +362,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() ); mpPptEscherEx->OpenContainer( EPP_MainMaster ); mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 ); - mpStrm->WriteInt32( (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE ) // slide layout -> title and body slide + mpStrm->WriteInt32( EPP_LAYOUT_TITLEANDBODYSLIDE ) // slide layout -> title and body slide .WriteUChar( 1 ).WriteUChar( 2 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ) // placeholderID .WriteUInt32( (sal_uInt32)0 ) // master ID (equals null at a master page) .WriteUInt32( (sal_uInt32)0 ) // notes ID (equals null if no notes are present) @@ -684,9 +684,9 @@ bool PPTWriter::ImplCreateDocument() mpPptEscherEx->AddAtom( 40, EPP_DocumentAtom, 1 ); mpStrm->WriteUInt32( nWidth ) // Slide Size in Master coordinates X .WriteUInt32( nHeight ) // " " " " " Y - .WriteInt32( (sal_Int32)maNotesPageSize.Width ) // Notes Page Size X - .WriteInt32( (sal_Int32)maNotesPageSize.Height ) // " " " Y - .WriteInt32( (sal_Int32)1 ).WriteInt32( (sal_Int32)2 ); // the scale used when the Powerpoint document is embedded. the default is 1:2 + .WriteInt32( maNotesPageSize.Width ) // Notes Page Size X + .WriteInt32( maNotesPageSize.Height ) // " " " Y + .WriteInt32( 1 ).WriteInt32( 2 ); // the scale used when the Powerpoint document is embedded. the default is 1:2 mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, mpStrm->Tell() ); mpStrm->WriteUInt32( (sal_uInt32)0 ) // Reference to NotesMaster ( 0 if none ); .WriteUInt32( (sal_uInt32)0 ) // Reference to HandoutMaster ( 0 if none ); @@ -720,8 +720,8 @@ bool PPTWriter::ImplCreateDocument() mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() ); mpStrm->WriteUInt32( (sal_uInt32)0 ) // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY ) .WriteUInt32( (sal_uInt32)4 ) // flags - only bit 3 used, if set then slide contains shapes other than placeholders - .WriteInt32( (sal_Int32)0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects - .WriteInt32( (sal_Int32)i + 0x100 ) // slideId - Unique slide identifier, used for OLE link monikers for example + .WriteInt32( 0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects + .WriteInt32( i + 0x100 ) // slideId - Unique slide identifier, used for OLE link monikers for example .WriteUInt32( (sal_uInt32)0 ); // reserved, usually 0 if ( !GetPageByIndex( i, NORMAL ) ) // very exciting: once again through all pages @@ -745,8 +745,8 @@ bool PPTWriter::ImplCreateDocument() mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, mpStrm->Tell() ); mpStrm->WriteUInt32( (sal_uInt32)0 ) .WriteUInt32( (sal_uInt32)4 ) - .WriteInt32( (sal_Int32)0 ) - .WriteInt32( (sal_Int32)i + 0x100 ) + .WriteInt32( 0 ) + .WriteInt32( i + 0x100 ) .WriteUInt32( (sal_uInt32)0 ); } mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText @@ -1289,7 +1289,7 @@ void PPTWriter::ImplWriteOLE( ) xStm->WriteUInt32( (sal_uInt32)0 ) // no ClipboardId .WriteUInt32( (sal_uInt32)4 ) // no target device .WriteUInt32( (sal_uInt32)1 ) // aspect ratio - .WriteInt32( (sal_Int32)-1 ) // L-Index + .WriteInt32( -1 ) // L-Index .WriteUInt32( (sal_uInt32)0 ) // Advanced Flags .WriteUInt32( (sal_uInt32)0 ) // compression .WriteUInt32( (sal_uInt32)0 ) // Size @@ -1431,7 +1431,7 @@ bool PPTWriter::ImplWriteAtomEnding() mpCurUserStrm->WriteUInt32( (sal_uInt32)nPos ); // set offset to current edit mpPptEscherEx->AddAtom( 28, EPP_UserEditAtom ); - mpStrm->WriteInt32( (sal_Int32)0x100 ) // last slide ID + mpStrm->WriteInt32( 0x100 ) // last slide ID .WriteUInt32( (sal_uInt32)0x03000dbc ) // minor and major app version that did the save .WriteUInt32( (sal_uInt32)0 ) // offset last save, 0 after a full save .WriteUInt32( nPersistOfs ) // File offset to persist pointers for this save operation diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index b5fce12a4cd6..7ee29aa384c4 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -198,9 +198,9 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream .WriteUInt32( (sal_uInt32)( EPP_SlideViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)3 ) .WriteUChar( bShowGuides ).WriteUChar( bSnapToGrid ).WriteUChar( bSnapToShape ) .WriteUInt32( (sal_uInt32)( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)52 ) - .WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ).WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ) // scaling atom - Keeps the current scale - .WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ).WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ) // scaling atom - Keeps the previous scale - .WriteInt32( (sal_Int32)0x17ac ).WriteInt32( nMasterCoordinate )// Origin - Keeps the origin in master coordinates + .WriteInt32( nScaling ).WriteInt32( 100 ).WriteInt32( nScaling ).WriteInt32( 100 ) // scaling atom - Keeps the current scale + .WriteInt32( nScaling ).WriteInt32( 100 ).WriteInt32( nScaling ).WriteInt32( 100 ) // scaling atom - Keeps the previous scale + .WriteInt32( 0x17ac ).WriteInt32( nMasterCoordinate )// Origin - Keeps the origin in master coordinates .WriteInt32( nXOrigin ).WriteInt32( nYOrigin ) // Origin .WriteUChar( 1 ) // Bool1 varScale - Set if zoom to fit is set .WriteUChar( 0 ) // bool1 draftMode - Not used @@ -209,7 +209,7 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream .WriteUInt32( (sal_uInt32)0 ) // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one. .WriteInt32( nPosition1 ) // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal. .WriteUInt32( (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) ).WriteUInt32( (sal_uInt32)8 ) - .WriteInt32( (sal_Int32)1 ) // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one. + .WriteInt32( 1 ) // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one. .WriteInt32( nPosition2 ); // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal. } return nSize; @@ -222,10 +222,10 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm ) { pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_OutlineViewInfo << 16 ) ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) ) .WriteUInt32( (sal_uInt32)( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)52 ) - .WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ).WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ) // scaling atom - Keeps the current scale - .WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ).WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ) // scaling atom - Keeps the previous scale - .WriteInt32( (sal_Int32)0x17ac ).WriteInt32( (sal_Int32)0xdda ) // Origin - Keeps the origin in master coordinates - .WriteInt32( (sal_Int32)-780 ).WriteInt32( (sal_Int32)-84 ) // Origin + .WriteInt32( 170 ).WriteInt32( 200 ).WriteInt32( 170 ).WriteInt32( 200 ) // scaling atom - Keeps the current scale + .WriteInt32( 170 ).WriteInt32( 200 ).WriteInt32( 170 ).WriteInt32( 200 ) // scaling atom - Keeps the previous scale + .WriteInt32( 0x17ac ).WriteInt32( 0xdda ) // Origin - Keeps the origin in master coordinates + .WriteInt32( -780 ).WriteInt32( -84 ) // Origin .WriteUChar( 1 ) // bool1 varScale - Set if zoom to fit is set .WriteUChar( 0 ) // bool1 draftMode - Not used .WriteUInt16( 0 ); // padword @@ -348,8 +348,8 @@ sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm ) mpPptEscherEx->InsertPersistOffset( EPP_MAINMASTER_PERSIST_KEY | i, pStrm->Tell() ); pStrm->WriteUInt32( (sal_uInt32)0 ) // psrReference - logical reference to the slide persist object ( EPP_MAINMASTER_PERSIST_KEY ) .WriteUInt32( (sal_uInt32)0 ) // flags - only bit 3 used, if set then slide contains shapes other than placeholders - .WriteInt32( (sal_Int32)0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects - .WriteInt32( (sal_Int32)( 0x80000000 | i ) ) // slideId - Unique slide identifier, used for OLE link monikers for example + .WriteInt32( 0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects + .WriteInt32( ( 0x80000000 | i ) ) // slideId - Unique slide identifier, used for OLE link monikers for example .WriteUInt32( (sal_uInt32)0 ); // reserved, usually 0 } } @@ -461,7 +461,7 @@ bool PPTWriter::ImplCloseDocument() // Open Container ( EPP_SrKinsoku ) mpStrm->WriteUInt16( 0x2f ).WriteUInt16( EPP_SrKinsoku ).WriteUInt32( (sal_uInt32)12 ); mpPptEscherEx->AddAtom( 4, EPP_SrKinsokuAtom, 0, 3 ); - mpStrm->WriteInt32( (sal_Int32)0 ); // SrKinsoku Level 0 + mpStrm->WriteInt32( 0 ); // SrKinsoku Level 0 // Open Container ( EPP_FontCollection ) mpStrm->WriteUInt16( 0xf ).WriteUInt16( EPP_FontCollection ).WriteUInt32( (sal_uInt32)maFontCollection.GetCount() * 76 ); @@ -3618,10 +3618,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer ); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 ); - mpStrm ->WriteInt32( (sal_Int32)maRect.Left() ) // Bounding box for the grouped shapes to which they are attached - .WriteInt32( (sal_Int32)maRect.Top() ) - .WriteInt32( (sal_Int32)maRect.Right() ) - .WriteInt32( (sal_Int32)maRect.Bottom() ); + mpStrm ->WriteInt32( maRect.Left() ) // Bounding box for the grouped shapes to which they are attached + .WriteInt32( maRect.Top() ) + .WriteInt32( maRect.Right() ) + .WriteInt32( maRect.Bottom() ); sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId(); mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index 8a7794ef4830..a796dd688daf 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -220,10 +220,10 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie OpenContainer( ESCHER_SpContainer ); AddAtom( 16, ESCHER_Spgr, 1 ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); - mpOutStrm ->WriteInt32( (sal_Int32)aRect.Left() ) // bounding box for the grouped shapes to which they are attached - .WriteInt32( (sal_Int32)aRect.Top() ) - .WriteInt32( (sal_Int32)aRect.Right() ) - .WriteInt32( (sal_Int32)aRect.Bottom() ); + mpOutStrm ->WriteInt32( aRect.Left() ) // bounding box for the grouped shapes to which they are attached + .WriteInt32( aRect.Top() ) + .WriteInt32( aRect.Right() ) + .WriteInt32( aRect.Bottom() ); nShapeId = GenerateShapeId(); if ( !mnGroupLevel ) @@ -241,10 +241,10 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie { AddAtom( 16, ESCHER_ChildAnchor ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); - mpOutStrm ->WriteInt32( (sal_Int32)aRect.Left() ) - .WriteInt32( (sal_Int32)aRect.Top() ) - .WriteInt32( (sal_Int32)aRect.Right() ) - .WriteInt32( (sal_Int32)aRect.Bottom() ); + mpOutStrm ->WriteInt32( aRect.Left() ) + .WriteInt32( aRect.Top() ) + .WriteInt32( aRect.Right() ) + .WriteInt32( aRect.Bottom() ); } } if ( pClientData ) diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index 56706e1b5ab2..9152d9e99a0c 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -488,7 +488,7 @@ void PPTExStyleSheet::WriteTxCFStyleAtom( SvStream& rSt ) .WriteUInt16( ( 0x80 | nCharFlags ) ) .WriteUInt16( nFlags ) .WriteUInt16( nCharFlags ) - .WriteInt32( (sal_Int32)-1 ) // ? + .WriteInt32( -1 ) // ? .WriteUInt16( rCharStyle.mnFontHeight ) .WriteUInt32( rCharStyle.mnFontColor ); } diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 06d40b3f60b5..45ad9679a744 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -164,7 +164,7 @@ bool StgHeader::Store( StgIo& rIo ) .WriteUInt16( nByteOrder ) // 1C Unicode byte order indicator .WriteInt16( nPageSize ) // 1E 1 << nPageSize = block size .WriteInt16( nDataPageSize ) // 20 1 << this size == data block size - .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt16( 0 ) + .WriteInt32( 0 ).WriteInt32( 0 ).WriteInt16( 0 ) .WriteInt32( nFATSize ) // 2C total number of FAT pages .WriteInt32( nTOCstrm ) // 30 starting page for the TOC stream .WriteInt32( nReserved ) // 34 diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 4a7cbec76986..242ff816cbd6 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -148,14 +148,14 @@ bool StgCompObjStream::Store() OString aAsciiUserName(OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252)); WriteInt16( 1 ); // Version? WriteInt16( -2 ); // 0xFFFE = Byte Order Indicator - WriteInt32( (sal_Int32) 0x0A03 ); // Windows 3.10 - WriteInt32( (sal_Int32) -1L ); + WriteInt32( 0x0A03 ); // Windows 3.10 + WriteInt32( -1L ); WriteClsId( *this, aClsId ); // Class ID - WriteInt32( (sal_Int32) (aAsciiUserName.getLength() + 1) ); + WriteInt32( (aAsciiUserName.getLength() + 1) ); WriteCharPtr( (const char *)aAsciiUserName.getStr() ); WriteUChar( 0 ); // string terminator WriteClipboardFormat( *this, nCbFormat ); - WriteInt32( (sal_Int32) 0 ); // terminator + WriteInt32( 0 ); // terminator Commit(); return GetError() == SVSTREAM_OK; } @@ -186,11 +186,11 @@ bool StgOleStream::Store() return false; Seek( 0L ); - WriteInt32( (sal_Int32) 0x02000001 ); // OLE version, format - WriteInt32( (sal_Int32) nFlags ); // Object flags - WriteInt32( (sal_Int32) 0 ); // Update Options - WriteInt32( (sal_Int32) 0 ); // reserved - WriteInt32( (sal_Int32) 0 ); // Moniker 1 + WriteInt32( 0x02000001 ); // OLE version, format + WriteInt32( nFlags ); // Object flags + WriteInt32( 0 ); // Update Options + WriteInt32( 0 ); // reserved + WriteInt32( 0 ); // Moniker 1 Commit(); return GetError() == SVSTREAM_OK; } diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx index 74e819e8c596..01a02003601e 100644 --- a/sot/source/sdstor/storinfo.cxx +++ b/sot/source/sdstor/storinfo.cxx @@ -72,18 +72,18 @@ void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat ) { OString aAsciiCbFmt(OUStringToOString(aCbFmt, RTL_TEXTENCODING_ASCII_US)); - rStm.WriteInt32( (sal_Int32) (aAsciiCbFmt.getLength() + 1) ); + rStm.WriteInt32( (aAsciiCbFmt.getLength() + 1) ); rStm.WriteCharPtr( (const char *)aAsciiCbFmt.getStr() ); rStm.WriteUChar( 0 ); } else if( nFormat ) { - rStm.WriteInt32( (sal_Int32) -1 ) // for Windows - .WriteInt32( (sal_Int32) nFormat ); + rStm.WriteInt32( -1 ) // for Windows + .WriteInt32( nFormat ); } else { - rStm.WriteInt32( (sal_Int32) 0 ); // no clipboard format + rStm.WriteInt32( 0 ); // no clipboard format } } diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index d5ea23d04f7a..e3adb6f172c1 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -1421,7 +1421,7 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, rItem.Store(rStream, nItemVersion); sal_uLong nIEnd = rStream.Tell(); rStream.Seek( nIStart-4 ); - rStream.WriteInt32( (sal_Int32) ( nIEnd-nIStart ) ); + rStream.WriteInt32( ( nIEnd-nIStart ) ); rStream.Seek( nIEnd ); } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 5fd9450be63c..ef5e6aefedb7 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -172,7 +172,7 @@ SvStream& SfxStringListItem::Store( SvStream & rStream, sal_uInt16 ) const { if( !pImp ) { - rStream.WriteInt32( (sal_Int32) 0 ); + rStream.WriteInt32( 0 ); return rStream; } diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 0fc2527afaf1..09c7c8fcf3a3 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -334,7 +334,7 @@ namespace svt // store the info about the children // the number - m_rStorage.WriteInt32( (sal_Int32)_rContent.size() ); + m_rStorage.WriteInt32( _rContent.size() ); // their URLs ( the local name is not enough, since URL might be not a hierarchical one, "expand:" for example ) ::std::for_each( _rContent.getSubContents().begin(), @@ -540,7 +540,7 @@ namespace svt // store the template root folders // the size - m_pCacheStream->WriteInt32( (sal_Int32)m_aCurrentState.size() ); + m_pCacheStream->WriteInt32( m_aCurrentState.size() ); // the complete URLs ::std::for_each( m_aCurrentState.begin(), diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 347cbfb24234..edba2e57b731 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -700,7 +700,7 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const if (!IsIndex()) { - rOut.WriteInt32( (sal_Int32) aDash.GetDashStyle() ); + rOut.WriteInt32( aDash.GetDashStyle() ); rOut.WriteUInt16( aDash.GetDots() ); rOut.WriteUInt32( (sal_uInt32) aDash.GetDotLen() ); rOut.WriteUInt16( aDash.GetDashes() ); @@ -2436,7 +2436,7 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) co nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut.WriteUInt16( nTmp ); nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut.WriteUInt16( nTmp ); - rOut.WriteInt32( (sal_Int32) aGradient.GetAngle() ); + rOut.WriteInt32( aGradient.GetAngle() ); rOut.WriteUInt16( aGradient.GetBorder() ); rOut.WriteUInt16( aGradient.GetXOffset() ); rOut.WriteUInt16( aGradient.GetYOffset() ); @@ -2917,8 +2917,8 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut.WriteUInt16( nTmp ); nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut.WriteUInt16( nTmp ); - rOut.WriteInt32( (sal_Int32) aHatch.GetDistance() ); - rOut.WriteInt32( (sal_Int32) aHatch.GetAngle() ); + rOut.WriteInt32( aHatch.GetDistance() ); + rOut.WriteInt32( aHatch.GetAngle() ); } return rOut; diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index 2ba375f6ed16..40de91d8d00c 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -500,8 +500,8 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) if( SVX_NUM_BITMAP == aFmt.GetNumberingType() ) { - rStream.WriteInt32( (sal_Int32)aFmt.GetGraphicSize().Width() ) - .WriteInt32( (sal_Int32)aFmt.GetGraphicSize().Height() ); + rStream.WriteInt32( aFmt.GetGraphicSize().Width() ) + .WriteInt32( aFmt.GetGraphicSize().Height() ); sal_uInt8 cFlg = ( 0 != aFmt.GetBrush() ? 1 : 0 ) + ( 0 != aFmt.GetGraphicOrientation() ? 2 : 0 ); rStream.WriteUChar( cFlg ); 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() ); |