diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-17 15:43:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-10-20 13:33:57 +0200 |
| commit | efa7f1a549ebf2580d50f6f0bb96e294a5fce670 (patch) | |
| tree | 7e8cccc2a6e0a5585c4c2eabc36400337f0bcc52 | |
| parent | b0509439d9fa664be8f94b557d83ea3a2891c31f (diff) | |
loplugin: cstylecast
Change-Id: Idb6337bed1c32444f9644d54eba5240f09c13ef6
42 files changed, 384 insertions, 384 deletions
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index a512a3bfe15c..050746f4c611 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -165,7 +165,7 @@ uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() { //style = ::rtl::OUString::createFromAscii("style="); style = ::rtl::OUString::createFromAscii("style:"); - style += ((SdrOle2Obj*)m_pShape)->GetStyleString(); + style += static_cast<SdrOle2Obj*>(m_pShape)->GetStyleString(); } style += ::rtl::OUString::createFromAscii(";"); strRet <<= style; diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index dc3fb56ecda2..8aba3a48ad1e 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -308,7 +308,7 @@ OUString { if(pSdrObj->ISA(SdrObjCustomShape)) { - SdrObjCustomShape* pCustomShape = (SdrObjCustomShape*)pSdrObj; + SdrObjCustomShape* pCustomShape = static_cast<SdrObjCustomShape*>(pSdrObj); if(pCustomShape) { if (pCustomShape->IsTextPath()) diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 0c683d7e5860..aea1cfbb59d6 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -57,16 +57,16 @@ #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> -#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() +#define ITEMVALUE(ItemSet,Id,Cast) (static_cast<const Cast&>((ItemSet).Get(Id))).GetValue() using namespace com::sun::star; using namespace com::sun::star::uno; namespace { -void GetOrigin( SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOriginY ) +void GetOrigin( const SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOriginY ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; - Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Origin" ); + const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Origin" ); if ( ! ( pAny && ( *pAny >>= aOriginParaPair ) && ( aOriginParaPair.First.Value >>= rOriginX ) && ( aOriginParaPair.Second.Value >>= rOriginY ) ) ) { rOriginX = 0.50; @@ -74,10 +74,10 @@ void GetOrigin( SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOr } } -void GetRotateAngle( SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& rAngleY ) +void GetRotateAngle( const SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& rAngleY ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; - Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "RotateAngle" ); + const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "RotateAngle" ); if ( ! ( pAny && ( *pAny >>= aRotateAngleParaPair ) && ( aRotateAngleParaPair.First.Value >>= rAngleX ) && ( aRotateAngleParaPair.Second.Value >>= rAngleY ) ) ) { rAngleX = 0.0; @@ -87,10 +87,10 @@ void GetRotateAngle( SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& rAngleY *= F_PI180; } -void GetSkew( SdrCustomShapeGeometryItem& rItem, double& rSkewAmount, double& rSkewAngle ) +void GetSkew( const SdrCustomShapeGeometryItem& rItem, double& rSkewAmount, double& rSkewAngle ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; - Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Skew" ); + const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Skew" ); if ( ! ( pAny && ( *pAny >>= aSkewParaPair ) && ( aSkewParaPair.First.Value >>= rSkewAmount ) && ( aSkewParaPair.Second.Value >>= rSkewAngle ) ) ) { rSkewAmount = 50; @@ -99,11 +99,11 @@ void GetSkew( SdrCustomShapeGeometryItem& rItem, double& rSkewAmount, double& rS rSkewAngle *= F_PI180; } -void GetExtrusionDepth( SdrCustomShapeGeometryItem& rItem, const double* pMap, double& rBackwardDepth, double& rForwardDepth ) +void GetExtrusionDepth( const SdrCustomShapeGeometryItem& rItem, const double* pMap, double& rBackwardDepth, double& rForwardDepth ) { ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; double fDepth = 0, fFraction = 0; - Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Depth" ); + const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Depth" ); if ( pAny && ( *pAny >>= aDepthParaPair ) && ( aDepthParaPair.First.Value >>= fDepth ) && ( aDepthParaPair.Second.Value >>= fFraction ) ) { rForwardDepth = fDepth * fFraction; @@ -122,10 +122,10 @@ void GetExtrusionDepth( SdrCustomShapeGeometryItem& rItem, const double* pMap, d } } -double GetDouble( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, double fDefault, const double* pMap ) +double GetDouble( const SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, double fDefault, const double* pMap ) { double fRetValue = fDefault; - Any* pAny = rItem.GetPropertyValueByName( "Extrusion", rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", rPropertyName ); if ( pAny ) *pAny >>= fRetValue; if ( pMap ) @@ -133,16 +133,16 @@ double GetDouble( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyNa return fRetValue; } -drawing::ShadeMode GetShadeMode( SdrCustomShapeGeometryItem& rItem, const drawing::ShadeMode eDefault ) +drawing::ShadeMode GetShadeMode( const SdrCustomShapeGeometryItem& rItem, const drawing::ShadeMode eDefault ) { drawing::ShadeMode eRet( eDefault ); - Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "ShadeMode" ); + const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "ShadeMode" ); if ( pAny ) *pAny >>= eRet; return eRet; } -bool GetBool( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const bool bDefault ) +bool GetBool( const SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const bool bDefault ) { bool bRetValue = bDefault; const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", rPropertyName ); @@ -151,7 +151,7 @@ bool GetBool( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, return bRetValue; } -drawing::Position3D GetPosition3D( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, +drawing::Position3D GetPosition3D( const SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const drawing::Position3D& rDefault, const double* pMap ) { drawing::Position3D aRetValue( rDefault ); @@ -167,7 +167,7 @@ drawing::Position3D GetPosition3D( SdrCustomShapeGeometryItem& rItem, const OUSt return aRetValue; } -drawing::Direction3D GetDirection3D( SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const drawing::Direction3D& rDefault ) +drawing::Direction3D GetDirection3D( const SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const drawing::Direction3D& rDefault ) { drawing::Direction3D aRetValue( rDefault ); const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", rPropertyName ); @@ -188,8 +188,8 @@ EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCus , fOriginY(0.0) , pMap( pM ) { - SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - Any* pAny = rGeometryItem.GetPropertyValueByName( "Extrusion", "ProjectionMode" ); + const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); + const Any* pAny = rGeometryItem.GetPropertyValueByName( "Extrusion", "ProjectionMode" ); if ( pAny ) *pAny >>= eProjectionMode; @@ -256,7 +256,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con { SdrObject* pRet = NULL; SdrModel* pModel = pCustomShape->GetModel(); - SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); + const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); double fMap, *pMap = NULL; if ( pModel ) @@ -278,8 +278,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con } if ( GetBool( rGeometryItem, "Extrusion", false ) ) { - bool bIsMirroredX = ((SdrObjCustomShape*)pCustomShape)->IsMirroredX(); - bool bIsMirroredY = ((SdrObjCustomShape*)pCustomShape)->IsMirroredY(); + bool bIsMirroredX = static_cast<const SdrObjCustomShape*>(pCustomShape)->IsMirroredX(); + bool bIsMirroredY = static_cast<const SdrObjCustomShape*>(pCustomShape)->IsMirroredY(); Rectangle aSnapRect( pCustomShape->GetLogicRect() ); long nObjectRotation = pCustomShape->GetRotateAngle(); if ( nObjectRotation ) @@ -317,7 +317,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con fDepth = 1.0; drawing::ProjectionMode eProjectionMode( drawing::ProjectionMode_PARALLEL ); - Any* pAny = rGeometryItem.GetPropertyValueByName( "Extrusion", "ProjectionMode" ); + const Any* pAny = rGeometryItem.GetPropertyValueByName( "Extrusion", "ProjectionMode" ); if ( pAny ) *pAny >>= eProjectionMode; ProjectionType eProjectionType( eProjectionMode == drawing::ProjectionMode_PARALLEL ? PR_PARALLEL : PR_PERSPECTIVE ); @@ -375,8 +375,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con while( aIter.IsMore() ) { const SdrObject* pNext = aIter.Next(); - bool bIsPlaceholderObject = (((XFillStyleItem&)pNext->GetMergedItem( XATTR_FILLSTYLE )).GetValue() == drawing::FillStyle_NONE ) - && (((XLineStyleItem&)pNext->GetMergedItem( XATTR_LINESTYLE )).GetValue() == XLINE_NONE ); + bool bIsPlaceholderObject = (static_cast<const XFillStyleItem&>(pNext->GetMergedItem( XATTR_FILLSTYLE )).GetValue() == drawing::FillStyle_NONE ) + && (static_cast<const XLineStyleItem&>(pNext->GetMergedItem( XATTR_LINESTYLE )).GetValue() == XLINE_NONE ); basegfx::B2DPolyPolygon aPolyPoly; SfxItemSet aLocalSet(aSet); drawing::FillStyle aLocalFillStyle(eFillStyle); @@ -392,7 +392,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // invisible (all this 'hidden' logic should be migrated to primitives). if(!bMultipleSubObjects) { - const drawing::FillStyle eStyle(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue()); + const drawing::FillStyle eStyle(static_cast<const XFillStyleItem&>(rSet.Get(XATTR_FILLSTYLE)).GetValue()); if(drawing::FillStyle_NONE == eStyle) { @@ -439,9 +439,9 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // switch from line to fill, copy line attr to fill attr (color, transparence) aLocalSet.Put(XLineWidthItem(0)); aLocalSet.Put(XLineStyleItem(XLINE_NONE)); - aLocalSet.Put(XFillColorItem(OUString(), ((const XLineColorItem&)(aLocalSet.Get(XATTR_LINECOLOR))).GetColorValue())); + aLocalSet.Put(XFillColorItem(OUString(), static_cast<const XLineColorItem&>(aLocalSet.Get(XATTR_LINECOLOR)).GetColorValue())); aLocalSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); - aLocalSet.Put(XFillTransparenceItem(((const XLineTransparenceItem&)(aLocalSet.Get(XATTR_LINETRANSPARENCE))).GetValue())); + aLocalSet.Put(XFillTransparenceItem(static_cast<const XLineTransparenceItem&>(aLocalSet.Get(XATTR_LINETRANSPARENCE)).GetValue())); aLocalFillStyle = drawing::FillStyle_SOLID; } } @@ -457,7 +457,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con } else { - aPolyPoly = ((SdrPathObj*)pNext)->GetPathPoly(); + aPolyPoly = static_cast<const SdrPathObj*>(pNext)->GetPathPoly(); } } else @@ -490,10 +490,10 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con else if ( bUseTwoFillStyles ) { BitmapEx aFillBmp; - bool bFillBmpTile = ((XFillBmpTileItem&)p3DObj->GetMergedItem( XATTR_FILLBMP_TILE )).GetValue(); + bool bFillBmpTile = static_cast<const XFillBmpTileItem&>(p3DObj->GetMergedItem( XATTR_FILLBMP_TILE )).GetValue(); if ( bFillBmpTile ) { - const XFillBitmapItem& rBmpItm = (XFillBitmapItem&)p3DObj->GetMergedItem(XATTR_FILLBITMAP); + const XFillBitmapItem& rBmpItm = static_cast<const XFillBitmapItem&>(p3DObj->GetMergedItem(XATTR_FILLBITMAP)); aFillBmp = rBmpItm.GetGraphicObject().GetGraphic().GetBitmapEx(); // #i122777# old adaption of FillStyle bitmap size to 5-times the original size; this is not needed @@ -515,7 +515,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con { if ( aSnapRect != aBoundRect && aSnapRect.GetWidth() > 0 && aSnapRect.GetHeight() > 0) { - const XFillBitmapItem& rBmpItm = (XFillBitmapItem&)p3DObj->GetMergedItem(XATTR_FILLBITMAP); + const XFillBitmapItem& rBmpItm = static_cast<const XFillBitmapItem&>(p3DObj->GetMergedItem(XATTR_FILLBITMAP)); aFillBmp = rBmpItm.GetGraphicObject().GetGraphic().GetBitmapEx(); Size aBmpSize( aFillBmp.GetSizePixel() ); double fXScale = (double)aBoundRect.GetWidth() / (double)aSnapRect.GetWidth(); @@ -535,7 +535,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con p3DObj->NbcSetLayer( pShape2d->GetLayer() ); p3DObj->SetMergedItemSet( aLocalSet ); if ( bUseExtrusionColor ) - p3DObj->SetMergedItem( XFillColorItem( "", ((XSecondaryFillColorItem&)pCustomShape->GetMergedItem( XATTR_SECONDARYFILLCOLOR )).GetColorValue() ) ); + p3DObj->SetMergedItem( XFillColorItem( "", static_cast<const XSecondaryFillColorItem&>(pCustomShape->GetMergedItem( XATTR_SECONDARYFILLCOLOR )).GetColorValue() ) ); p3DObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_SOLID ) ); p3DObj->SetMergedItem( Svx3DCloseFrontItem( false ) ); p3DObj->SetMergedItem( Svx3DCloseBackItem( false ) ); @@ -558,7 +558,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con } else if ( aLocalFillStyle == drawing::FillStyle_NONE ) { - XLineColorItem& rLineColor = (XLineColorItem&)p3DObj->GetMergedItem( XATTR_LINECOLOR ); + const XLineColorItem& rLineColor = static_cast<const XLineColorItem&>(p3DObj->GetMergedItem( XATTR_LINECOLOR )); p3DObj->SetMergedItem( XFillColorItem( "", rLineColor.GetColorValue() ) ); p3DObj->SetMergedItem( makeSvx3DDoubleSidedItem( true ) ); p3DObj->SetMergedItem( Svx3DCloseFrontItem( false ) ); @@ -604,7 +604,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con double fXRotate, fYRotate; GetRotateAngle( rGeometryItem, fXRotate, fYRotate ); - double fZRotate = ((SdrObjCustomShape*)pCustomShape)->GetObjectRotation() * F_PI180; + double fZRotate = static_cast<const SdrObjCustomShape*>(pCustomShape)->GetObjectRotation() * F_PI180; if ( fZRotate != 0.0 ) aNewTransform.rotate( 0.0, 0.0, fZRotate ); if ( bIsMirroredX ) @@ -740,7 +740,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* pCustomShape, const Rectangle& rSnapRect, const Rectangle& rBoundRect, const double* pMap ) { - SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); + const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); const Point aCenter( rSnapRect.Center() ); double fExtrusionBackward, fExtrusionForward; GetExtrusionDepth( rGeometryItem, pMap, fExtrusionBackward, fExtrusionForward ); @@ -765,16 +765,16 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* pCustomS double fXRotate, fYRotate; GetRotateAngle( rGeometryItem, fXRotate, fYRotate ); - double fZRotate = - ((SdrObjCustomShape*)pCustomShape)->GetObjectRotation() * F_PI180; + double fZRotate = - static_cast<const SdrObjCustomShape*>(pCustomShape)->GetObjectRotation() * F_PI180; // rotating bound volume basegfx::B3DHomMatrix aMatrix; aMatrix.translate(-aRotationCenter.DirectionX, -aRotationCenter.DirectionY, -aRotationCenter.DirectionZ); if ( fZRotate != 0.0 ) aMatrix.rotate( 0.0, 0.0, fZRotate ); - if ( ((SdrObjCustomShape*)pCustomShape)->IsMirroredX() ) + if ( static_cast<const SdrObjCustomShape*>(pCustomShape)->IsMirroredX() ) aMatrix.scale( -1.0, 1, 1 ); - if ( ((SdrObjCustomShape*)pCustomShape)->IsMirroredY() ) + if ( static_cast<const SdrObjCustomShape*>(pCustomShape)->IsMirroredY() ) aMatrix.scale( 1, -1.0, 1 ); if( fYRotate != 0.0 ) aMatrix.rotate( 0.0, fYRotate, 0.0 ); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 24f6942828c2..2613d6537500 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -180,9 +180,9 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom { SdrObject* pTmp = pRenderedShape; pRenderedShape = new SdrObjGroup(); - ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTmp ); + static_cast<SdrObjGroup*>(pRenderedShape)->GetSubList()->NbcInsertObject( pTmp ); } - ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pShadowGeometry->Clone(), 0 ); + static_cast<SdrObjGroup*>(pRenderedShape)->GetSubList()->NbcInsertObject( pShadowGeometry->Clone(), 0 ); } else pRenderedShape = pShadowGeometry->Clone(); @@ -235,9 +235,9 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom { SdrObject* pTmp = pRenderedShape; pRenderedShape = new SdrObjGroup(); - ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTmp ); + static_cast<SdrObjGroup*>(pRenderedShape)->GetSubList()->NbcInsertObject( pTmp ); } - ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTextObj ); + static_cast<SdrObjGroup*>(pRenderedShape)->GetSubList()->NbcInsertObject( pTextObj ); } else pRenderedShape = pTextObj; @@ -250,7 +250,7 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom { SdrObject* pTmp = pRenderedShape; pRenderedShape = new SdrObjGroup(); - ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTmp ); + static_cast<SdrObjGroup*>(pRenderedShape)->GetSubList()->NbcInsertObject( pTmp ); } pRenderedShape->SetPage( pCustoObj->GetPage() ); pRenderedShape->SetModel( pCustoObj->GetModel() ); @@ -277,10 +277,10 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() if ( pSdrObjCustomShape ) { // retrieving the TextPath property to check if feature is enabled - SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&) - pSdrObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); + const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>( + pSdrObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); bool bTextPathOn = false; - uno::Any* pAny = rGeometryItem.GetPropertyValueByName( "TextPath", "TextPath" ); + const uno::Any* pAny = rGeometryItem.GetPropertyValueByName( "TextPath", "TextPath" ); if ( pAny ) *pAny >>= bTextPathOn; @@ -314,7 +314,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() } Rectangle aRect( pSdrObjCustomShape->GetSnapRect() ); - const GeoStat& rGeoStat = ((SdrObjCustomShape*)pSdrObjCustomShape)->GetGeoStat(); + const GeoStat& rGeoStat = static_cast<SdrObjCustomShape*>(pSdrObjCustomShape)->GetGeoStat(); if ( rGeoStat.nShearWink ) { long nShearWink = rGeoStat.nShearWink; @@ -354,7 +354,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() } if ( mbForceGroupWithText ) - pRenderedShape = ImplForceGroupWithText( (SdrObjCustomShape*)pSdrObjCustomShape, pRenderedShape ); + pRenderedShape = ImplForceGroupWithText( static_cast<SdrObjCustomShape*>(pSdrObjCustomShape), pRenderedShape ); if ( pRenderedShape ) { @@ -403,7 +403,7 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom bool bFlipV = aCustomShape2d.IsFlipVert(); bool bFlipH = aCustomShape2d.IsFlipHorz(); - const GeoStat& rGeoStat = ((SdrObjCustomShape*)pSdrObjCustomShape)->GetGeoStat(); + const GeoStat& rGeoStat = static_cast<SdrObjCustomShape*>(pSdrObjCustomShape)->GetGeoStat(); if ( rGeoStat.nShearWink ) { long nShearWink = rGeoStat.nShearWink; @@ -445,7 +445,7 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom if ( pNext->ISA( SdrPathObj ) ) { - aPP = ((SdrPathObj*)pNext)->GetPathPoly(); + aPP = static_cast<const SdrPathObj*>(pNext)->GetPathPoly(); } else { diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 18dd8d10f9be..b3bc74237baa 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -98,7 +98,7 @@ static bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal_uIn rFWData.bSingleLineMode = bSingleLineMode; // setting the strings - OutlinerParaObject* pParaObj = ((SdrObjCustomShape*)pCustomShape)->GetOutlinerParaObject(); + OutlinerParaObject* pParaObj = static_cast<const SdrObjCustomShape*>(pCustomShape)->GetOutlinerParaObject(); if ( pParaObj ) { const EditTextObject& rTextObj = pParaObj->GetTextObject(); @@ -116,7 +116,7 @@ static bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal_uIn aParagraphData.aString = rTextObj.GetText( j ); const SfxItemSet& rParaSet = rTextObj.GetParaAttribs( j ); // retrieving some paragraph attributes - aParagraphData.nFrameDirection = ((SvxFrameDirectionItem&)rParaSet.Get( EE_PARA_WRITINGDIR )).GetValue(); + aParagraphData.nFrameDirection = static_cast<const SvxFrameDirectionItem&>(rParaSet.Get( EE_PARA_WRITINGDIR )).GetValue(); aTextArea.vParagraphs.push_back( aParagraphData ); } rFWData.vTextAreas.push_back( aTextArea ); @@ -155,7 +155,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape, sal_uInt16 nOutlinesCount2d = rOutline2d.Count(); vcl::Font aFont; - SvxFontItem& rFontItem = (SvxFontItem&)pCustomShape->GetMergedItem( EE_CHAR_FONTINFO ); + const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(pCustomShape->GetMergedItem( EE_CHAR_FONTINFO )); aFont.SetHeight( pCustomShape->GetLogicRect().GetHeight() / rFWData.nMaxParagraphsPerTextArea ); aFont.SetAlign( ALIGN_TOP ); aFont.SetName( rFontItem.GetFamilyName() ); @@ -210,7 +210,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape, void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, FWTextArea& rTextArea, bool bSameLetterHeights ) { - bool bIsVertical = ((SdrObjCustomShape*)pCustomShape)->IsVerticalWriting(); + bool bIsVertical = static_cast<const SdrObjCustomShape*>(pCustomShape)->IsVerticalWriting(); sal_Int32 nVerticalOffset = rFWData.nMaxParagraphsPerTextArea > rTextArea.vParagraphs.size() ? rFWData.nSingleLineHeight / 2 : 0; @@ -241,7 +241,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F nFntItm = EE_CHAR_FONTINFO_CTL; else if ( nScriptType == i18n::ScriptType::ASIAN ) nFntItm = EE_CHAR_FONTINFO_CJK; - SvxFontItem& rFontItem = (SvxFontItem&)pCustomShape->GetMergedItem( nFntItm ); + const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(pCustomShape->GetMergedItem( nFntItm )); vcl::Font aFont; aFont.SetHeight( rFWData.nSingleLineHeight ); aFont.SetAlign( ALIGN_TOP ); @@ -251,10 +251,10 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F aFont.SetStyleName( rFontItem.GetStyleName() ); aFont.SetOrientation( 0 ); - SvxPostureItem& rPostureItem = (SvxPostureItem&)pCustomShape->GetMergedItem( EE_CHAR_ITALIC ); + const SvxPostureItem& rPostureItem = static_cast<const SvxPostureItem&>(pCustomShape->GetMergedItem( EE_CHAR_ITALIC )); aFont.SetItalic( rPostureItem.GetPosture() ); - SvxWeightItem& rWeightItem = (SvxWeightItem&)pCustomShape->GetMergedItem( EE_CHAR_WEIGHT ); + const SvxWeightItem& rWeightItem = static_cast<const SvxWeightItem&>(pCustomShape->GetMergedItem( EE_CHAR_WEIGHT )); aFont.SetWeight( rWeightItem.GetWeight() ); // initializing virtual device @@ -265,7 +265,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F if ( aParagraphIter->nFrameDirection == FRMDIR_HORI_RIGHT_TOP ) aVirDev.SetLayoutMode( TEXT_LAYOUT_BIDI_RTL ); - SvxCharScaleWidthItem& rCharScaleWidthItem = (SvxCharScaleWidthItem&)pCustomShape->GetMergedItem( EE_CHAR_FONTWIDTH ); + const SvxCharScaleWidthItem& rCharScaleWidthItem = static_cast<const SvxCharScaleWidthItem&>(pCustomShape->GetMergedItem( EE_CHAR_FONTWIDTH )); sal_uInt16 nCharScaleWidth = rCharScaleWidthItem.GetValue(); long* pDXArry = NULL; sal_Int32 nWidth = 0; @@ -414,8 +414,8 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) { - SdrTextHorzAdjust eHorzAdjust( ((SdrTextHorzAdjustItem&)pCustomShape->GetMergedItem( SDRATTR_TEXT_HORZADJUST )).GetValue() ); - SdrFitToSizeType eFTS( ((SdrTextFitToSizeTypeItem&)pCustomShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE )).GetValue() ); + SdrTextHorzAdjust eHorzAdjust( static_cast<const SdrTextHorzAdjustItem&>(pCustomShape->GetMergedItem( SDRATTR_TEXT_HORZADJUST )).GetValue() ); + SdrFitToSizeType eFTS( static_cast<const SdrTextFitToSizeTypeItem&>(pCustomShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE )).GetValue() ); std::vector< FWTextArea >::iterator aTextAreaIter = rFWData.vTextAreas.begin(); std::vector< FWTextArea >::iterator aTextAreaIEnd = rFWData.vTextAreas.end(); @@ -424,8 +424,8 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) / rFWData.nMaxParagraphsPerTextArea ) * rFWData.fHorizontalTextScaling ); bool bSameLetterHeights = false; - SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); - com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( "TextPath", "SameLetterHeights" ); + const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); + const com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( "TextPath", "SameLetterHeights" ); if ( pAny ) *pAny >>= bSameLetterHeights; @@ -515,7 +515,7 @@ basegfx::B2DPolyPolygon GetOutlinesFromShape2d( const SdrObject* pShape2d ) SdrObject* pPartObj = aObjListIter.Next(); if ( pPartObj->ISA( SdrPathObj ) ) { - basegfx::B2DPolyPolygon aCandidate(((SdrPathObj*)pPartObj)->GetPathPoly()); + basegfx::B2DPolyPolygon aCandidate(static_cast<SdrPathObj*>(pPartObj)->GetPathPoly()); if(aCandidate.areControlPointsUsed()) { aCandidate = basegfx::tools::adaptiveSubdivideByAngle(aCandidate); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 3d538fcc9bdb..c720a73ebf68 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -373,7 +373,7 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( vcl::Window* pParent_, sal_uInt16 { pWindow = new SvxBmpMask( pBindings, this, pParent_, BMP_RESID( RID_SVXDLG_BMPMASK ) ); - SvxBmpMask* pDlg = (SvxBmpMask*) pWindow; + SvxBmpMask* pDlg = static_cast<SvxBmpMask*>(pWindow); eChildAlignment = SFX_ALIGN_NOALIGNMENT; @@ -816,7 +816,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) { case( META_PIXEL_ACTION ): { - MetaPixelAction* pAct = (MetaPixelAction*) pAction; + MetaPixelAction* pAct = static_cast<MetaPixelAction*>(pAction); aCol = pAct->GetColor(); TEST_COLS(); @@ -832,7 +832,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_LINECOLOR_ACTION ): { - MetaLineColorAction* pAct = (MetaLineColorAction*) pAction; + MetaLineColorAction* pAct = static_cast<MetaLineColorAction*>(pAction); aCol = pAct->GetColor(); TEST_COLS(); @@ -848,7 +848,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_FILLCOLOR_ACTION ): { - MetaFillColorAction* pAct = (MetaFillColorAction*) pAction; + MetaFillColorAction* pAct = static_cast<MetaFillColorAction*>(pAction); aCol = pAct->GetColor(); TEST_COLS(); @@ -864,7 +864,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_TEXTCOLOR_ACTION ): { - MetaTextColorAction* pAct = (MetaTextColorAction*) pAction; + MetaTextColorAction* pAct = static_cast<MetaTextColorAction*>(pAction); aCol = pAct->GetColor(); TEST_COLS(); @@ -880,7 +880,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_TEXTFILLCOLOR_ACTION ): { - MetaTextFillColorAction* pAct = (MetaTextFillColorAction*) pAction; + MetaTextFillColorAction* pAct = static_cast<MetaTextFillColorAction*>(pAction); aCol = pAct->GetColor(); TEST_COLS(); @@ -896,7 +896,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_FONT_ACTION ): { - MetaFontAction* pAct = (MetaFontAction*) pAction; + MetaFontAction* pAct = static_cast<MetaFontAction*>(pAction); vcl::Font aFont( pAct->GetFont() ); aCol = aFont.GetColor(); @@ -916,7 +916,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_WALLPAPER_ACTION ): { - MetaWallpaperAction* pAct = (MetaWallpaperAction*) pAction; + MetaWallpaperAction* pAct = static_cast<MetaWallpaperAction*>(pAction); Wallpaper aWall( pAct->GetWallpaper() ); aCol = aWall.GetColor(); @@ -936,7 +936,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_BMP_ACTION ): { - MetaBmpAction* pAct = (MetaBmpAction*) pAction; + MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pAction); const Bitmap aBmp( Mask( pAct->GetBitmap() ).GetBitmap() ); pAct = new MetaBmpAction( pAct->GetPoint(), aBmp ); @@ -946,7 +946,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_BMPSCALE_ACTION ): { - MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction; + MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pAction); const Bitmap aBmp( Mask( pAct->GetBitmap() ).GetBitmap() ); pAct = new MetaBmpScaleAction( pAct->GetPoint(), pAct->GetSize(), aBmp ); @@ -956,7 +956,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_BMPSCALEPART_ACTION ): { - MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction; + MetaBmpScalePartAction* pAct = static_cast<MetaBmpScalePartAction*>(pAction); const Bitmap aBmp( Mask( pAct->GetBitmap() ).GetBitmap() ); pAct = new MetaBmpScalePartAction( pAct->GetDestPoint(), pAct->GetDestSize(), @@ -967,7 +967,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_BMPEX_ACTION ): { - MetaBmpExAction* pAct = (MetaBmpExAction*) pAction; + MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pAction); const BitmapEx aBmpEx( Mask( pAct->GetBitmapEx() ).GetBitmapEx() ); pAct = new MetaBmpExAction( pAct->GetPoint(), aBmpEx ); @@ -977,7 +977,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_BMPEXSCALE_ACTION ): { - MetaBmpExScaleAction* pAct = (MetaBmpExScaleAction*) pAction; + MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pAction); const BitmapEx aBmpEx( Mask( pAct->GetBitmapEx() ).GetBitmapEx() ); pAct = new MetaBmpExScaleAction( pAct->GetPoint(), pAct->GetSize(), aBmpEx ); @@ -987,7 +987,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_BMPEXSCALEPART_ACTION ): { - MetaBmpExScalePartAction* pAct = (MetaBmpExScalePartAction*) pAction; + MetaBmpExScalePartAction* pAct = static_cast<MetaBmpExScalePartAction*>(pAction); const BitmapEx aBmpEx( Mask( pAct->GetBitmapEx() ).GetBitmapEx() ); pAct = new MetaBmpExScalePartAction( pAct->GetDestPoint(), pAct->GetDestSize(), diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 8175a0baee83..70b82e578a4a 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -47,7 +47,7 @@ CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj m_rBindings ( rBindings ), m_dResolution ( 96.0 ) { - const SdrGrafCropItem& rCrop = (const SdrGrafCropItem&) m_pGraphicObj->GetMergedItem(SDRATTR_GRAFCROP); + const SdrGrafCropItem& rCrop = static_cast<const SdrGrafCropItem&>( m_pGraphicObj->GetMergedItem(SDRATTR_GRAFCROP) ); m_aCropRectangle = Rectangle(rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom()); Initialize(); diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index efa5f39d3d14..43a6989f086d 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -161,7 +161,7 @@ void SvxXConnectionPreview::Construct() if( nInv == SdrInventor && nId == OBJ_EDGE ) { bFound = true; - SdrEdgeObj* pTmpEdgeObj = (SdrEdgeObj*) pObj; + const SdrEdgeObj* pTmpEdgeObj = static_cast<const SdrEdgeObj*>(pObj); pEdgeObj = (SdrEdgeObj*) pTmpEdgeObj->Clone(); SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( true ); @@ -249,7 +249,7 @@ sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz() sal_uInt16 nCount(0); if(SfxItemState::DONTCARE != rSet.GetItemState(SDRATTR_EDGELINEDELTAANZ)) - nCount = ((const SdrEdgeLineDeltaAnzItem&)rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue(); + nCount = static_cast<const SdrEdgeLineDeltaAnzItem&>(rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue(); return nCount; } diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 15fc238b438d..7587a24b4d9b 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -100,7 +100,7 @@ const tools::PolyPolygon& ContourWindow::GetPolyPolygon() if ( pPage && pPage->GetObjCount() ) { - SdrPathObj* pPathObj = (SdrPathObj*)pPage->GetObj(0); + SdrPathObj* pPathObj = static_cast<SdrPathObj*>(pPage->GetObj(0)); // Not sure if subdivision is needed for ContourWindow, but maybe it cannot handle // curves at all. Keeping subdivision here for security const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(pPathObj->GetPathPoly())); @@ -137,7 +137,7 @@ bool ContourWindow::IsContourChanged() const bool bRet = false; if ( pPage && pPage->GetObjCount() ) - bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged(); + bRet = static_cast<SdrPathObj*>( pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged(); return bRet; } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 7371223a4fb2..911b607b469b 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -894,14 +894,14 @@ bool Svx3DLightControl::GetLightOnOff(sal_uInt32 nNum) const switch(nNum) { - case 0 : return ((const SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); - case 1 : return ((const SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); - case 2 : return ((const SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); - case 3 : return ((const SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); - case 4 : return ((const SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); - case 5 : return ((const SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); - case 6 : return ((const SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); - case 7 : return ((const SfxBoolItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); + case 0 : return static_cast<const SfxBoolItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); + case 1 : return static_cast<const SfxBoolItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); + case 2 : return static_cast<const SfxBoolItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); + case 3 : return static_cast<const SfxBoolItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); + case 4 : return static_cast<const SfxBoolItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); + case 5 : return static_cast<const SfxBoolItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); + case 6 : return static_cast<const SfxBoolItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); + case 7 : return static_cast<const SfxBoolItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); } } @@ -916,14 +916,14 @@ Color Svx3DLightControl::GetLightColor(sal_uInt32 nNum) const switch(nNum) { - case 0 : return ((const SvxColorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_1)).GetValue(); - case 1 : return ((const SvxColorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_2)).GetValue(); - case 2 : return ((const SvxColorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_3)).GetValue(); - case 3 : return ((const SvxColorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_4)).GetValue(); - case 4 : return ((const SvxColorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_5)).GetValue(); - case 5 : return ((const SvxColorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_6)).GetValue(); - case 6 : return ((const SvxColorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_7)).GetValue(); - case 7 : return ((const SvxColorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_8)).GetValue(); + case 0 : return static_cast<const SvxColorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_1)).GetValue(); + case 1 : return static_cast<const SvxColorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_2)).GetValue(); + case 2 : return static_cast<const SvxColorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_3)).GetValue(); + case 3 : return static_cast<const SvxColorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_4)).GetValue(); + case 4 : return static_cast<const SvxColorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_5)).GetValue(); + case 5 : return static_cast<const SvxColorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_6)).GetValue(); + case 6 : return static_cast<const SvxColorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_7)).GetValue(); + case 7 : return static_cast<const SvxColorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTCOLOR_8)).GetValue(); } } @@ -938,14 +938,14 @@ basegfx::B3DVector Svx3DLightControl::GetLightDirection(sal_uInt32 nNum) const switch(nNum) { - case 0 : return ((const SvxB3DVectorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_1)).GetValue(); - case 1 : return ((const SvxB3DVectorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_2)).GetValue(); - case 2 : return ((const SvxB3DVectorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_3)).GetValue(); - case 3 : return ((const SvxB3DVectorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_4)).GetValue(); - case 4 : return ((const SvxB3DVectorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_5)).GetValue(); - case 5 : return ((const SvxB3DVectorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_6)).GetValue(); - case 6 : return ((const SvxB3DVectorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_7)).GetValue(); - case 7 : return ((const SvxB3DVectorItem&)aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)).GetValue(); + case 0 : return static_cast<const SvxB3DVectorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_1)).GetValue(); + case 1 : return static_cast<const SvxB3DVectorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_2)).GetValue(); + case 2 : return static_cast<const SvxB3DVectorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_3)).GetValue(); + case 3 : return static_cast<const SvxB3DVectorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_4)).GetValue(); + case 4 : return static_cast<const SvxB3DVectorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_5)).GetValue(); + case 5 : return static_cast<const SvxB3DVectorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_6)).GetValue(); + case 6 : return static_cast<const SvxB3DVectorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_7)).GetValue(); + case 7 : return static_cast<const SvxB3DVectorItem&>(aLightItemSet.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)).GetValue(); } } diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 6290079307d1..cca9ef81781e 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -265,7 +265,7 @@ void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt ) vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) - ( (SvxTabPage*)pTabPage)->PointChanged( this, eRP ); + static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, eRP ); } } } @@ -350,7 +350,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) - ((SvxTabPage*) pTabPage)->PointChanged(this, eRP); + static_cast<SvxTabPage*>(pTabPage)->PointChanged(this, eRP); SetFocusRect(); } @@ -671,7 +671,7 @@ void SvxRectCtl::SetState( CTL_STATE nState ) vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) - ((SvxTabPage*)pTabPage)->PointChanged(this, eRP); + static_cast<SvxTabPage*>(pTabPage)->PointChanged(this, eRP); } sal_uInt8 SvxRectCtl::GetNumOfChildren( void ) const @@ -798,7 +798,7 @@ long SvxPixelCtl::ShowPosition( const Point &pt) vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) - ( (SvxTabPage*)pTabPage)->PointChanged( this, RP_MM ); // RectPoint ist dummy + static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, RP_MM ); // RectPoint ist dummy return GetFoucsPosIndex(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index bb3f1bf6f71d..0cb7d9a1f157 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -822,7 +822,7 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry, SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind); DBG_ASSERT( TabCount() == 2, "*RecovDocList::InitEntry(): structure missmatch" ); - SvLBoxString* pCol = (SvLBoxString*)pEntry->GetItem(2); + SvLBoxString* pCol = static_cast<SvLBoxString*>(pEntry->GetItem(2)); RecovDocListEntry* p = new RecovDocListEntry(pEntry, 0, pCol->GetText()); pEntry->ReplaceItem(p, 2); } diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index fc7656920688..9cb0a1ce0b8f 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -865,7 +865,7 @@ static void SetPrevFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFon sal_uInt16 nWhich; if (GetWhich ( rSet, nSlot, nWhich ) ) { - const SvxFontItem& rFontItem = ( SvxFontItem& ) rSet.Get( nWhich ); + const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>( rSet.Get( nWhich ) ); rFont.SetFamily( rFontItem.GetFamily() ); rFont.SetName( rFontItem.GetFamilyName() ); rFont.SetPitch( rFontItem.GetPitch() ); @@ -879,13 +879,13 @@ static void SetPrevFontStyle( const SfxItemSet& rSet, sal_uInt16 nPosture, sal_u sal_uInt16 nWhich; if( GetWhich( rSet, nPosture, nWhich ) ) { - const SvxPostureItem& rItem = ( const SvxPostureItem& ) rSet.Get( nWhich ); + const SvxPostureItem& rItem = static_cast<const SvxPostureItem&>( rSet.Get( nWhich ) ); rFont.SetItalic( ( FontItalic ) rItem.GetValue() != ITALIC_NONE ? ITALIC_NORMAL : ITALIC_NONE ); } if( GetWhich( rSet, nWeight, nWhich ) ) { - const SvxWeightItem& rItem = ( const SvxWeightItem& ) rSet.Get( nWhich ); + const SvxWeightItem& rItem = static_cast<const SvxWeightItem&>( rSet.Get( nWhich ) ); rFont.SetWeight( ( FontWeight ) rItem.GetValue() != WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL ); } } @@ -896,7 +896,7 @@ void SvxFontPrevWindow::SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, S long nH; if( GetWhich( rSet, nSlot, nWhich ) ) { - nH = LogicToLogic( ( ( SvxFontHeightItem& ) rSet.Get( nWhich ) ).GetHeight(), + nH = LogicToLogic( static_cast<const SvxFontHeightItem&>( rSet.Get( nWhich ) ).GetHeight(), ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), MAP_TWIP ); } @@ -935,7 +935,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // Preview string if( GetWhich( rSet, SID_CHAR_DLG_PREVIEW_STRING, nWhich ) ) { - const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich ); + const SfxStringItem& rItem = static_cast<const SfxStringItem&>( rSet.Get( nWhich ) ); OUString aString = rItem.GetValue(); if( !aString.isEmpty() ) SetPreviewText( aString ); @@ -947,7 +947,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, FontUnderline eUnderline; if( GetWhich( rSet, SID_ATTR_CHAR_UNDERLINE, nWhich ) ) { - const SvxUnderlineItem& rItem = ( SvxUnderlineItem& ) rSet.Get( nWhich ); + const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>( rSet.Get( nWhich ) ); eUnderline = ( FontUnderline ) rItem.GetValue(); SetTextLineColor( rItem.GetColor() ); } @@ -962,7 +962,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, FontUnderline eOverline; if( GetWhich( rSet, SID_ATTR_CHAR_OVERLINE, nWhich ) ) { - const SvxOverlineItem& rItem = ( SvxOverlineItem& ) rSet.Get( nWhich ); + const SvxOverlineItem& rItem = static_cast<const SvxOverlineItem&>( rSet.Get( nWhich ) ); eOverline = ( FontUnderline ) rItem.GetValue(); SetOverlineColor( rItem.GetColor() ); } @@ -977,7 +977,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, FontStrikeout eStrikeout; if( GetWhich( rSet, SID_ATTR_CHAR_STRIKEOUT, nWhich ) ) { - const SvxCrossedOutItem& rItem = ( SvxCrossedOutItem& ) rSet.Get( nWhich ); + const SvxCrossedOutItem& rItem = static_cast<const SvxCrossedOutItem&>( rSet.Get( nWhich ) ); eStrikeout = ( FontStrikeout ) rItem.GetValue(); } else @@ -990,7 +990,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // WordLineMode if( GetWhich( rSet, SID_ATTR_CHAR_WORDLINEMODE, nWhich ) ) { - const SvxWordLineModeItem& rItem = ( SvxWordLineModeItem& ) rSet.Get( nWhich ); + const SvxWordLineModeItem& rItem = static_cast<const SvxWordLineModeItem&>( rSet.Get( nWhich ) ); rFont.SetWordLineMode( rItem.GetValue() ); rCJKFont.SetWordLineMode( rItem.GetValue() ); rCTLFont.SetWordLineMode( rItem.GetValue() ); @@ -999,7 +999,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // Emphasis if( GetWhich( rSet, SID_ATTR_CHAR_EMPHASISMARK, nWhich ) ) { - const SvxEmphasisMarkItem& rItem = ( SvxEmphasisMarkItem& ) rSet.Get( nWhich ); + const SvxEmphasisMarkItem& rItem = static_cast<const SvxEmphasisMarkItem&>( rSet.Get( nWhich ) ); FontEmphasisMark eMark = rItem.GetEmphasisMark(); rFont.SetEmphasisMark( eMark ); rCJKFont.SetEmphasisMark( eMark ); @@ -1009,7 +1009,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // Relief if( GetWhich( rSet, SID_ATTR_CHAR_RELIEF, nWhich ) ) { - const SvxCharReliefItem& rItem = ( SvxCharReliefItem& ) rSet.Get( nWhich ); + const SvxCharReliefItem& rItem = static_cast<const SvxCharReliefItem&>( rSet.Get( nWhich ) ); FontRelief eFontRelief = ( FontRelief ) rItem.GetValue(); rFont.SetRelief( eFontRelief ); rCJKFont.SetRelief( eFontRelief ); @@ -1019,7 +1019,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // Effects if( GetWhich( rSet, SID_ATTR_CHAR_CASEMAP, nWhich ) ) { - const SvxCaseMapItem& rItem = ( SvxCaseMapItem& ) rSet.Get( nWhich ); + const SvxCaseMapItem& rItem = static_cast<const SvxCaseMapItem&>( rSet.Get( nWhich ) ); SvxCaseMap eCaseMap = ( SvxCaseMap ) rItem.GetValue(); rFont.SetCaseMap( eCaseMap ); rCJKFont.SetCaseMap( eCaseMap ); @@ -1030,7 +1030,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // Outline if( GetWhich( rSet, SID_ATTR_CHAR_CONTOUR, nWhich ) ) { - const SvxContourItem& rItem = ( SvxContourItem& ) rSet.Get( nWhich ); + const SvxContourItem& rItem = static_cast<const SvxContourItem&>( rSet.Get( nWhich ) ); bool bOutline = rItem.GetValue(); rFont.SetOutline( bOutline ); rCJKFont.SetOutline( bOutline ); @@ -1040,7 +1040,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // Shadow if( GetWhich( rSet, SID_ATTR_CHAR_SHADOWED, nWhich ) ) { - const SvxShadowedItem& rItem = ( SvxShadowedItem& ) rSet.Get( nWhich ); + const SvxShadowedItem& rItem = static_cast<const SvxShadowedItem&>( rSet.Get( nWhich ) ); bool bShadow = rItem.GetValue(); rFont.SetShadow( bShadow ); rCJKFont.SetShadow( bShadow ); @@ -1051,7 +1051,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, bool bTransparent; if( GetWhich( rSet, bPreviewBackgroundToCharacter ? SID_ATTR_BRUSH : SID_ATTR_BRUSH_CHAR, nWhich ) ) { - const SvxBrushItem& rBrush = ( SvxBrushItem& ) rSet.Get( nWhich ); + const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>( rSet.Get( nWhich ) ); const Color& rColor = rBrush.GetColor(); bTransparent = rColor.GetTransparency() > 0; rFont.SetFillColor( rColor ); @@ -1070,7 +1070,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, { if( GetWhich( rSet, SID_ATTR_BRUSH, nWhich ) ) { - const SvxBrushItem& rBrush = ( SvxBrushItem& ) rSet.Get( nWhich ); + const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>( rSet.Get( nWhich ) ); if( GPOS_NONE == rBrush.GetGraphicPos() ) aBackCol = rBrush.GetColor(); } @@ -1100,7 +1100,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // Color if( GetWhich( rSet, SID_ATTR_CHAR_COLOR, nWhich ) ) { - const SvxColorItem& rItem = ( SvxColorItem& ) rSet.Get( nWhich ); + const SvxColorItem& rItem = static_cast<const SvxColorItem&>( rSet.Get( nWhich ) ); Color aCol( rItem.GetValue() ); rFont.SetColor( aCol ); @@ -1113,7 +1113,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // Kerning if( GetWhich( rSet, SID_ATTR_CHAR_KERNING, nWhich ) ) { - const SvxKerningItem& rItem = ( SvxKerningItem& ) rSet.Get( nWhich ); + const SvxKerningItem& rItem = static_cast<const SvxKerningItem&>( rSet.Get( nWhich ) ); short nKern = ( short ) LogicToLogic( rItem.GetValue(), ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), MAP_TWIP ); rFont.SetFixKerning( nKern ); @@ -1127,7 +1127,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, sal_uInt8 nEscProp; if( GetWhich( rSet, SID_ATTR_CHAR_ESCAPEMENT, nWhich ) ) { - const SvxEscapementItem& rItem = ( SvxEscapementItem& ) rSet.Get( nWhich ); + const SvxEscapementItem& rItem = static_cast<const SvxEscapementItem&>( rSet.Get( nWhich ) ); nEsc = rItem.GetEsc(); nEscProp = rItem.GetProp(); @@ -1148,7 +1148,7 @@ void SvxFontPrevWindow::SetFromItemSet( const SfxItemSet &rSet, // Font width scale if( GetWhich( rSet, SID_ATTR_CHAR_SCALEWIDTH, nWhich ) ) { - const SvxCharScaleWidthItem&rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); + const SvxCharScaleWidthItem&rItem = static_cast<const SvxCharScaleWidthItem&>( rSet.Get( nWhich ) ); SetFontWidthScale( rItem.GetValue() ); } @@ -1172,7 +1172,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_CHAR_DLG_PREVIEW_STRING ); if( ISITEMSET ) { - const SfxStringItem& rItem = ( SfxStringItem& ) rSet.Get( nWhich ); + const SfxStringItem& rItem = static_cast<const SfxStringItem&>( rSet.Get( nWhich ) ); OUString aString = rItem.GetValue(); if( !aString.isEmpty() ) SetPreviewText( aString ); @@ -1185,7 +1185,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_UNDERLINE ); if( ISITEMSET ) { - const SvxUnderlineItem& rItem = ( SvxUnderlineItem& ) rSet.Get( nWhich ); + const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>( rSet.Get( nWhich ) ); eUnderline = ( FontUnderline ) rItem.GetValue(); SetTextLineColor( rItem.GetColor() ); } @@ -1201,7 +1201,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_OVERLINE ); if( ISITEMSET ) { - const SvxOverlineItem& rItem = ( SvxOverlineItem& ) rSet.Get( nWhich ); + const SvxOverlineItem& rItem = static_cast<const SvxOverlineItem&>( rSet.Get( nWhich ) ); eOverline = ( FontUnderline ) rItem.GetValue(); SetOverlineColor( rItem.GetColor() ); } @@ -1217,7 +1217,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_STRIKEOUT ); if( ISITEMSET ) { - const SvxCrossedOutItem& rItem = ( SvxCrossedOutItem& ) rSet.Get( nWhich ); + const SvxCrossedOutItem& rItem = static_cast<const SvxCrossedOutItem&>( rSet.Get( nWhich ) ); eStrikeout = ( FontStrikeout ) rItem.GetValue(); } else @@ -1231,7 +1231,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_WORDLINEMODE ); if( ISITEMSET ) { - const SvxWordLineModeItem& rItem = ( SvxWordLineModeItem& ) rSet.Get( nWhich ); + const SvxWordLineModeItem& rItem = static_cast<const SvxWordLineModeItem&>( rSet.Get( nWhich ) ); rFont.SetWordLineMode( rItem.GetValue() ); rCJKFont.SetWordLineMode( rItem.GetValue() ); rCTLFont.SetWordLineMode( rItem.GetValue() ); @@ -1241,7 +1241,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); if( ISITEMSET ) { - const SvxEmphasisMarkItem& rItem = ( SvxEmphasisMarkItem& ) rSet.Get( nWhich ); + const SvxEmphasisMarkItem& rItem = static_cast<const SvxEmphasisMarkItem&>( rSet.Get( nWhich ) ); FontEmphasisMark eMark = rItem.GetEmphasisMark(); rFont.SetEmphasisMark( eMark ); rCJKFont.SetEmphasisMark( eMark ); @@ -1252,7 +1252,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_RELIEF ); if( ISITEMSET ) { - const SvxCharReliefItem& rItem = ( SvxCharReliefItem& ) rSet.Get( nWhich ); + const SvxCharReliefItem& rItem = static_cast<const SvxCharReliefItem&>( rSet.Get( nWhich ) ); FontRelief eFontRelief = ( FontRelief ) rItem.GetValue(); rFont.SetRelief( eFontRelief ); rCJKFont.SetRelief( eFontRelief ); @@ -1263,7 +1263,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_CASEMAP ); if( ISITEMSET ) { - const SvxCaseMapItem& rItem = ( SvxCaseMapItem& ) rSet.Get( nWhich ); + const SvxCaseMapItem& rItem = static_cast<const SvxCaseMapItem&>( rSet.Get( nWhich ) ); SvxCaseMap eCaseMap = ( SvxCaseMap ) rItem.GetValue(); rFont.SetCaseMap( eCaseMap ); rCJKFont.SetCaseMap( eCaseMap ); @@ -1275,7 +1275,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_CONTOUR ); if( ISITEMSET ) { - const SvxContourItem& rItem = ( SvxContourItem& ) rSet.Get( nWhich ); + const SvxContourItem& rItem = static_cast<const SvxContourItem&>( rSet.Get( nWhich ) ); bool bOutline = rItem.GetValue(); rFont.SetOutline( bOutline ); rCJKFont.SetOutline( bOutline ); @@ -1286,7 +1286,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_SHADOWED ); if( ISITEMSET ) { - const SvxShadowedItem& rItem = ( SvxShadowedItem& ) rSet.Get( nWhich ); + const SvxShadowedItem& rItem = static_cast<const SvxShadowedItem&>( rSet.Get( nWhich ) ); bool bShadow = rItem.GetValue(); rFont.SetShadow( bShadow ); rCJKFont.SetShadow( bShadow ); @@ -1298,7 +1298,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( pImpl->bPreviewBackgroundToCharacter ? SID_ATTR_BRUSH : SID_ATTR_BRUSH_CHAR ); if( ISITEMSET ) { - const SvxBrushItem& rBrush = ( SvxBrushItem& ) rSet.Get( nWhich ); + const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>( rSet.Get( nWhich ) ); const Color& rColor = rBrush.GetColor(); bTransparent = rColor.GetTransparency() > 0; rFont.SetFillColor( rColor ); @@ -1318,7 +1318,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_BRUSH ); if( ISITEMSET ) { - const SvxBrushItem& rBrush = ( SvxBrushItem& ) rSet.Get( nWhich ); + const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>( rSet.Get( nWhich ) ); if( GPOS_NONE == rBrush.GetGraphicPos() ) aBackCol = rBrush.GetColor(); } @@ -1349,7 +1349,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_COLOR ); if( ISITEMSET ) { - const SvxColorItem& rItem = ( SvxColorItem& ) rSet.Get( nWhich ); + const SvxColorItem& rItem = static_cast<const SvxColorItem&>( rSet.Get( nWhich ) ); Color aCol( rItem.GetValue() ); rFont.SetColor( aCol ); rCJKFont.SetColor( aCol ); @@ -1362,7 +1362,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_KERNING ); if( ISITEMSET ) { - const SvxKerningItem& rItem = ( SvxKerningItem& ) rSet.Get( nWhich ); + const SvxKerningItem& rItem = static_cast<const SvxKerningItem&>( rSet.Get( nWhich ) ); short nKern = ( short ) LogicToLogic( rItem.GetValue(), ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), MAP_TWIP ); rFont.SetFixKerning( nKern ); @@ -1377,7 +1377,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet ) sal_uInt8 nEscProp; if( ISITEMSET ) { - const SvxEscapementItem& rItem = ( SvxEscapementItem& ) rSet.Get( nWhich ); + const SvxEscapementItem& rItem = static_cast<const SvxEscapementItem&>( rSet.Get( nWhich ) ); nEsc = rItem.GetEsc(); nEscProp = rItem.GetProp(); @@ -1410,7 +1410,7 @@ void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFo sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nSlot ); if( ISITEMSET ) { - const SvxFontItem& rFontItem = (const SvxFontItem&)rSet.Get(nWhich); + const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>( rSet.Get(nWhich) ); rFont.SetFamily( rFontItem.GetFamily() ); rFont.SetName( rFontItem.GetFamilyName() ); rFont.SetPitch( rFontItem.GetPitch() ); @@ -1426,14 +1426,14 @@ void SvxFontPrevWindow::SetFontStyle( const SfxItemSet& rSet, sal_uInt16 nPostur sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nPosture ); if( ISITEMSET ) { - const SvxPostureItem& rItem = ( SvxPostureItem& ) rSet.Get( nWhich ); + const SvxPostureItem& rItem = static_cast<const SvxPostureItem&>( rSet.Get( nWhich ) ); rFont.SetItalic( ( FontItalic ) rItem.GetValue() != ITALIC_NONE ? ITALIC_NORMAL : ITALIC_NONE ); } nWhich = rSet.GetPool()->GetWhich( nWeight ); if( ISITEMSET ) { - SvxWeightItem& rItem = ( SvxWeightItem& ) rSet.Get( nWhich ); + const SvxWeightItem& rItem = static_cast<const SvxWeightItem&>( rSet.Get( nWhich ) ); rFont.SetWeight( ( FontWeight ) rItem.GetValue() != WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL ); } } @@ -1445,7 +1445,7 @@ void SvxFontPrevWindow::SetFontWidthScale( const SfxItemSet& rSet ) sal_uInt16 nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); if( ISITEMSET ) { - const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); + const SvxCharScaleWidthItem& rItem = static_cast<const SvxCharScaleWidthItem&>( rSet.Get( nWhich ) ); SetFontWidthScale( rItem.GetValue() ); } diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index e18752492ba9..ed0a318cdd3e 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -167,7 +167,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow { pWindow = new SvxFontWorkDialog( pBindings, this, _pParent, SVX_RES( RID_SVXDLG_FONTWORK ) ); - SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*) pWindow; + SvxFontWorkDialog* pDlg = static_cast<SvxFontWorkDialog*>(pWindow); eChildAlignment = SFX_ALIGN_NOALIGNMENT; diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 68bebd6f563e..13860381ab04 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -145,7 +145,7 @@ sal_uInt16 FmGridHeader::GetModelColumnPos(sal_uInt16 nId) const void FmGridHeader::notifyColumnSelect(sal_uInt16 nColumnId) { sal_uInt16 nPos = GetModelColumnPos(nColumnId); - Reference< XIndexAccess > xColumns(((FmGridControl*)GetParent())->GetPeer()->getColumns(), UNO_QUERY); + Reference< XIndexAccess > xColumns(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns(), UNO_QUERY); if ( nPos < xColumns->getCount() ) { Reference< XSelectionSupplier > xSelSupplier(xColumns, UNO_QUERY); @@ -761,7 +761,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe if (eState >= SfxItemState::DEFAULT && pItem ) { - bChecked = pItem->ISA(SfxBoolItem) && ((SfxBoolItem*)pItem)->GetValue(); + bChecked = pItem->ISA(SfxBoolItem) && static_cast<SfxBoolItem*>(pItem)->GetValue(); rMenu.CheckItem(SID_FM_SHOW_PROPERTY_BROWSER,bChecked); } delete pItem; @@ -1138,7 +1138,7 @@ void FmGridControl::DeleteSelectedRows() if (xConfirm.is()) { ::com::sun::star::sdb::RowChangeEvent aEvent; - aEvent.Source = (Reference< XInterface > )(*getDataSource()); + aEvent.Source = Reference< XInterface >(*getDataSource()); aEvent.Rows = nSelectedRows; aEvent.Action = ::com::sun::star::sdb::RowChangeAction::DELETE; if (!xConfirm->confirmDelete(aEvent)) @@ -1151,7 +1151,7 @@ void FmGridControl::DeleteSelectedRows() { BeginCursorAction(); CursorWrapper* pCursor = getDataSource(); - Reference< XResultSetUpdate > xUpdateCursor((Reference< XInterface >)*pCursor, UNO_QUERY); + Reference< XResultSetUpdate > xUpdateCursor(Reference< XInterface >(*pCursor), UNO_QUERY); try { pCursor->beforeFirst(); @@ -1174,7 +1174,7 @@ void FmGridControl::DeleteSelectedRows() } else { - Reference< ::com::sun::star::sdbcx::XDeleteRows > xDeleteThem((Reference< XInterface >)*getDataSource(), UNO_QUERY); + Reference< ::com::sun::star::sdbcx::XDeleteRows > xDeleteThem(Reference< XInterface >(*getDataSource()), UNO_QUERY); // collect the bookmarks of the selected rows Sequence < Any> aBookmarks = getSelectionBookmarks(); @@ -1267,13 +1267,13 @@ void FmGridControl::DeleteSelectedRows() // no valid bookmark so move to the insert row else { - Reference< XResultSetUpdate > xUpdateCursor((Reference< XInterface >)*m_pDataCursor, UNO_QUERY); + Reference< XResultSetUpdate > xUpdateCursor(Reference< XInterface >(*m_pDataCursor), UNO_QUERY); xUpdateCursor->moveToInsertRow(); } } else { - Reference< ::com::sun::star::beans::XPropertySet > xSet((Reference< XInterface >)*m_pDataCursor, UNO_QUERY); + Reference< ::com::sun::star::beans::XPropertySet > xSet(Reference< XInterface >(*m_pDataCursor), UNO_QUERY); sal_Int32 nRecordCount(0); xSet->getPropertyValue(FM_PROP_ROWCOUNT) >>= nRecordCount; @@ -1283,7 +1283,7 @@ void FmGridControl::DeleteSelectedRows() // there are no rows left and we have an insert row if (!nRecordCount && GetEmptyRow().Is()) { - Reference< XResultSetUpdate > xUpdateCursor((Reference< XInterface >)*m_pDataCursor, UNO_QUERY); + Reference< XResultSetUpdate > xUpdateCursor(Reference< XInterface >(*m_pDataCursor), UNO_QUERY); xUpdateCursor->moveToInsertRow(); } else if (nRecordCount) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 24a3312bf0cc..c6c1c504bb50 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1250,7 +1250,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType Reference< XIndexContainer > xColumns = getColumns(); - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); sal_Int32 nColumns = pGrid->GetViewColCount(); DbGridColumns aColumns = pGrid->GetColumns(); @@ -1304,7 +1304,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException, std::exception) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); DBG_ASSERT(pGrid && pGrid->IsOpen(), "FmXGridPeer::queryFieldData : have no valid grid window !"); if (!pGrid || !pGrid->IsOpen()) return Sequence< Any>(); @@ -1398,7 +1398,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE // this should not be (deadlock) critical, as by definition, every component should release // any own mutexes before notifying - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); if (!pGrid) return; @@ -1518,7 +1518,7 @@ void FmXGridPeer::removeUpdateListener(const Reference< XUpdateListener >& l) th sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception ) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); if (!m_xCursor.is() || !pGrid) return sal_True; @@ -1541,7 +1541,7 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception ) void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeException, std::exception ) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); // we are not interested in move to insert row only in the resetted event // which is fired after positioning an the insert row if (pGrid && pGrid->IsOpen() && !::comphelper::getBOOL(Reference< XPropertySet > (_rEvent.Source, UNO_QUERY)->getPropertyValue(FM_PROP_ISNEW))) @@ -1551,7 +1551,7 @@ void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeExceptio void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException, std::exception ) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); if (pGrid && pGrid->IsOpen()) { if (m_xCursor->rowUpdated() && !pGrid->IsCurrentAppending()) @@ -1713,7 +1713,7 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exce { vcl::Window* pWin = GetWindow(); if (pWin) - ((FmGridControl*) pWin)->SetDesignMode(bOn); + static_cast<FmGridControl*>(pWin)->SetDesignMode(bOn); } if (bOn) @@ -1727,7 +1727,7 @@ sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException, std::exception ) { vcl::Window* pWin = GetWindow(); if (pWin) - return ((FmGridControl*) pWin)->IsDesignMode(); + return static_cast<FmGridControl*>(pWin)->IsDesignMode(); else return sal_False; } @@ -1737,7 +1737,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep { SolarMutexGuard aGuard; - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); // Handle Column beruecksichtigen if (!pGrid || !m_xColumns.is() || pGrid->IsInColumnMove() || m_xColumns->getCount() == ((sal_Int32)pGrid->GetModelColCount())) return; @@ -1770,7 +1770,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep { SolarMutexGuard aGuard; - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); // Handle Column beruecksichtigen if (!pGrid || !m_xColumns.is() || pGrid->IsInColumnMove()) @@ -1804,7 +1804,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep Reference< XColumnsSupplier > xSuppColumns; CursorWrapper* pGridDataSource = pGrid->getDataSource(); if ( pGridDataSource ) - xSuppColumns.set((Reference< XInterface >)( *pGridDataSource ), css::uno::UNO_QUERY); + xSuppColumns.set(Reference< XInterface >( *pGridDataSource ), css::uno::UNO_QUERY); Reference< XNameAccess > xColumnsByName; if ( xSuppColumns.is() ) xColumnsByName = xSuppColumns->getColumns(); @@ -1825,7 +1825,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept { SolarMutexGuard aGuard; - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); // Handle Column beruecksichtigen if (!pGrid || !m_xColumns.is() || pGrid->IsInColumnMove() || m_xColumns->getCount() == ((sal_Int32)pGrid->GetModelColCount())) @@ -1842,7 +1842,7 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t { SolarMutexGuard aGuard; - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); bool bVoid = !Value.hasValue(); @@ -2056,7 +2056,7 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc Any aProp; if (GetWindow()) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); vcl::Window* pDataWindow = &pGrid->GetDataWindow(); if ( _rPropertyName == FM_PROP_NAME ) @@ -2192,7 +2192,7 @@ void FmXGridPeer::stopCursorListening() void FmXGridPeer::updateGrid(const Reference< XRowSet >& _rxCursor) { - FmGridControl* pGrid = (FmGridControl*)GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); if (pGrid) pGrid->setDataSource(_rxCursor); } @@ -2206,7 +2206,7 @@ Reference< XRowSet > FmXGridPeer::getRowSet() throw( RuntimeException, std::exc void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) throw( RuntimeException, std::exception ) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); if (!pGrid || !m_xColumns.is() || !m_xColumns->getCount()) return; // unregister all listeners @@ -2255,14 +2255,14 @@ void SAL_CALL FmXGridPeer::removeGridControlListener( const Reference< XGridCont sal_Int16 FmXGridPeer::getCurrentColumnPosition() throw( RuntimeException, std::exception ) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); return pGrid ? pGrid->GetViewColumnPos(pGrid->GetCurColumnId()) : -1; } void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException, std::exception ) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); if (pGrid) pGrid->GoToColumnId(pGrid->GetColumnIdFromViewPos(nPos)); } @@ -2272,7 +2272,7 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeExcepti { SolarMutexGuard aGuard; - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); if (pGrid) { Reference< ::com::sun::star::view::XSelectionSupplier > xSelSupplier(evt.Source, UNO_QUERY); @@ -2340,7 +2340,7 @@ Reference< XEnumeration > FmXGridPeer::createEnumeration() throw( RuntimeExcept sal_Int32 FmXGridPeer::getCount() throw( RuntimeException, std::exception ) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); if (pGrid) return pGrid->GetViewColCount(); else @@ -2350,7 +2350,7 @@ sal_Int32 FmXGridPeer::getCount() throw( RuntimeException, std::exception ) Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); if (_nIndex < 0 || _nIndex >= getCount() || !pGrid) throw IndexOutOfBoundsException(); @@ -2383,7 +2383,7 @@ void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, Runti m_aMode = Mode; - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); if ( Mode == "FilterMode" ) pGrid->SetFilterMode(true); else @@ -2429,7 +2429,7 @@ sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException void FmXGridPeer::columnVisible(DbGridColumn* pColumn) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); sal_Int32 _nIndex = pGrid->GetModelColumnPos(pColumn->GetId()); Reference< ::com::sun::star::awt::XControl > xControl(pColumn->GetCell()); @@ -2444,7 +2444,7 @@ void FmXGridPeer::columnVisible(DbGridColumn* pColumn) void FmXGridPeer::columnHidden(DbGridColumn* pColumn) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); sal_Int32 _nIndex = pGrid->GetModelColumnPos(pColumn->GetId()); Reference< ::com::sun::star::awt::XControl > xControl(pColumn->GetCell()); @@ -2459,7 +2459,7 @@ void FmXGridPeer::columnHidden(DbGridColumn* pColumn) void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std::exception ) { - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); sal_Int32 nOldFlags = pGrid->GetBrowserFlags(); pGrid->SetBrowserFlags(nOldFlags | EBBF_NOROWPICTURE); @@ -2599,7 +2599,7 @@ void FmXGridPeer::statusChanged(const ::com::sun::star::frame::FeatureStateEvent { DBG_ASSERT(m_pDispatchers[i] == Event.Source, "FmXGridPeer::statusChanged : the event source is a little bit suspect !"); m_pStateCache[i] = Event.IsEnabled; - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>( GetWindow() ); if (*pSlots != SID_FM_RECORD_UNDO) pGrid->GetNavigationBar().InvalidateState(*pSlots); break; @@ -2657,7 +2657,7 @@ void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException, s { if (m_xColumns == rEvent.Source) { // my model was reset -> refresh the grid content - FmGridControl* pGrid = (FmGridControl*)GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); if (!pGrid) return; SolarMutexGuard aGuard; @@ -2667,7 +2667,7 @@ void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException, s else if (m_xCursor == rEvent.Source) { SolarMutexGuard aGuard; - FmGridControl* pGrid = (FmGridControl*) GetWindow(); + FmGridControl* pGrid = static_cast<FmGridControl*>(GetWindow()); if (pGrid && pGrid->IsOpen()) pGrid->positioned(rEvent); } @@ -2829,7 +2829,7 @@ IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot) if (!m_pStateCache) return -1; // unspecified - sal_uInt16 nSlot = (sal_uInt16)(sal_uIntPtr)pSlot; + sal_uInt16 nSlot = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(pSlot); // search the given slot with our supported sequence Sequence<sal_uInt16>& aSupported = getSupportedGridSlots(); @@ -2862,7 +2862,7 @@ IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, void*, pSlot) DBG_ASSERT(aSlots.getLength() == aUrls.getLength(), "FmXGridPeer::OnExecuteGridSlot : inconstent data returned by getSupportedURLs/getSupportedGridSlots !"); - sal_uInt16 nSlot = (sal_uInt16)(sal_uIntPtr)pSlot; + sal_uInt16 nSlot = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(pSlot); for (sal_uInt16 i=0; i<aSlots.getLength(); ++i, ++pUrls, ++pSlots) { if (*pSlots == nSlot) diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 83c39b82a2b7..5dff48fe71b2 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -208,7 +208,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s } Reference< XRowSet > xCur; if (m_rParent.getDataSource()) - xCur = Reference< XRowSet > ((Reference< XInterface >)*m_rParent.getDataSource(), UNO_QUERY); + xCur = Reference< XRowSet > (Reference< XInterface >(*m_rParent.getDataSource()), UNO_QUERY); // TODO : the cursor wrapper should use an XRowSet interface, too pCellControl->Init( m_rParent.GetDataWindow(), xCur ); @@ -1348,7 +1348,7 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x // einen Standard-Formatter ... if (pFormatterUsed == NULL) { - pFormatterUsed = ((FormattedField*)m_pWindow)->StandardFormatter(); + pFormatterUsed = static_cast<FormattedField*>(m_pWindow)->StandardFormatter(); DBG_ASSERT(pFormatterUsed != NULL, "DbFormattedField::Init : no standard formatter given by the numeric field !"); } // ... und einen Standard-Key @@ -1357,14 +1357,14 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x m_nKeyType = comphelper::getNumberFormatType(m_xSupplier->getNumberFormats(), nFormatKey); - ((FormattedField*)m_pWindow)->SetFormatter(pFormatterUsed); - ((FormattedField*)m_pPainter)->SetFormatter(pFormatterUsed); + static_cast<FormattedField*>(m_pWindow)->SetFormatter(pFormatterUsed); + static_cast<FormattedField*>(m_pPainter)->SetFormatter(pFormatterUsed); - ((FormattedField*)m_pWindow)->SetFormatKey(nFormatKey); - ((FormattedField*)m_pPainter)->SetFormatKey(nFormatKey); + static_cast<FormattedField*>(m_pWindow)->SetFormatKey(nFormatKey); + static_cast<FormattedField*>(m_pPainter)->SetFormatKey(nFormatKey); - ((FormattedField*)m_pWindow)->TreatAsNumber(m_rColumn.IsNumeric()); - ((FormattedField*)m_pPainter)->TreatAsNumber(m_rColumn.IsNumeric()); + static_cast<FormattedField*>(m_pWindow)->TreatAsNumber(m_rColumn.IsNumeric()); + static_cast<FormattedField*>(m_pPainter)->TreatAsNumber(m_rColumn.IsNumeric()); // Min- und Max-Werte if (m_rColumn.IsNumeric()) @@ -1377,15 +1377,15 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x { DBG_ASSERT(aMin.getValueType().getTypeClass() == TypeClass_DOUBLE, "DbFormattedField::Init : the model has an invalid min value !"); double dMin = ::comphelper::getDouble(aMin); - ((FormattedField*)m_pWindow)->SetMinValue(dMin); - ((FormattedField*)m_pPainter)->SetMinValue(dMin); + static_cast<FormattedField*>(m_pWindow)->SetMinValue(dMin); + static_cast<FormattedField*>(m_pPainter)->SetMinValue(dMin); bClearMin = false; } } if (bClearMin) { - ((FormattedField*)m_pWindow)->ClearMinValue(); - ((FormattedField*)m_pPainter)->ClearMinValue(); + static_cast<FormattedField*>(m_pWindow)->ClearMinValue(); + static_cast<FormattedField*>(m_pPainter)->ClearMinValue(); } bool bClearMax = true; if (::comphelper::hasProperty(FM_PROP_EFFECTIVE_MAX, xUnoModel)) @@ -1395,15 +1395,15 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x { DBG_ASSERT(aMin.getValueType().getTypeClass() == TypeClass_DOUBLE, "DbFormattedField::Init : the model has an invalid max value !"); double dMin = ::comphelper::getDouble(aMin); - ((FormattedField*)m_pWindow)->SetMaxValue(dMin); - ((FormattedField*)m_pPainter)->SetMaxValue(dMin); + static_cast<FormattedField*>(m_pWindow)->SetMaxValue(dMin); + static_cast<FormattedField*>(m_pPainter)->SetMaxValue(dMin); bClearMax = false; } } if (bClearMax) { - ((FormattedField*)m_pWindow)->ClearMaxValue(); - ((FormattedField*)m_pPainter)->ClearMaxValue(); + static_cast<FormattedField*>(m_pWindow)->ClearMaxValue(); + static_cast<FormattedField*>(m_pPainter)->ClearMaxValue(); } } @@ -1416,16 +1416,16 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x case TypeClass_DOUBLE: if (m_rColumn.IsNumeric()) { - ((FormattedField*)m_pWindow)->SetDefaultValue(::comphelper::getDouble(aDefault)); - ((FormattedField*)m_pPainter)->SetDefaultValue(::comphelper::getDouble(aDefault)); + static_cast<FormattedField*>(m_pWindow)->SetDefaultValue(::comphelper::getDouble(aDefault)); + static_cast<FormattedField*>(m_pPainter)->SetDefaultValue(::comphelper::getDouble(aDefault)); } else { OUString sConverted; Color* pDummy; pFormatterUsed->GetOutputString(::comphelper::getDouble(aDefault), 0, sConverted, &pDummy); - ((FormattedField*)m_pWindow)->SetDefaultText(sConverted); - ((FormattedField*)m_pPainter)->SetDefaultText(sConverted); + static_cast<FormattedField*>(m_pWindow)->SetDefaultText(sConverted); + static_cast<FormattedField*>(m_pPainter)->SetDefaultText(sConverted); } break; case TypeClass_STRING: @@ -1437,14 +1437,14 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x sal_uInt32 nTestFormat(0); if (pFormatterUsed->IsNumberFormat(sDefault, nTestFormat, dVal)) { - ((FormattedField*)m_pWindow)->SetDefaultValue(dVal); - ((FormattedField*)m_pPainter)->SetDefaultValue(dVal); + static_cast<FormattedField*>(m_pWindow)->SetDefaultValue(dVal); + static_cast<FormattedField*>(m_pPainter)->SetDefaultValue(dVal); } } else { - ((FormattedField*)m_pWindow)->SetDefaultText(sDefault); - ((FormattedField*)m_pPainter)->SetDefaultText(sDefault); + static_cast<FormattedField*>(m_pWindow)->SetDefaultText(sDefault); + static_cast<FormattedField*>(m_pPainter)->SetDefaultText(sDefault); } } break; @@ -1506,7 +1506,7 @@ OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb: double dValue = getValue( _rxField, m_rColumn.GetParent().getNullDate() ); if (_rxField->wasNull()) return aText; - ((FormattedField*)m_pPainter)->SetValue(dValue); + static_cast<FormattedField*>(m_pPainter)->SetValue(dValue); } else { @@ -1515,7 +1515,7 @@ OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb: aText = _rxField->getString(); if (_rxField->wasNull()) return aText; - ((FormattedField*)m_pPainter)->SetTextFormatted(aText); + static_cast<FormattedField*>(m_pPainter)->SetTextFormatted(aText); } } catch( const Exception& ) @@ -1525,7 +1525,7 @@ OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb: aText = m_pPainter->GetText(); if (ppColor != NULL) - *ppColor = ((FormattedField*)m_pPainter)->GetLastOutputColor(); + *ppColor = static_cast<FormattedField*>(m_pPainter)->GetLastOutputColor(); return aText; } @@ -1595,7 +1595,7 @@ void DbFormattedField::updateFromModel( Reference< XPropertySet > _rxModel ) bool DbFormattedField::commitControl() { Any aNewVal; - FormattedField& rField = *(FormattedField*)m_pWindow; + FormattedField& rField = *static_cast<FormattedField*>(m_pWindow); DBG_ASSERT(&rField == m_pWindow, "DbFormattedField::commitControl : can't work with a window other than my own !"); if (m_rColumn.IsNumeric()) { @@ -1670,7 +1670,7 @@ void DbCheckBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor CellControllerRef DbCheckBox::CreateController() const { - return new CheckBoxCellController((CheckBoxControl*)m_pWindow); + return new CheckBoxCellController(static_cast<CheckBoxControl*>(m_pWindow)); } static void lcl_setCheckBoxState( const Reference< ::com::sun::star::sdb::XColumn >& _rxField, @@ -1918,7 +1918,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier; Reference< XRowSet > xForm; if ( m_rColumn.GetParent().getDataSource() ) - xForm = Reference< XRowSet >( ( Reference< XInterface > )*m_rColumn.GetParent().getDataSource(), UNO_QUERY ); + xForm = Reference< XRowSet >( Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY ); if ( xForm.is() ) xSupplier = getNumberFormats( getConnection( xForm ), true ); SvNumberFormatter* pFormatterUsed = NULL; @@ -2009,7 +2009,7 @@ bool DbNumericField::commitControl() if (!aText.isEmpty()) // not empty { - double fValue = ((DoubleNumericField*)m_pWindow)->GetValue(); + double fValue = static_cast<DoubleNumericField*>(m_pWindow)->GetValue(); aVal <<= (double)fValue; } m_rColumn.getModel()->setPropertyValue(FM_PROP_VALUE, aVal); @@ -2157,7 +2157,7 @@ bool DbCurrencyField::commitControl() Any aVal; if (!aText.isEmpty()) // not empty { - double fValue = ((LongCurrencyField*)m_pWindow)->GetValue(); + double fValue = static_cast<LongCurrencyField*>(m_pWindow)->GetValue(); if (m_nScale) { fValue /= ::rtl::math::pow10Exp(1.0, m_nScale); @@ -2431,7 +2431,7 @@ void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( R void DbComboBox::SetList(const Any& rItems) { - ComboBoxControl* pField = (ComboBoxControl*)m_pWindow; + ComboBoxControl* pField = static_cast<ComboBoxControl*>(m_pWindow); pField->Clear(); ::comphelper::StringSequence aTest; @@ -2488,7 +2488,7 @@ void DbComboBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor CellControllerRef DbComboBox::CreateController() const { - return new ComboBoxCellController((ComboBoxControl*)m_pWindow); + return new ComboBoxCellController(static_cast<ComboBoxControl*>(m_pWindow)); } @@ -2560,7 +2560,7 @@ void DbListBox::_propertyChanged( const ::com::sun::star::beans::PropertyChangeE void DbListBox::SetList(const Any& rItems) { - ListBoxControl* pField = (ListBoxControl*)m_pWindow; + ListBoxControl* pField = static_cast<ListBoxControl*>(m_pWindow); pField->Clear(); m_bBound = false; @@ -2614,7 +2614,7 @@ void DbListBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& CellControllerRef DbListBox::CreateController() const { - return new ListBoxCellController((ListBoxControl*)m_pWindow); + return new ListBoxCellController(static_cast<ListBoxControl*>(m_pWindow)); } @@ -2704,7 +2704,7 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG DbFilterField::~DbFilterField() { if (m_nControlClass == ::com::sun::star::form::FormComponentType::CHECKBOX) - ((CheckBoxControl*)m_pWindow)->SetClickHdl( Link() ); + static_cast<CheckBoxControl*>(m_pWindow)->SetClickHdl( Link() ); } @@ -2736,13 +2736,13 @@ void DbFilterField::SetList(const Any& rItems, bool bComboBox) { if (bComboBox) { - ComboBox* pField = (ComboBox*)m_pWindow; + ComboBox* pField = static_cast<ComboBox*>(m_pWindow); for (sal_Int32 i = 0; i < nItems; ++i, ++pStrings ) pField->InsertEntry(*pStrings, LISTBOX_APPEND); } else { - ListBox* pField = (ListBox*)m_pWindow; + ListBox* pField = static_cast<ListBox*>(m_pWindow); for (sal_Int32 i = 0; i < nItems; ++i, ++pStrings ) pField->InsertEntry(*pStrings, LISTBOX_APPEND); @@ -2760,7 +2760,7 @@ void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< ::com:: case ::com::sun::star::form::FormComponentType::CHECKBOX: m_pWindow = new CheckBoxControl(pParent); m_pWindow->SetPaintTransparent( true ); - ((CheckBoxControl*)m_pWindow)->SetClickHdl( LINK( this, DbFilterField, OnClick ) ); + static_cast<CheckBoxControl*>(m_pWindow)->SetClickHdl( LINK( this, DbFilterField, OnClick ) ); m_pPainter = new CheckBoxControl(pParent); m_pPainter->SetPaintTransparent( true ); @@ -2790,10 +2790,10 @@ void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< ::com:: sal_Int16 nLines = ::comphelper::getINT16(xModel->getPropertyValue(FM_PROP_LINECOUNT)); Any aItems = xModel->getPropertyValue(FM_PROP_STRINGITEMLIST); SetList(aItems, m_nControlClass == ::com::sun::star::form::FormComponentType::COMBOBOX); - ((ComboBox*)m_pWindow)->SetDropDownLineCount(nLines); + static_cast<ComboBox*>(m_pWindow)->SetDropDownLineCount(nLines); } else - ((ComboBox*)m_pWindow)->SetDropDownLineCount(5); + static_cast<ComboBox*>(m_pWindow)->SetDropDownLineCount(5); } break; default: @@ -2855,19 +2855,19 @@ CellControllerRef DbFilterField::CreateController() const switch (m_nControlClass) { case ::com::sun::star::form::FormComponentType::CHECKBOX: - xController = new CheckBoxCellController((CheckBoxControl*)m_pWindow); + xController = new CheckBoxCellController(static_cast<CheckBoxControl*>(m_pWindow)); break; case ::com::sun::star::form::FormComponentType::LISTBOX: - xController = new ListBoxCellController((ListBoxControl*)m_pWindow); + xController = new ListBoxCellController(static_cast<ListBoxControl*>(m_pWindow)); break; case ::com::sun::star::form::FormComponentType::COMBOBOX: - xController = new ComboBoxCellController((ComboBoxControl*)m_pWindow); + xController = new ComboBoxCellController(static_cast<ComboBoxControl*>(m_pWindow)); break; default: if (m_bFilterList) - xController = new ComboBoxCellController((ComboBoxControl*)m_pWindow); + xController = new ComboBoxCellController(static_cast<ComboBoxControl*>(m_pWindow)); else - xController = new EditCellController((Edit*)m_pWindow); + xController = new EditCellController(static_cast<Edit*>(m_pWindow)); } return xController; } @@ -2927,7 +2927,7 @@ bool DbFilterField::commitControl() ::com::sun::star::lang::Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); Reference< XRowSet > xDataSourceRowSet( - (Reference< XInterface >)*m_rColumn.GetParent().getDataSource(), UNO_QUERY); + Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY); Reference< XConnection > xConnection(getConnection(xDataSourceRowSet)); xParseNode->parseNodeToPredicateStr(aPreparedText, @@ -2976,8 +2976,8 @@ void DbFilterField::SetText(const OUString& rText) else eState = TRISTATE_INDET; - ((CheckBoxControl*)m_pWindow)->GetBox().SetState(eState); - ((CheckBoxControl*)m_pPainter)->GetBox().SetState(eState); + static_cast<CheckBoxControl*>(m_pWindow)->GetBox().SetState(eState); + static_cast<CheckBoxControl*>(m_pPainter)->GetBox().SetState(eState); } break; case ::com::sun::star::form::FormComponentType::LISTBOX: { @@ -3108,7 +3108,7 @@ void DbFilterField::Update() // filling the entries for the combobox for (::std::vector< OUString >::const_iterator iter = aStringList.begin(); iter != aStringList.end(); ++iter) - ((ComboBox*)m_pWindow)->InsertEntry(*iter, LISTBOX_APPEND); + static_cast<ComboBox*>(m_pWindow)->InsertEntry(*iter, LISTBOX_APPEND); } } } @@ -3128,7 +3128,7 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co IMPL_LINK_NOARG(DbFilterField, OnClick) { - TriState eState = ((CheckBoxControl*)m_pWindow)->GetBox().GetState(); + TriState eState = static_cast<CheckBoxControl*>(m_pWindow)->GetBox().GetState(); OUString aText; switch (eState) @@ -4348,7 +4348,7 @@ IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick) aEvent.ActionCommand = m_pBox->GetSelectEntry(); while( aIt.hasMoreElements() ) - ((::com::sun::star::awt::XActionListener *)aIt.next())->actionPerformed( aEvent ); + static_cast< ::com::sun::star::awt::XActionListener *>(aIt.next())->actionPerformed( aEvent ); } return 1; } @@ -4601,7 +4601,7 @@ void FmXFilterCell::disposing() ::com::sun::star::lang::EventObject aEvt(*this); m_aTextListeners.disposeAndClear(aEvt); - ((DbFilterField*)m_pCellControl)->SetCommitHdl(Link()); + static_cast<DbFilterField*>(m_pCellControl)->SetCommitHdl(Link()); FmXGridCell::disposing(); } @@ -4646,7 +4646,7 @@ void SAL_CALL FmXFilterCell::removeTextListener(const Reference< ::com::sun::sta void SAL_CALL FmXFilterCell::setText( const OUString& aText ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); - ((DbFilterField*)m_pCellControl)->SetText(aText); + static_cast<DbFilterField*>(m_pCellControl)->SetText(aText); } @@ -4658,7 +4658,7 @@ void SAL_CALL FmXFilterCell::insertText( const ::com::sun::star::awt::Selection& OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); - return ((DbFilterField*)m_pCellControl)->GetText(); + return static_cast<DbFilterField*>(m_pCellControl)->GetText(); } @@ -4707,7 +4707,7 @@ IMPL_LINK_NOARG(FmXFilterCell, OnCommit) ::com::sun::star::awt::TextEvent aEvt; aEvt.Source = *this; while( aIt.hasMoreElements() ) - ((::com::sun::star::awt::XTextListener *)aIt.next())->textChanged( aEvt ); + static_cast< ::com::sun::star::awt::XTextListener *>(aIt.next())->textChanged( aEvt ); return 1; } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 357206e9a1ad..9d80bd2cd5b6 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -298,7 +298,7 @@ void DbGridControl::NavigationBar::AbsolutePos::KeyInput(const KeyEvent& rEvt) if (nRecord < GetMin() || nRecord > GetMax()) return; else - ((NavigationBar*)GetParent())->PositionDataSource(static_cast<sal_Int32>(nRecord)); + static_cast<NavigationBar*>(GetParent())->PositionDataSource(static_cast<sal_Int32>(nRecord)); } else if (rEvt.GetKeyCode() == KEY_TAB) GetParent()->GetParent()->GrabFocus(); @@ -314,8 +314,8 @@ void DbGridControl::NavigationBar::AbsolutePos::LoseFocus() return; else { - ((NavigationBar*)GetParent())->PositionDataSource(static_cast<sal_Int32>(nRecord)); - ((NavigationBar*)GetParent())->InvalidateState(NavigationBar::RECORD_ABSOLUTE); + static_cast<NavigationBar*>(GetParent())->PositionDataSource(static_cast<sal_Int32>(nRecord)); + static_cast<NavigationBar*>(GetParent())->InvalidateState(NavigationBar::RECORD_ABSOLUTE); } } @@ -326,7 +326,7 @@ void DbGridControl::NavigationBar::PositionDataSource(sal_Int32 nRecord) // the MoveToPosition may cause a LoseFocus which would lead to a second MoveToPosition, // so protect against this recursion m_bPositioning = true; - ((DbGridControl*)GetParent())->MoveToPosition(nRecord - 1); + static_cast<DbGridControl*>(GetParent())->MoveToPosition(nRecord - 1); m_bPositioning = false; } @@ -349,7 +349,7 @@ DbGridControl::NavigationBar::NavigationBar(vcl::Window* pParent, WinBits nStyle m_aPrevBtn.SetSymbol(SymbolType::PREV); m_aNextBtn.SetSymbol(SymbolType::NEXT); m_aLastBtn.SetSymbol(SymbolType::LAST); - m_aNewBtn.SetModeImage(((DbGridControl*)pParent)->GetImage(DbGridControl_Base::NEW)); + m_aNewBtn.SetModeImage(static_cast<DbGridControl*>(pParent)->GetImage(DbGridControl_Base::NEW)); m_aFirstBtn.SetHelpId(HID_GRID_TRAVEL_FIRST); m_aPrevBtn.SetHelpId(HID_GRID_TRAVEL_PREV); @@ -414,7 +414,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() { // positioning of the controls // calculate base size - Rectangle aRect(((DbGridControl*)GetParent())->GetControlArea()); + Rectangle aRect(static_cast<DbGridControl*>(GetParent())->GetControlArea()); const long nH = aRect.GetSize().Height(); Size aBorder = LogicToPixel(Size(2, 2),MAP_APPFONT); aBorder = Size(CalcZoom(aBorder.Width()), CalcZoom(aBorder.Height())); @@ -480,21 +480,21 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() IMPL_LINK(DbGridControl::NavigationBar, OnClick, Button *, pButton ) { - DbGridControl* pParent = (DbGridControl*)GetParent(); + DbGridControl* pParent = static_cast<DbGridControl*>(GetParent()); if (pParent->m_aMasterSlotExecutor.IsSet()) { long lResult = 0; if (pButton == &m_aFirstBtn) - lResult = pParent->m_aMasterSlotExecutor.Call((void*)RECORD_FIRST); + lResult = pParent->m_aMasterSlotExecutor.Call(reinterpret_cast<void*>(RECORD_FIRST)); else if( pButton == &m_aPrevBtn ) - lResult = pParent->m_aMasterSlotExecutor.Call((void*)RECORD_PREV); + lResult = pParent->m_aMasterSlotExecutor.Call(reinterpret_cast<void*>(RECORD_PREV)); else if( pButton == &m_aNextBtn ) - lResult = pParent->m_aMasterSlotExecutor.Call((void*)RECORD_NEXT); + lResult = pParent->m_aMasterSlotExecutor.Call(reinterpret_cast<void*>(RECORD_NEXT)); else if( pButton == &m_aLastBtn ) - lResult = pParent->m_aMasterSlotExecutor.Call((void*)RECORD_LAST); + lResult = pParent->m_aMasterSlotExecutor.Call(reinterpret_cast<void*>(RECORD_LAST)); else if( pButton == &m_aNewBtn ) - lResult = pParent->m_aMasterSlotExecutor.Call((void*)RECORD_NEW); + lResult = pParent->m_aMasterSlotExecutor.Call(reinterpret_cast<void*>(RECORD_NEW)); if (lResult) // the link already handled it @@ -518,7 +518,7 @@ void DbGridControl::NavigationBar::InvalidateAll(sal_Int32 nCurrentPos, bool bAl { if (m_nCurrentPos != nCurrentPos || nCurrentPos < 0 || bAll) { - DbGridControl* pParent = (DbGridControl*)GetParent(); + DbGridControl* pParent = static_cast<DbGridControl*>(GetParent()); sal_Int32 nAdjustedRowCount = pParent->GetRowCount() - ((pParent->GetOptions() & DbGridControl::OPT_INSERT) ? 2 : 1); @@ -546,7 +546,7 @@ void DbGridControl::NavigationBar::InvalidateAll(sal_Int32 nCurrentPos, bool bAl bool DbGridControl::NavigationBar::GetState(sal_uInt16 nWhich) const { - DbGridControl* pParent = (DbGridControl*)GetParent(); + DbGridControl* pParent = static_cast<DbGridControl*>(GetParent()); if (!pParent->IsOpen() || pParent->IsDesignMode() || !pParent->IsEnabled() || pParent->IsFilterMode() ) @@ -601,7 +601,7 @@ bool DbGridControl::NavigationBar::GetState(sal_uInt16 nWhich) const void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) { bool bAvailable = GetState(nWhich); - DbGridControl* pParent = (DbGridControl*)GetParent(); + DbGridControl* pParent = static_cast<DbGridControl*>(GetParent()); vcl::Window* pWnd = NULL; switch (nWhich) { @@ -1565,7 +1565,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt // start listening on the seek cursor if (m_pSeekCursor) - m_pCursorDisposeListener = new DisposeListenerGridBridge(*this, Reference< XComponent > ((Reference< XInterface >)*m_pSeekCursor, UNO_QUERY), 0); + m_pCursorDisposeListener = new DisposeListenerGridBridge(*this, Reference< XComponent > (Reference< XInterface >(*m_pSeekCursor), UNO_QUERY), 0); } void DbGridControl::RemoveColumns() @@ -2028,7 +2028,7 @@ bool DbGridControl::SetCurrent(long nNewRow) Reference< XPropertySet > xCursorProps = m_pDataCursor->getPropertySet(); if ( !::comphelper::getBOOL(xCursorProps->getPropertyValue(FM_PROP_ISNEW)) ) { - Reference< XResultSetUpdate > xUpdateCursor((Reference< XInterface >)*m_pDataCursor, UNO_QUERY); + Reference< XResultSetUpdate > xUpdateCursor(Reference< XInterface >(*m_pDataCursor), UNO_QUERY); xUpdateCursor->moveToInsertRow(); } bNewRowInserted = true; @@ -2633,7 +2633,7 @@ void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 /*nRow*/, PopupMenu& rMe bool bCanUndo = IsModified(); long nState = -1; if (m_aMasterStateProvider.IsSet()) - nState = m_aMasterStateProvider.Call((void*)SID_FM_RECORD_UNDO); + nState = m_aMasterStateProvider.Call(reinterpret_cast<void*>(SID_FM_RECORD_UNDO)); bCanUndo &= ( 0 != nState ); rMenu.EnableItem(SID_FM_RECORD_UNDO, bCanUndo); @@ -2949,11 +2949,11 @@ void DbGridControl::Undo() // check if we have somebody doin' the UNDO for us long nState = -1; if (m_aMasterStateProvider.IsSet()) - nState = m_aMasterStateProvider.Call((void*)SID_FM_RECORD_UNDO); + nState = m_aMasterStateProvider.Call(reinterpret_cast<void*>(SID_FM_RECORD_UNDO)); if (nState>0) { // yes, we have, and the slot is enabled DBG_ASSERT(m_aMasterSlotExecutor.IsSet(), "DbGridControl::Undo : a state, but no execute link ?"); - long lResult = m_aMasterSlotExecutor.Call((void*)SID_FM_RECORD_UNDO); + long lResult = m_aMasterSlotExecutor.Call(reinterpret_cast<void*>(SID_FM_RECORD_UNDO)); if (lResult) // handled return; @@ -2970,7 +2970,7 @@ void DbGridControl::Undo() try { // cancel editing - Reference< XResultSetUpdate > xUpdateCursor((Reference< XInterface >)*m_pDataCursor, UNO_QUERY); + Reference< XResultSetUpdate > xUpdateCursor(Reference< XInterface >(*m_pDataCursor), UNO_QUERY); // no effects if we're not updating currently if (bAppending) // just refresh the row @@ -3135,7 +3135,7 @@ bool DbGridControl::SaveRow() bool bSuccess = false; try { - Reference< XResultSetUpdate > xUpdateCursor((Reference< XInterface >)*m_pDataCursor, UNO_QUERY); + Reference< XResultSetUpdate > xUpdateCursor(Reference< XInterface >(*m_pDataCursor), UNO_QUERY); if (bAppending) xUpdateCursor->insertRow(); else diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 92b3552a0e21..2a0baed9638f 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -293,7 +293,7 @@ namespace svxform extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDataTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &) { - return new DataTreeListBox((XFormsPage*)pParent, WB_BORDER); + return new DataTreeListBox(static_cast<XFormsPage*>(pParent), WB_BORDER); } XFormsPage::XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ) : @@ -2164,7 +2164,7 @@ namespace svxform if ( eState >= SfxItemState::DEFAULT ) { - FmFormShell* pShell = PTR_CAST( FmFormShell,((SfxObjectItem*)pState)->GetShell() ); + FmFormShell* pShell = PTR_CAST( FmFormShell, static_cast<const SfxObjectItem*>(pState)->GetShell() ); Update( pShell ); } else @@ -2242,7 +2242,7 @@ namespace svxform pWindow = new DataNavigator( _pBindings, this, _pParent ); eChildAlignment = SFX_ALIGN_RIGHT; pWindow->SetSizePixel( Size( 250, 400 ) ); - ( (SfxDockingWindow*)pWindow )->Initialize( _pInfo ); + static_cast<SfxDockingWindow*>(pWindow)->Initialize( _pInfo ); } AddDataItemDialog::AddDataItemDialog(vcl::Window* pParent, ItemNode* _pNode, diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 7bb5193e4ab4..b708dfa6ae9b 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -309,7 +309,7 @@ bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData ) return true; if( !pEntryData->ISA(FmFormData) ) return false; - FmFormData* pFormData = (FmFormData*)pEntryData; + FmFormData* pFormData = static_cast<FmFormData*>(pEntryData); if( (XForm*)m_xForm.get() != (XForm*)pFormData->GetFormIface().get() ) return false; @@ -473,7 +473,7 @@ bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData ) if( !pEntryData->ISA(FmControlData) ) return false; - FmControlData* pControlData = (FmControlData*)pEntryData; + FmControlData* pControlData = static_cast<FmControlData*>(pEntryData); if( (XFormComponent*)m_xFormComponent.get() != (XFormComponent*)pControlData->GetFormComponent().get() ) return false; @@ -531,7 +531,7 @@ namespace svxform if( eState >= SfxItemState::DEFAULT ) { - FmFormShell* pShell = PTR_CAST( FmFormShell,((SfxObjectItem*)pState)->GetShell() ); + FmFormShell* pShell = PTR_CAST( FmFormShell, static_cast<const SfxObjectItem*>(pState)->GetShell() ); UpdateContent( pShell ); } else @@ -609,7 +609,7 @@ namespace svxform { pWindow = new NavigatorFrame( _pBindings, this, _pParent ); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - ((SfxDockingWindow*)pWindow)->Initialize( _pInfo ); + static_cast<SfxDockingWindow*>(pWindow)->Initialize( _pInfo ); } diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index ce88ba7381af..440ec5c40593 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -31,7 +31,7 @@ TYPEINIT1(FmInterfaceItem, SfxPoolItem); bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); - return( xInterface == ((FmInterfaceItem&)rAttr).GetInterface() ); + return( xInterface == static_cast<const FmInterfaceItem&>(rAttr).GetInterface() ); } diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index e21271702c9b..11fe2380bafb 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -140,7 +140,7 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum) m_pImpl->pUndoEnv->RemoveForms( xForms ); } - FmFormPage* pRemovedPage = (FmFormPage*)SdrModel::RemovePage(nPgNum); + FmFormPage* pRemovedPage = static_cast<FmFormPage*>(SdrModel::RemovePage(nPgNum)); OSL_ENSURE( pRemovedPage == pToBeRemovedPage, "FmFormModel::RemovePage: inconsistency!" ); return pRemovedPage; } @@ -156,7 +156,7 @@ void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos) SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum) { - FmFormPage* pPage = (FmFormPage*)SdrModel::RemoveMasterPage(nPgNum); + FmFormPage* pPage = static_cast<FmFormPage*>(SdrModel::RemoveMasterPage(nPgNum)); if ( pPage ) { diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index e5293b74e4ae..7a42951c65f4 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -431,7 +431,7 @@ namespace sReturn = sCurrentIndex; // travel up - if (::comphelper::query_interface((Reference< XInterface >)xParent,xChild)) + if (::comphelper::query_interface(Reference< XInterface >(xParent),xChild)) xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); } diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index fdb4176b148a..3c31af00cf1c 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -97,7 +97,7 @@ void FmFormPage::SetModel(SdrModel* pNewModel) { // we want to keep the current collection, just reset the model // with which it's associated. - FmFormModel* pDrawModel = (FmFormModel*) GetModel(); + FmFormModel* pDrawModel = static_cast<FmFormModel*>( GetModel() ); SfxObjectShell* pObjShell = pDrawModel->GetObjectShell(); if ( pObjShell ) xForms->setParent( pObjShell->GetModel() ); @@ -123,7 +123,7 @@ void FmFormPage::InsertObject(SdrObject* pObj, size_t nPos, { SdrPage::InsertObject( pObj, nPos, pReason ); if (GetModel() && (!pReason || pReason->GetReason() != SDRREASON_STREAMING)) - ((FmFormModel*)GetModel())->GetUndoEnv().Inserted(pObj); + static_cast<FmFormModel*>(GetModel())->GetUndoEnv().Inserted(pObj); } @@ -209,7 +209,7 @@ SdrObject* FmFormPage::RemoveObject(size_t nObjNum) { SdrObject* pObj = SdrPage::RemoveObject(nObjNum); if (pObj && GetModel()) - ((FmFormModel*)GetModel())->GetUndoEnv().Removed(pObj); + static_cast<FmFormModel*>(GetModel())->GetUndoEnv().Removed(pObj); return pObj; } diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index dd67c04b9887..90446ea97332 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -431,7 +431,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() if( pModel->IsUndoEnabled() ) { - pModel->AddUndo(new FmUndoContainerAction(*(FmFormModel*)pModel, + pModel->AddUndo(new FmUndoContainerAction(*static_cast<FmFormModel*>(pModel), FmUndoContainerAction::Inserted, xForms, xForm, @@ -528,7 +528,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo if( bUndo ) { Reference< ::com::sun::star::container::XIndexContainer > xContainer( getForms(), UNO_QUERY ); - pModel->AddUndo(new FmUndoContainerAction(*(FmFormModel*)pModel, + pModel->AddUndo(new FmUndoContainerAction(*static_cast<FmFormModel*>(pModel), FmUndoContainerAction::Inserted, xContainer, xForm, diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 1744605a3e44..c9f95466cdd0 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -1206,7 +1206,7 @@ void FmFormShell::SetView( FmFormView* _pView ) m_pFormView = _pView; m_pFormView->SetFormShell( this, FmFormView::FormShellAccess() ); - m_pFormModel = (FmFormModel*)m_pFormView->GetModel(); + m_pFormModel = static_cast<FmFormModel*>(m_pFormView->GetModel()); impl_setDesignMode( m_pFormView->IsDesignMode() ); diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 080f5cbd07fb..b080786558a5 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -1046,7 +1046,7 @@ namespace svx { #if OSL_DEBUG_LEVEL > 0 OString sTrace( "FmTextControlShell::formActivated: 0x" ); - sTrace += OString::number( (sal_IntPtr)_rxController.get(), 16 ); + sTrace += OString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif @@ -1074,7 +1074,7 @@ namespace svx { #if OSL_DEBUG_LEVEL > 0 OString sTrace( "FmTextControlShell::formDeactivated: 0x" ); - sTrace += OString::number( (sal_IntPtr)_rxController.get(), 16 ); + sTrace += OString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif (void)_rxController; @@ -1327,7 +1327,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 OString sTrace( "FmTextControlShell::focusGained: 0x" ); - sTrace += OString::number( (sal_IntPtr)xControl.get(), 16 ); + sTrace += OString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif @@ -1343,7 +1343,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 OString sTrace( "FmTextControlShell::focusLost: 0x" ); - sTrace += OString::number( (sal_IntPtr)xControl.get(), 16 ); + sTrace += OString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 ); OSL_TRACE( "%s", sTrace.getStr() ); #endif diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 6d0e16747ebd..eeaa5330c8de 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -976,7 +976,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC void FmUndoPropertyAction::Undo() { - FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv(); + FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(rMod).GetUndoEnv(); if (xObj.is() && !rEnv.IsLocked()) { @@ -996,7 +996,7 @@ void FmUndoPropertyAction::Undo() void FmUndoPropertyAction::Redo() { - FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv(); + FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(rMod).GetUndoEnv(); if (xObj.is() && !rEnv.IsLocked()) { diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index b62e8eb4ceef..5926389c48eb 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -102,7 +102,7 @@ void FmFormView::Init() DBG_ASSERT( pModel->ISA(FmFormModel), "Falsches Model" ); if( !pModel->ISA(FmFormModel) ) return; - FmFormModel* pFormModel = (FmFormModel*)pModel; + FmFormModel* pFormModel = static_cast<FmFormModel*>(pModel); // DesignMode vom Model holen @@ -125,7 +125,7 @@ void FmFormView::Init() const SfxPoolItem *pItem=0; if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, false, &pItem ) == SfxItemState::SET ) { - ::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() ); + ::comphelper::NamedValueCollection aComponentData( static_cast<const SfxUnoAnyItem*>(pItem)->GetValue() ); bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode ); } } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index d9ed7a042cef..e0b06c2e8412 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1406,11 +1406,11 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor // The service name decides which control should be created sal_uInt16 nOBJID = OBJ_FM_EDIT; - if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_NUMERICFIELD)) + if(OUString(_rDesc.szServiceName).equals(FM_SUN_COMPONENT_NUMERICFIELD)) nOBJID = OBJ_FM_NUMERICFIELD; - if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_CHECKBOX)) + if(OUString(_rDesc.szServiceName).equals(FM_SUN_COMPONENT_CHECKBOX)) nOBJID = OBJ_FM_CHECKBOX; - if(OUString(_rDesc.szServiceName).equals((OUString)FM_COMPONENT_COMMANDBUTTON)) + if(OUString(_rDesc.szServiceName).equals(FM_COMPONENT_COMMANDBUTTON)) nOBJID = OBJ_FM_BUTTON; typedef ::com::sun::star::form::submission::XSubmission XSubmission_t; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 41391c4222d3..91330e11ea81 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3684,7 +3684,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent { RowChangeEvent aEvt( _rEvent ); aEvt.Source = *this; - bValid = ((XRowSetApproveListener*)aIter.next())->approveRowChange(aEvt); + bValid = static_cast<XRowSetApproveListener*>(aIter.next())->approveRowChange(aEvt); } if ( !bValid ) @@ -3771,7 +3771,7 @@ sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) th { EventObject aEvt(event); aEvt.Source = *this; - return ((XRowSetApproveListener*)aIter.next())->approveCursorMove(aEvt); + return static_cast<XRowSetApproveListener*>(aIter.next())->approveCursorMove(aEvt); } return sal_True; @@ -3788,7 +3788,7 @@ sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) { EventObject aEvt(event); aEvt.Source = *this; - return ((XRowSetApproveListener*)aIter.next())->approveRowSetChange(aEvt); + return static_cast<XRowSetApproveListener*>(aIter.next())->approveRowSetChange(aEvt); } return sal_True; @@ -3825,7 +3825,7 @@ void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( R { SQLErrorEvent aEvt(aEvent); aEvt.Source = *this; - ((XSQLErrorListener*)aIter.next())->errorOccured(aEvt); + static_cast<XSQLErrorListener*>(aIter.next())->errorOccured(aEvt); } else { @@ -3898,7 +3898,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& { DatabaseParameterEvent aEvt(aEvent); aEvt.Source = *this; - return ((XDatabaseParameterListener*)aIter.next())->approveParameter(aEvt); + return static_cast<XDatabaseParameterListener*>(aIter.next())->approveParameter(aEvt); } else { @@ -3994,7 +3994,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th { RowChangeEvent aEvt(aEvent); aEvt.Source = *this; - return ((XConfirmDeleteListener*)aIter.next())->confirmDelete(aEvt); + return static_cast<XConfirmDeleteListener*>(aIter.next())->confirmDelete(aEvt); } // default handling: instantiate an interaction handler and let it handle the request diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index a1867c7e49e0..ab83348b0964 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1063,7 +1063,7 @@ namespace svxform Reference< XChild > xCurrentChild(pCurrentUserData->GetChildIFace(), UNO_QUERY); Reference< XIndexContainer > xContainer(xCurrentChild->getParent(), UNO_QUERY); - FmFormData* pCurrentParentUserData = (FmFormData*)pCurrentUserData->GetParent(); + FmFormData* pCurrentParentUserData = static_cast<FmFormData*>(pCurrentUserData->GetParent()); DBG_ASSERT(pCurrentParentUserData == NULL || pCurrentParentUserData->ISA(FmFormData), "NavigatorTree::implExecuteDataTransfer: ungueltiges Parent"); // beim Vater austragen @@ -1403,7 +1403,7 @@ namespace svxform // Namen setzen FmFormView* pFormView = GetNavModel()->GetFormShell()->GetFormView(); SdrPageView* pPageView = pFormView->GetSdrPageView(); - FmFormPage* pPage = (FmFormPage*)pPageView->GetPage(); + FmFormPage* pPage = static_cast<FmFormPage*>(pPageView->GetPage()); OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm ); @@ -1442,7 +1442,7 @@ namespace svxform // Neuen Namen erstellen - FmFormData* pFormParentData = (FmFormData*)pEntryData->GetParent(); + FmFormData* pFormParentData = static_cast<FmFormData*>(pEntryData->GetParent()); for( sal_Int32 i=0; i<nMaxCount; i++ ) { @@ -1716,7 +1716,7 @@ namespace svxform for (SvLBoxEntrySortedArray::reverse_iterator it = m_arrCurrentSelection.rbegin(); it != m_arrCurrentSelection.rend(); ) { - FmEntryData* pCurrent = (FmEntryData*)((*it)->GetUserData()); + FmEntryData* pCurrent = static_cast<FmEntryData*>((*it)->GetUserData()); // eine Form ? bool bIsForm = pCurrent->ISA(FmFormData); @@ -1725,7 +1725,7 @@ namespace svxform // einem makierten Formular nur die direkt, nicht die indirekt abhaengigen Controls markiert werden, muss ich das hier // noch nachholen if (bIsForm) - MarkViewObj((FmFormData*)pCurrent, true, true); // das zweite sal_True heisst "deep" + MarkViewObj(static_cast<FmFormData*>(pCurrent), true, true); // das zweite sal_True heisst "deep" // ein hidden control ? bool bIsHidden = IsHiddenControl(pCurrent); @@ -2102,7 +2102,7 @@ namespace svxform OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); if ( ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) && !aMarkRect.IsEmpty() ) { - pFormView->MakeVisible( aMarkRect, (vcl::Window&)rOutDev ); + pFormView->MakeVisible( aMarkRect, static_cast<vcl::Window&>(rOutDev) ); } } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } @@ -2118,11 +2118,11 @@ namespace svxform pEntryData = pChildList->at( i ); if( pEntryData->ISA(FmControlData) ) { - pControlData = (FmControlData*)pEntryData; + pControlData = static_cast<FmControlData*>(pEntryData); _rObjects.insert(pControlData->GetFormComponent()); } // if( pEntryData->ISA(FmControlData) ) else if (bDeep && (pEntryData->ISA(FmFormData))) - CollectObjects((FmFormData*)pEntryData,bDeep,_rObjects); + CollectObjects(static_cast<FmFormData*>(pEntryData), bDeep, _rObjects); } // for( sal_uInt32 i=0; i<pChildList->Count(); i++ ) } @@ -2175,7 +2175,7 @@ namespace svxform OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); if ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) { - pFormView->MakeVisible( aMarkRect, (vcl::Window&)rOutDev ); + pFormView->MakeVisible( aMarkRect, static_cast<vcl::Window&>(rOutDev) ); } } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 215060641680..2c6b7ce55f7f 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -261,7 +261,7 @@ namespace svxform EndListening(*m_pFormModel); m_pPropChangeList->Lock(); - FmFormData* pFolder = (FmFormData*) pEntry->GetParent(); + FmFormData* pFolder = static_cast<FmFormData*>( pEntry->GetParent() ); Reference< XChild > xElement( pEntry->GetChildIFace() ); if (bAlterModel) { @@ -367,7 +367,7 @@ namespace svxform const bool bUndo = m_pFormModel->IsUndoEnabled(); m_pPropChangeList->Lock(); - FmFormData* pFolder = (FmFormData*) pEntry->GetParent(); + FmFormData* pFolder = static_cast<FmFormData*>( pEntry->GetParent() ); Reference< XChild > xElement ( pEntry->GetChildIFace() ); if (bAlterModel) { @@ -387,9 +387,9 @@ namespace svxform // jetzt die eigentliche Entfernung der Daten aus dem Model if (pEntry->ISA(FmFormData)) - RemoveForm((FmFormData*)pEntry); + RemoveForm(static_cast<FmFormData*>(pEntry)); else - RemoveFormComponent((FmControlData*)pEntry); + RemoveFormComponent(static_cast<FmControlData*>(pEntry)); if (bAlterModel) @@ -459,9 +459,9 @@ namespace svxform // Child ist Form -> rekursiver Aufruf if( pEntryData->ISA(FmFormData) ) - RemoveForm( (FmFormData*)pEntryData); + RemoveForm( static_cast<FmFormData*>(pEntryData)); else if( pEntryData->ISA(FmControlData) ) - RemoveFormComponent((FmControlData*) pEntryData); + RemoveFormComponent(static_cast<FmControlData*>(pEntryData)); } @@ -501,7 +501,7 @@ namespace svxform { FmEntryData* pChildData = pChildList->at( --i ); if( pChildData->ISA(FmFormData) ) - ClearBranch( (FmFormData*)pChildData ); + ClearBranch( static_cast<FmFormData*>(pChildData) ); pChildList->remove( pChildData ); } @@ -574,7 +574,7 @@ namespace svxform void NavigatorTreeModel::InsertForm(const Reference< XForm > & xForm, sal_uInt32 nRelPos) { - FmFormData* pFormData = (FmFormData*)FindData( xForm, GetRootList() ); + FmFormData* pFormData = static_cast<FmFormData*>(FindData( xForm, GetRootList() )); if (pFormData) return; @@ -584,7 +584,7 @@ namespace svxform Reference< XForm > xParentForm(xIFace, UNO_QUERY); FmFormData* pParentData = NULL; if (xParentForm.is()) - pParentData = (FmFormData*)FindData( xParentForm, GetRootList() ); + pParentData = static_cast<FmFormData*>(FindData( xParentForm, GetRootList() )); pFormData = new FmFormData( xForm, m_aNormalImages, pParentData ); Insert( pFormData, nRelPos ); @@ -600,7 +600,7 @@ namespace svxform if (!xForm.is()) return; - FmFormData* pParentData = (FmFormData*)FindData( xForm, GetRootList() ); + FmFormData* pParentData = static_cast<FmFormData*>(FindData( xForm, GetRootList() )); if( !pParentData ) { pParentData = new FmFormData( xForm, m_aNormalImages, NULL ); @@ -629,7 +629,7 @@ namespace svxform assert(pData && pData->ISA(FmControlData)); //NavigatorTreeModel::ReplaceFormComponent : invalid argument if (!pData || !pData->ISA(FmControlData)) return; - ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages ); + static_cast<FmControlData*>(pData)->ModelReplaced( xNew, m_aNormalImages ); FmNavModelReplacedHint aReplacedHint( pData ); Broadcast( aReplacedHint ); @@ -679,7 +679,7 @@ namespace svxform if( bRecurs && pEntryData->ISA(FmFormData) ) { - pChildData = FindData( rText, (FmFormData*)pEntryData ); + pChildData = FindData( rText, static_cast<FmFormData*>(pEntryData) ); if( pChildData ) return pChildData; } @@ -775,7 +775,7 @@ namespace svxform { if ( pObject->ISA(SdrObjGroup) ) { // rekursiv absteigen - const SdrObjList *pChildren = ((SdrObjGroup*)pObject)->GetSubList(); + const SdrObjList *pChildren = static_cast<SdrObjGroup*>(pObject)->GetSubList(); for ( size_t i=0; i<pChildren->GetObjCount(); ++i ) { SdrObject* pCurrent = pChildren->GetObj(i); @@ -917,14 +917,14 @@ namespace svxform if( pEntryData->ISA(FmFormData) ) { - FmFormData* pFormData = (FmFormData*)pEntryData; + FmFormData* pFormData = static_cast<FmFormData*>(pEntryData); Reference< XForm > xForm( pFormData->GetFormIface()); xFormComponent = xForm; } if( pEntryData->ISA(FmControlData) ) { - FmControlData* pControlData = (FmControlData*)pEntryData; + FmControlData* pControlData = static_cast<FmControlData*>(pEntryData); xFormComponent = pControlData->GetFormComponent(); } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index f37e4a4cd6e7..510d98e95cee 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -106,7 +106,7 @@ NameOrIndex::NameOrIndex(const NameOrIndex& rNameOrIndex) : bool NameOrIndex::operator==(const SfxPoolItem& rItem) const { return ( SfxStringItem::operator==(rItem) && - ((const NameOrIndex&) rItem).nPalIndex == nPalIndex ); + static_cast<const NameOrIndex&>(rItem).nPalIndex == nPalIndex ); } SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const @@ -148,7 +148,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u const NameOrIndex *pItem; for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate ); + pItem = static_cast<const NameOrIndex*>(pPool1->GetItem2( nWhich, nSurrogate )); if( pItem && ( pItem->GetName() == pCheckItem->GetName() ) ) { @@ -189,26 +189,26 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u { case XATTR_FILLBITMAP: { - const GraphicObject& rGraphicObjectA(((XFillBitmapItem*)pCheckItem)->GetGraphicObject()); - const GraphicObject& rGraphicObjectB(((XBitmapEntry*)pEntry)->GetGraphicObject()); + const GraphicObject& rGraphicObjectA(static_cast<const XFillBitmapItem*>(pCheckItem)->GetGraphicObject()); + const GraphicObject& rGraphicObjectB(static_cast<XBitmapEntry*>(pEntry)->GetGraphicObject()); bFound = (rGraphicObjectA == rGraphicObjectB); break; } case XATTR_LINEDASH: - bFound = (((XLineDashItem*)pCheckItem)->GetDashValue() == ((XDashEntry*)pEntry) ->GetDash()); + bFound = static_cast<const XLineDashItem*>(pCheckItem)->GetDashValue() == static_cast<XDashEntry*>(pEntry)->GetDash(); break; case XATTR_LINESTART: - bFound = (((XLineStartItem*)pCheckItem)->GetLineStartValue() == ((XLineEndEntry*)pEntry)->GetLineEnd()); + bFound = static_cast<const XLineStartItem*>(pCheckItem)->GetLineStartValue() == static_cast<XLineEndEntry*>(pEntry)->GetLineEnd(); break; case XATTR_LINEEND: - bFound = (((XLineEndItem*)pCheckItem)->GetLineEndValue() == ((XLineEndEntry*)pEntry)->GetLineEnd()); + bFound = static_cast<const XLineEndItem*>(pCheckItem)->GetLineEndValue() == static_cast<XLineEndEntry*>(pEntry)->GetLineEnd(); break; case XATTR_FILLGRADIENT: - bFound = (((XFillGradientItem*)pCheckItem)->GetGradientValue() == ((XGradientEntry*)pEntry)->GetGradient()); + bFound = static_cast<const XFillGradientItem*>(pCheckItem)->GetGradientValue() == static_cast<XGradientEntry*>(pEntry)->GetGradient(); break; case XATTR_FILLHATCH: - bFound = (((XFillHatchItem*)pCheckItem)->GetHatchValue() == ((XHatchEntry*)pEntry)->GetHatch()); + bFound = static_cast<const XFillHatchItem*>(pCheckItem)->GetHatchValue() == static_cast<XHatchEntry*>(pEntry)->GetHatch(); break; } @@ -237,7 +237,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u const NameOrIndex *pItem; for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate ); + pItem = static_cast<const NameOrIndex*>(pPool1->GetItem2( nWhich, nSurrogate )); if( pItem && !pItem->GetName().isEmpty() ) { @@ -303,7 +303,7 @@ SfxPoolItem* XColorItem::Clone(SfxItemPool* /*pPool*/) const bool XColorItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && - ((const XColorItem&) rItem).aColor == aColor ); + static_cast<const XColorItem&>(rItem).aColor == aColor ); } SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -686,7 +686,7 @@ SfxPoolItem* XLineDashItem::Clone(SfxItemPool* /*pPool*/) const bool XLineDashItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && - aDash == ((const XLineDashItem&) rItem).aDash ); + aDash == static_cast<const XLineDashItem&>(rItem).aDash ); } SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -985,7 +985,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { - return ((XLineDashItem*)p1)->GetDashValue() == ((XLineDashItem*)p2)->GetDashValue(); + return static_cast<const XLineDashItem*>(p1)->GetDashValue() == static_cast<const XLineDashItem*>(p2)->GetDashValue(); } XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const @@ -1255,7 +1255,7 @@ SfxPoolItem* XLineStartItem::Clone(SfxItemPool* /*pPool*/) const bool XLineStartItem::operator==(const SfxPoolItem& rItem) const { - return ( NameOrIndex::operator==(rItem) && ((const XLineStartItem&) rItem).maPolyPolygon == maPolyPolygon ); + return ( NameOrIndex::operator==(rItem) && static_cast<const XLineStartItem&>(rItem).maPolyPolygon == maPolyPolygon ); } SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -1384,7 +1384,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = static_cast<const XLineStartItem*>(pPool1->GetItem2( XATTR_LINESTART, nSurrogate )); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1406,7 +1406,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = static_cast<const XLineEndItem*>(pPool1->GetItem2( XATTR_LINEEND, nSurrogate )); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1430,7 +1430,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const nCount = pPool2->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = static_cast<const XLineStartItem*>(pPool2->GetItem2( XATTR_LINESTART, nSurrogate )); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1451,7 +1451,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const nCount = pPool2->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = static_cast<const XLineEndItem*>(pPool2->GetItem2( XATTR_LINEEND, nSurrogate )); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1486,7 +1486,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 ); + const XLineStartItem* pItem = static_cast<const XLineStartItem*>(pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 )); if( pItem && !pItem->GetName().isEmpty() ) { @@ -1509,7 +1509,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 ); + const XLineEndItem* pItem = static_cast<const XLineEndItem*>(pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 )); if( pItem && !pItem->GetName().isEmpty() ) { @@ -1597,7 +1597,7 @@ SfxPoolItem* XLineEndItem::Clone(SfxItemPool* /*pPool*/) const bool XLineEndItem::operator==(const SfxPoolItem& rItem) const { - return ( NameOrIndex::operator==(rItem) && ((const XLineEndItem&) rItem).maPolyPolygon == maPolyPolygon ); + return ( NameOrIndex::operator==(rItem) && static_cast<const XLineEndItem&>(rItem).maPolyPolygon == maPolyPolygon ); } SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -1667,7 +1667,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = static_cast<const XLineStartItem*>(pPool1->GetItem2( XATTR_LINESTART, nSurrogate )); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -1689,7 +1689,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = static_cast<const XLineEndItem*>(pPool1->GetItem2( XATTR_LINEEND, nSurrogate )); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -1713,7 +1713,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const nCount = pPool2->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = static_cast<const XLineStartItem*>(pPool2->GetItem2( XATTR_LINESTART, nSurrogate )); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -1734,7 +1734,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const nCount = pPool2->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = static_cast<const XLineEndItem*>(pPool2->GetItem2( XATTR_LINEEND, nSurrogate )); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -1769,7 +1769,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 ); + const XLineStartItem* pItem = static_cast<const XLineStartItem*>(pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 )); if( pItem && !pItem->GetName().isEmpty() ) { @@ -1792,7 +1792,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 ); + const XLineEndItem* pItem = static_cast<const XLineEndItem*>(pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 )); if( pItem && !pItem->GetName().isEmpty() ) { @@ -2411,7 +2411,7 @@ SfxPoolItem* XFillGradientItem::Clone(SfxItemPool* /*pPool*/) const bool XFillGradientItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && - aGradient == ((const XFillGradientItem&) rItem).aGradient ); + aGradient == static_cast<const XFillGradientItem&>(rItem).aGradient ); } SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const @@ -2698,7 +2698,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { - return ((XFillGradientItem*)p1)->GetGradientValue() == ((XFillGradientItem*)p2)->GetGradientValue(); + return static_cast<const XFillGradientItem*>(p1)->GetGradientValue() == static_cast<const XFillGradientItem*>(p2)->GetGradientValue(); } XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) const @@ -2751,8 +2751,8 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, c bool XFillFloatTransparenceItem::operator==( const SfxPoolItem& rItem ) const { return ( NameOrIndex::operator==(rItem) ) && - ( GetGradientValue() == ((const XFillGradientItem&)rItem).GetGradientValue() ) && - ( bEnabled == ( (XFillFloatTransparenceItem&) rItem ).bEnabled ); + ( GetGradientValue() == static_cast<const XFillGradientItem&>(rItem).GetGradientValue() ) && + ( bEnabled == static_cast<const XFillFloatTransparenceItem&>(rItem).bEnabled ); } SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const @@ -2787,8 +2787,8 @@ bool XFillFloatTransparenceItem::GetPresentation( SfxItemPresentation ePres, bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { - return ((XFillFloatTransparenceItem*)p1)->IsEnabled() == ((XFillFloatTransparenceItem*)p2)->IsEnabled() && - ((XFillFloatTransparenceItem*)p1)->GetGradientValue() == ((XFillFloatTransparenceItem*)p2)->GetGradientValue(); + return static_cast<const XFillFloatTransparenceItem*>(p1)->IsEnabled() == static_cast<const XFillFloatTransparenceItem*>(p2)->IsEnabled() && + static_cast<const XFillFloatTransparenceItem*>(p1)->GetGradientValue() == static_cast<const XFillFloatTransparenceItem*>(p2)->GetGradientValue(); } XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrModel* pModel ) const @@ -2896,7 +2896,7 @@ SfxPoolItem* XFillHatchItem::Clone(SfxItemPool* /*pPool*/) const bool XFillHatchItem::operator==(const SfxPoolItem& rItem) const { return ( NameOrIndex::operator==(rItem) && - aHatch == ((const XFillHatchItem&) rItem).aHatch ); + aHatch == static_cast<const XFillHatchItem&>(rItem).aHatch ); } SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const @@ -3105,7 +3105,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { - return ((XFillHatchItem*)p1)->GetHatchValue() == ((XFillHatchItem*)p2)->GetHatchValue(); + return static_cast<const XFillHatchItem*>(p1)->GetHatchValue() == static_cast<const XFillHatchItem*>(p2)->GetHatchValue(); } XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 10bc9525791f..101f8d7150b5 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -348,7 +348,7 @@ SfxPoolItem* XFillBitmapItem::Clone(SfxItemPool* /*pPool*/) const bool XFillBitmapItem::operator==(const SfxPoolItem& rItem) const { return (NameOrIndex::operator==(rItem) - && maGraphicObject == ((const XFillBitmapItem&)rItem).maGraphicObject); + && maGraphicObject == static_cast<const XFillBitmapItem&>(rItem).maGraphicObject); } SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const @@ -524,8 +524,8 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { - const GraphicObject& aGraphicObjectA(((XFillBitmapItem*)p1)->GetGraphicObject()); - const GraphicObject& aGraphicObjectB(((XFillBitmapItem*)p2)->GetGraphicObject()); + const GraphicObject& aGraphicObjectA(static_cast<const XFillBitmapItem*>(p1)->GetGraphicObject()); + const GraphicObject& aGraphicObjectB(static_cast<const XFillBitmapItem*>(p2)->GetGraphicObject()); return aGraphicObjectA == aGraphicObjectB; } diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index af2714a6fa74..af794ad3028e 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -39,7 +39,7 @@ XFillExchangeData::XFillExchangeData() : } XFillExchangeData::XFillExchangeData( const XFillAttrSetItem rXFillAttrSetItem ) : - pXFillAttrSetItem( (XFillAttrSetItem*) rXFillAttrSetItem.Clone( rXFillAttrSetItem.GetItemSet().GetPool() ) ), + pXFillAttrSetItem( static_cast<XFillAttrSetItem*>( rXFillAttrSetItem.Clone( rXFillAttrSetItem.GetItemSet().GetPool() ) ) ), pPool( rXFillAttrSetItem.GetItemSet().GetPool() ) { } @@ -130,7 +130,7 @@ XFillExchangeData& XFillExchangeData::operator=( const XFillExchangeData& rData delete pXFillAttrSetItem; if( rData.pXFillAttrSetItem ) - pXFillAttrSetItem = (XFillAttrSetItem*) rData.pXFillAttrSetItem->Clone( pPool = rData.pXFillAttrSetItem->GetItemSet().GetPool() ); + pXFillAttrSetItem = static_cast<XFillAttrSetItem*>( rData.pXFillAttrSetItem->Clone( pPool = rData.pXFillAttrSetItem->GetItemSet().GetPool() ) ); else { pPool = NULL; diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 5a9d13e7095d..d5ed9d543d7f 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -32,12 +32,12 @@ using namespace com::sun::star; XBitmapEntry* XBitmapList::Remove(long nIndex) { - return (XBitmapEntry*) XPropertyList::Remove(nIndex); + return static_cast<XBitmapEntry*>( XPropertyList::Remove(nIndex) ); } XBitmapEntry* XBitmapList::GetBitmap(long nIndex) const { - return (XBitmapEntry*) XPropertyList::Get(nIndex); + return static_cast<XBitmapEntry*>( XPropertyList::Get(nIndex) ); } uno::Reference< container::XNameContainer > XBitmapList::createInstance() diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 85c3b4ff1635..da2f0b3c4658 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -42,17 +42,17 @@ XColorListRef XColorList::GetStdColorList() XColorEntry* XColorList::Replace(long nIndex, XColorEntry* pEntry ) { - return (XColorEntry*)XPropertyList::Replace( pEntry, nIndex ); + return static_cast<XColorEntry*>(XPropertyList::Replace( pEntry, nIndex )); } XColorEntry* XColorList::Remove(long nIndex) { - return (XColorEntry*) XPropertyList::Remove(nIndex); + return static_cast<XColorEntry*>(XPropertyList::Remove(nIndex)); } XColorEntry* XColorList::GetColor(long nIndex) const { - return (XColorEntry*) XPropertyList::Get(nIndex); + return static_cast<XColorEntry*>( XPropertyList::Get(nIndex) ); } uno::Reference< container::XNameContainer > XColorList::createInstance() diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index c9414cb86ffc..47dacc287fdb 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -49,17 +49,17 @@ XDashList::~XDashList() XDashEntry* XDashList::Replace(XDashEntry* pEntry, long nIndex ) { - return (XDashEntry*) XPropertyList::Replace(pEntry, nIndex); + return static_cast<XDashEntry*>( XPropertyList::Replace(pEntry, nIndex) ); } XDashEntry* XDashList::Remove(long nIndex) { - return (XDashEntry*) XPropertyList::Remove(nIndex); + return static_cast<XDashEntry*>( XPropertyList::Remove(nIndex) ); } XDashEntry* XDashList::GetDash(long nIndex) const { - return (XDashEntry*) XPropertyList::Get(nIndex); + return static_cast<XDashEntry*>( XPropertyList::Get(nIndex) ); } uno::Reference< container::XNameContainer > XDashList::createInstance() diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index efd625732559..6e88708f7c29 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -47,17 +47,17 @@ XGradientList::~XGradientList() XGradientEntry* XGradientList::Replace(XGradientEntry* pEntry, long nIndex ) { - return( (XGradientEntry*) XPropertyList::Replace( pEntry, nIndex ) ); + return static_cast<XGradientEntry*>( XPropertyList::Replace( pEntry, nIndex ) ); } XGradientEntry* XGradientList::Remove(long nIndex) { - return( (XGradientEntry*) XPropertyList::Remove( nIndex ) ); + return static_cast<XGradientEntry*>( XPropertyList::Remove( nIndex ) ); } XGradientEntry* XGradientList::GetGradient(long nIndex) const { - return( (XGradientEntry*) XPropertyList::Get( nIndex ) ); + return static_cast<XGradientEntry*>( XPropertyList::Get( nIndex ) ); } uno::Reference< container::XNameContainer > XGradientList::createInstance() diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index ff6955113d93..26df8fe25ac2 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -47,17 +47,17 @@ XHatchList::~XHatchList() XHatchEntry* XHatchList::Replace(XHatchEntry* pEntry, long nIndex ) { - return (XHatchEntry*) XPropertyList::Replace(pEntry, nIndex); + return static_cast<XHatchEntry*>( XPropertyList::Replace(pEntry, nIndex) ); } XHatchEntry* XHatchList::Remove(long nIndex) { - return (XHatchEntry*) XPropertyList::Remove(nIndex); + return static_cast<XHatchEntry*>( XPropertyList::Remove(nIndex) ); } XHatchEntry* XHatchList::GetHatch(long nIndex) const { - return (XHatchEntry*) XPropertyList::Get(nIndex); + return static_cast<XHatchEntry*>( XPropertyList::Get(nIndex) ); } uno::Reference< container::XNameContainer > XHatchList::createInstance() diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 546b0a69cc39..cd4dae3f091b 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -46,12 +46,12 @@ XLineEndList::~XLineEndList() XLineEndEntry* XLineEndList::Remove(long nIndex) { - return (XLineEndEntry*) XPropertyList::Remove(nIndex); + return static_cast<XLineEndEntry*>( XPropertyList::Remove(nIndex) ); } XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const { - return (XLineEndEntry*) XPropertyList::Get(nIndex); + return static_cast<XLineEndEntry*>( XPropertyList::Get(nIndex) ); } uno::Reference< container::XNameContainer > XLineEndList::createInstance() |