diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 56ffacc5c941..43689881a929 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -66,7 +66,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod maXMultiServiceFactory.set( rModel, uno::UNO_QUERY); if( maXMultiServiceFactory.is() ) { - maXDrawPage = *(uno::Reference< drawing::XDrawPage > *)maXDrawPages->getByIndex( 0 ).getValue(); + maXDrawPage = *static_cast const *>(maXDrawPages->getByIndex( 0 ).getValue()); if ( ImplInitPage() ) bStatRet = true; } @@ -424,7 +424,7 @@ void CGMImpressOutAct::EndGroup() uno::Reference< drawing::XShapes > aXShapes = drawing::ShapeCollection::create(comphelper::getProcessComponentContext()); for ( sal_uInt32 i = mnFirstIndex; i < mnCurrentCount; i++ ) { - uno::Reference< drawing::XShape > aXShape = *(uno::Reference< drawing::XShape > *)maXShapes->getByIndex( i ).getValue(); + uno::Reference< drawing::XShape > aXShape = *static_cast const *>(maXShapes->getByIndex( i ).getValue()); if (aXShape.is() ) { aXShapes->add( aXShape ); @@ -880,7 +880,7 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla { if ( nFinalTextCount ) { - uno::Reference< drawing::XShape > aShape = *(uno::Reference< drawing::XShape > *)maXShapes->getByIndex( nFinalTextCount - 1 ).getValue(); + uno::Reference< drawing::XShape > aShape = *static_cast const *>(maXShapes->getByIndex( nFinalTextCount - 1 ).getValue()); if ( aShape.is() ) { uno::Reference< text::XText > xText; diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index f3d370ffff47..acd073eb88c3 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -238,7 +238,7 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize ) const int nSwitch = ( bCompatible ) ? 0 : 1 ; if ( nRealSize == 4 ) { - sal_uInt16* pShort = (sal_uInt16*)pPtr; + sal_uInt16* pShort = static_cast(pPtr); nVal = pShort[ nSwitch ]; nVal <<= 16; nVal |= pShort[ nSwitch ^ 1 ]; @@ -247,7 +247,7 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize ) } else { - sal_Int32* pLong = (sal_Int32*)pPtr; + sal_Int32* pLong = static_cast(pPtr); nRetValue = (double)abs( pLong[ nSwitch ] ); nRetValue *= 65536; nVal = (sal_uInt32)( pLong[ nSwitch ^ 1 ] ); diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 3ca015eca050..93800c536f5b 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -278,7 +278,7 @@ extern "C" { static void WriteFileInThread(void *wData) { sal_uInt64 nCount; - WriteData *wdata = (WriteData *)wData; + WriteData *wdata = static_cast(wData); osl_writeFile(wdata->m_pFile, wdata->m_pBuf, wdata->m_nBytesToWrite, &nCount); // The number of bytes written does not matter. // The helper process may close its input stream before reading it all. @@ -431,7 +431,7 @@ void CreateMtfReplacementAction( GDIMetaFile& rMtf, SvStream& rStrm, sal_uInt32 rStrm.Read( pBuf.get(), nSizeTIFF ); aReplacement.Write( pBuf.get(), nSizeTIFF ); } - rMtf.AddAction( (MetaAction*)( new MetaCommentAction( aComment, 0, (const sal_uInt8*)aReplacement.GetData(), aReplacement.Tell() ) ) ); + rMtf.AddAction( (MetaAction*)( new MetaCommentAction( aComment, 0, static_cast(aReplacement.GetData()), aReplacement.Tell() ) ) ); } else rMtf.AddAction( (MetaAction*)( new MetaCommentAction( aComment, 0, NULL, 0 ) ) ); diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 3d6ca9035f91..3bbdc8052ce7 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -210,14 +210,14 @@ void PCDReader::ReadImage() nW2=nWidth>>1; nH2=nHeight>>1; - pL0 =(sal_uInt8*)rtl_allocateMemory( nWidth ); - pL1 =(sal_uInt8*)rtl_allocateMemory( nWidth ); - pCb =(sal_uInt8*)rtl_allocateMemory( nW2+1 ); - pCr =(sal_uInt8*)rtl_allocateMemory( nW2+1 ); - pL0N=(sal_uInt8*)rtl_allocateMemory( nWidth ); - pL1N=(sal_uInt8*)rtl_allocateMemory( nWidth ); - pCbN=(sal_uInt8*)rtl_allocateMemory( nW2+1 ); - pCrN=(sal_uInt8*)rtl_allocateMemory( nW2+1 ); + pL0 =static_cast(rtl_allocateMemory( nWidth )); + pL1 =static_cast(rtl_allocateMemory( nWidth )); + pCb =static_cast(rtl_allocateMemory( nW2+1 )); + pCr =static_cast(rtl_allocateMemory( nW2+1 )); + pL0N=static_cast(rtl_allocateMemory( nWidth )); + pL1N=static_cast(rtl_allocateMemory( nWidth )); + pCbN=static_cast(rtl_allocateMemory( nW2+1 )); + pCrN=static_cast(rtl_allocateMemory( nW2+1 )); if ( pL0 == NULL || pL1 == NULL || pCb == NULL || pCr == NULL || pL0N == NULL || pL1N == NULL || pCbN == NULL || pCrN == NULL) diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 700c9f753aef..d9c42781733d 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -288,8 +288,8 @@ EscherProperties EscherPropertyContainer::GetOpts() const extern "C" int SAL_CALL EscherPropSortFunc( const void* p1, const void* p2 ) { - sal_Int16 nID1 = ((EscherPropSortStruct*)p1)->nPropId &~0xc000; - sal_Int16 nID2 = ((EscherPropSortStruct*)p2)->nPropId &~0xc000; + sal_Int16 nID1 = static_cast(p1)->nPropId &~0xc000; + sal_Int16 nID2 = static_cast(p2)->nPropId &~0xc000; if( nID1 < nID2 ) return -1; @@ -429,7 +429,7 @@ void EscherPropertyContainer::CreateGradientProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet , bool bTransparentGradient) { ::com::sun::star::uno::Any aAny; - ::com::sun::star::awt::Gradient* pGradient = NULL; + ::com::sun::star::awt::Gradient const * pGradient = NULL; sal_uInt32 nFillType = ESCHER_FillShadeScale; sal_Int32 nAngle = 0; @@ -443,7 +443,7 @@ void EscherPropertyContainer::CreateGradientProperties( if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillTransparenceGradient" ), false ) ) { - pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue(); + pGradient = static_cast(aAny.getValue()); ::com::sun::star::uno::Any aAnyTemp; const rtl::OUString aPropName( "FillStyle" ); @@ -459,8 +459,8 @@ void EscherPropertyContainer::CreateGradientProperties( if ( EscherPropertyValueHelper::GetPropertyValue( aAnyTemp, rXPropSet, OUString( "FillColor" ), false ) ) { - pGradient->StartColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), false ); - pGradient->EndColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), false ); + const_cast(pGradient)->StartColor = ImplGetColor( *static_cast(aAnyTemp.getValue()), false ); + const_cast(pGradient)->EndColor = ImplGetColor( *static_cast(aAnyTemp.getValue()), false ); } } // gradient and transparency. @@ -468,7 +468,7 @@ void EscherPropertyContainer::CreateGradientProperties( { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillGradient" ), false ) ) - pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue(); + pGradient = static_cast(aAny.getValue()); } } @@ -477,7 +477,7 @@ void EscherPropertyContainer::CreateGradientProperties( else if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillGradient" ), false ) ) { - pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue(); + pGradient = static_cast(aAny.getValue()); } if ( pGradient ) @@ -546,7 +546,7 @@ void EscherPropertyContainer::CreateGradientProperties( if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillTransparenceGradient" ), false ) ) { - pGradient = (::com::sun::star::awt::Gradient*)aAny.getValue(); + pGradient = static_cast(aAny.getValue()); if ( pGradient ) { sal_uInt32 nBlue = GetGradientColor( pGradient, nFirstColor ) >> 16; @@ -628,7 +628,7 @@ void EscherPropertyContainer::CreateFillProperties( if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillColor" ), false ) ) { - sal_uInt32 nFillColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()) ); + sal_uInt32 nFillColor = ImplGetColor( *static_cast(aAny.getValue()) ); nFillBackColor = nFillColor ^ 0xffffff; AddOpt( ESCHER_Prop_fillColor, nFillColor ); } @@ -645,7 +645,7 @@ void EscherPropertyContainer::CreateFillProperties( { sal_uInt16 nTransparency = ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillTransparence" ), true ) ) - ? *((sal_Int16*)aAny.getValue() ) : 0; + ? *static_cast(aAny.getValue()) : 0; if ( nTransparency ) AddOpt( ESCHER_Prop_fillOpacity, ( ( 100 - nTransparency ) << 16 ) / 100 ); } @@ -831,7 +831,7 @@ void EscherPropertyContainer::CreateTextProperties( { sal_uInt16 nAngle = EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "RotateAngle" ), true ) ? - (sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10 : 0; + (sal_uInt16)( ( *static_cast(aAny.getValue()) ) + 5 ) / 10 : 0; if (nAngle==900) { AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflBtoT ); @@ -873,7 +873,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart, if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, sLineName, false ) ) { - OUString aArrowStartName = *(OUString*)aAny.getValue(); + OUString aArrowStartName = *static_cast(aAny.getValue()); sal_Int16 nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND; OUString aApiName = SvxUnogetApiNameForItem(nWhich, aArrowStartName); @@ -1026,7 +1026,7 @@ void EscherPropertyContainer::CreateLineProperties( if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineDash" ), false ) ) { ESCHER_LineDashing eDash = ESCHER_LineSolid; - ::com::sun::star::drawing::LineDash* pLineDash = (::com::sun::star::drawing::LineDash*)aAny.getValue(); + ::com::sun::star::drawing::LineDash const * pLineDash = static_cast(aAny.getValue()); sal_Int32 nDistance = pLineDash->Distance << 1; switch ( pLineDash->Style ) { @@ -1080,14 +1080,14 @@ void EscherPropertyContainer::CreateLineProperties( } if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineColor" ), false ) ) { - sal_uInt32 nLineColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()) ); + sal_uInt32 nLineColor = ImplGetColor( *static_cast(aAny.getValue()) ); AddOpt( ESCHER_Prop_lineColor, nLineColor ); AddOpt( ESCHER_Prop_lineBackColor, nLineColor ^ 0xffffff ); } } sal_uInt32 nLineSize = ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineWidth" ), false ) ) - ? *((sal_uInt32*)aAny.getValue()) : 0; + ? *static_cast(aAny.getValue()) : 0; if ( nLineSize > 1 ) AddOpt( ESCHER_Prop_lineWidth, nLineSize * 360 ); // 100TH MM -> PT , 1PT = 12700 EMU @@ -1344,9 +1344,9 @@ bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const OString& rUniqueId ) // grab BLIP from stream and insert directly as complex property // ownership of stream memory goes to complex property aMemStrm.ObjectOwnsMemory( false ); - sal_uInt8* pBuf = (sal_uInt8*) aMemStrm.GetData(); + sal_uInt8 const * pBuf = static_cast(aMemStrm.GetData()); sal_uInt32 nSize = aMemStrm.Seek( STREAM_SEEK_TO_END ); - AddOpt( ESCHER_Prop_fillBlip, true, nSize, pBuf, nSize ); + AddOpt( ESCHER_Prop_fillBlip, true, nSize, const_cast(pBuf), nSize ); return true; } } @@ -1452,7 +1452,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( sal_uInt16 nAngle = 0; if ( rSource == "MetaFile" ) { - ::com::sun::star::uno::Sequence aSeq = *(::com::sun::star::uno::Sequence*)aAny.getValue(); + ::com::sun::star::uno::Sequence aSeq = *static_cast const *>(aAny.getValue()); const sal_uInt8* pAry = aSeq.getArray(); sal_uInt32 nAryLen = aSeq.getLength(); @@ -1491,11 +1491,11 @@ bool EscherPropertyContainer::CreateGraphicProperties( } else if ( rSource == "FillBitmapURL" ) { - aGraphicUrl = *(OUString*)aAny.getValue(); + aGraphicUrl = *static_cast(aAny.getValue()); } else if ( rSource == "GraphicURL" ) { - aGraphicUrl = *(OUString*)aAny.getValue(); + aGraphicUrl = *static_cast(aAny.getValue()); bCreateFillStyles = true; } else if ( rSource == "FillHatch" ) @@ -1506,7 +1506,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( Color aBackColor; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillColor" ), false ) ) { - aBackColor = ImplGetColor( *((sal_uInt32*)aAny.getValue()), false ); + aBackColor = ImplGetColor( *static_cast(aAny.getValue()), false ); } bool bFillBackground = false; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillBackground" ), true ) ) @@ -1560,7 +1560,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( else { nAngle = bRotate && EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "RotateAngle" ), true ) - ? (sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10 + ? (sal_uInt16)( ( *static_cast(aAny.getValue()) ) + 5 ) / 10 : 0; } @@ -1744,9 +1744,9 @@ bool EscherPropertyContainer::CreateGraphicProperties( // grab BLIP from stream and insert directly as complex property // ownership of stream memory goes to complex property aMemStrm.ObjectOwnsMemory( false ); - sal_uInt8* pBuf = (sal_uInt8*) aMemStrm.GetData(); + sal_uInt8 const * pBuf = static_cast(aMemStrm.GetData()); sal_uInt32 nSize = aMemStrm.Seek( STREAM_SEEK_TO_END ); - AddOpt( ESCHER_Prop_fillBlip, true, nSize, pBuf, nSize ); + AddOpt( ESCHER_Prop_fillBlip, true, nSize, const_cast(pBuf), nSize ); bRetValue = true; } } @@ -1807,32 +1807,32 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st if ( rAny.getValueType() == cppu::UnoType::get()) { - ::com::sun::star::drawing::PolyPolygonBezierCoords* pSourcePolyPolygon - = (::com::sun::star::drawing::PolyPolygonBezierCoords*)rAny.getValue(); + ::com::sun::star::drawing::PolyPolygonBezierCoords const * pSourcePolyPolygon + = static_cast(rAny.getValue()); sal_uInt16 nOuterSequenceCount = (sal_uInt16)pSourcePolyPolygon->Coordinates.getLength(); // get pointer of inner sequences - ::com::sun::star::drawing::PointSequence* pOuterSequence = pSourcePolyPolygon->Coordinates.getArray(); - ::com::sun::star::drawing::FlagSequence* pOuterFlags = pSourcePolyPolygon->Flags.getArray(); + ::com::sun::star::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->Coordinates.getConstArray(); + ::com::sun::star::drawing::FlagSequence const * pOuterFlags = pSourcePolyPolygon->Flags.getConstArray(); bNoError = pOuterSequence && pOuterFlags; if ( bNoError ) { sal_uInt16 a, b, nInnerSequenceCount; - ::com::sun::star::awt::Point* pArray; + ::com::sun::star::awt::Point const * pArray; // this will be a polygon set for ( a = 0; a < nOuterSequenceCount; a++ ) { - ::com::sun::star::drawing::PointSequence* pInnerSequence = pOuterSequence++; - ::com::sun::star::drawing::FlagSequence* pInnerFlags = pOuterFlags++; + ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++; + ::com::sun::star::drawing::FlagSequence const * pInnerFlags = pOuterFlags++; bNoError = pInnerSequence && pInnerFlags; if ( bNoError ) { // get pointer to arrays - pArray = pInnerSequence->getArray(); - ::com::sun::star::drawing::PolygonFlags* pFlags = pInnerFlags->getArray(); + pArray = pInnerSequence->getConstArray(); + ::com::sun::star::drawing::PolygonFlags const * pFlags = pInnerFlags->getConstArray(); if ( pArray && pFlags ) { @@ -1856,12 +1856,12 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st } else if ( rAny.getValueType() == ::getCppuType( ( const ::com::sun::star::drawing::PointSequenceSequence* ) 0 ) ) { - ::com::sun::star::drawing::PointSequenceSequence* pSourcePolyPolygon - = (::com::sun::star::drawing::PointSequenceSequence*)rAny.getValue(); + ::com::sun::star::drawing::PointSequenceSequence const * pSourcePolyPolygon + = static_cast(rAny.getValue()); sal_uInt16 nOuterSequenceCount = (sal_uInt16)pSourcePolyPolygon->getLength(); // get pointer to inner sequences - ::com::sun::star::drawing::PointSequence* pOuterSequence = pSourcePolyPolygon->getArray(); + ::com::sun::star::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->getConstArray(); bNoError = pOuterSequence != NULL; if ( bNoError ) { @@ -1870,13 +1870,13 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st // this will be a polygon set for( a = 0; a < nOuterSequenceCount; a++ ) { - ::com::sun::star::drawing::PointSequence* pInnerSequence = pOuterSequence++; + ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++; bNoError = pInnerSequence != NULL; if ( bNoError ) { // get pointer to arrays - ::com::sun::star::awt::Point* pArray = - pInnerSequence->getArray(); + ::com::sun::star::awt::Point const * pArray = + pInnerSequence->getConstArray(); if ( pArray != NULL ) { nInnerSequenceCount = (sal_uInt16)pInnerSequence->getLength(); @@ -1894,8 +1894,8 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st } else if ( rAny.getValueType() == ::getCppuType( ( const ::com::sun::star::drawing::PointSequence* ) 0 ) ) { - ::com::sun::star::drawing::PointSequence* pInnerSequence = - (::com::sun::star::drawing::PointSequence*)rAny.getValue(); + ::com::sun::star::drawing::PointSequence const * pInnerSequence = + static_cast(rAny.getValue()); bNoError = pInnerSequence != NULL; if ( bNoError ) @@ -1903,7 +1903,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st sal_uInt16 a, nInnerSequenceCount; // get pointer to arrays - ::com::sun::star::awt::Point* pArray = pInnerSequence->getArray(); + ::com::sun::star::awt::Point const * pArray = pInnerSequence->getConstArray(); if ( pArray != NULL ) { nInnerSequenceCount = (sal_uInt16)pInnerSequence->getLength(); @@ -1919,8 +1919,8 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st } else if ( rAny.getValueType() == ::getCppuType( ( const uno::Sequence< beans::PropertyValue >* ) 0 ) ) { - uno::Sequence< beans::PropertyValue >* pGeometrySeq = - (uno::Sequence< beans::PropertyValue >*)rAny.getValue(); + uno::Sequence< beans::PropertyValue > const * pGeometrySeq = + static_cast const *>(rAny.getValue()); if ( pGeometrySeq ) { @@ -2335,10 +2335,10 @@ bool EscherPropertyContainer::CreateConnectorProperties( aAny >>= eCt; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeStartPoint ) ) { - aStartPoint = *(::com::sun::star::awt::Point*)aAny.getValue(); + aStartPoint = *static_cast(aAny.getValue()); if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeEndPoint ) ) { - aEndPoint = *(::com::sun::star::awt::Point*)aAny.getValue(); + aEndPoint = *static_cast(aAny.getValue()); rShapeFlags = SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT | SHAPEFLAG_CONNECTOR; rGeoRect = ::com::sun::star::awt::Rectangle( aStartPoint.X, aStartPoint.Y, @@ -2452,13 +2452,13 @@ bool EscherPropertyContainer::CreateShadowProperties( { nShadowFlags |= 2; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowColor" ), false ) ) - AddOpt( ESCHER_Prop_shadowColor, ImplGetColor( *((sal_uInt32*)aAny.getValue()) ) ); + AddOpt( ESCHER_Prop_shadowColor, ImplGetColor( *static_cast(aAny.getValue()) ) ); if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowXDistance" ), false ) ) - AddOpt( ESCHER_Prop_shadowOffsetX, *((sal_Int32*)aAny.getValue()) * 360 ); + AddOpt( ESCHER_Prop_shadowOffsetX, *static_cast(aAny.getValue()) * 360 ); if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowYDistance" ), false ) ) - AddOpt( ESCHER_Prop_shadowOffsetY, *((sal_Int32*)aAny.getValue()) * 360 ); + AddOpt( ESCHER_Prop_shadowOffsetY, *static_cast(aAny.getValue()) * 360 ); if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowTransparence" ), false ) ) - AddOpt( ESCHER_Prop_shadowOpacity, 0x10000 - (((sal_uInt32)*((sal_uInt16*)aAny.getValue())) * 655 ) ); + AddOpt( ESCHER_Prop_shadowOpacity, 0x10000 - (((sal_uInt32)*static_cast(aAny.getValue())) * 655 ) ); } } } @@ -3077,7 +3077,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT uno::Any aFillColor2; if ( EscherPropertyValueHelper::GetPropertyValue( aFillColor2, aXPropSet, OUString( "FillColor2" ), true ) ) { - sal_uInt32 nFillColor = ImplGetColor( *((sal_uInt32*)aFillColor2.getValue()) ); + sal_uInt32 nFillColor = ImplGetColor( *static_cast(aFillColor2.getValue()) ); AddOpt( DFF_Prop_c3DExtrusionColor, nFillColor ); } } @@ -4442,7 +4442,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin p_EscherBlibEntry->meBlibType = ( eGraphicType == GRAPHIC_BITMAP ) ? PNG : EMF; aStream.Seek( STREAM_SEEK_TO_END ); p_EscherBlibEntry->mnSize = aStream.Tell(); - pGraphicAry = (sal_uInt8*)aStream.GetData(); + pGraphicAry = static_cast(aStream.GetData()); } } } @@ -4509,7 +4509,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin aZCodec.EndCompression(); aDestStrm.Seek( STREAM_SEEK_TO_END ); p_EscherBlibEntry->mnSize = aDestStrm.Tell(); - pGraphicAry = (sal_uInt8*)aDestStrm.GetData(); + pGraphicAry = static_cast(aDestStrm.GetData()); if ( p_EscherBlibEntry->mnSize && pGraphicAry ) { nExtra = eBlibType == WMF ? 0x42 : 0x32; // !EMF -> no change @@ -4643,10 +4643,10 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aPropertySet, "PolyPolygon" ) ) { - ::com::sun::star::drawing::PointSequenceSequence* pSourcePolyPolygon = - (::com::sun::star::drawing::PointSequenceSequence*)aAny.getValue(); + ::com::sun::star::drawing::PointSequenceSequence const * pSourcePolyPolygon = + static_cast(aAny.getValue()); sal_Int32 nOuterSequenceCount = pSourcePolyPolygon->getLength(); - ::com::sun::star::drawing::PointSequence* pOuterSequence = pSourcePolyPolygon->getArray(); + ::com::sun::star::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->getConstArray(); if ( pOuterSequence ) { @@ -4654,10 +4654,10 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) sal_uInt32 nDistance = 0xffffffff; for( a = 0; a < nOuterSequenceCount; a++ ) { - ::com::sun::star::drawing::PointSequence* pInnerSequence = pOuterSequence++; + ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++; if ( pInnerSequence ) { - ::com::sun::star::awt::Point* pArray = pInnerSequence->getArray(); + ::com::sun::star::awt::Point const * pArray = pInnerSequence->getConstArray(); if ( pArray ) { for ( b = 0; b < pInnerSequence->getLength(); b++, nIndex++, pArray++ ) @@ -4685,15 +4685,15 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aPropertySet2, "PolyPolygonBezier" ) ) { - ::com::sun::star::drawing::PolyPolygonBezierCoords* pSourcePolyPolygon = - (::com::sun::star::drawing::PolyPolygonBezierCoords*)aAny.getValue(); + ::com::sun::star::drawing::PolyPolygonBezierCoords const * pSourcePolyPolygon = + static_cast(aAny.getValue()); sal_Int32 nOuterSequenceCount = pSourcePolyPolygon->Coordinates.getLength(); // Zeiger auf innere sequences holen - ::com::sun::star::drawing::PointSequence* pOuterSequence = - pSourcePolyPolygon->Coordinates.getArray(); - ::com::sun::star::drawing::FlagSequence* pOuterFlags = - pSourcePolyPolygon->Flags.getArray(); + ::com::sun::star::drawing::PointSequence const * pOuterSequence = + pSourcePolyPolygon->Coordinates.getConstArray(); + ::com::sun::star::drawing::FlagSequence const * pOuterFlags = + pSourcePolyPolygon->Flags.getConstArray(); if ( pOuterSequence && pOuterFlags ) { @@ -4702,12 +4702,12 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) for ( a = 0; a < nOuterSequenceCount; a++ ) { - ::com::sun::star::drawing::PointSequence* pInnerSequence = pOuterSequence++; - ::com::sun::star::drawing::FlagSequence* pInnerFlags = pOuterFlags++; + ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++; + ::com::sun::star::drawing::FlagSequence const * pInnerFlags = pOuterFlags++; if ( pInnerSequence && pInnerFlags ) { - ::com::sun::star::awt::Point* pArray = pInnerSequence->getArray(); - ::com::sun::star::drawing::PolygonFlags* pFlags = pInnerFlags->getArray(); + ::com::sun::star::awt::Point const * pArray = pInnerSequence->getConstArray(); + ::com::sun::star::drawing::PolygonFlags const * pFlags = pInnerFlags->getConstArray(); if ( pArray && pFlags ) { for ( b = 0; b < pInnerSequence->getLength(); b++, pArray++ ) @@ -4829,7 +4829,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) aPoly[ 3 ] = Point( aRect.Right(), aCenter.Y() ); sal_Int32 nAngle = ( EscherPropertyValueHelper::GetPropertyValue( aAny, aPropertySet, OUString( "RotateAngle" ), true ) ) - ? *((sal_Int32*)aAny.getValue() ) : 0; + ? *static_cast(aAny.getValue()) : 0; if ( nAngle ) aPoly.Rotate( aRect.TopLeft(), (sal_uInt16)( ( nAngle + 5 ) / 10 ) ); nRule = GetClosestPoint( aPoly, aRefPoint ); diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 30a87f8e8576..6ce7fc8ab57e 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -227,8 +227,8 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, for( sal_uInt32 n = 0, nCnt = xXIndexAccess->getCount(); n < nCnt; ++n ) { - ImplEESdrObject aObj( *this, *(Reference< XShape >*) - xXIndexAccess->getByIndex( n ).getValue() ); + ImplEESdrObject aObj( *this, *static_cast const *>( + xXIndexAccess->getByIndex( n ).getValue()) ); if( aObj.IsValid() ) { aObj.SetOOXML(bOOxmlExport); @@ -264,9 +264,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, if ( pMemStrm.get() ) { pMemStrm->ObjectOwnsMemory( false ); - sal_uInt8* pBuf = (sal_uInt8*) pMemStrm->GetData(); + sal_uInt8 const * pBuf = static_cast(pMemStrm->GetData()); sal_uInt32 nSize = pMemStrm->Seek( STREAM_SEEK_TO_END ); - aPropOpt.AddOpt( ESCHER_Prop_pihlShape, false, nSize, pBuf, nSize ); + aPropOpt.AddOpt( ESCHER_Prop_pihlShape, false, nSize, const_cast(pBuf), nSize ); } if ( pInteraction->hasInteraction() ) aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 ); @@ -349,7 +349,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, PolyStyle ePolyKind = PolyStyle(); if ( rObj.ImplGetPropertyValue( OUString( "CircleKind" ) ) ) { - eCircleKind = *( (CircleKind*)rObj.GetUsrAny().getValue() ); + eCircleKind = *( static_cast(rObj.GetUsrAny().getValue()) ); switch ( eCircleKind ) { case CircleKind_SECTION : @@ -384,10 +384,10 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, sal_Int32 nStartAngle, nEndAngle; if ( !rObj.ImplGetPropertyValue( OUString( "CircleStartAngle" ) ) ) break; - nStartAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() ); + nStartAngle = *( static_cast(rObj.GetUsrAny().getValue()) ); if( !rObj.ImplGetPropertyValue( OUString( "CircleEndAngle" ) ) ) break; - nEndAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() ); + nEndAngle = *( static_cast(rObj.GetUsrAny().getValue()) ); Point aStart, aEnd, aCenter; aStart.X() = (sal_Int32)( ( cos( (double)( nStartAngle * @@ -664,7 +664,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, if( USHRT_MAX != mpEscherEx->GetHellLayerId() && rObj.ImplGetPropertyValue( OUString( "LayerID" ) ) && - (*((sal_uInt16*)rObj.GetUsrAny().getValue()) ) == mpEscherEx->GetHellLayerId() ) + (*static_cast(rObj.GetUsrAny().getValue()) ) == mpEscherEx->GetHellLayerId() ) { aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x200020 ); } @@ -850,8 +850,8 @@ void ImplEESdrWriter::ImplWritePage( mXStatusIndicator->setValue( nValue ); } - ImplEESdrObject aObj( *this, *(Reference< XShape >*) - mXShapes->getByIndex( n ).getValue() ); + ImplEESdrObject aObj( *this, *static_cast const *>( + mXShapes->getByIndex( n ).getValue()) ); if( aObj.IsValid() ) { ImplWriteShape( aObj, rSolverContainer, ePageType ); diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index e655ce95b7db..0f8c6abc5198 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -57,7 +57,7 @@ public: bool ImplGetPropertyValue( const OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); } sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 ) - { return ImplGetPropertyValue( pStr ) ? *(sal_Int32*)mAny.getValue() : nDef; } + { return ImplGetPropertyValue( pStr ) ? *static_cast(mAny.getValue()) : nDef; } sal_Int32 ImplGetInt32PropertyValue( const OUString& rStr, sal_uInt32 nDef = 0 ) { return ImplGetInt32PropertyValue(rStr.getStr(), nDef); } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 2d9997ff5a77..8a0ecd53fc1e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4937,7 +4937,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, { if( !rTextRect.IsEmpty() ) { - SvxMSDffImportData& rImportData = *(SvxMSDffImportData*)pData; + SvxMSDffImportData& rImportData = *static_cast(pData); SvxMSDffImportRec* pImpRec = new SvxMSDffImportRec; bool bDeleteImpRec = true; SvxMSDffImportRec* pTextImpRec = pImpRec; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index bc88ae8a723d..47e05d2a75fb 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -725,7 +725,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi // we are initializing our return value with the object that was imported by our escher import SdrObject* pRet = pOriginalObj; - ProcessData& rData = *((ProcessData*)pData); + ProcessData& rData = *static_cast(pData); PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry; if ( ! ( rObjData.nSpFlags & SP_FGROUP ) ) // sj: #114758# ... @@ -1193,7 +1193,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi { maShapeRecords.Current()->SeekToBegOfRecord( rSt ); DffPropertyReader aSecPropSet( *this ); - aSecPropSet.ReadPropSet( rSt, (ProcessData*)pData ); + aSecPropSet.ReadPropSet( rSt, pData ); sal_Int32 nTableProperties = aSecPropSet.GetPropertyValue( DFF_Prop_tableProperties, 0 ); if ( nTableProperties & 3 ) { @@ -2568,7 +2568,7 @@ bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, sal_uIn bool bRet = SvxMSDffManager::SeekToShape( rSt, pClientData, nId ); if ( !bRet ) { - ProcessData& rData = *( (ProcessData*)pClientData ); + ProcessData& rData = *static_cast(pClientData); PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry; if ( rPersistEntry.ePageKind == PPT_SLIDEPAGE ) { diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 5e1dc5283176..77f792f3d15b 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1513,7 +1513,7 @@ ImplErrorDialog::~ImplErrorDialog() { // free strings again for( sal_uInt16 n = 0; n < m_pErrors->GetEntryCount(); n++ ) - delete (OUString*)m_pErrors->GetEntryData( n ); + delete static_cast(m_pErrors->GetEntryData( n )); } IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 0ebab07639b3..44fe1253bd36 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -2607,7 +2607,7 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx, { Point aPt; Size aSz; - Sequence< sal_Int8 > aSeq( (sal_Int8*) aOStm.GetData(), aOStm.Tell() ); + Sequence< sal_Int8 > aSeq( static_cast(aOStm.GetData()), aOStm.Tell() ); OUStringBuffer aBuffer( "data:image/png;base64," ); ::sax::Converter::encodeBase64( aBuffer, aSeq ); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index c5051bcbf33d..57d451d1c81d 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -184,7 +184,7 @@ void XMLFilterSettingsDialog::updateStates() bool bIsDefault = false; if(pSelectedEntry) { - filter_info_impl* pInfo = (filter_info_impl*)pSelectedEntry->GetUserData(); + filter_info_impl* pInfo = static_cast(pSelectedEntry->GetUserData()); bIsReadonly = pInfo->mbReadonly; sal_Int32 nFact = SvtModuleOptions::E_WRITER; @@ -244,7 +244,7 @@ void XMLFilterSettingsDialog::onEdit() if( pEntry ) { // get its filter info - filter_info_impl* pOldInfo = (filter_info_impl*)pEntry->GetUserData(); + filter_info_impl* pOldInfo = static_cast(pEntry->GetUserData()); // execute XML Filter Dialog XMLFilterTabDialog aDlg( this, *getXSLTDialogResMgr(), mxContext, pOldInfo ); @@ -770,7 +770,7 @@ void XMLFilterSettingsDialog::onTest() SvTreeListEntry* pEntry = m_pFilterListBox->FirstSelected(); if( pEntry ) { - filter_info_impl* pInfo = (filter_info_impl*)pEntry->GetUserData(); + filter_info_impl* pInfo = static_cast(pEntry->GetUserData()); XMLFilterTestDialog aDlg(this, mxContext); aDlg.test( *pInfo ); @@ -784,7 +784,7 @@ void XMLFilterSettingsDialog::onDelete() SvTreeListEntry* pEntry = m_pFilterListBox->FirstSelected(); if( pEntry ) { - filter_info_impl* pInfo = (filter_info_impl*)pEntry->GetUserData(); + filter_info_impl* pInfo = static_cast(pEntry->GetUserData()); OUString aPlaceHolder( "%s" ); OUString aMessage(RESIDSTR(STR_WARN_DELETE)); @@ -880,7 +880,7 @@ void XMLFilterSettingsDialog::onSave() SvTreeListEntry* pEntry = m_pFilterListBox->FirstSelected(); while( pEntry ) { - filter_info_impl* pInfo = (filter_info_impl*)pEntry->GetUserData(); + filter_info_impl* pInfo = static_cast(pEntry->GetUserData()); aFilters.push_back( pInfo ); pEntry = m_pFilterListBox->NextSelected( pEntry ); nFilters++; @@ -1509,7 +1509,7 @@ void XMLFilterListBox::changeEntry( const filter_info_impl* pInfo ) for( nPos = 0; nPos < nCount; nPos++ ) { SvTreeListEntry* pEntry = GetEntry( nPos ); - if( (filter_info_impl*)pEntry->GetUserData() == pInfo ) + if( static_cast(pEntry->GetUserData()) == pInfo ) { OUString aEntryText( getEntryString( pInfo ) ); SetEntryText( aEntryText, pEntry ); diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index 14ef6bd052fc..74d4ea9bc819 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -102,7 +102,7 @@ namespace XSLT return "Not Found:";// + streamName; } ; - Reference subStream((*(Reference< XInterface > *) m_storage->getByName(streamName).getValue()), UNO_QUERY); + Reference subStream(*static_cast const *>(m_storage->getByName(streamName).getValue()), UNO_QUERY); if (!subStream.is()) { return "Not Found:";// + streamName;