summaryrefslogtreecommitdiff
path: root/xmloff/source/draw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-10-01 12:11:52 +0200
committerNoel Grandin <noel@peralex.com>2014-10-01 13:08:43 +0200
commitc190577f754158c9e3b003a838bc97762e4773e8 (patch)
tree6b6188cedaa1c055b3293e20b821aab1e3a17849 /xmloff/source/draw
parente5bf214ebb58637d1af89ea137c8952a46f14ef4 (diff)
loplugin: cstylecast
Change-Id: I25b82a96aace448a8debe90c181b22976ea95414
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r--xmloff/source/draw/XMLShapePropertySetContext.cxx2
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx4
-rw-r--r--xmloff/source/draw/shapeexport.cxx2
-rw-r--r--xmloff/source/draw/xexptran.cxx116
-rw-r--r--xmloff/source/draw/ximp3dscene.cxx2
-rw-r--r--xmloff/source/draw/ximp3dscene.hxx4
-rw-r--r--xmloff/source/draw/ximpbody.hxx4
-rw-r--r--xmloff/source/draw/ximppage.cxx12
-rw-r--r--xmloff/source/draw/ximppage.hxx4
-rw-r--r--xmloff/source/draw/ximpstyl.cxx16
-rw-r--r--xmloff/source/draw/ximpstyl.hxx24
11 files changed, 95 insertions, 95 deletions
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index 1aec8f5a6df3..e4599f310e3b 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -52,7 +52,7 @@ void XMLShapePropertySetContext::EndElement()
Reference< container::XIndexReplace > xNumRule;
if( mxBulletStyle.Is() )
{
- SvxXMLListStyleContext* pBulletStyle = (SvxXMLListStyleContext*)&mxBulletStyle;
+ SvxXMLListStyleContext* pBulletStyle = static_cast<SvxXMLListStyleContext*>(&mxBulletStyle);
xNumRule = SvxXMLListStyleContext::CreateNumRule( GetImport().GetModel() );
if( xNumRule.is() )
pBulletStyle->FillUnoNumRule(xNumRule, NULL /* const SvI18NMap * ??? */ );
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 6110b258ba2a..4b21bcaa268d 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -52,7 +52,7 @@ using namespace ::xmloff::token;
class SdXMLBodyContext_Impl : public SvXMLImportContext
{
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
@@ -90,7 +90,7 @@ SvXMLImportContext *SdXMLBodyContext_Impl::CreateChildContext(
class SdXMLDocContext_Impl : public virtual SvXMLImportContext
{
protected:
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
SdXMLDocContext_Impl(
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 2a838049342c..c5d09cdfb13c 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1229,7 +1229,7 @@ void XMLShapeExport::ExportGraphicDefaults()
// construct PropertySetMapper
rtl::Reference< SvXMLExportPropertyMapper > xPropertySetMapper( CreateShapePropMapper( mrExport ) );
- ((XMLShapeExportPropertyMapper*)xPropertySetMapper.get())->SetAutoStyles( false );
+ static_cast<XMLShapeExportPropertyMapper*>(xPropertySetMapper.get())->SetAutoStyles( false );
// chain text attributes
xPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(mrExport));
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index f3968e3c37a2..6d9f3422372f 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -233,32 +233,32 @@ void SdXMLImExTransform2D::EmptyList()
{
case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
{
- delete (ImpSdXMLExpTransObj2DRotate*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj2DRotate*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
{
- delete (ImpSdXMLExpTransObj2DScale*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj2DScale*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
{
- delete (ImpSdXMLExpTransObj2DTranslate*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj2DTranslate*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
{
- delete (ImpSdXMLExpTransObj2DSkewX*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj2DSkewX*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
{
- delete (ImpSdXMLExpTransObj2DSkewY*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj2DSkewY*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
{
- delete (ImpSdXMLExpTransObj2DMatrix*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj2DMatrix*>(pObj);
break;
}
default :
@@ -308,39 +308,39 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
{
aNewString += "rotate (";
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DRotate*>(pObj)->mfRotate);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
{
aNewString += "scale (";
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getX());
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DScale*>(pObj)->maScale.getX());
aNewString += aEmptySpace;
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getY());
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DScale*>(pObj)->maScale.getY());
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
{
aNewString += "translate (";
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getX(), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DTranslate*>(pObj)->maTranslate.getX(), true);
aNewString += aEmptySpace;
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getY(), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DTranslate*>(pObj)->maTranslate.getY(), true);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
{
aNewString += "skewX (";
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DSkewX*>(pObj)->mfSkewX);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
{
aNewString += "skewY (";
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DSkewY*>(pObj)->mfSkewY);
aNewString += aClosingBrace;
break;
}
@@ -349,27 +349,27 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
aNewString += "matrix (";
// a
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(0, 0));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DMatrix*>(pObj)->maMatrix.get(0, 0));
aNewString += aEmptySpace;
// b
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(1, 0));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DMatrix*>(pObj)->maMatrix.get(1, 0));
aNewString += aEmptySpace;
// c
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(0, 1));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DMatrix*>(pObj)->maMatrix.get(0, 1));
aNewString += aEmptySpace;
// d
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(1, 1));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DMatrix*>(pObj)->maMatrix.get(1, 1));
aNewString += aEmptySpace;
// e
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(0, 2), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DMatrix*>(pObj)->maMatrix.get(0, 2), true);
aNewString += aEmptySpace;
// f
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(1, 2), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj2DMatrix*>(pObj)->maMatrix.get(1, 2), true);
aNewString += aClosingBrace;
break;
@@ -546,34 +546,34 @@ void SdXMLImExTransform2D::GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans)
// For the FileFormat there is a follow-up task (#i78698#) to fix this in the next
// ODF FileFormat version. For now - to emulate the old behaviour - it is necessary
// to mirror the value here
- rFullTrans.rotate(((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate * -1.0);
+ rFullTrans.rotate(static_cast<ImpSdXMLExpTransObj2DRotate*>(pObj)->mfRotate * -1.0);
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
{
- const ::basegfx::B2DTuple& rScale = ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale;
+ const ::basegfx::B2DTuple& rScale = static_cast<ImpSdXMLExpTransObj2DScale*>(pObj)->maScale;
rFullTrans.scale(rScale.getX(), rScale.getY());
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
{
- const ::basegfx::B2DTuple& rTranslate = ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate;
+ const ::basegfx::B2DTuple& rTranslate = static_cast<ImpSdXMLExpTransObj2DTranslate*>(pObj)->maTranslate;
rFullTrans.translate(rTranslate.getX(), rTranslate.getY());
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
{
- rFullTrans.shearX(tan(((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX));
+ rFullTrans.shearX(tan(static_cast<ImpSdXMLExpTransObj2DSkewX*>(pObj)->mfSkewX));
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
{
- rFullTrans.shearY(tan(((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY));
+ rFullTrans.shearY(tan(static_cast<ImpSdXMLExpTransObj2DSkewY*>(pObj)->mfSkewY));
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
{
- rFullTrans *= ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix;
+ rFullTrans *= static_cast<ImpSdXMLExpTransObj2DMatrix*>(pObj)->maMatrix;
break;
}
default :
@@ -655,32 +655,32 @@ void SdXMLImExTransform3D::EmptyList()
{
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
{
- delete (ImpSdXMLExpTransObj3DRotateX*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj3DRotateX*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
{
- delete (ImpSdXMLExpTransObj3DRotateY*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj3DRotateY*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
{
- delete (ImpSdXMLExpTransObj3DRotateZ*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj3DRotateZ*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
{
- delete (ImpSdXMLExpTransObj3DScale*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj3DScale*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
{
- delete (ImpSdXMLExpTransObj3DTranslate*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj3DTranslate*>(pObj);
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
{
- delete (ImpSdXMLExpTransObj3DMatrix*)pObj;
+ delete static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj);
break;
}
default :
@@ -738,43 +738,43 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
{
aNewString += "rotatex (";
- Imp_PutDoubleChar(aNewString, rConv, basegfx::rad2deg( ((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX) );
+ Imp_PutDoubleChar(aNewString, rConv, basegfx::rad2deg( static_cast<ImpSdXMLExpTransObj3DRotateX*>(pObj)->mfRotateX) );
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
{
aNewString += "rotatey (";
- Imp_PutDoubleChar(aNewString, rConv, basegfx::rad2deg( ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY) );
+ Imp_PutDoubleChar(aNewString, rConv, basegfx::rad2deg( static_cast<ImpSdXMLExpTransObj3DRotateY*>(pObj)->mfRotateY) );
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
{
aNewString += "rotatez (";
- Imp_PutDoubleChar(aNewString, rConv, basegfx::rad2deg( ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ) );
+ Imp_PutDoubleChar(aNewString, rConv, basegfx::rad2deg( static_cast<ImpSdXMLExpTransObj3DRotateZ*>(pObj)->mfRotateZ) );
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
{
aNewString += "scale (";
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getX());
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DScale*>(pObj)->maScale.getX());
aNewString += aEmptySpace;
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getY());
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DScale*>(pObj)->maScale.getY());
aNewString += aEmptySpace;
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getZ());
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DScale*>(pObj)->maScale.getZ());
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
{
aNewString += "translate (";
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getX(), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DTranslate*>(pObj)->maTranslate.getX(), true);
aNewString += aEmptySpace;
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getY(), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DTranslate*>(pObj)->maTranslate.getY(), true);
aNewString += aEmptySpace;
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getZ(), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DTranslate*>(pObj)->maTranslate.getZ(), true);
aNewString += aClosingBrace;
break;
}
@@ -783,51 +783,51 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
aNewString += "matrix (";
// a
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(0, 0));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(0, 0));
aNewString += aEmptySpace;
// b
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(1, 0));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(1, 0));
aNewString += aEmptySpace;
// c
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(2, 0));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(2, 0));
aNewString += aEmptySpace;
// d
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(0, 1));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(0, 1));
aNewString += aEmptySpace;
// e
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(1, 1));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(1, 1));
aNewString += aEmptySpace;
// f
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(2, 1));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(2, 1));
aNewString += aEmptySpace;
// g
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(0, 2));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(0, 2));
aNewString += aEmptySpace;
// h
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(1, 2));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(1, 2));
aNewString += aEmptySpace;
// i
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(2, 2));
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(2, 2));
aNewString += aEmptySpace;
// j
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(0, 3), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(0, 3), true);
aNewString += aEmptySpace;
// k
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(1, 3), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(1, 3), true);
aNewString += aEmptySpace;
// l
- Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(2, 3), true);
+ Imp_PutDoubleChar(aNewString, rConv, static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix.get(2, 3), true);
aNewString += aClosingBrace;
break;
@@ -1070,34 +1070,34 @@ void SdXMLImExTransform3D::GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans)
{
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
{
- rFullTrans.rotate(((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX, 0.0, 0.0);
+ rFullTrans.rotate(static_cast<ImpSdXMLExpTransObj3DRotateX*>(pObj)->mfRotateX, 0.0, 0.0);
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
{
- rFullTrans.rotate(0.0, ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY, 0.0);
+ rFullTrans.rotate(0.0, static_cast<ImpSdXMLExpTransObj3DRotateY*>(pObj)->mfRotateY, 0.0);
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
{
- rFullTrans.rotate(0.0, 0.0, ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ);
+ rFullTrans.rotate(0.0, 0.0, static_cast<ImpSdXMLExpTransObj3DRotateZ*>(pObj)->mfRotateZ);
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
{
- const ::basegfx::B3DTuple& rScale = ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale;
+ const ::basegfx::B3DTuple& rScale = static_cast<ImpSdXMLExpTransObj3DScale*>(pObj)->maScale;
rFullTrans.scale(rScale.getX(), rScale.getY(), rScale.getZ());
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
{
- const ::basegfx::B3DTuple& rTranslate = ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate;
+ const ::basegfx::B3DTuple& rTranslate = static_cast<ImpSdXMLExpTransObj3DTranslate*>(pObj)->maTranslate;
rFullTrans.translate(rTranslate.getX(), rTranslate.getY(), rTranslate.getZ());
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
{
- rFullTrans *= ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix;
+ rFullTrans *= static_cast<ImpSdXMLExpTransObj3DMatrix*>(pObj)->maMatrix;
break;
}
default :
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index f1dc67962568..ce1d8639b0fb 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -234,7 +234,7 @@ SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uIn
if(pContext)
{
pContext->AddRef();
- maList.push_back( (SdXML3DLightContext*)pContext );
+ maList.push_back( static_cast<SdXML3DLightContext*>(pContext) );
}
return pContext;
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index bbdfac75c363..b2fd87275c49 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -35,8 +35,8 @@ class SdXML3DSceneShapeContext : public SdXMLShapeContext, public SdXML3DSceneAt
// this is the scene at the same time
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren;
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
protected:
void SetLocalShapesContext(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rNew)
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index 0a0cb161e546..c57638d8d307 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -53,8 +53,8 @@ public:
class SdXMLBodyContext : public SvXMLImportContext
{
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName );
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 11a5a166b05f..a3e2bb92f510 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -355,7 +355,7 @@ void SdXMLGenericPageContext::SetStyle( OUString& rStyleName )
if( pContext && pContext->ISA( SvXMLStyleContext ) )
{
- const SdXMLStylesContext* pStyles = (SdXMLStylesContext*)pContext;
+ const SdXMLStylesContext* pStyles = static_cast<const SdXMLStylesContext*>(pContext);
if(pStyles)
{
const SvXMLStyleContext* pStyle = pStyles->FindStyleChildContext(
@@ -363,7 +363,7 @@ void SdXMLGenericPageContext::SetStyle( OUString& rStyleName )
if(pStyle && pStyle->ISA(XMLPropStyleContext))
{
- XMLPropStyleContext* pPropStyle = (XMLPropStyleContext*)pStyle;
+ const XMLPropStyleContext* pPropStyle = static_cast<const XMLPropStyleContext*>(pStyle);
Reference <beans::XPropertySet> xPropSet1(mxShapes, uno::UNO_QUERY);
if(xPropSet1.is())
@@ -392,7 +392,7 @@ void SdXMLGenericPageContext::SetStyle( OUString& rStyleName )
if(xPropSet.is())
{
- pPropStyle->FillPropertySet(xPropSet);
+ const_cast<XMLPropStyleContext*>(pPropStyle)->FillPropertySet(xPropSet);
if( xBackgroundSet.is() )
xPropSet1->setPropertyValue( aBackground, uno::makeAny( xBackgroundSet ) );
@@ -420,14 +420,14 @@ void SdXMLGenericPageContext::SetLayout()
if( pContext && pContext->ISA( SvXMLStyleContext ) )
{
- const SdXMLStylesContext* pStyles = (SdXMLStylesContext*)pContext;
+ const SdXMLStylesContext* pStyles = static_cast<const SdXMLStylesContext*>(pContext);
if(pStyles)
{
const SvXMLStyleContext* pStyle = pStyles->FindStyleChildContext( XML_STYLE_FAMILY_SD_PRESENTATIONPAGELAYOUT_ID, maPageLayoutName);
if(pStyle && pStyle->ISA(SdXMLPresentationPageLayoutContext))
{
- SdXMLPresentationPageLayoutContext* pLayout = (SdXMLPresentationPageLayoutContext*)pStyle;
+ const SdXMLPresentationPageLayoutContext* pLayout = static_cast<const SdXMLPresentationPageLayoutContext*>(pStyle);
nType = pLayout->GetTypeId();
}
}
@@ -489,7 +489,7 @@ void SdXMLGenericPageContext::SetPageMaster( OUString& rsPageMasterName )
if(pStyle && pStyle->ISA(SdXMLPageMasterContext))
{
- const SdXMLPageMasterContext* pPageMaster = (SdXMLPageMasterContext*)pStyle;
+ const SdXMLPageMasterContext* pPageMaster = static_cast<const SdXMLPageMasterContext*>(pStyle);
const SdXMLPageMasterStyleContext* pPageMasterContext = pPageMaster->GetPageMasterStyle();
if(pPageMasterContext)
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index 52cf4ccd899a..de944c8972fc 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -55,8 +55,8 @@ protected:
/** deletes all shapes on this drawing page */
void DeleteAllShapes();
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
/** sets the properties from a page master style with the given name on this contexts page */
void SetPageMaster( OUString& rsPageMasterName );
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 83c2c481bacf..3e3ddd3c056a 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -439,7 +439,7 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
{
pContext->AddRef();
DBG_ASSERT(!mpPageMasterStyle, "PageMasterStyle is set, there seem to be two of them (!)");
- mpPageMasterStyle = (SdXMLPageMasterStyleContext*)pContext;
+ mpPageMasterStyle = static_cast<SdXMLPageMasterStyleContext*>(pContext);
}
}
@@ -498,7 +498,7 @@ SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
if(pContext)
{
pContext->AddRef();
- maList.push_back( (SdXMLPresentationPlaceholderContext*)pContext );
+ maList.push_back( static_cast<SdXMLPresentationPlaceholderContext*>(pContext) );
}
}
@@ -885,7 +885,7 @@ void SdXMLMasterPageContext::EndElement()
{
SvXMLImportContext* pContext = GetSdImport().GetShapeImport()->GetStylesContext();
if( pContext && pContext->ISA( SvXMLStyleContext ) )
- ((SdXMLStylesContext*)pContext)->SetMasterPageStyles(*this);
+ static_cast<SdXMLStylesContext*>(pContext)->SetMasterPageStyles(*this);
}
SdXMLGenericPageContext::EndElement();
@@ -1160,7 +1160,7 @@ void SdXMLStylesContext::EndElement()
const SvXMLStyleContext* pStyle = GetStyle(a);
if(pStyle && pStyle->ISA(XMLShapeStyleContext))
{
- XMLShapeStyleContext* pDocStyle = (XMLShapeStyleContext*)pStyle;
+ const XMLShapeStyleContext* pDocStyle = static_cast<const XMLShapeStyleContext*>(pStyle);
SvXMLStylesContext* pStylesContext = GetSdImport().GetShapeImport()->GetStylesContext();
if( pStylesContext )
@@ -1169,10 +1169,10 @@ void SdXMLStylesContext::EndElement()
if(pStyle && pStyle->ISA(XMLShapeStyleContext))
{
- XMLShapeStyleContext* pParentStyle = (XMLShapeStyleContext*)pStyle;
+ const XMLShapeStyleContext* pParentStyle = static_cast<const XMLShapeStyleContext*>(pStyle);
if(pParentStyle->GetStyle().is())
{
- pDocStyle->SetStyle(pParentStyle->GetStyle());
+ const_cast<XMLShapeStyleContext*>(pDocStyle)->SetStyle(pParentStyle->GetStyle());
}
}
}
@@ -1469,7 +1469,7 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co
if(pStyle && pStyle->ISA(SdXMLPresentationPageLayoutContext))
{
xLayouts->insertByName( pStyle->GetName(), uno::makeAny(
- (sal_Int32)((SdXMLPresentationPageLayoutContext*)pStyle)->GetTypeId() ) );
+ (sal_Int32)static_cast<const SdXMLPresentationPageLayoutContext*>(pStyle)->GetTypeId() ) );
}
}
@@ -1535,7 +1535,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
if(pContext)
{
pContext->AddRef();
- maMasterPageList.push_back( (SdXMLMasterPageContext*)pContext );
+ maMasterPageList.push_back( static_cast<SdXMLMasterPageContext*>(pContext) );
}
}
}
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 6f88a0aed7c6..b1a693811cfc 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -42,8 +42,8 @@ class SdXMLPageMasterStyleContext: public SvXMLStyleContext
sal_Int32 mnHeight;
com::sun::star::view::PaperOrientation meOrientation;
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
TYPEINFO_OVERRIDE();
@@ -71,8 +71,8 @@ class SdXMLPageMasterContext: public SvXMLStyleContext
OUString msName;
SdXMLPageMasterStyleContext*mpPageMasterStyle;
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
TYPEINFO_OVERRIDE();
@@ -135,8 +135,8 @@ class SdXMLPresentationPlaceholderContext: public SvXMLImportContext
sal_Int32 mnWidth;
sal_Int32 mnHeight;
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
SdXMLPresentationPlaceholderContext(
@@ -162,8 +162,8 @@ class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext
ImpPlaceholderList maList;
sal_uInt16 mnTypeId;
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
TYPEINFO_OVERRIDE();
@@ -192,8 +192,8 @@ class SdXMLStylesContext : public SvXMLStylesContext
SvXMLNumFmtHelper* mpNumFmtHelper;
SvNumberFormatter* mpNumFormatter;
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
void ImpSetGraphicStyles() const;
void ImpSetCellStyles() const;
@@ -243,8 +243,8 @@ class SdXMLMasterStylesContext : public SvXMLImportContext
{
ImpMasterPageList maMasterPageList;
- const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
- SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+ const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
+ SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
public:
TYPEINFO_OVERRIDE();