diff options
-rw-r--r-- | basic/source/classes/image.cxx | 4 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 8 | ||||
-rw-r--r-- | basic/source/sbx/sbxarray.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 14 | ||||
-rw-r--r-- | editeng/source/items/paraitem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/epict/epict.cxx | 16 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 16 | ||||
-rw-r--r-- | sc/source/core/data/patattr.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 6 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 12 | ||||
-rw-r--r-- | sd/source/filter/eppt/escherex.cxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgelem.cxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgole.cxx | 4 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/wmf/emfwr.cxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/wmf/wmfwr.cxx | 14 | ||||
-rw-r--r-- | vcl/source/gdi/cvtsvm.cxx | 160 |
18 files changed, 138 insertions, 138 deletions
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 784a1c509996..fb0d12eccc1c 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -267,8 +267,8 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) } r .WriteInt32( (sal_Int32) eCharSet ) .WriteInt32( (sal_Int32) nDimBase ) - .WriteInt16( (sal_Int16) nFlags ) - .WriteInt16( (sal_Int16) 0 ) + .WriteInt16( nFlags ) + .WriteInt16( 0 ) .WriteInt32( (sal_Int32) 0 ) .WriteInt32( (sal_Int32) 0 ); diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 0da36032570a..7195f6d56f45 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2071,10 +2071,10 @@ bool SbMethod::StoreData( SvStream& rStrm ) const { if( !SbxMethod::StoreData( rStrm ) ) return false; - rStrm.WriteInt16( (sal_Int16) nDebugFlags ) - .WriteInt16( (sal_Int16) nLine1 ) - .WriteInt16( (sal_Int16) nLine2 ) - .WriteInt16( (sal_Int16) nStart ) + rStrm.WriteInt16( nDebugFlags ) + .WriteInt16( nLine1 ) + .WriteInt16( nLine2 ) + .WriteInt16( nStart ) .WriteUChar( bInvalid ); return true; } diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx index eafb2d23270f..55cd00beaebe 100644 --- a/basic/source/sbx/sbxarray.cxx +++ b/basic/source/sbx/sbxarray.cxx @@ -781,7 +781,7 @@ bool SbxDimArray::LoadData( SvStream& rStrm, sal_uInt16 nVer ) bool SbxDimArray::StoreData( SvStream& rStrm ) const { - rStrm.WriteInt16( (sal_Int16) m_vDimensions.size() ); + rStrm.WriteInt16( m_vDimensions.size() ); for( short i = 0; i < static_cast<short>(m_vDimensions.size()); i++ ) { short lb, ub; diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 9a62c911ab72..c958e8ca37be 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -2580,9 +2580,9 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) { rStrm.WriteChar( (char) i ); WriteColor( rStrm, l->GetColor() ); - rStrm.WriteInt16( (short) l->GetOutWidth() ) - .WriteInt16( (short) l->GetInWidth() ) - .WriteInt16( (short) l->GetDistance() ); + rStrm.WriteInt16( l->GetOutWidth() ) + .WriteInt16( l->GetInWidth() ) + .WriteInt16( l->GetDistance() ); } } rStrm.WriteChar( (char) 2 ); @@ -3189,14 +3189,14 @@ SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co if( pLine ) { WriteColor( rStrm, pLine->GetColor() ); - rStrm.WriteInt16( (short)pLine->GetOutWidth() ) - .WriteInt16( (short)pLine->GetInWidth() ) - .WriteInt16( (short)pLine->GetDistance() ); + rStrm.WriteInt16( pLine->GetOutWidth() ) + .WriteInt16( pLine->GetInWidth() ) + .WriteInt16( pLine->GetDistance() ); } else { WriteColor( rStrm, Color() ); - rStrm.WriteInt16( (short)0 ).WriteInt16( (short)0 ).WriteInt16( (short)0 ); + rStrm.WriteInt16( 0 ).WriteInt16( 0 ).WriteInt16( 0 ); } return rStrm; } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 5a9789e2d39e..d46627ddbdec 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -267,7 +267,7 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( GetPropLineSpace() ) - .WriteInt16( (short) GetInterLineSpace() ) + .WriteInt16( GetInterLineSpace() ) .WriteUInt16( (sal_uInt16) GetLineHeight() ) .WriteSChar( GetLineSpaceRule() ) .WriteSChar( GetInterLineSpaceRule() ); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 78954f0c3420..0122f2584bc0 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2030,7 +2030,7 @@ SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteInt16( (short) GetValue() ); + rStrm.WriteInt16( GetValue() ); return rStrm; } @@ -2271,7 +2271,7 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* _nEsc = DFLT_ESC_SUB; } rStrm.WriteUChar( GetProp() ) - .WriteInt16( (short) _nEsc ); + .WriteInt16( _nEsc ); return rStrm; } diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index e3606deaa34a..a044ef414820 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -282,14 +282,14 @@ Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly) void PictWriter::WritePoint(const Point & rPoint) { Point aPoint = OutputDevice::LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ); - pPict->WriteInt16( (short)aPoint.Y() ).WriteInt16( (short)aPoint.X() ); + pPict->WriteInt16( aPoint.Y() ).WriteInt16( aPoint.X() ); } void PictWriter::WriteSize(const Size & rSize) { OutputDevice::LogicToLogic( rSize, aSrcMapMode, aTargetMapMode ); // -Wall is this needed. - pPict->WriteInt16( (short)rSize.Height() ).WriteInt16( (short)rSize.Width() ); + pPict->WriteInt16( rSize.Height() ).WriteInt16( rSize.Width() ); } @@ -327,8 +327,8 @@ Rectangle PictWriter::MapRectangle( const Rectangle& rRect ) void PictWriter::WriteRectangle(const Rectangle & rRect) { Rectangle aRect( MapRectangle( rRect ) ); - pPict ->WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ) - .WriteInt16( (sal_Int16)aRect.Bottom() ).WriteInt16( (sal_Int16)aRect.Right() ); + pPict ->WriteInt16( aRect.Top() ).WriteInt16( aRect.Left() ) + .WriteInt16( aRect.Bottom() ).WriteInt16( aRect.Right() ); } void PictWriter::WritePolygon(const Polygon & rPoly) @@ -713,8 +713,8 @@ void PictWriter::WriteOpcode_ClipRect( const Rectangle& rRect ) ++aRect.Right(); pPict ->WriteUInt16( (sal_uInt16)1 ) // opcode 1 .WriteUInt16( (sal_uInt16)10 ) // data size - .WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ) - .WriteInt16( (sal_Int16)aRect.Bottom() ).WriteInt16( (sal_Int16)aRect.Right() ); + .WriteInt16( aRect.Top() ).WriteInt16( aRect.Left() ) + .WriteInt16( aRect.Bottom() ).WriteInt16( aRect.Right() ); aClipRect = aRect; } @@ -2055,8 +2055,8 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) Rectangle aRect( pAt->aClipRect ); pPict ->WriteUInt16( (sal_uInt16)1 ) // opcode 1 .WriteUInt16( (sal_uInt16)10 ) // data size - .WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ) - .WriteInt16( (sal_Int16)aRect.Bottom() ).WriteInt16( (sal_Int16)aRect.Right() ); + .WriteInt16( aRect.Top() ).WriteInt16( aRect.Left() ) + .WriteInt16( aRect.Bottom() ).WriteInt16( aRect.Right() ); } aClipRect=pAt->aClipRect; pAttrStack=pAt->pSucc; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index e322d7f32d31..7728e1ed163f 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3114,9 +3114,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT while( aIter != aEnd ) { aOut.WriteUInt16( (sal_uInt16)aIter->nOperation ) - .WriteInt16( (sal_Int16)aIter->nPara[ 0 ] ) - .WriteInt16( (sal_Int16)aIter->nPara[ 1 ] ) - .WriteInt16( (sal_Int16)aIter->nPara[ 2 ] ); + .WriteInt16( aIter->nPara[ 0 ] ) + .WriteInt16( aIter->nPara[ 1 ] ) + .WriteInt16( aIter->nPara[ 2 ] ); ++aIter; } sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ]; @@ -5368,10 +5368,10 @@ void EscherEx::AddChildAnchor( const Rectangle& rRect ) void EscherEx::AddClientAnchor( const Rectangle& rRect ) { AddAtom( 8, ESCHER_ClientAnchor ); - mpOutStrm->WriteInt16( (sal_Int16)rRect.Top() ) - .WriteInt16( (sal_Int16)rRect.Left() ) - .WriteInt16( (sal_Int16)( rRect.GetWidth() + rRect.Left() ) ) - .WriteInt16( (sal_Int16)( rRect.GetHeight() + rRect.Top() ) ); + mpOutStrm->WriteInt16( rRect.Top() ) + .WriteInt16( rRect.Left() ) + .WriteInt16( ( rRect.GetWidth() + rRect.Left() ) ) + .WriteInt16( ( rRect.GetHeight() + rRect.Top() ) ); } EscherExHostAppData* EscherEx::EnterAdditionalTextGroup() @@ -5458,7 +5458,7 @@ bool EscherEx::SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect sal_uInt32 nCurrentPos = mpOutStrm->Tell(); if ( DoSeek( ESCHER_Persist_Grouping_Logic | ( nGroupLevel - 1 ) ) ) { - mpOutStrm->WriteInt16( (sal_Int16)rRect.Top() ).WriteInt16( (sal_Int16)rRect.Left() ).WriteInt16( (sal_Int16)rRect.Right() ).WriteInt16( (sal_Int16)rRect.Bottom() ); + mpOutStrm->WriteInt16( rRect.Top() ).WriteInt16( rRect.Left() ).WriteInt16( rRect.Right() ).WriteInt16( rRect.Bottom() ); mpOutStrm->Seek( nCurrentPos ); } } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index b73ff8eccef7..acbaeda1aaed 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -182,7 +182,7 @@ SvStream& ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) rStream.WriteUniOrByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), rStream.GetStreamCharSet() ); - rStream.WriteInt16( (short)SFX_STYLE_FAMILY_PARA ); // wg. altem Dateiformat + rStream.WriteInt16( SFX_STYLE_FAMILY_PARA ); // wg. altem Dateiformat GetItemSet().Store( rStream ); diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index ae0fda8c4800..31ea2d6e1deb 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -690,7 +690,7 @@ bool PPTWriter::ImplCreateDocument() 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 ); - .WriteInt16( (sal_Int16)1 ) // Number of the first slide; + .WriteInt16( 1 ) // Number of the first slide; .WriteUInt16( nSlideType ) // Size of the document slides ( default: EPP_SLIDESIZETYPEONSCREEN ) .WriteUChar( 0 ) // bool1 indicates if document was saved with embedded true type fonts .WriteUChar( 0 ) // bool1 indicates if the placeholders on the title slide are omitted @@ -1437,8 +1437,8 @@ bool PPTWriter::ImplWriteAtomEnding() .WriteUInt32( nPersistOfs ) // File offset to persist pointers for this save operation .WriteUInt32( (sal_uInt32)1 ) // Persist reference to the document persist object .WriteUInt32( (sal_uInt32)nPersistEntrys ) // max persists written, Seed value for persist object id management - .WriteInt16( (sal_Int16)EPP_LastViewTypeSlideView ) // last view type - .WriteInt16( (sal_Int16)0x12 ); // padword + .WriteInt16( EPP_LastViewTypeSlideView ) // last view type + .WriteInt16( 0x12 ); // padword return true; } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 254120f82999..30ec562f60e4 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -532,10 +532,10 @@ bool PPTWriter::ImplCloseDocument() mpStyleSheet->WriteTxCFStyleAtom( *mpStrm ); // create style that is used for new standard objects mpPptEscherEx->AddAtom( 10, EPP_TxSIStyleAtom ); mpStrm->WriteUInt32( (sal_uInt32)7 ) // ? - .WriteInt16( (sal_Int16)2 ) // ? + .WriteInt16( 2 ) // ? .WriteUChar( 9 ) // ? .WriteUChar( 8 ) // ? - .WriteInt16( (sal_Int16)0 ); // ? + .WriteInt16( 0 ); // ? mpStrm->Write( aTxMasterStyleAtomStrm.GetData(), aTxMasterStyleAtomStrm.Tell() ); maSoundCollection.Write( *mpStrm ); @@ -749,7 +749,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) if ( nPropertyFlags & 0x10 ) rOut.WriteUInt16( nFontId ); if ( nPropertyFlags & 0x40 ) - rOut.WriteInt16( (sal_Int16)nBuRealSize ); + rOut.WriteInt16( nBuRealSize ); if ( nPropertyFlags & 0x20 ) { sal_uInt32 nBulletColor = pPara->nBulletColor; @@ -2112,7 +2112,7 @@ bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, const aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // oben, links, rechts, unten ???? + mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // oben, links, rechts, unten ???? mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID @@ -2810,7 +2810,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt ); aPropertyOptions.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // top, left, right, bottom ???? + mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // top, left, right, bottom ???? mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID @@ -2902,7 +2902,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt2 ); aPropOpt2.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // top, left, right, bottom ???? + mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // top, left, right, bottom ???? mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); sal_uInt8 PlaceHolderID = ( mType == "presentation.Subtitle") ? EPP_PLACEHOLDER_MASTERSUBTITLE:EPP_PLACEHOLDER_MASTERBODY; diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index 48b8b8a648ba..c2862793b36f 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -235,7 +235,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie { AddAtom( 8, ESCHER_ClientAnchor ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() ); - mpOutStrm->WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ).WriteInt16( (sal_Int16)aRect.Right() ).WriteInt16( (sal_Int16)aRect.Bottom() ); + mpOutStrm->WriteInt16( aRect.Top() ).WriteInt16( aRect.Left() ).WriteInt16( aRect.Right() ).WriteInt16( aRect.Bottom() ); } else { diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 8cf9239f5f97..06d40b3f60b5 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( (sal_Int16) 0 ) + .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 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 6669867defa3..4a7cbec76986 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -146,8 +146,8 @@ bool StgCompObjStream::Store() return false; Seek( 0L ); OString aAsciiUserName(OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252)); - WriteInt16( (sal_Int16) 1 ); // Version? - WriteInt16( (sal_Int16) -2 ); // 0xFFFE = Byte Order Indicator + WriteInt16( 1 ); // Version? + WriteInt16( -2 ); // 0xFFFE = Byte Order Indicator WriteInt32( (sal_Int32) 0x0A03 ); // Windows 3.10 WriteInt32( (sal_Int32) -1L ); WriteClsId( *this, aClsId ); // Class ID diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 28e034b12a9a..347cbfb24234 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -2425,7 +2425,7 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) co if (!IsIndex()) { - rOut.WriteInt16( (sal_Int16)aGradient.GetGradientStyle() ); + rOut.WriteInt16( aGradient.GetGradientStyle() ); sal_uInt16 nTmp; @@ -2910,7 +2910,7 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const if (!IsIndex()) { - rOut.WriteInt16( (sal_Int16)aHatch.GetHatchStyle() ); + rOut.WriteInt16( aHatch.GetHatchStyle() ); sal_uInt16 nTmp; nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut.WriteUInt16( nTmp ); diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index ade474752a08..ee0780879ab6 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -223,8 +223,8 @@ void EMFWriter::WriteEMFPlusHeader( const Size &rMtfSizePix, const Size &rMtfSiz if (nDivY) nDPIY /= nDivY; // DPI Y - m_rStm.WriteInt16( (sal_Int16) EmfPlusHeader ); - m_rStm.WriteInt16( (sal_Int16) 0x01 ) // Flags - Dual Mode // TODO: Check this + 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 diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 3e10281d8b83..b93eeca47b86 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -211,13 +211,13 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF ) void WMFWriter::WritePointXY(const Point & rPoint) { Point aPt( OutputDevice::LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); - pWMF->WriteInt16( (short)aPt.X() ).WriteInt16( (short)aPt.Y() ); + pWMF->WriteInt16( aPt.X() ).WriteInt16( aPt.Y() ); } void WMFWriter::WritePointYX(const Point & rPoint) { Point aPt( OutputDevice::LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); - pWMF->WriteInt16( (short)aPt.Y() ).WriteInt16( (short)aPt.X() ); + pWMF->WriteInt16( aPt.Y() ).WriteInt16( aPt.X() ); } sal_Int32 WMFWriter::ScaleWidth( sal_Int32 nDX ) @@ -229,13 +229,13 @@ sal_Int32 WMFWriter::ScaleWidth( sal_Int32 nDX ) void WMFWriter::WriteSize(const Size & rSize) { Size aSz( OutputDevice::LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); - pWMF->WriteInt16( (short)aSz.Width() ).WriteInt16( (short)aSz.Height() ); + pWMF->WriteInt16( aSz.Width() ).WriteInt16( aSz.Height() ); } void WMFWriter::WriteHeightWidth(const Size & rSize) { Size aSz( OutputDevice::LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); - pWMF->WriteInt16( (short)aSz.Height() ).WriteInt16( (short)aSz.Width() ); + pWMF->WriteInt16( aSz.Height() ).WriteInt16( aSz.Width() ); } void WMFWriter::WriteRectangle(const Rectangle & rRect) @@ -309,7 +309,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const vcl::Font & rFont) WriteRecordHeader(0x00000000,W_META_CREATEFONTINDIRECT); WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height())); - pWMF->WriteInt16( (short)rFont.GetOrientation() ).WriteInt16( (short)rFont.GetOrientation() ); + pWMF->WriteInt16( rFont.GetOrientation() ).WriteInt16( rFont.GetOrientation() ); switch (rFont.GetWeight()) { case WEIGHT_THIN: nWeight=W_FW_THIN; break; @@ -673,7 +673,7 @@ void WMFWriter::WMFRecord_Rectangle(const Rectangle & rRect) void WMFWriter::WMFRecord_RestoreDC() { WriteRecordHeader(0x00000004,W_META_RESTOREDC); - pWMF->WriteInt16( (short)-1 ); + pWMF->WriteInt16( -1 ); } void WMFWriter::WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, long nVertRound) @@ -799,7 +799,7 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, } } - pWMF->WriteUInt32( nROP ). WriteInt16( (short) 0 ). WriteInt16( (short) rBitmap.GetSizePixel().Height() ). WriteInt16( (short) rBitmap.GetSizePixel().Width() ). WriteInt16( (short) 0 ). WriteInt16( (short) 0 ); + pWMF->WriteUInt32( nROP ). WriteInt16( 0 ). WriteInt16( rBitmap.GetSizePixel().Height() ). WriteInt16( rBitmap.GetSizePixel().Width() ). WriteInt16( 0 ). WriteInt16( 0 ); WriteHeightWidth(rSize); WritePointYX(rPoint); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 54aa95652c56..d916ed9767e6 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -84,7 +84,7 @@ void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly ) for( n = 0; n < nPoly; n++ ) nPoints = sal::static_int_cast<sal_uInt16>(nPoints + rPolyPoly[ n ].GetSize()); - rOStm.WriteInt16( (sal_Int16) GDI_POLYPOLYGON_ACTION ); + rOStm.WriteInt16( GDI_POLYPOLYGON_ACTION ); rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoly << 2 ) + ( nPoints << 3 ) ) ); rOStm.WriteInt32( (sal_Int32) nPoly ); @@ -144,7 +144,7 @@ void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode ) void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode ) { - rOStm.WriteInt16( (sal_Int16) rMapMode.GetMapUnit() ); + rOStm.WriteInt16( rMapMode.GetMapUnit() ); WritePair( rOStm, rMapMode.GetOrigin() ); rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetNumerator() ); rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetDenominator() ); @@ -154,13 +154,13 @@ void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode ) void ImplWritePushAction( SvStream& rOStm ) { - rOStm.WriteInt16( (sal_Int16) GDI_PUSH_ACTION ); + rOStm.WriteInt16( GDI_PUSH_ACTION ); rOStm.WriteInt32( (sal_Int32) 4 ); } void ImplWritePopAction( SvStream& rOStm ) { - rOStm.WriteInt16( (sal_Int16) GDI_POP_ACTION ); + rOStm.WriteInt16( GDI_POP_ACTION ); rOStm.WriteInt32( (sal_Int32) 4 ); } @@ -169,7 +169,7 @@ void ImplWriteLineColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle, if( rColor.GetTransparency() > 127 ) nStyle = 0; - rOStm.WriteInt16( (sal_Int16) GDI_PEN_ACTION ); + rOStm.WriteInt16( GDI_PEN_ACTION ); rOStm.WriteInt32( (sal_Int32) 16 ); ImplWriteColor( rOStm, rColor ); rOStm.WriteInt32( nWidth ); @@ -178,7 +178,7 @@ void ImplWriteLineColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle, void ImplWriteFillColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle ) { - rOStm.WriteInt16( (sal_Int16) GDI_FILLBRUSH_ACTION ); + rOStm.WriteInt16( GDI_FILLBRUSH_ACTION ); rOStm.WriteInt32( (sal_Int32) 20 ); ImplWriteColor( rOStm, rColor ); @@ -189,13 +189,13 @@ void ImplWriteFillColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle { ImplWriteColor( rOStm, COL_WHITE ); rOStm.WriteInt16( nStyle ); - rOStm.WriteInt16( (sal_Int16) 1 ); + rOStm.WriteInt16( 1 ); } else { ImplWriteColor( rOStm, COL_BLACK ); rOStm.WriteInt16( nStyle ); - rOStm.WriteInt16( (sal_Int16) 0 ); + rOStm.WriteInt16( 0 ); } } @@ -234,7 +234,7 @@ void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont, break; } - rOStm.WriteInt16( (sal_Int16) GDI_FONT_ACTION ); + rOStm.WriteInt16( GDI_FONT_ACTION ); rOStm.WriteInt32( (sal_Int32) 78 ); rActualCharSet = GetStoreCharSet( rFont.GetCharSet() ); @@ -242,15 +242,15 @@ void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont, ImplWriteColor( rOStm, rFont.GetFillColor() ); rOStm.Write( aName, 32 ); WritePair( rOStm, rFont.GetSize() ); - rOStm.WriteInt16( (sal_Int16) 0 ); // no character orientation anymore - rOStm.WriteInt16( (sal_Int16) rFont.GetOrientation() ); - rOStm.WriteInt16( (sal_Int16) rActualCharSet ); - rOStm.WriteInt16( (sal_Int16) rFont.GetFamily() ); - rOStm.WriteInt16( (sal_Int16) rFont.GetPitch() ); - rOStm.WriteInt16( (sal_Int16) rFont.GetAlign() ); - rOStm.WriteInt16( (sal_Int16) nWeight ); - rOStm.WriteInt16( (sal_Int16) rFont.GetUnderline() ); - rOStm.WriteInt16( (sal_Int16) rFont.GetStrikeout() ); + rOStm.WriteInt16( 0 ); // no character orientation anymore + rOStm.WriteInt16( rFont.GetOrientation() ); + rOStm.WriteInt16( rActualCharSet ); + rOStm.WriteInt16( rFont.GetFamily() ); + rOStm.WriteInt16( rFont.GetPitch() ); + rOStm.WriteInt16( rFont.GetAlign() ); + rOStm.WriteInt16( nWeight ); + rOStm.WriteInt16( rFont.GetUnderline() ); + rOStm.WriteInt16( rFont.GetStrikeout() ); rOStm.WriteUChar( rFont.GetItalic() != ITALIC_NONE ); rOStm.WriteUChar( rFont.IsOutline() ); rOStm.WriteUChar( rFont.IsShadow() ); @@ -261,7 +261,7 @@ void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont, void ImplWriteRasterOpAction( SvStream& rOStm, sal_Int16 nRasterOp ) { - rOStm.WriteInt16( (sal_Int16) GDI_RASTEROP_ACTION ).WriteInt32( (sal_Int32) 6 ).WriteInt16( nRasterOp ); + rOStm.WriteInt16( GDI_RASTEROP_ACTION ).WriteInt32( (sal_Int32) 6 ).WriteInt16( nRasterOp ); } bool ImplWriteUnicodeComment( SvStream& rOStm, const OUString& rString ) @@ -341,7 +341,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol if((bOnlyWhenCurve && nAllFlagCount) || (!bOnlyWhenCurve && nAllPointCount)) { - rOStm.WriteInt16( (sal_Int16) GDI_EXTENDEDPOLYGON_ACTION ); + rOStm.WriteInt16( GDI_EXTENDEDPOLYGON_ACTION ); const sal_Int32 nActionSize( 4 + // Action size @@ -1359,8 +1359,8 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ) // Write MagicCode rOStm.WriteCharPtr( "SVGDI" ); // Identifier - rOStm.WriteInt16( (sal_Int16) 42 ); // HeaderSize - rOStm.WriteInt16( (sal_Int16) 200 ); // VERSION + rOStm.WriteInt16( 42 ); // HeaderSize + rOStm.WriteInt16( 200 ); // VERSION rOStm.WriteInt32( (sal_Int32) aPrefSize.Width() ); rOStm.WriteInt32( (sal_Int32) aPrefSize.Height() ); ImplWriteMapMode( rOStm, rMtf.GetPrefMapMode() ); @@ -1401,7 +1401,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaPixelAction* pAct = (MetaPixelAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_PIXEL_ACTION ); + rOStm.WriteInt16( GDI_PIXEL_ACTION ); rOStm.WriteInt32( (sal_Int32) 18 ); WritePair( rOStm, pAct->GetPoint() ); ImplWriteColor( rOStm, pAct->GetColor() ); @@ -1413,7 +1413,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaPointAction* pAct = (MetaPointAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_POINT_ACTION ); + rOStm.WriteInt16( GDI_POINT_ACTION ); rOStm.WriteInt32( (sal_Int32) 12 ); WritePair( rOStm, pAct->GetPoint() ); nCount++; @@ -1436,31 +1436,31 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, if(bLineJoin) { - rOStm.WriteInt16( (sal_Int16) GDI_LINEJOIN_ACTION ); + rOStm.WriteInt16( GDI_LINEJOIN_ACTION ); rOStm.WriteInt32( (sal_Int32) 6 ); - rOStm.WriteInt16( (sal_Int16) rInfo.GetLineJoin() ); + rOStm.WriteInt16( rInfo.GetLineJoin() ); } if(bLineCap) { - rOStm.WriteInt16( (sal_Int16) GDI_LINECAP_ACTION ); + rOStm.WriteInt16( GDI_LINECAP_ACTION ); rOStm.WriteInt32( (sal_Int32) 6 ); - rOStm.WriteInt16( (sal_Int16) rInfo.GetLineCap() ); + rOStm.WriteInt16( rInfo.GetLineCap() ); } } if(bLineDashDot) { - rOStm.WriteInt16( (sal_Int16) GDI_LINEDASHDOT_ACTION ); + rOStm.WriteInt16( GDI_LINEDASHDOT_ACTION ); rOStm.WriteInt32( (sal_Int32) 4 + 16 ); - rOStm.WriteInt16( (sal_Int16)rInfo.GetDashCount() ); + rOStm.WriteInt16( rInfo.GetDashCount() ); rOStm.WriteInt32( (sal_Int32)rInfo.GetDashLen() ); - rOStm.WriteInt16( (sal_Int16)rInfo.GetDotCount() ); + rOStm.WriteInt16( rInfo.GetDotCount() ); rOStm.WriteInt32( (sal_Int32)rInfo.GetDotLen() ); rOStm.WriteInt32( (sal_Int32)rInfo.GetDistance() ); } - rOStm.WriteInt16( (sal_Int16) GDI_LINE_ACTION ); + rOStm.WriteInt16( GDI_LINE_ACTION ); rOStm.WriteInt32( (sal_Int32) 20 ); WritePair( rOStm, pAct->GetStartPoint() ); WritePair( rOStm, pAct->GetEndPoint() ); @@ -1493,7 +1493,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaRectAction* pAct = (MetaRectAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_RECT_ACTION ); + rOStm.WriteInt16( GDI_RECT_ACTION ); rOStm.WriteInt32( (sal_Int32) 28 ); ImplWriteRect( rOStm, pAct->GetRect() ); rOStm.WriteInt32( (sal_Int32) 0 ); @@ -1506,7 +1506,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaRoundRectAction* pAct = (MetaRoundRectAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_RECT_ACTION ); + rOStm.WriteInt16( GDI_RECT_ACTION ); rOStm.WriteInt32( (sal_Int32) 28 ); ImplWriteRect( rOStm, pAct->GetRect() ); rOStm.WriteInt32( (sal_Int32) pAct->GetHorzRound() ); @@ -1519,7 +1519,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaEllipseAction* pAct = (MetaEllipseAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_ELLIPSE_ACTION ); + rOStm.WriteInt16( GDI_ELLIPSE_ACTION ); rOStm.WriteInt32( (sal_Int32) 20 ); ImplWriteRect( rOStm, pAct->GetRect() ); nCount++; @@ -1530,7 +1530,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaArcAction* pAct = (MetaArcAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_ARC_ACTION ); + rOStm.WriteInt16( GDI_ARC_ACTION ); rOStm.WriteInt32( (sal_Int32) 36 ); ImplWriteRect( rOStm, pAct->GetRect() ); WritePair( rOStm, pAct->GetStartPoint() ); @@ -1543,7 +1543,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaPieAction* pAct = (MetaPieAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_PIE_ACTION ); + rOStm.WriteInt16( GDI_PIE_ACTION ); rOStm.WriteInt32( (sal_Int32) 36 ); ImplWriteRect( rOStm, pAct->GetRect() ); WritePair( rOStm, pAct->GetStartPoint() ); @@ -1559,7 +1559,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, pAct->GetEndPoint(), POLY_CHORD ); const sal_uInt16 nPoints = aChordPoly.GetSize(); - rOStm.WriteInt16( (sal_Int16) GDI_POLYGON_ACTION ); + rOStm.WriteInt16( GDI_POLYGON_ACTION ); rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) ); rOStm.WriteInt32( (sal_Int32) nPoints ); @@ -1592,31 +1592,31 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, if(bLineJoin) { - rOStm.WriteInt16( (sal_Int16) GDI_LINEJOIN_ACTION ); + rOStm.WriteInt16( GDI_LINEJOIN_ACTION ); rOStm.WriteInt32( (sal_Int32) 6 ); - rOStm.WriteInt16( (sal_Int16) rInfo.GetLineJoin() ); + rOStm.WriteInt16( rInfo.GetLineJoin() ); } if(bLineCap) { - rOStm.WriteInt16( (sal_Int16) GDI_LINECAP_ACTION ); + rOStm.WriteInt16( GDI_LINECAP_ACTION ); rOStm.WriteInt32( (sal_Int32) 6 ); - rOStm.WriteInt16( (sal_Int16) rInfo.GetLineCap() ); + rOStm.WriteInt16( rInfo.GetLineCap() ); } } if(bLineDashDot) { - rOStm.WriteInt16( (sal_Int16) GDI_LINEDASHDOT_ACTION ); + rOStm.WriteInt16( GDI_LINEDASHDOT_ACTION ); rOStm.WriteInt32( (sal_Int32) 4 + 16 ); - rOStm.WriteInt16( (sal_Int16)rInfo.GetDashCount() ); + rOStm.WriteInt16( rInfo.GetDashCount() ); rOStm.WriteInt32( (sal_Int32)rInfo.GetDashLen() ); - rOStm.WriteInt16( (sal_Int16)rInfo.GetDotCount() ); + rOStm.WriteInt16( rInfo.GetDotCount() ); rOStm.WriteInt32( (sal_Int32)rInfo.GetDotLen() ); rOStm.WriteInt32( (sal_Int32)rInfo.GetDistance() ); } - rOStm.WriteInt16( (sal_Int16) GDI_POLYLINE_ACTION ); + rOStm.WriteInt16( GDI_POLYLINE_ACTION ); rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) ); rOStm.WriteInt32( (sal_Int32) nPoints ); @@ -1666,7 +1666,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, pAct->GetPolygon().AdaptiveSubdivide(aSimplePoly); const sal_uInt16 nPoints(aSimplePoly.GetSize()); - rOStm.WriteInt16( (sal_Int16) GDI_POLYGON_ACTION ); + rOStm.WriteInt16( GDI_POLYGON_ACTION ); rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) ); rOStm.WriteInt32( (sal_Int32) nPoints ); @@ -1707,7 +1707,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, if ( ImplWriteUnicodeComment( rOStm, aUniText ) ) nCount++; - rOStm.WriteInt16( (sal_Int16) GDI_TEXT_ACTION ); + rOStm.WriteInt16( GDI_TEXT_ACTION ); rOStm.WriteInt32( ( 24 + ( nStrLen + 1 ) ) ); WritePair( rOStm, pAct->GetPoint() ); rOStm.WriteInt32( pAct->GetIndex() ); @@ -1746,7 +1746,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, else nAryLen = nLen; // #105987# Write out all of DX array - rOStm.WriteInt16( (sal_Int16) GDI_TEXTARRAY_ACTION ); + rOStm.WriteInt16( GDI_TEXTARRAY_ACTION ); rOStm.WriteInt32( ( 28 + ( nLen + 1 ) + ( nAryLen * 4 ) ) ); WritePair( rOStm, pAct->GetPoint() ); rOStm.WriteInt32( 0 ); @@ -1773,7 +1773,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, if ( ImplWriteUnicodeComment( rOStm, aUniText ) ) nCount++; - rOStm.WriteInt16( (sal_Int16) GDI_STRETCHTEXT_ACTION ); + rOStm.WriteInt16( GDI_STRETCHTEXT_ACTION ); rOStm.WriteInt32( ( 28 + ( nStrLen + 1 ) ) ); WritePair( rOStm, pAct->GetPoint() ); rOStm.WriteInt32( pAct->GetIndex() ); @@ -1789,7 +1789,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaBmpAction* pAct = (MetaBmpAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_BITMAP_ACTION ); + rOStm.WriteInt16( GDI_BITMAP_ACTION ); rOStm.WriteInt32( (sal_Int32) 12 ); WritePair( rOStm, pAct->GetPoint() ); WriteDIB(pAct->GetBitmap(), rOStm, false, true); @@ -1801,7 +1801,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALE_ACTION ); + rOStm.WriteInt16( GDI_BITMAPSCALE_ACTION ); rOStm.WriteInt32( (sal_Int32) 20 ); WritePair( rOStm, pAct->GetPoint() ); WritePair( rOStm, pAct->GetSize() ); @@ -1814,7 +1814,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALEPART_ACTION ); + rOStm.WriteInt16( GDI_BITMAPSCALEPART_ACTION ); rOStm.WriteInt32( (sal_Int32) 36 ); WritePair( rOStm, pAct->GetDestPoint() ); WritePair( rOStm, pAct->GetDestSize() ); @@ -1830,7 +1830,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaBmpExAction* pAct = (MetaBmpExAction*) pAction; const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() ); - rOStm.WriteInt16( (sal_Int16) GDI_BITMAP_ACTION ); + rOStm.WriteInt16( GDI_BITMAP_ACTION ); rOStm.WriteInt32( (sal_Int32) 12 ); WritePair( rOStm, pAct->GetPoint() ); WriteDIB(aBmp, rOStm, false, true); @@ -1843,7 +1843,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaBmpExScaleAction* pAct = (MetaBmpExScaleAction*) pAction; const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() ); - rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALE_ACTION ); + rOStm.WriteInt16( GDI_BITMAPSCALE_ACTION ); rOStm.WriteInt32( (sal_Int32) 20 ); WritePair( rOStm, pAct->GetPoint() ); WritePair( rOStm, pAct->GetSize() ); @@ -1857,7 +1857,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaBmpExScalePartAction* pAct = (MetaBmpExScalePartAction*) pAction; const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() ); - rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALEPART_ACTION ); + rOStm.WriteInt16( GDI_BITMAPSCALEPART_ACTION ); rOStm.WriteInt32( (sal_Int32) 36 ); WritePair( rOStm, pAct->GetDestPoint() ); WritePair( rOStm, pAct->GetDestSize() ); @@ -1873,18 +1873,18 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaGradientAction* pAct = (MetaGradientAction*) pAction; const Gradient& rGrad = pAct->GetGradient(); - rOStm.WriteInt16( (sal_Int16) GDI_GRADIENT_ACTION ); + rOStm.WriteInt16( GDI_GRADIENT_ACTION ); rOStm.WriteInt32( (sal_Int32) 46 ); ImplWriteRect( rOStm, pAct->GetRect() ); - rOStm.WriteInt16( (sal_Int16) rGrad.GetStyle() ); + rOStm.WriteInt16( rGrad.GetStyle() ); ImplWriteColor( rOStm, rGrad.GetStartColor() ); ImplWriteColor( rOStm, rGrad.GetEndColor() ); - rOStm.WriteInt16( (sal_Int16) rGrad.GetAngle() ); - rOStm.WriteInt16( (sal_Int16) rGrad.GetBorder() ); - rOStm.WriteInt16( (sal_Int16) rGrad.GetOfsX() ); - rOStm.WriteInt16( (sal_Int16) rGrad.GetOfsY() ); - rOStm.WriteInt16( (sal_Int16) rGrad.GetStartIntensity() ); - rOStm.WriteInt16( (sal_Int16) rGrad.GetEndIntensity() ); + rOStm.WriteInt16( rGrad.GetAngle() ); + rOStm.WriteInt16( rGrad.GetBorder() ); + rOStm.WriteInt16( rGrad.GetOfsX() ); + rOStm.WriteInt16( rGrad.GetOfsY() ); + rOStm.WriteInt16( rGrad.GetStartIntensity() ); + rOStm.WriteInt16( rGrad.GetEndIntensity() ); nCount++; } break; @@ -1895,7 +1895,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm.WriteInt16( (sal_Int16) GDI_GRADIENTEX_COMMENT ); + rOStm.WriteInt16( GDI_GRADIENTEX_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -1925,7 +1925,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, ImplWriteLineColor( rOStm, rColor, 1 ); ImplWriteFillColor( rOStm, rColor, 1 ); - rOStm.WriteInt16( (sal_Int16) GDI_RECT_ACTION ); + rOStm.WriteInt16( GDI_RECT_ACTION ); rOStm.WriteInt32( (sal_Int32) 28 ); ImplWriteRect( rOStm, pAct->GetRect() ); rOStm.WriteInt32( (sal_Int32) 0 ); @@ -1942,18 +1942,18 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const Region& rRegion = pAct->GetRegion(); Rectangle aClipRect; - rOStm.WriteInt16( (sal_Int16) GDI_CLIPREGION_ACTION ); + rOStm.WriteInt16( GDI_CLIPREGION_ACTION ); rOStm.WriteInt32( (sal_Int32) 24 ); if( pAct->IsClipping() ) { aClipRect = rRegion.GetBoundRect(); - rOStm.WriteInt16( (sal_Int16) 1 ); + rOStm.WriteInt16( 1 ); } else - rOStm.WriteInt16( (sal_Int16) 0 ); + rOStm.WriteInt16( 0 ); - rOStm.WriteInt16( (sal_Int16) 0 ); + rOStm.WriteInt16( 0 ); ImplWriteRect( rOStm, aClipRect ); if( pAct->IsClipping() ) @@ -1967,7 +1967,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_ISECTCLIPREGION_ACTION ); + rOStm.WriteInt16( GDI_ISECTCLIPREGION_ACTION ); rOStm.WriteInt32( (sal_Int32) 20 ); WriteRectangle( rOStm, pAct->GetRect() ); nCount++; @@ -1978,7 +1978,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaMoveClipRegionAction* pAct = (MetaMoveClipRegionAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_MOVECLIPREGION_ACTION ); + rOStm.WriteInt16( GDI_MOVECLIPREGION_ACTION ); rOStm.WriteInt32( (sal_Int32) 12 ); rOStm.WriteInt32( (sal_Int32) pAct->GetHorzMove() ); rOStm.WriteInt32( (sal_Int32) pAct->GetVertMove() ); @@ -2052,7 +2052,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaMapModeAction* pAct = (MetaMapModeAction*) pAction; - rOStm.WriteInt16( (sal_Int16) GDI_MAPMODE_ACTION ); + rOStm.WriteInt16( GDI_MAPMODE_ACTION ); rOStm.WriteInt32( (sal_Int32) 30 ); ImplWriteMapMode( rOStm, pAct->GetMapMode() ); nCount++; @@ -2151,7 +2151,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write transparence comment - rOStm.WriteInt16( (sal_Int16) GDI_TRANSPARENT_COMMENT ); + rOStm.WriteInt16( GDI_TRANSPARENT_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2212,7 +2212,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm.WriteInt16( (sal_Int16) GDI_FLOATTRANSPARENT_COMMENT ); + rOStm.WriteInt16( GDI_FLOATTRANSPARENT_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2272,7 +2272,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos, nAddCount; // write hatch comment - rOStm.WriteInt16( (sal_Int16) GDI_HATCH_COMMENT ); + rOStm.WriteInt16( GDI_HATCH_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2315,7 +2315,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm.WriteInt16( (sal_Int16) GDI_REFPOINT_COMMENT ); + rOStm.WriteInt16( GDI_REFPOINT_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2344,7 +2344,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm.WriteInt16( (sal_Int16) GDI_TEXTLINECOLOR_COMMENT ); + rOStm.WriteInt16( GDI_TEXTLINECOLOR_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2375,7 +2375,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm.WriteInt16( (sal_Int16) GDI_TEXTLINE_COMMENT ); + rOStm.WriteInt16( GDI_TEXTLINE_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2406,7 +2406,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm.WriteInt16( (sal_Int16) GDI_COMMENT_COMMENT ); + rOStm.WriteInt16( GDI_COMMENT_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); |