diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-15 09:01:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-15 09:01:15 +0100 |
commit | 72e3c234104a17566c0354beacc6d182234f1e5f (patch) | |
tree | 676e0c1a21ac6b107938d486cbe0b4201b5d4f1c /vcl | |
parent | 0ffaf416ba6ec1d5955008467a5bf46a40ac6640 (diff) |
More loplugin:cstylecast: vcl
Change-Id: I74d1555b461fd8ea316380423fcde2d167714170
Diffstat (limited to 'vcl')
45 files changed, 143 insertions, 143 deletions
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index f4381df1d115..bdfa85a403b0 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -87,7 +87,7 @@ bool VclFiltersTest::load(const OUString &, void VclFiltersTest::testScaling() { - for (BmpScaleFlag i = BmpScaleFlag::Default; i <= BmpScaleFlag::BiLinear; i = (BmpScaleFlag)((int)i + 1)) + for (BmpScaleFlag i = BmpScaleFlag::Default; i <= BmpScaleFlag::BiLinear; i = static_cast<BmpScaleFlag>(static_cast<int>(i) + 1)) { Bitmap aBitmap( Size( 413, 409 ), 24 ); BitmapEx aBitmapEx( aBitmap ); diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index b53a58ecf555..1928161aecea 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -44,7 +44,7 @@ template< typename charT, typename traits > inline std::basic_ostream<charT, traits> & operator <<( std::basic_ostream<charT, traits> & stream, const Task& task ) { - stream << "a: " << task.IsActive() << " p: " << (int) task.GetPriority(); + stream << "a: " << task.IsActive() << " p: " << static_cast<int>(task.GetPriority()); const sal_Char *name = task.GetDebugName(); if( nullptr == name ) return stream << " (nullptr)"; @@ -65,7 +65,7 @@ inline std::basic_ostream<charT, traits> & operator <<( { bool bIsIdle = (dynamic_cast<const Idle*>( &timer ) != nullptr); stream << (bIsIdle ? "Idle " : "Timer") - << " a: " << timer.IsActive() << " p: " << (int) timer.GetPriority(); + << " a: " << timer.IsActive() << " p: " << static_cast<int>(timer.GetPriority()); const sal_Char *name = timer.GetDebugName(); if ( nullptr == name ) stream << " (nullptr)"; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index dd4583de0181..ea0e7fd8e846 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -148,7 +148,7 @@ OUString Button::GetStandardText(StandardButtonType eButton) SV_BUTTONTEXT_LESS, }; - return VclResId(aResIdAry[(sal_uInt16)eButton]); + return VclResId(aResIdAry[static_cast<sal_uInt16>(eButton)]); } bool Button::SetModeImage( const Image& rImage ) diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 8d6a54e7cff2..379f2adeb6c0 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1740,7 +1740,7 @@ void TextEngine::CreateTextPortions( sal_uInt32 nPara, sal_Int32 nStartPos ) if ( mpIMEInfos && mpIMEInfos->pAttribs && ( mpIMEInfos->aPos.GetPara() == nPara ) ) { - ExtTextInputAttr nLastAttr = (ExtTextInputAttr)0xffff; + ExtTextInputAttr nLastAttr = ExtTextInputAttr(0xffff); for( sal_Int32 n = 0; n < mpIMEInfos->nLen; n++ ) { if ( mpIMEInfos->pAttribs[n] != nLastAttr ) diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 80d7a5ac8d77..56b5ab6d0ef5 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -856,7 +856,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r if ( nColors ) // graphic conversion necessary ? { BitmapEx aBmpEx( aGraphic.GetBitmapEx() ); - aBmpEx.Convert( (BmpConversion)nColors ); // the entries in the xml section have the same meaning as + aBmpEx.Convert( static_cast<BmpConversion>(nColors) ); // the entries in the xml section have the same meaning as aGraphic = aBmpEx; // they have in the BmpConversion enum, so it should be } // allowed to cast them } @@ -1984,7 +1984,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r if( aFilterName.equalsIgnoreAsciiCase( EXP_BMP ) ) { Bitmap aBmp( aGraphic.GetBitmap() ); - BmpConversion nColorRes = (BmpConversion) aConfigItem.ReadInt32( "Colors", 0 ); + BmpConversion nColorRes = static_cast<BmpConversion>(aConfigItem.ReadInt32( "Colors", 0 )); if ( nColorRes != BmpConversion::NNONE && ( nColorRes <= BmpConversion::N24Bit) ) { if( !aBmp.Convert( nColorRes ) ) diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index ae181f4269b6..84bb1fe59194 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -991,7 +991,7 @@ bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, bool bExtendedInfo ) nTemp16 = 0; rStm.ReadUInt16( nTemp16 ); aLogSize = OutputDevice::LogicToLogic( aLogSize, - MapMode( (MapUnit) nTemp16 ), + MapMode( static_cast<MapUnit>(nTemp16) ), MapMode( MapUnit::Map100thMM ) ); } } diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index de1060a58698..a624b7156703 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -133,7 +133,7 @@ void EMFWriter::ImplBeginPlusRecord( EmfPlusRecordType nType, sal_uInt16 nFlags mbRecordPlusOpen = true; mnRecordPlusPos = m_rStm.Tell(); - m_rStm.WriteUInt16( (sal_uInt16)nType ).WriteUInt16( nFlags ); + m_rStm.WriteUInt16( static_cast<sal_uInt16>(nType) ).WriteUInt16( nFlags ); m_rStm.SeekRel( 8 ); } } @@ -174,7 +174,7 @@ void EMFWriter::WriteEMFPlusHeader( const Size &rMtfSizePix, const Size &rMtfSiz if (nDivY) nDPIY /= nDivY; // DPI Y - m_rStm.WriteInt16( (sal_Int16)EmfPlusRecordType::Header ); + m_rStm.WriteInt16( sal_Int16(EmfPlusRecordType::Header) ); m_rStm.WriteInt16( 0x01 ) // Flags - Dual Mode // TODO: Check this .WriteInt32( 0x1C ) // Size .WriteInt32( 0x10 ) // Data Size diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index 5c59f344f87c..0d4cc3a480e0 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -370,14 +370,14 @@ SvStream& ReadImplFont( SvStream& rIStm, ImplFont& rImplFont ) ReadPair( rIStm, rImplFont.maAverageFontSize ); rIStm.ReadUInt16( nTmp16 ); rImplFont.SetCharSet( static_cast<rtl_TextEncoding>(nTmp16) ); - rIStm.ReadUInt16( nTmp16 ); rImplFont.SetFamilyType( (FontFamily) nTmp16 ); - rIStm.ReadUInt16( nTmp16 ); rImplFont.SetPitch( (FontPitch) nTmp16 ); - rIStm.ReadUInt16( nTmp16 ); rImplFont.SetWeight( (FontWeight) nTmp16 ); - rIStm.ReadUInt16( nTmp16 ); rImplFont.meUnderline = (FontLineStyle) nTmp16; - rIStm.ReadUInt16( nTmp16 ); rImplFont.meStrikeout = (FontStrikeout) nTmp16; - rIStm.ReadUInt16( nTmp16 ); rImplFont.SetItalic( (FontItalic) nTmp16 ); + rIStm.ReadUInt16( nTmp16 ); rImplFont.SetFamilyType( static_cast<FontFamily>(nTmp16) ); + rIStm.ReadUInt16( nTmp16 ); rImplFont.SetPitch( static_cast<FontPitch>(nTmp16) ); + rIStm.ReadUInt16( nTmp16 ); rImplFont.SetWeight( static_cast<FontWeight>(nTmp16) ); + rIStm.ReadUInt16( nTmp16 ); rImplFont.meUnderline = static_cast<FontLineStyle>(nTmp16); + rIStm.ReadUInt16( nTmp16 ); rImplFont.meStrikeout = static_cast<FontStrikeout>(nTmp16); + rIStm.ReadUInt16( nTmp16 ); rImplFont.SetItalic( static_cast<FontItalic>(nTmp16) ); rIStm.ReadUInt16( nTmp16 ); rImplFont.maLanguageTag.reset( LanguageType(nTmp16) ); - rIStm.ReadUInt16( nTmp16 ); rImplFont.meWidthType = (FontWidth) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImplFont.meWidthType = static_cast<FontWidth>(nTmp16); rIStm.ReadInt16( rImplFont.mnOrientation ); @@ -388,15 +388,15 @@ SvStream& ReadImplFont( SvStream& rIStm, ImplFont& rImplFont ) if( aCompat.GetVersion() >= 2 ) { - rIStm.ReadUChar( nTmp8 ); rImplFont.meRelief = (FontRelief)nTmp8; + rIStm.ReadUChar( nTmp8 ); rImplFont.meRelief = static_cast<FontRelief>(nTmp8); rIStm.ReadUInt16( nTmp16 ); rImplFont.maCJKLanguageTag.reset( LanguageType(nTmp16) ); rIStm.ReadCharAsBool( bTmp ); rImplFont.mbVertical = bTmp; - rIStm.ReadUInt16( nTmp16 ); rImplFont.meEmphasisMark = (FontEmphasisMark)nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImplFont.meEmphasisMark = static_cast<FontEmphasisMark>(nTmp16); } if( aCompat.GetVersion() >= 3 ) { - rIStm.ReadUInt16( nTmp16 ); rImplFont.meOverline = (FontLineStyle) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImplFont.meOverline = static_cast<FontLineStyle>(nTmp16); } // Relief @@ -430,10 +430,10 @@ SvStream& WriteImplFont( SvStream& rOStm, const ImplFont& rImplFont ) rOStm.WriteUChar( static_cast<sal_uInt8>(rImplFont.meKerning) ); // new in version 2 - rOStm.WriteUChar( (sal_uChar)rImplFont.meRelief ); + rOStm.WriteUChar( static_cast<sal_uChar>(rImplFont.meRelief) ); rOStm.WriteUInt16( static_cast<sal_uInt16>(rImplFont.maCJKLanguageTag.getLanguageType( false)) ); rOStm.WriteBool( rImplFont.mbVertical ); - rOStm.WriteUInt16( (sal_uInt16)rImplFont.meEmphasisMark ); + rOStm.WriteUInt16( static_cast<sal_uInt16>(rImplFont.meEmphasisMark) ); // new in version 3 rOStm.WriteUInt16( rImplFont.meOverline ); diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index c438382df487..ee3dceeeaa00 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -663,7 +663,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs) hb_buffer_set_direction(pHbBuffer, aSubRun.maDirection); hb_buffer_set_script(pHbBuffer, aSubRun.maScript); hb_buffer_set_language(pHbBuffer, hb_language_from_string(sLanguage.getStr(), -1)); - hb_buffer_set_flags(pHbBuffer, (hb_buffer_flags_t) nHbFlags); + hb_buffer_set_flags(pHbBuffer, static_cast<hb_buffer_flags_t>(nHbFlags)); hb_buffer_add_utf16( pHbBuffer, reinterpret_cast<uint16_t const *>(pStr), nLength, nMinRunPos, nRunLen); diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 8e96965e7047..0cb67808398a 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -51,7 +51,7 @@ BitmapChecksum AnimationBitmap::GetChecksum() const UInt32ToSVBT32( nWait, aBT32 ); nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); - UInt32ToSVBT32( (long) eDisposal, aBT32 ); + UInt32ToSVBT32( static_cast<long>(eDisposal), aBT32 ); nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); UInt32ToSVBT32( static_cast<long>(bUserInput), aBT32 ); @@ -684,7 +684,7 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation ) WritePair( rOStm, rAnimBmp.aSizePix ); WritePair( rOStm, rAnimation.maGlobalSize ); rOStm.WriteUInt16( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ); - rOStm.WriteUInt16( (sal_uInt16)rAnimBmp.eDisposal ); + rOStm.WriteUInt16( static_cast<sal_uInt16>(rAnimBmp.eDisposal) ); rOStm.WriteBool( rAnimBmp.bUserInput ); rOStm.WriteUInt32( rAnimation.mnLoopCount ); rOStm.WriteUInt32( nDummy32 ); // Unused @@ -746,7 +746,7 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation ) ReadPair( rIStm, aAnimBmp.aSizePix ); ReadPair( rIStm, rAnimation.maGlobalSize ); rIStm.ReadUInt16( nTmp16 ); aAnimBmp.nWait = ( ( 65535 == nTmp16 ) ? ANIMATION_TIMEOUT_ON_CLICK : nTmp16 ); - rIStm.ReadUInt16( nTmp16 ); aAnimBmp.eDisposal = ( Disposal) nTmp16; + rIStm.ReadUInt16( nTmp16 ); aAnimBmp.eDisposal = static_cast<Disposal>(nTmp16); rIStm.ReadCharAsBool( cTmp ); aAnimBmp.bUserInput = cTmp; rIStm.ReadUInt32( rAnimation.mnLoopCount ); rIStm.ReadUInt32( nTmp32 ); // Unused diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 2eb5a2ceb90c..28ea7efe1c3b 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -303,7 +303,7 @@ BitmapChecksum BitmapEx::GetChecksum() const SVBT32 aBT32; BitmapChecksumOctetArray aBCOA; - UInt32ToSVBT32( (long) eTransparent, aBT32 ); + UInt32ToSVBT32( static_cast<long>(eTransparent), aBT32 ); nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); UInt32ToSVBT32( static_cast<long>(bAlpha), aBT32 ); diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 29737e1617d3..c08a9b349d1b 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -420,7 +420,7 @@ inline bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc static int nNotAccelerated = 0; SAL_WARN_IF( rSrc.mnWidth * rSrc.mnHeight >= 4000 && ++nNotAccelerated == 100, "vcl.gdi", - "ImplConvertFromBitmap for not accelerated case (" << std::hex << (int)rSrc.mnFormat << "->" << (int)rDst.mnFormat << ")" ); + "ImplConvertFromBitmap for not accelerated case (" << std::hex << static_cast<int>(rSrc.mnFormat) << "->" << static_cast<int>(rDst.mnFormat) << ")" ); return false; } @@ -528,7 +528,7 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc, static int nNotAccelerated = 0; SAL_WARN_IF( rSrc.mnWidth * rSrc.mnHeight >= 4000 && ++nNotAccelerated == 100, "vcl.gdi", - "ImplFastBitmapConversion for not accelerated case (" << std::hex << (int)rSrc.mnFormat << "->" << (int)rDst.mnFormat << ")" ); + "ImplFastBitmapConversion for not accelerated case (" << std::hex << static_cast<int>(rSrc.mnFormat) << "->" << static_cast<int>(rDst.mnFormat) << ")" ); return false; } @@ -655,7 +655,7 @@ bool ImplBlendFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc, const Bi static int nNotAccelerated = 0; SAL_WARN_IF( rSrc.mnWidth * rSrc.mnHeight >= 4000 && ++nNotAccelerated == 100, "vcl.gdi", - "ImplBlendFromBitmap for not accelerated case (" << std::hex << (int)rSrc.mnFormat << "*" << (int)rMsk.mnFormat << "->" << (int)rDst.mnFormat ); + "ImplBlendFromBitmap for not accelerated case (" << std::hex << static_cast<int>(rSrc.mnFormat) << "*" << static_cast<int>(rMsk.mnFormat) << "->" << static_cast<int>(rDst.mnFormat) ); return false; } @@ -770,7 +770,7 @@ bool ImplFastBitmapBlending( BitmapWriteAccess const & rDstWA, static int nNotAccelerated = 0; SAL_WARN_IF( rSrc.mnWidth * rSrc.mnHeight >= 4000 && ++nNotAccelerated == 100, "vcl.gdi", - "ImplFastBlend for not accelerated case (" << std::hex << (int)rSrc.mnFormat << "*" << (int)rMsk.mnFormat << "->" << (int)rDst.mnFormat << ")" ); + "ImplFastBlend for not accelerated case (" << std::hex << static_cast<int>(rSrc.mnFormat) << "*" << static_cast<int>(rMsk.mnFormat) << "->" << static_cast<int>(rDst.mnFormat) << ")" ); return false; } diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 6a97eebc3cab..a8fee2ad85e4 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -1733,7 +1733,7 @@ bool ReadDIBBitmapEx( { sal_uInt8 tmp = 0; rIStm.ReadUChar( tmp ); - TransparentType transparent = (TransparentType)tmp; + TransparentType transparent = static_cast<TransparentType>(tmp); bRetval = !rIStm.GetError(); if(bRetval) @@ -1822,7 +1822,7 @@ bool WriteDIBBitmapEx( { rOStm.WriteUInt32( 0x25091962 ); rOStm.WriteUInt32( 0xACB20201 ); - rOStm.WriteUChar( (sal_uChar)rSource.eTransparent ); + rOStm.WriteUChar( static_cast<sal_uChar>(rSource.eTransparent) ); if(TransparentType::Bitmap == rSource.eTransparent) { diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index a7a33ad1c862..c1b0cd4bd5df 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -187,7 +187,7 @@ SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink ) std::unique_ptr<VersionCompat> pCompat(new VersionCompat( rOStream, StreamMode::WRITE, 2 )); // Version 1 - rOStream.WriteUInt16( (sal_uInt16)rGfxLink.GetType() ).WriteUInt32( rGfxLink.GetDataSize() ).WriteUInt32( rGfxLink.GetUserId() ); + rOStream.WriteUInt16( static_cast<sal_uInt16>(rGfxLink.GetType()) ).WriteUInt32( rGfxLink.GetDataSize() ).WriteUInt32( rGfxLink.GetUserId() ); // Version 2 WritePair( rOStream, rGfxLink.GetPrefSize() ); @@ -236,7 +236,7 @@ SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink) std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[ nSize ]); rIStream.ReadBytes( pBuf.get(), nSize ); - rGfxLink = GfxLink( std::move(pBuf), nSize, (GfxLinkType) nType ); + rGfxLink = GfxLink( std::move(pBuf), nSize, static_cast<GfxLinkType>(nType) ); rGfxLink.SetUserId( nUserId ); if( bMapAndSizeValid ) diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx index 67b8a02d46b2..dc08091295e7 100644 --- a/vcl/source/gdi/gradient.cxx +++ b/vcl/source/gdi/gradient.cxx @@ -243,7 +243,7 @@ SvStream& ReadGradient( SvStream& rIStm, Gradient& rGradient ) VersionCompat aCompat( rIStm, StreamMode::READ ); sal_uInt16 nTmp16; - rIStm.ReadUInt16( nTmp16 ); rGradient.mpImplGradient->meStyle = (GradientStyle) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rGradient.mpImplGradient->meStyle = static_cast<GradientStyle>(nTmp16); ReadColor( rIStm, rGradient.mpImplGradient->maStartColor ); ReadColor( rIStm, rGradient.mpImplGradient->maEndColor ); @@ -262,7 +262,7 @@ SvStream& WriteGradient( SvStream& rOStm, const Gradient& rGradient ) { VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 ); - rOStm.WriteUInt16( (sal_uInt16)rGradient.mpImplGradient->meStyle ); + rOStm.WriteUInt16( static_cast<sal_uInt16>(rGradient.mpImplGradient->meStyle) ); WriteColor( rOStm, rGradient.mpImplGradient->maStartColor ); WriteColor( rOStm, rGradient.mpImplGradient->maEndColor ); rOStm.WriteUInt16( rGradient.mpImplGradient->mnAngle ) diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index f0f822cbf01a..ac2accdbd26d 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -99,7 +99,7 @@ SvStream& ReadHatch( SvStream& rIStm, Hatch& rHatch ) sal_uInt16 nTmp16; sal_Int32 nTmp32(0); - rIStm.ReadUInt16( nTmp16 ); rHatch.mpImplHatch->meStyle = (HatchStyle) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rHatch.mpImplHatch->meStyle = static_cast<HatchStyle>(nTmp16); ReadColor( rIStm, rHatch.mpImplHatch->maColor ).ReadInt32( nTmp32 ).ReadUInt16( rHatch.mpImplHatch->mnAngle ); rHatch.mpImplHatch->mnDistance = nTmp32; @@ -111,7 +111,7 @@ SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch ) { VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 ); - rOStm.WriteUInt16( (sal_uInt16)rHatch.mpImplHatch->meStyle ); + rOStm.WriteUInt16( static_cast<sal_uInt16>(rHatch.mpImplHatch->meStyle) ); WriteColor( rOStm, rHatch.mpImplHatch->maColor ); rOStm.WriteInt32( rHatch.mpImplHatch->mnDistance ).WriteUInt16( rHatch.mpImplHatch->mnAngle ); diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 09186dd054bb..84aa0462c863 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1015,12 +1015,12 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm ) } aSize = Size( nWidth, nHeight ); - aMapMode = MapMode( (MapUnit) nMapMode, Point( nOffsX, nOffsY ), + aMapMode = MapMode( static_cast<MapUnit>(nMapMode), Point( nOffsX, nOffsY ), Fraction( nScaleNumX, nScaleDenomX ), Fraction( nScaleNumY, nScaleDenomY ) ); } - meType = (GraphicType) nType; + meType = static_cast<GraphicType>(nType); if( meType != GraphicType::NONE ) { @@ -1114,7 +1114,7 @@ bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) // write new style header std::unique_ptr<VersionCompat> pCompat( new VersionCompat( rOStm, StreamMode::WRITE, 1 ) ); - rOStm.WriteInt32( (sal_Int32)meType ); + rOStm.WriteInt32( static_cast<sal_Int32>(meType) ); // data size is updated later nDataFieldPos = rOStm.Tell(); @@ -1126,14 +1126,14 @@ bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) else { // write old style (<=4.0) header - rOStm.WriteInt32( (sal_Int32)meType ); + rOStm.WriteInt32( static_cast<sal_Int32>(meType) ); // data size is updated later nDataFieldPos = rOStm.Tell(); rOStm.WriteInt32( 0 ); rOStm.WriteInt32( aSize.Width() ); rOStm.WriteInt32( aSize.Height() ); - rOStm.WriteInt32( (sal_uInt16)aMapMode.GetMapUnit() ); + rOStm.WriteInt32( static_cast<sal_uInt16>(aMapMode.GetMapUnit()) ); rOStm.WriteInt32( aMapMode.GetScaleX().GetNumerator() ); rOStm.WriteInt32( aMapMode.GetScaleX().GetDenominator() ); rOStm.WriteInt32( aMapMode.GetScaleY().GetNumerator() ); diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index fdb002394662..844dcb60dce8 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -277,10 +277,10 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup ) sal_uInt16 nOldJobDataSize = SVBT16ToShort( pOldJobData->nSize ); rJobData.SetSystem( SVBT16ToShort( pOldJobData->nSystem ) ); rJobData.SetDriverDataLen( SVBT32ToUInt32( pOldJobData->nDriverDataLen ) ); - rJobData.SetOrientation( (Orientation)SVBT16ToShort( pOldJobData->nOrientation ) ); + rJobData.SetOrientation( static_cast<Orientation>(SVBT16ToShort( pOldJobData->nOrientation )) ); rJobData.SetDuplexMode( DuplexMode::Unknown ); rJobData.SetPaperBin( SVBT16ToShort( pOldJobData->nPaperBin ) ); - rJobData.SetPaperFormat( (Paper)SVBT16ToShort( pOldJobData->nPaperFormat ) ); + rJobData.SetPaperFormat( static_cast<Paper>(SVBT16ToShort( pOldJobData->nPaperFormat )) ); rJobData.SetPaperWidth( static_cast<long>(SVBT32ToUInt32( pOldJobData->nPaperWidth )) ); rJobData.SetPaperHeight( static_cast<long>(SVBT32ToUInt32( pOldJobData->nPaperHeight )) ); if ( rJobData.GetDriverDataLen() ) @@ -346,7 +346,7 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup ) ShortToSVBT16( nOldJobDataSize, aOldJobData.nSize ); ShortToSVBT16( rJobData.GetSystem(), aOldJobData.nSystem ); UInt32ToSVBT32( rJobData.GetDriverDataLen(), aOldJobData.nDriverDataLen ); - ShortToSVBT16( (sal_uInt16)(rJobData.GetOrientation()), aOldJobData.nOrientation ); + ShortToSVBT16( static_cast<sal_uInt16>(rJobData.GetOrientation()), aOldJobData.nOrientation ); ShortToSVBT16( rJobData.GetPaperBin(), aOldJobData.nPaperBin ); ShortToSVBT16( static_cast<sal_uInt16>(rJobData.GetPaperFormat()), aOldJobData.nPaperFormat ); UInt32ToSVBT32( static_cast<sal_uLong>(rJobData.GetPaperWidth()), aOldJobData.nPaperWidth ); diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 1c9ee4846a72..f8b48da94520 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -166,7 +166,7 @@ SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ) sal_uInt16 nTmp16(0); sal_Int32 nTmp32(0); - rIStm.ReadUInt16( nTmp16 ); rLineInfo.mpImplLineInfo->meStyle = (LineStyle) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rLineInfo.mpImplLineInfo->meStyle = static_cast<LineStyle>(nTmp16); rIStm.ReadInt32( nTmp32 ); rLineInfo.mpImplLineInfo->mnWidth = nTmp32; @@ -184,13 +184,13 @@ SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ) if( aCompat.GetVersion() >= 3 ) { // version 3 - rIStm.ReadUInt16( nTmp16 ); rLineInfo.mpImplLineInfo->meLineJoin = (basegfx::B2DLineJoin) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rLineInfo.mpImplLineInfo->meLineJoin = static_cast<basegfx::B2DLineJoin>(nTmp16); } if( aCompat.GetVersion() >= 4 ) { // version 4 - rIStm.ReadUInt16( nTmp16 ); rLineInfo.mpImplLineInfo->meLineCap = (css::drawing::LineCap) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rLineInfo.mpImplLineInfo->meLineCap = static_cast<css::drawing::LineCap>(nTmp16); } return rIStm; @@ -201,7 +201,7 @@ SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ) VersionCompat aCompat( rOStm, StreamMode::WRITE, 4 ); // version 1 - rOStm.WriteUInt16( (sal_uInt16)rLineInfo.mpImplLineInfo->meStyle ) + rOStm.WriteUInt16( static_cast<sal_uInt16>(rLineInfo.mpImplLineInfo->meStyle) ) .WriteInt32( rLineInfo.mpImplLineInfo->mnWidth ); // since version2 @@ -215,7 +215,7 @@ SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ) rOStm.WriteUInt16( static_cast<sal_uInt16>(rLineInfo.mpImplLineInfo->meLineJoin) ); // since version4 - rOStm.WriteUInt16( (sal_uInt16)rLineInfo.mpImplLineInfo->meLineCap ); + rOStm.WriteUInt16( static_cast<sal_uInt16>(rLineInfo.mpImplLineInfo->meLineCap) ); return rOStm; } diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index 3f7a8272bd7f..740794e67bde 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -156,7 +156,7 @@ SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ) VersionCompat aCompat( rIStm, StreamMode::READ ); sal_uInt16 nTmp16; - rIStm.ReadUInt16( nTmp16 ); rMapMode.mpImplMapMode->meUnit = (MapUnit) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rMapMode.mpImplMapMode->meUnit = static_cast<MapUnit>(nTmp16); ReadPair( rIStm, rMapMode.mpImplMapMode->maOrigin ); ReadFraction( rIStm, rMapMode.mpImplMapMode->maScaleX ); ReadFraction( rIStm, rMapMode.mpImplMapMode->maScaleY ); @@ -169,7 +169,7 @@ SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ) { VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 ); - rOStm.WriteUInt16( (sal_uInt16)rMapMode.mpImplMapMode->meUnit ); + rOStm.WriteUInt16( static_cast<sal_uInt16>(rMapMode.mpImplMapMode->meUnit) ); WritePair( rOStm, rMapMode.mpImplMapMode->maOrigin ); WriteFraction( rOStm, rMapMode.mpImplMapMode->maScaleX ); WriteFraction( rOStm, rMapMode.mpImplMapMode->maScaleY ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index ecd91f724d67..9856b1d22df5 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1437,17 +1437,17 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) sal_uInt32 nTempStrikeout(0); rIStm.ReadUInt32( nTempStrikeout ); - meStrikeout = (FontStrikeout)nTempStrikeout; + meStrikeout = static_cast<FontStrikeout>(nTempStrikeout); sal_uInt32 nTempUnderline(0); rIStm.ReadUInt32( nTempUnderline ); - meUnderline = (FontLineStyle)nTempUnderline; + meUnderline = static_cast<FontLineStyle>(nTempUnderline); if (aCompat.GetVersion() >= 2) { sal_uInt32 nTempOverline(0); rIStm.ReadUInt32(nTempOverline); - meOverline = (FontLineStyle)nTempOverline; + meOverline = static_cast<FontLineStyle>(nTempOverline); } } @@ -2709,7 +2709,7 @@ void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) sal_uInt16 nTmp16(0); VersionCompat aCompat(rIStm, StreamMode::READ); - rIStm.ReadUInt16( nTmp16 ); maAlign = (TextAlign) nTmp16; + rIStm.ReadUInt16( nTmp16 ); maAlign = static_cast<TextAlign>(nTmp16); } MetaMapModeAction::MetaMapModeAction() : @@ -2918,7 +2918,7 @@ void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); - rOStm.WriteUInt16( (sal_uInt16)meRasterOp ); + rOStm.WriteUInt16( static_cast<sal_uInt16>(meRasterOp) ); } void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) @@ -2926,7 +2926,7 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) sal_uInt16 nTmp16(0); VersionCompat aCompat(rIStm, StreamMode::READ); - rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16; + rIStm.ReadUInt16( nTmp16 ); meRasterOp = static_cast<RasterOp>(nTmp16); } MetaTransparentAction::MetaTransparentAction() : @@ -3399,7 +3399,7 @@ void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); - rOStm.WriteUInt32( (sal_uInt32)mnLayoutMode ); + rOStm.WriteUInt32( static_cast<sal_uInt32>(mnLayoutMode) ); } void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 44174f392f70..75e11feb27ba 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -3364,7 +3364,7 @@ bool PDFWriterImpl::emitFonts() } else { - SAL_INFO("vcl.pdfwriter", "PDF: CreateFontSubset result in not yet supported format=" << (int)aSubsetInfo.m_nFontType); + SAL_INFO("vcl.pdfwriter", "PDF: CreateFontSubset result in not yet supported format=" << static_cast<int>(aSubsetInfo.m_nFontType)); aLine.append( "0 >>\nstream\n" ); } diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index f1f5c2661783..18ac2e32e162 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1071,7 +1071,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa if( !bAssertionFired ) { bAssertionFired = true; - SAL_WARN( "vcl", "PDFExport::ImplWriteActions: deprecated and unsupported MetaAction encountered " << (int)nType ); + SAL_WARN( "vcl", "PDFExport::ImplWriteActions: deprecated and unsupported MetaAction encountered " << static_cast<int>(nType) ); } break; } diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index eee377547688..28ff84b8bfd1 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -146,17 +146,17 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile ) if( xSet->getPropertyValue("ReduceTransparency") >>= bValue ) SetReduceTransparency( bValue ); if( xSet->getPropertyValue("ReducedTransparencyMode") >>= nValue ) - SetReducedTransparencyMode( (PrinterTransparencyMode)nValue ); + SetReducedTransparencyMode( static_cast<PrinterTransparencyMode>(nValue) ); if( xSet->getPropertyValue("ReduceGradients") >>= bValue ) SetReduceGradients( bValue ); if( xSet->getPropertyValue("ReducedGradientMode") >>= nValue ) - SetReducedGradientMode( (PrinterGradientMode)nValue ); + SetReducedGradientMode( static_cast<PrinterGradientMode>(nValue) ); if( xSet->getPropertyValue("ReducedGradientStepCount") >>= nValue ) SetReducedGradientStepCount( static_cast<sal_uInt16>(nValue) ); if( xSet->getPropertyValue("ReduceBitmaps") >>= bValue ) SetReduceBitmaps( bValue ); if( xSet->getPropertyValue("ReducedBitmapMode") >>= nValue ) - SetReducedBitmapMode( (PrinterBitmapMode)nValue ); + SetReducedBitmapMode( static_cast<PrinterBitmapMode>(nValue) ); if( xSet->getPropertyValue("ReducedBitmapResolution") >>= nValue ) SetReducedBitmapResolution( static_cast<sal_uInt16>(nValue) ); if( xSet->getPropertyValue("ReducedBitmapIncludesTransparency") >>= bValue ) diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 30cdc4aebaa9..cbdd88bc00be 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -435,7 +435,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController, if( nValue >= 0 ) aMPS.nVerticalSpacing = nValue; aMPS.bDrawBorder = xController->getBoolProperty( "NUpDrawBorder", aMPS.bDrawBorder ); - aMPS.nOrder = static_cast<NupOrderType>(xController->getIntProperty( "NUpSubPageOrder", (sal_Int32)aMPS.nOrder )); + aMPS.nOrder = static_cast<NupOrderType>(xController->getIntProperty( "NUpSubPageOrder", static_cast<sal_Int32>(aMPS.nOrder) )); aMPS.aPaperSize = xController->getPrinter()->PixelToLogic( xController->getPrinter()->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) ); css::beans::PropertyValue* pPgSizeVal = xController->getValue( OUString( "NUpPaperSize" ) ); css::awt::Size aSizeVal; diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index a4163402ea7a..e59ca166348b 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1567,7 +1567,7 @@ SvStream& ReadRegion(SvStream& rIStrm, vcl::Region& rRegion) rIStrm.ReadUInt16( nTmp16 ); enum RegionType { REGION_NULL, REGION_EMPTY, REGION_RECTANGLE, REGION_COMPLEX }; - RegionType meStreamedType = (RegionType)nTmp16; + RegionType meStreamedType = static_cast<RegionType>(nTmp16); switch(meStreamedType) { diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index e14029548202..4f89231dd1ad 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -202,7 +202,7 @@ void RegionBand::load(SvStream& rIStrm) sal_uInt16 nTmp16(STREAMENTRY_END); rIStrm.ReadUInt16(nTmp16); - if (STREAMENTRY_END == (StreamEntryType)nTmp16) + if (STREAMENTRY_END == static_cast<StreamEntryType>(nTmp16)) return; size_t nRecordsPossible = rIStrm.remainingSize() / (2*sizeof(sal_Int32)); @@ -216,7 +216,7 @@ void RegionBand::load(SvStream& rIStrm) do { // insert new band or new separation? - if(STREAMENTRY_BANDHEADER == (StreamEntryType)nTmp16) + if(STREAMENTRY_BANDHEADER == static_cast<StreamEntryType>(nTmp16)) { sal_Int32 nYTop(0); sal_Int32 nYBottom(0); @@ -265,7 +265,7 @@ void RegionBand::load(SvStream& rIStrm) // get next header rIStrm.ReadUInt16( nTmp16 ); } - while (STREAMENTRY_END != (StreamEntryType)nTmp16 && rIStrm.good()); + while (STREAMENTRY_END != static_cast<StreamEntryType>(nTmp16) && rIStrm.good()); } void RegionBand::save(SvStream& rOStrm) const diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx index 4ce92b1d932f..3b1447f5df5c 100644 --- a/vcl/source/gdi/svmconverter.cxx +++ b/vcl/source/gdi/svmconverter.cxx @@ -171,14 +171,14 @@ bool ImplReadMapMode(SvStream& rIStm, MapMode& rMapMode) return false; } - rMapMode = MapMode((MapUnit) nUnit, aOrg, Fraction(nXNum, nXDenom), Fraction(nYNum, nYDenom)); + rMapMode = MapMode(static_cast<MapUnit>(nUnit), aOrg, Fraction(nXNum, nXDenom), Fraction(nYNum, nYDenom)); return true; } void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode ) { - rOStm.WriteInt16( (sal_uInt16)rMapMode.GetMapUnit() ); + rOStm.WriteInt16( static_cast<sal_uInt16>(rMapMode.GetMapUnit()) ); WritePair( rOStm, rMapMode.GetOrigin() ); rOStm.WriteInt32( rMapMode.GetScaleX().GetNumerator() ); rOStm.WriteInt32( rMapMode.GetScaleX().GetDenominator() ); @@ -407,7 +407,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const tools::PolyPolygo for(sal_uInt16 c(0); c < nPointCount; c++) { - rOStm.WriteUChar( (sal_uInt8)rCandidate.GetFlags(c) ); + rOStm.WriteUChar( static_cast<sal_uInt8>(rCandidate.GetFlags(c)) ); } } else @@ -475,7 +475,7 @@ void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, tools::PolyPolygon& rPol for(sal_uInt16 c(0); c < nPointCount; c++) { rIStm.ReadUChar( aPolyFlags ); - aCandidate.SetFlags(c, (PolyFlags)aPolyFlags); + aCandidate.SetFlags(c, static_cast<PolyFlags>(aPolyFlags)); } } } @@ -619,7 +619,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { sal_Int16 nLineJoin(0); rIStm.ReadInt16( nLineJoin ); - aLineInfo.SetLineJoin((basegfx::B2DLineJoin)nLineJoin); + aLineInfo.SetLineJoin(static_cast<basegfx::B2DLineJoin>(nLineJoin)); } break; @@ -627,7 +627,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { sal_Int16 nLineCap(0); rIStm.ReadInt16( nLineCap ); - aLineInfo.SetLineCap((css::drawing::LineCap)nLineCap); + aLineInfo.SetLineCap(static_cast<css::drawing::LineCap>(nLineCap)); } break; @@ -891,13 +891,13 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) aFont.SetFontSize( Size( nWidth, nHeight ) ); aFont.SetCharSet( static_cast<rtl_TextEncoding>(nCharSet) ); - aFont.SetFamily( (FontFamily) nFamily ); - aFont.SetPitch( (FontPitch) nPitch ); - aFont.SetAlignment( (FontAlign) nAlign ); + aFont.SetFamily( static_cast<FontFamily>(nFamily) ); + aFont.SetPitch( static_cast<FontPitch>(nPitch) ); + aFont.SetAlignment( static_cast<FontAlign>(nAlign) ); aFont.SetWeight( ( nWeight == 1 ) ? WEIGHT_LIGHT : ( nWeight == 2 ) ? WEIGHT_NORMAL : ( nWeight == 3 ) ? WEIGHT_BOLD : WEIGHT_DONTKNOW ); - aFont.SetUnderline( (FontLineStyle) nUnderline ); - aFont.SetStrikeout( (FontStrikeout) nStrikeout ); + aFont.SetUnderline( static_cast<FontLineStyle>(nUnderline) ); + aFont.SetStrikeout( static_cast<FontStrikeout>(nStrikeout) ); aFont.SetItalic( bItalic ? ITALIC_NORMAL : ITALIC_NONE ); aFont.SetOutline( bOutline ); aFont.SetShadow( bShadow ); @@ -1297,7 +1297,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) ImplReadColor( rIStm, aEndCol ); rIStm.ReadInt16( nAngle ).ReadInt16( nBorder ).ReadInt16( nOfsX ).ReadInt16( nOfsY ).ReadInt16( nIntensityStart ).ReadInt16( nIntensityEnd ); - Gradient aGrad( (GradientStyle) nStyle, aStartCol, aEndCol ); + Gradient aGrad( static_cast<GradientStyle>(nStyle), aStartCol, aEndCol ); aGrad.SetAngle( nAngle ); aGrad.SetBorder( nBorder ); @@ -1408,8 +1408,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm.ReadInt32(nWidth ).ReadUInt32(nStrikeout).ReadUInt32(nUnderline).ReadInt32(nFollowingActionCount); ImplSkipActions(rIStm, nFollowingActionCount); rMtf.AddAction( new MetaTextLineAction( aStartPt, nWidth, - (FontStrikeout) nStrikeout, - (FontLineStyle) nUnderline, + static_cast<FontStrikeout>(nStrikeout), + static_cast<FontLineStyle>(nUnderline), LINESTYLE_NONE ) ); i = SkipActions(i, nFollowingActionCount, nActions); @@ -1587,7 +1587,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile const & r { rOStm.WriteInt16( GDI_LINECAP_ACTION ); rOStm.WriteInt32( 6 ); - rOStm.WriteInt16( (sal_Int16)rInfo.GetLineCap() ); + rOStm.WriteInt16( static_cast<sal_Int16>(rInfo.GetLineCap()) ); } } @@ -1743,7 +1743,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile const & r { rOStm.WriteInt16( GDI_LINECAP_ACTION ); rOStm.WriteInt32( 6 ); - rOStm.WriteInt16( (sal_Int16)rInfo.GetLineCap() ); + rOStm.WriteInt16( static_cast<sal_Int16>(rInfo.GetLineCap()) ); } } @@ -2016,7 +2016,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile const & r rOStm.WriteInt16( GDI_GRADIENT_ACTION ); rOStm.WriteInt32( 46 ); ImplWriteRect( rOStm, pAct->GetRect() ); - rOStm.WriteInt16( (sal_Int16)rGrad.GetStyle() ); + rOStm.WriteInt16( static_cast<sal_Int16>(rGrad.GetStyle()) ); ImplWriteColor( rOStm, rGrad.GetStartColor() ); ImplWriteColor( rOStm, rGrad.GetEndColor() ); rOStm.WriteInt16( rGrad.GetAngle() ); diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx index 91d051999258..c9f0e7c460ce 100644 --- a/vcl/source/outdev/rect.cxx +++ b/vcl/source/outdev/rect.cxx @@ -159,7 +159,7 @@ void OutputDevice::Invert( const tools::Rectangle& rRect, InvertFlags nFlags ) nSalFlags |= SalInvert::Highlight; if ( nFlags & InvertFlags::N50 ) nSalFlags |= SalInvert::N50; - if ( nFlags == (InvertFlags) 0xffff ) // vcldemo trackframe test + if ( nFlags == InvertFlags(0xffff) ) // vcldemo trackframe test nSalFlags = SalInvert::TrackFrame; mpGraphics->Invert( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), nSalFlags, this ); } diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index 65a6a09fad43..3bf276a4e4d0 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -276,7 +276,7 @@ StringMap WindowUIObject::get_state() aMap["Visible"] = OUString::boolean(mxWindow->IsVisible()); aMap["ReallyVisible"] = OUString::boolean(mxWindow->IsReallyVisible()); aMap["Enabled"] = OUString::boolean(mxWindow->IsEnabled()); - aMap["WindowType"] = OUString::number((sal_uInt16)mxWindow->GetType(), 16); + aMap["WindowType"] = OUString::number(static_cast<sal_uInt16>(mxWindow->GetType()), 16); Point aPos = mxWindow->GetPosPixel(); aMap["RelPosition"] = to_string(aPos); diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 93e16339df06..5f4d4c441d30 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -88,15 +88,15 @@ KeyFuncType vcl::KeyCode::GetFunction() const sal_uInt16 nCompCode = GetModifier() | GetCode(); if ( nCompCode ) { - for ( sal_uInt16 i = (sal_uInt16)KeyFuncType::NEW; i < (sal_uInt16)KeyFuncType::FRONT; i++ ) + for ( sal_uInt16 i = sal_uInt16(KeyFuncType::NEW); i < sal_uInt16(KeyFuncType::FRONT); i++ ) { sal_uInt16 nKeyCode1; sal_uInt16 nKeyCode2; sal_uInt16 nKeyCode3; sal_uInt16 nKeyCode4; - ImplGetKeyCode( (KeyFuncType)i, nKeyCode1, nKeyCode2, nKeyCode3, nKeyCode4 ); + ImplGetKeyCode( static_cast<KeyFuncType>(i), nKeyCode1, nKeyCode2, nKeyCode3, nKeyCode4 ); if ( (nCompCode == nKeyCode1) || (nCompCode == nKeyCode2) || (nCompCode == nKeyCode3) || (nCompCode == nKeyCode4) ) - return (KeyFuncType)i; + return static_cast<KeyFuncType>(i); } } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 4c2c4852db51..bd927d6a224c 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -464,7 +464,7 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll mpBorderCB->Check( i_rMPS.bDrawBorder ); mpNupRowsEdt->SetValue( i_rMPS.nRows ); mpNupColEdt->SetValue( i_rMPS.nColumns ); - mpNupOrderBox->SelectEntryPos( (sal_Int32)i_rMPS.nOrder ); + mpNupOrderBox->SelectEntryPos( static_cast<sal_Int32>(i_rMPS.nOrder) ); if( i_rMPS.nRows != 1 || i_rMPS.nColumns != 1 ) { mpNupPagesBox->SelectEntryPos( mpNupPagesBox->GetEntryCount()-1 ); @@ -1488,7 +1488,7 @@ void PrintDialog::updateNup() aMPS.bDrawBorder = maNUpPage.mpBorderCB->IsChecked(); - aMPS.nOrder = (NupOrderType)maNUpPage.mpNupOrderBox->GetSelectedEntryPos(); + aMPS.nOrder = static_cast<NupOrderType>(maNUpPage.mpNupOrderBox->GetSelectedEntryPos()); int nOrientationMode = maNUpPage.mpNupOrientationBox->GetSelectedEntryPos(); if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE ) diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 351a90c8cc2b..d418d69518e2 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -486,7 +486,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData, { // #94144# allow Minimize again, should be masked out when read from configuration // 91625 - ignore Minimize - WindowStateState nState = (WindowStateState)aTokenStr.toInt32(); + WindowStateState nState = static_cast<WindowStateState>(aTokenStr.toInt32()); //nState &= ~(WindowStateState::Minimized); rData.SetState( nState ); nValidMask |= WindowStateMask::State; diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 4675ea801b3d..5c7ce150c5e4 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2527,7 +2527,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE default: - SAL_WARN( "vcl.layout", "ImplWindowFrameProc(): unknown event (" << (int)nEvent << ")" ); + SAL_WARN( "vcl.layout", "ImplWindowFrameProc(): unknown event (" << static_cast<int>(nEvent) << ")" ); break; } diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx index a56aebe69621..c062e12e2415 100644 --- a/vcl/unx/gtk/a11y/atkcomponent.cxx +++ b/vcl/unx/gtk/a11y/atkcomponent.cxx @@ -287,7 +287,7 @@ component_wrapper_add_focus_handler (AtkComponent *component, gulong ret; guint signal_id; - match_type = (GSignalMatchType) (G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC); + match_type = GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC); signal_id = g_signal_lookup( "focus-event", ATK_TYPE_OBJECT ); ret = g_signal_handler_find( component, match_type, signal_id, 0, nullptr, diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index 6ba88500913f..5c163cd38ece 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -69,7 +69,7 @@ atk_noop_object_wrapper_get_type() nullptr } ; - type = g_type_register_static (ATK_TYPE_OBJECT, "OOoAtkNoOpObj", &typeInfo, (GTypeFlags)0) ; + type = g_type_register_static (ATK_TYPE_OBJECT, "OOoAtkNoOpObj", &typeInfo, GTypeFlags(0)) ; } return type; } @@ -184,7 +184,7 @@ wrapper_factory_get_type() t = g_type_register_static ( ATK_TYPE_OBJECT_FACTORY, "OOoAtkObjectWrapperFactory", - &tinfo, (GTypeFlags) 0); + &tinfo, GTypeFlags(0)); } return t; diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index 637842bfe123..d566f441eee5 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -179,7 +179,7 @@ hyper_link_get_type() type = g_type_register_static (ATK_TYPE_HYPERLINK, "OOoAtkObjHyperLink", &tinfo, - (GTypeFlags)0); + GTypeFlags(0)); g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); } diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index a8c7c8e3cdae..5582215b8cb4 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -387,7 +387,7 @@ Adjust2Justification(const uno::Any& rAny) { const gchar * value = nullptr; - switch( (style::ParagraphAdjust)rAny.get<short>() ) + switch( static_cast<style::ParagraphAdjust>(rAny.get<short>()) ) { case style::ParagraphAdjust_LEFT: value = "left"; @@ -432,7 +432,7 @@ Justification2Adjust( uno::Any& rAny, const gchar * value ) else return false; - rAny <<= (short)nParagraphAdjust; + rAny <<= static_cast<short>(nParagraphAdjust); return true; } diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index 7ad94e9d443a..16271c9696c5 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -781,7 +781,7 @@ ooo_atk_util_get_type() nullptr } ; - type = g_type_register_static (parent_type, "OOoUtil", &typeInfo, (GTypeFlags)0) ; + type = g_type_register_static (parent_type, "OOoUtil", &typeInfo, GTypeFlags(0)) ; } return type; diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index 581e81d23db4..930702f92b27 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -304,7 +304,7 @@ ooo_window_wrapper_get_type() nullptr } ; - type = g_type_register_static (parent_type, "OOoWindowAtkObject", &typeInfo, (GTypeFlags)0) ; + type = g_type_register_static (parent_type, "OOoWindowAtkObject", &typeInfo, GTypeFlags(0)) ; } return type; diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 5d397b6ccc92..33ec9caabb14 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -654,7 +654,7 @@ atk_object_wrapper_get_type() } ; type = g_type_register_static (ATK_TYPE_OBJECT, "OOoAtkObj", - &typeInfo, (GTypeFlags)0) ; + &typeInfo, GTypeFlags(0)) ; } return type; } @@ -763,7 +763,7 @@ ensureTypeFor( uno::XInterface *pAccessible ) } ; nType = g_type_register_static( ATK_TYPE_OBJECT_WRAPPER, aTypeName.getStr(), &aTypeInfo, - (GTypeFlags)0 ) ; + GTypeFlags(0) ) ; for( int j = 0; j < aTypeTableSize; j++ ) if( bTypes[j] ) diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 96618d1c0af1..5d6920cedee6 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -334,7 +334,7 @@ static guint GetKeyValFor(GdkKeymap* pKeyMap, guint16 hardware_keycode, guint8 g { guint updated_keyval = 0; gdk_keymap_translate_keyboard_state(pKeyMap, hardware_keycode, - (GdkModifierType)0, group, &updated_keyval, nullptr, nullptr, nullptr); + GdkModifierType(0), group, &updated_keyval, nullptr, nullptr, nullptr); return updated_keyval; } @@ -906,7 +906,7 @@ ooo_fixed_get_type() }; type = g_type_register_static( GTK_TYPE_FIXED, "OOoFixed", - &tinfo, (GTypeFlags) 0); + &tinfo, GTypeFlags(0)); } return type; @@ -2188,7 +2188,7 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) if( bUseGdkGrab ) { gdk_pointer_grab( widget_get_window( m_pWindow ), bOwnerEvents, - (GdkEventMask) nMask, nullptr, m_pCurrentCursor, + GdkEventMask(nMask), nullptr, m_pCurrentCursor, GDK_CURRENT_TIME ); } else @@ -2281,16 +2281,16 @@ void GtkSalFrame::KeyCodeToGdkKey(const vcl::KeyCode& rKeyCode, return; // Get GDK key modifiers - GdkModifierType nModifiers = (GdkModifierType) 0; + GdkModifierType nModifiers = GdkModifierType(0); if ( rKeyCode.IsShift() ) - nModifiers = (GdkModifierType) ( nModifiers | GDK_SHIFT_MASK ); + nModifiers = static_cast<GdkModifierType>( nModifiers | GDK_SHIFT_MASK ); if ( rKeyCode.IsMod1() ) - nModifiers = (GdkModifierType) ( nModifiers | GDK_CONTROL_MASK ); + nModifiers = static_cast<GdkModifierType>( nModifiers | GDK_CONTROL_MASK ); if ( rKeyCode.IsMod2() ) - nModifiers = (GdkModifierType) ( nModifiers | GDK_MOD1_MASK ); + nModifiers = static_cast<GdkModifierType>( nModifiers | GDK_MOD1_MASK ); *pGdkModifiers = nModifiers; diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index d465fa01ef1b..485ef9323d0d 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -334,7 +334,7 @@ static guint GetKeyValFor(GdkKeymap* pKeyMap, guint16 hardware_keycode, guint8 g { guint updated_keyval = 0; gdk_keymap_translate_keyboard_state(pKeyMap, hardware_keycode, - (GdkModifierType)0, group, &updated_keyval, nullptr, nullptr, nullptr); + GdkModifierType(0), group, &updated_keyval, nullptr, nullptr, nullptr); return updated_keyval; } @@ -948,7 +948,7 @@ ooo_fixed_get_type() }; type = g_type_register_static( GTK_TYPE_FIXED, "OOoFixed", - &tinfo, (GTypeFlags) 0); + &tinfo, GTypeFlags(0)); } return type; @@ -1021,7 +1021,7 @@ void GtkSalFrame::InitCommon() m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "button-release-event", G_CALLBACK(signalButton), this )); //Drop Target Stuff - gtk_drag_dest_set(GTK_WIDGET(pEventWidget), (GtkDestDefaults)0, nullptr, 0, (GdkDragAction)0); + gtk_drag_dest_set(GTK_WIDGET(pEventWidget), GtkDestDefaults(0), nullptr, 0, GdkDragAction(0)); gtk_drag_dest_set_track_motion(GTK_WIDGET(pEventWidget), true); m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "drag-motion", G_CALLBACK(signalDragMotion), this )); m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "drag-drop", G_CALLBACK(signalDragDrop), this )); @@ -2108,7 +2108,7 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) if (bGrab) { gdk_device_grab(pPointer, widget_get_window(getMouseEventWidget()), GDK_OWNERSHIP_NONE, - bOwnerEvents, (GdkEventMask) nMask, m_pCurrentCursor, gtk_get_current_event_time()); + bOwnerEvents, GdkEventMask(nMask), m_pCurrentCursor, gtk_get_current_event_time()); } else { @@ -2159,16 +2159,16 @@ void GtkSalFrame::KeyCodeToGdkKey(const vcl::KeyCode& rKeyCode, return; // Get GDK key modifiers - GdkModifierType nModifiers = (GdkModifierType) 0; + GdkModifierType nModifiers = GdkModifierType(0); if ( rKeyCode.IsShift() ) - nModifiers = (GdkModifierType) ( nModifiers | GDK_SHIFT_MASK ); + nModifiers = static_cast<GdkModifierType>( nModifiers | GDK_SHIFT_MASK ); if ( rKeyCode.IsMod1() ) - nModifiers = (GdkModifierType) ( nModifiers | GDK_CONTROL_MASK ); + nModifiers = static_cast<GdkModifierType>( nModifiers | GDK_CONTROL_MASK ); if ( rKeyCode.IsMod2() ) - nModifiers = (GdkModifierType) ( nModifiers | GDK_MOD1_MASK ); + nModifiers = static_cast<GdkModifierType>( nModifiers | GDK_MOD1_MASK ); *pGdkModifiers = nModifiers; diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index a1dd2e557cbe..f9c1b119ac63 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -107,27 +107,27 @@ static GtkStateFlags NWConvertVCLStateToGTKState(ControlState nVCLState) if ( nVCLState & ControlState::PRESSED ) { - nGTKState = (GtkStateFlags) (nGTKState | GTK_STATE_FLAG_ACTIVE); + nGTKState = static_cast<GtkStateFlags>(nGTKState | GTK_STATE_FLAG_ACTIVE); } if ( nVCLState & ControlState::ROLLOVER ) { - nGTKState = (GtkStateFlags) (nGTKState | GTK_STATE_FLAG_PRELIGHT); + nGTKState = static_cast<GtkStateFlags>(nGTKState | GTK_STATE_FLAG_PRELIGHT); } if ( nVCLState & ControlState::SELECTED ) - nGTKState = (GtkStateFlags) (nGTKState | GTK_STATE_FLAG_SELECTED); + nGTKState = static_cast<GtkStateFlags>(nGTKState | GTK_STATE_FLAG_SELECTED); if ( nVCLState & ControlState::FOCUSED ) - nGTKState = (GtkStateFlags) (nGTKState | GTK_STATE_FLAG_FOCUSED); + nGTKState = static_cast<GtkStateFlags>(nGTKState | GTK_STATE_FLAG_FOCUSED); if (AllSettings::GetLayoutRTL()) { - nGTKState = (GtkStateFlags) (nGTKState | GTK_STATE_FLAG_DIR_RTL); + nGTKState = static_cast<GtkStateFlags>(nGTKState | GTK_STATE_FLAG_DIR_RTL); } else { - nGTKState = (GtkStateFlags) (nGTKState | GTK_STATE_FLAG_DIR_LTR); + nGTKState = static_cast<GtkStateFlags>(nGTKState | GTK_STATE_FLAG_DIR_LTR); } return nGTKState; @@ -735,7 +735,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, { stateFlags = NWConvertVCLStateToGTKState(rScrollbarVal.mnThumbState); if ( rScrollbarVal.mnThumbState & ControlState::PRESSED ) - stateFlags = (GtkStateFlags) (stateFlags | GTK_STATE_PRELIGHT); + stateFlags = static_cast<GtkStateFlags>(stateFlags | GTK_STATE_PRELIGHT); GtkStyleContext* pScrollbarSliderStyle = scrollbarOrientation == GTK_ORIENTATION_VERTICAL ? mpVScrollbarSliderStyle : mpHScrollbarSliderStyle; @@ -919,7 +919,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, { stateFlags = NWConvertVCLStateToGTKState(rScrollbarVal.mnThumbState); if ( rScrollbarVal.mnThumbState & ControlState::PRESSED ) - stateFlags = (GtkStateFlags) (stateFlags | GTK_STATE_PRELIGHT); + stateFlags = static_cast<GtkStateFlags>(stateFlags | GTK_STATE_PRELIGHT); GtkStyleContext* pScrollbarSliderStyle = scrollbarOrientation == GTK_ORIENTATION_VERTICAL ? mpVScrollbarSliderStyle : mpHScrollbarSliderStyle; @@ -2209,8 +2209,8 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co // map selected menu entries in vcl parlance to gtk prelight if (nPart >= ControlPart::MenuItem && nPart <= ControlPart::SubmenuArrow && (nState & ControlState::SELECTED)) - flags = (GtkStateFlags) (flags | GTK_STATE_FLAG_PRELIGHT); - flags = (GtkStateFlags)(flags & ~GTK_STATE_FLAG_ACTIVE); + flags = static_cast<GtkStateFlags>(flags | GTK_STATE_FLAG_PRELIGHT); + flags = static_cast<GtkStateFlags>(flags & ~GTK_STATE_FLAG_ACTIVE); switch(nPart) { case ControlPart::MenuItem: @@ -2229,7 +2229,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co nType = ControlType::Checkbox; if (nState & ControlState::PRESSED) { - flags = (GtkStateFlags)(flags | GTK_STATE_FLAG_CHECKED); + flags = static_cast<GtkStateFlags>(flags | GTK_STATE_FLAG_CHECKED); } break; case ControlPart::MenuItemRadioMark: @@ -2244,12 +2244,12 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co nType = ControlType::Radiobutton; if (nState & ControlState::PRESSED) { - flags = (GtkStateFlags)(flags | GTK_STATE_FLAG_CHECKED); + flags = static_cast<GtkStateFlags>(flags | GTK_STATE_FLAG_CHECKED); } break; case ControlPart::Separator: context = mpSeparatorMenuItemSeparatorStyle; - flags = (GtkStateFlags)(GTK_STATE_FLAG_BACKDROP | GTK_STATE_FLAG_INSENSITIVE); //GTK_STATE_FLAG_BACKDROP hack ? + flags = GtkStateFlags(GTK_STATE_FLAG_BACKDROP | GTK_STATE_FLAG_INSENSITIVE); //GTK_STATE_FLAG_BACKDROP hack ? renderType = RenderType::MenuSeparator; break; case ControlPart::SubmenuArrow: @@ -2278,7 +2278,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co break; case ControlPart::Button: /* For all checkbuttons in the toolbars */ - flags = (GtkStateFlags)(flags | + flags = static_cast<GtkStateFlags>(flags | ( (rValue.getTristateVal() == ButtonValue::On) ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL)); context = mpToolButtonStyle; break; @@ -2291,13 +2291,13 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co } break; case ControlType::Radiobutton: - flags = (GtkStateFlags)(flags | + flags = static_cast<GtkStateFlags>(flags | ( (rValue.getTristateVal() == ButtonValue::On) ? GTK_STATE_FLAG_CHECKED : GTK_STATE_FLAG_NORMAL)); context = mpRadioButtonRadioStyle; renderType = nPart == ControlPart::Focus ? RenderType::Focus : RenderType::Radio; break; case ControlType::Checkbox: - flags = (GtkStateFlags)(flags | + flags = static_cast<GtkStateFlags>(flags | ( (rValue.getTristateVal() == ButtonValue::On) ? GTK_STATE_FLAG_CHECKED : (rValue.getTristateVal() == ButtonValue::Mixed) ? GTK_STATE_FLAG_INCONSISTENT : GTK_STATE_FLAG_NORMAL)); @@ -2334,7 +2334,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co case ControlType::TabItem: context = mpNotebookHeaderTabsTabStyle; if (nState & ControlState::SELECTED) - flags = (GtkStateFlags) (flags | ACTIVE_TAB()); + flags = static_cast<GtkStateFlags>(flags | ACTIVE_TAB()); renderType = RenderType::TabItem; break; case ControlType::WindowBackground: @@ -2356,7 +2356,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co flags = (!(nState & ControlState::ENABLED)) ? GTK_STATE_FLAG_INSENSITIVE : GTK_STATE_FLAG_NORMAL; if (nState & ControlState::SELECTED) - flags = (GtkStateFlags) (flags | GTK_STATE_FLAG_PRELIGHT); + flags = static_cast<GtkStateFlags>(flags | GTK_STATE_FLAG_PRELIGHT); } else { @@ -2372,7 +2372,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co context = mpTreeHeaderButtonStyle; ButtonValue aButtonValue = rValue.getTristateVal(); if (aButtonValue == ButtonValue::On) - flags = (GtkStateFlags) (flags | GTK_STATE_FLAG_CHECKED); + flags = static_cast<GtkStateFlags>(flags | GTK_STATE_FLAG_CHECKED); renderType = RenderType::Expander; break; } @@ -3259,7 +3259,7 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP default: break; } - SAL_INFO("vcl.gtk", "Unhandled is native supported for Type:" << (int)nType << ", Part" << (int)nPart); + SAL_INFO("vcl.gtk", "Unhandled is native supported for Type:" << static_cast<int>(nType) << ", Part" << static_cast<int>(nPart)); return false; } diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index f94414b380d2..06189d2ccd67 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -763,7 +763,7 @@ public: doInvert(rDev, aRegions[0], InvertFlags::NONE); doInvert(rDev, aRegions[1], InvertFlags::N50); doInvert(rDev, aRegions[2], InvertFlags::Highlight); - doInvert(rDev, aRegions[3], (InvertFlags)0xffff); + doInvert(rDev, aRegions[3], InvertFlags(0xffff)); } } }; |