From 5429049e3b8fd12e84aca83be7ca19e52920f672 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Mar 2015 15:31:47 +0100 Subject: const_cast: convert some C-style casts and remove some redundant ones Change-Id: Ic90647cc4da716b54b00520b683cee027a664c22 --- svx/source/core/graphichelper.cxx | 2 +- svx/source/customshapes/EnhancedCustomShape2d.cxx | 2 +- .../customshapes/EnhancedCustomShapeGeometry.cxx | 2018 ++++++++++---------- svx/source/dialog/framelink.cxx | 4 +- svx/source/dialog/hdft.cxx | 2 +- svx/source/dialog/srchdlg.cxx | 2 +- svx/source/engine3d/scene3d.cxx | 4 +- svx/source/engine3d/view3d.cxx | 4 +- svx/source/fmcomp/fmgridcl.cxx | 2 +- svx/source/fmcomp/gridctrl.cxx | 2 +- svx/source/form/fmshell.cxx | 2 +- svx/source/form/fmundo.cxx | 4 +- svx/source/gallery2/galbrws1.cxx | 2 +- svx/source/gallery2/gallery1.cxx | 2 +- svx/source/gallery2/galtheme.cxx | 2 +- svx/source/items/numfmtsh.cxx | 6 +- .../sdr/contact/viewobjectcontactofunocontrol.cxx | 2 +- svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 6 +- svx/source/sdr/properties/attributeproperties.cxx | 2 +- svx/source/sdr/properties/defaultproperties.cxx | 4 +- svx/source/sdr/properties/emptyproperties.cxx | 2 +- svx/source/sdr/properties/pageproperties.cxx | 2 +- svx/source/svdraw/svdedxv.cxx | 2 +- svx/source/svdraw/svdglev.cxx | 8 +- svx/source/svdraw/svdlayer.cxx | 2 +- svx/source/svdraw/svdmark.cxx | 12 +- svx/source/svdraw/svdmodel.cxx | 2 +- svx/source/svdraw/svdmrkv.cxx | 6 +- svx/source/svdraw/svdmrkv1.cxx | 16 +- svx/source/svdraw/svdoattr.cxx | 4 +- svx/source/svdraw/svdobj.cxx | 2 +- svx/source/svdraw/svdoedge.cxx | 12 +- svx/source/svdraw/svdograf.cxx | 2 +- svx/source/svdraw/svdomeas.cxx | 16 +- svx/source/svdraw/svdopath.cxx | 14 +- svx/source/svdraw/svdorect.cxx | 2 +- svx/source/svdraw/svdotext.cxx | 4 +- svx/source/svdraw/svdovirt.cxx | 18 +- svx/source/svdraw/svdpage.cxx | 8 +- svx/source/svdraw/svdpntv.cxx | 10 +- svx/source/svdraw/svdview.cxx | 4 +- svx/source/toolbars/extrusionbar.cxx | 2 +- svx/source/toolbars/fontworkbar.cxx | 4 +- .../chinese_dictionarydialog.cxx | 4 +- svx/source/unodraw/unopage.cxx | 2 +- svx/source/unodraw/unoshtxt.cxx | 16 +- svx/source/xoutdev/xattrbmp.cxx | 2 +- svx/source/xoutdev/xtable.cxx | 12 +- 48 files changed, 1132 insertions(+), 1132 deletions(-) (limited to 'svx/source') diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index 5cd4e4074c3b..96f6788885a1 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -61,7 +61,7 @@ namespace drawing = com::sun::star::drawing; void GraphicHelper::GetPreferredExtension( OUString& rExtension, const Graphic& rGraphic ) { OUString aExtension = "png"; - switch( const_cast( rGraphic ).GetLink().GetType() ) + switch( rGraphic.GetLink().GetType() ) { case GFX_LINK_TYPE_NATIVE_GIF: aExtension = "gif"; diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index deb1e14a24e5..368e87682d35 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -876,7 +876,7 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex ) else { // cast to non const, so that we can optimize by caching // equation results, without changing all the const in the stack - struct EquationResult &aResult = ((EnhancedCustomShape2d*)this)->vEquationResults[ nIndex ]; + struct EquationResult &aResult = const_cast(this)->vEquationResults[ nIndex ]; fNumber = aResult.fValue = (*vNodesSharedPtr[ nIndex ])(); aResult.bReady = true; diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index 8dd6a0482e34..df73b63cd240 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -126,15 +126,15 @@ static const SvxMSDffHandle mso_sptArcHandle[] = }; static const mso_CustomShape msoArc = { - (SvxMSDffVertPair*)mso_sptArcVert, SAL_N_ELEMENTS( mso_sptArcVert ), - (sal_uInt16*)mso_sptArcSegm, sizeof( mso_sptArcSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptArcCalc, SAL_N_ELEMENTS( mso_sptArcCalc ), - (sal_Int32*)mso_sptArcDefault, + const_cast(mso_sptArcVert), SAL_N_ELEMENTS( mso_sptArcVert ), + const_cast(mso_sptArcSegm), sizeof( mso_sptArcSegm ) >> 1, + const_cast(mso_sptArcCalc), SAL_N_ELEMENTS( mso_sptArcCalc ), + const_cast(mso_sptArcDefault), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptArcHandle, SAL_N_ELEMENTS( mso_sptArcHandle ) // handles + const_cast(mso_sptArcHandle), SAL_N_ELEMENTS( mso_sptArcHandle ) // handles }; static const SvxMSDffVertPair mso_sptTextSimpleVert[] = @@ -143,7 +143,7 @@ static const SvxMSDffVertPair mso_sptTextSimpleVert[] = }; static const mso_CustomShape msoTextSimple = { - (SvxMSDffVertPair*)mso_sptTextSimpleVert, SAL_N_ELEMENTS( mso_sptTextSimpleVert ), + const_cast(mso_sptTextSimpleVert), SAL_N_ELEMENTS( mso_sptTextSimpleVert ), NULL, 0, NULL, 0, NULL, @@ -160,7 +160,7 @@ static const SvxMSDffVertPair mso_sptRectangleVert[] = }; static const mso_CustomShape msoRectangle = { - (SvxMSDffVertPair*)mso_sptRectangleVert, SAL_N_ELEMENTS( mso_sptRectangleVert ), + const_cast(mso_sptRectangleVert), SAL_N_ELEMENTS( mso_sptRectangleVert ), NULL, 0, NULL, 0, NULL, @@ -205,15 +205,15 @@ static const SvxMSDffHandle mso_sptRoundRectangleHandle[] = }; static const mso_CustomShape msoRoundRectangle = { - (SvxMSDffVertPair*)mso_sptRoundRectangleVert, SAL_N_ELEMENTS( mso_sptRoundRectangleVert ), - (sal_uInt16*)mso_sptRoundRectangleSegm, sizeof( mso_sptRoundRectangleSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptRoundRectangleCalc, SAL_N_ELEMENTS( mso_sptRoundRectangleCalc ), - (sal_Int32*)mso_sptDefault3600, - (SvxMSDffTextRectangles*)mso_sptRoundRectangleTextRect, SAL_N_ELEMENTS( mso_sptRoundRectangleTextRect ), + const_cast(mso_sptRoundRectangleVert), SAL_N_ELEMENTS( mso_sptRoundRectangleVert ), + const_cast(mso_sptRoundRectangleSegm), sizeof( mso_sptRoundRectangleSegm ) >> 1, + const_cast(mso_sptRoundRectangleCalc), SAL_N_ELEMENTS( mso_sptRoundRectangleCalc ), + const_cast(mso_sptDefault3600), + const_cast(mso_sptRoundRectangleTextRect), SAL_N_ELEMENTS( mso_sptRoundRectangleTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptRoundRectangleHandle, SAL_N_ELEMENTS( mso_sptRoundRectangleHandle ) // handles + const_cast(mso_sptRoundRectangleHandle), SAL_N_ELEMENTS( mso_sptRoundRectangleHandle ) // handles }; static const SvxMSDffVertPair mso_sptRightTriangleVert[] = @@ -230,14 +230,14 @@ static const SvxMSDffVertPair mso_sptRightTriangleGluePoints[] = }; static const mso_CustomShape msoRightTriangle = { - (SvxMSDffVertPair*)mso_sptRightTriangleVert, SAL_N_ELEMENTS( mso_sptRightTriangleVert ), + const_cast(mso_sptRightTriangleVert), SAL_N_ELEMENTS( mso_sptRightTriangleVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptRightTriangleTextRect, SAL_N_ELEMENTS( mso_sptRightTriangleTextRect ), + const_cast(mso_sptRightTriangleTextRect), SAL_N_ELEMENTS( mso_sptRightTriangleTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptRightTriangleGluePoints, SAL_N_ELEMENTS( mso_sptRightTriangleGluePoints ), + const_cast(mso_sptRightTriangleGluePoints), SAL_N_ELEMENTS( mso_sptRightTriangleGluePoints ), NULL, 0 // handles }; @@ -259,14 +259,14 @@ static const SvxMSDffVertPair mso_sptEllipseGluePoints[] = }; static const mso_CustomShape msoEllipse = { - (SvxMSDffVertPair*)mso_sptEllipseVert, SAL_N_ELEMENTS( mso_sptEllipseVert ), - (sal_uInt16*)mso_sptEllipseSegm, sizeof( mso_sptEllipseSegm ) >> 1, + const_cast(mso_sptEllipseVert), SAL_N_ELEMENTS( mso_sptEllipseVert ), + const_cast(mso_sptEllipseSegm), sizeof( mso_sptEllipseSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, SAL_N_ELEMENTS( mso_sptEllipseTextRect ), + const_cast(mso_sptEllipseTextRect), SAL_N_ELEMENTS( mso_sptEllipseTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptEllipseGluePoints, SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), + const_cast(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), NULL, 0 // handles }; @@ -310,15 +310,15 @@ static const SvxMSDffHandle mso_sptParallelogramHandle[] = }; static const mso_CustomShape msoParallelogram = { - (SvxMSDffVertPair*)mso_sptParallelogramVert, SAL_N_ELEMENTS( mso_sptParallelogramVert ), - (sal_uInt16*)mso_sptParallelogramSegm, sizeof( mso_sptParallelogramSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptParallelogramCalc, SAL_N_ELEMENTS( mso_sptParallelogramCalc ), - (sal_Int32*)mso_sptDefault5400, - (SvxMSDffTextRectangles*)mso_sptParallelogramTextRect, SAL_N_ELEMENTS( mso_sptParallelogramTextRect ), + const_cast(mso_sptParallelogramVert), SAL_N_ELEMENTS( mso_sptParallelogramVert ), + const_cast(mso_sptParallelogramSegm), sizeof( mso_sptParallelogramSegm ) >> 1, + const_cast(mso_sptParallelogramCalc), SAL_N_ELEMENTS( mso_sptParallelogramCalc ), + const_cast(mso_sptDefault5400), + const_cast(mso_sptParallelogramTextRect), SAL_N_ELEMENTS( mso_sptParallelogramTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptParallelogramGluePoints, SAL_N_ELEMENTS( mso_sptParallelogramGluePoints ), - (SvxMSDffHandle*)mso_sptParallelogramHandle, SAL_N_ELEMENTS( mso_sptParallelogramHandle ) // handles + const_cast(mso_sptParallelogramGluePoints), SAL_N_ELEMENTS( mso_sptParallelogramGluePoints ), + const_cast(mso_sptParallelogramHandle), SAL_N_ELEMENTS( mso_sptParallelogramHandle ) // handles }; static const SvxMSDffVertPair mso_sptDiamondVert[] = @@ -331,14 +331,14 @@ static const SvxMSDffTextRectangles mso_sptDiamondTextRect[] = }; static const mso_CustomShape msoDiamond = { - (SvxMSDffVertPair*)mso_sptDiamondVert, SAL_N_ELEMENTS( mso_sptDiamondVert ), + const_cast(mso_sptDiamondVert), SAL_N_ELEMENTS( mso_sptDiamondVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptDiamondTextRect, SAL_N_ELEMENTS( mso_sptDiamondTextRect ), + const_cast(mso_sptDiamondTextRect), SAL_N_ELEMENTS( mso_sptDiamondTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -375,15 +375,15 @@ static const SvxMSDffHandle mso_sptTrapezoidHandle[] = }; static const mso_CustomShape msoTrapezoid = { - (SvxMSDffVertPair*)mso_sptTrapezoidVert, SAL_N_ELEMENTS( mso_sptTrapezoidVert ), - (sal_uInt16*)mso_sptTrapezoidSegm, sizeof( mso_sptTrapezoidSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTrapezoidCalc, SAL_N_ELEMENTS( mso_sptTrapezoidCalc ), - (sal_Int32*)mso_sptDefault5400, - (SvxMSDffTextRectangles*)mso_sptTrapezoidTextRect, SAL_N_ELEMENTS( mso_sptTrapezoidTextRect ), + const_cast(mso_sptTrapezoidVert), SAL_N_ELEMENTS( mso_sptTrapezoidVert ), + const_cast(mso_sptTrapezoidSegm), sizeof( mso_sptTrapezoidSegm ) >> 1, + const_cast(mso_sptTrapezoidCalc), SAL_N_ELEMENTS( mso_sptTrapezoidCalc ), + const_cast(mso_sptDefault5400), + const_cast(mso_sptTrapezoidTextRect), SAL_N_ELEMENTS( mso_sptTrapezoidTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptTrapezoidGluePoints, SAL_N_ELEMENTS( mso_sptTrapezoidGluePoints ), - (SvxMSDffHandle*)mso_sptTrapezoidHandle, SAL_N_ELEMENTS( mso_sptTrapezoidHandle ) // handles + const_cast(mso_sptTrapezoidGluePoints), SAL_N_ELEMENTS( mso_sptTrapezoidGluePoints ), + const_cast(mso_sptTrapezoidHandle), SAL_N_ELEMENTS( mso_sptTrapezoidHandle ) // handles }; /* @@ -466,15 +466,15 @@ static const SvxMSDffHandle mso_sptOctagonHandle[] = }; static const mso_CustomShape msoOctagon = { - (SvxMSDffVertPair*)mso_sptOctagonVert, SAL_N_ELEMENTS( mso_sptOctagonVert ), - (sal_uInt16*)mso_sptOctagonSegm, sizeof( mso_sptOctagonSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptOctagonCalc, SAL_N_ELEMENTS( mso_sptOctagonCalc ), - (sal_Int32*)mso_sptOctagonDefault, - (SvxMSDffTextRectangles*)mso_sptOctagonTextRect, SAL_N_ELEMENTS( mso_sptOctagonTextRect ), + const_cast(mso_sptOctagonVert), SAL_N_ELEMENTS( mso_sptOctagonVert ), + const_cast(mso_sptOctagonSegm), sizeof( mso_sptOctagonSegm ) >> 1, + const_cast(mso_sptOctagonCalc), SAL_N_ELEMENTS( mso_sptOctagonCalc ), + const_cast(mso_sptOctagonDefault), + const_cast(mso_sptOctagonTextRect), SAL_N_ELEMENTS( mso_sptOctagonTextRect ), 21600, 21600, 10800, 10800, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - (SvxMSDffHandle*)mso_sptOctagonHandle, SAL_N_ELEMENTS( mso_sptOctagonHandle ) // handles + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptOctagonHandle), SAL_N_ELEMENTS( mso_sptOctagonHandle ) // handles }; static const SvxMSDffVertPair mso_sptIsocelesTriangleVert[] = // adjustment1 : 0 - 21600 @@ -512,15 +512,15 @@ static const SvxMSDffHandle mso_sptIsocelesTriangleHandle[] = }; static const mso_CustomShape msoIsocelesTriangle = { - (SvxMSDffVertPair*)mso_sptIsocelesTriangleVert, SAL_N_ELEMENTS( mso_sptIsocelesTriangleVert ), - (sal_uInt16*)mso_sptIsocelesTriangleSegm, sizeof( mso_sptIsocelesTriangleSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptIsocelesTriangleCalc, SAL_N_ELEMENTS( mso_sptIsocelesTriangleCalc ), - (sal_Int32*)mso_sptDefault10800, - (SvxMSDffTextRectangles*)mso_sptIsocelesTriangleTextRect, SAL_N_ELEMENTS( mso_sptIsocelesTriangleTextRect ), + const_cast(mso_sptIsocelesTriangleVert), SAL_N_ELEMENTS( mso_sptIsocelesTriangleVert ), + const_cast(mso_sptIsocelesTriangleSegm), sizeof( mso_sptIsocelesTriangleSegm ) >> 1, + const_cast(mso_sptIsocelesTriangleCalc), SAL_N_ELEMENTS( mso_sptIsocelesTriangleCalc ), + const_cast(mso_sptDefault10800), + const_cast(mso_sptIsocelesTriangleTextRect), SAL_N_ELEMENTS( mso_sptIsocelesTriangleTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptIsocelesTriangleGluePoints, SAL_N_ELEMENTS( mso_sptIsocelesTriangleGluePoints ), - (SvxMSDffHandle*)mso_sptIsocelesTriangleHandle, SAL_N_ELEMENTS( mso_sptIsocelesTriangleHandle ) // handles + const_cast(mso_sptIsocelesTriangleGluePoints), SAL_N_ELEMENTS( mso_sptIsocelesTriangleGluePoints ), + const_cast(mso_sptIsocelesTriangleHandle), SAL_N_ELEMENTS( mso_sptIsocelesTriangleHandle ) // handles }; static const SvxMSDffVertPair mso_sptHexagonVert[] = // adjustment1 : 0 - 10800 @@ -551,15 +551,15 @@ static const SvxMSDffHandle mso_sptHexagonHandle[] = }; static const mso_CustomShape msoHexagon = { - (SvxMSDffVertPair*)mso_sptHexagonVert, SAL_N_ELEMENTS( mso_sptHexagonVert ), - (sal_uInt16*)mso_sptHexagonSegm, sizeof( mso_sptHexagonSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptHexagonCalc, SAL_N_ELEMENTS( mso_sptHexagonCalc ), - (sal_Int32*)mso_sptDefault5400, - (SvxMSDffTextRectangles*)mso_sptHexagonTextRect, SAL_N_ELEMENTS( mso_sptHexagonTextRect ), + const_cast(mso_sptHexagonVert), SAL_N_ELEMENTS( mso_sptHexagonVert ), + const_cast(mso_sptHexagonSegm), sizeof( mso_sptHexagonSegm ) >> 1, + const_cast(mso_sptHexagonCalc), SAL_N_ELEMENTS( mso_sptHexagonCalc ), + const_cast(mso_sptDefault5400), + const_cast(mso_sptHexagonTextRect), SAL_N_ELEMENTS( mso_sptHexagonTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - (SvxMSDffHandle*)mso_sptHexagonHandle, SAL_N_ELEMENTS( mso_sptHexagonHandle ) // handles + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptHexagonHandle), SAL_N_ELEMENTS( mso_sptHexagonHandle ) // handles }; static const SvxMSDffVertPair mso_sptPentagonVert[] = @@ -578,14 +578,14 @@ static const SvxMSDffVertPair mso_sptPentagonGluePoints[] = }; static const mso_CustomShape msoPentagon = { - (SvxMSDffVertPair*)mso_sptPentagonVert, SAL_N_ELEMENTS( mso_sptPentagonVert ), + const_cast(mso_sptPentagonVert), SAL_N_ELEMENTS( mso_sptPentagonVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptPentagonTextRect, SAL_N_ELEMENTS( mso_sptPentagonTextRect ), + const_cast(mso_sptPentagonTextRect), SAL_N_ELEMENTS( mso_sptPentagonTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptPentagonGluePoints, SAL_N_ELEMENTS( mso_sptPentagonGluePoints ), + const_cast(mso_sptPentagonGluePoints), SAL_N_ELEMENTS( mso_sptPentagonGluePoints ), NULL, 0 // handles }; @@ -613,15 +613,15 @@ static const SvxMSDffHandle mso_sptPlusHandle[] = }; static const mso_CustomShape msoPlus = { - (SvxMSDffVertPair*)mso_sptPlusVert, SAL_N_ELEMENTS( mso_sptPlusVert ), + const_cast(mso_sptPlusVert), SAL_N_ELEMENTS( mso_sptPlusVert ), NULL, 0, - (SvxMSDffCalculationData*)mso_sptPlusCalc, SAL_N_ELEMENTS( mso_sptPlusCalc ), - (sal_Int32*)mso_sptDefault5400, - (SvxMSDffTextRectangles*)mso_sptPlusTextRect, SAL_N_ELEMENTS( mso_sptPlusTextRect ), + const_cast(mso_sptPlusCalc), SAL_N_ELEMENTS( mso_sptPlusCalc ), + const_cast(mso_sptDefault5400), + const_cast(mso_sptPlusTextRect), SAL_N_ELEMENTS( mso_sptPlusTextRect ), 21600, 21600, 10800, 10800, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - (SvxMSDffHandle*)mso_sptPlusHandle, SAL_N_ELEMENTS( mso_sptPlusHandle ) // handles + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptPlusHandle), SAL_N_ELEMENTS( mso_sptPlusHandle ) // handles }; static const SvxMSDffVertPair mso_sptCanVert[] = // adjustment1 : 0 - 10800 @@ -670,15 +670,15 @@ static const SvxMSDffHandle mso_sptCanHandle[] = }; static const mso_CustomShape msoCan = { - (SvxMSDffVertPair*)mso_sptCanVert, SAL_N_ELEMENTS( mso_sptCanVert ), - (sal_uInt16*)mso_sptCanSegm, sizeof( mso_sptCanSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCanCalc, SAL_N_ELEMENTS( mso_sptCanCalc ), - (sal_Int32*)mso_sptDefault5400, - (SvxMSDffTextRectangles*)mso_sptCanTextRect, SAL_N_ELEMENTS( mso_sptCanTextRect ), + const_cast(mso_sptCanVert), SAL_N_ELEMENTS( mso_sptCanVert ), + const_cast(mso_sptCanSegm), sizeof( mso_sptCanSegm ) >> 1, + const_cast(mso_sptCanCalc), SAL_N_ELEMENTS( mso_sptCanCalc ), + const_cast(mso_sptDefault5400), + const_cast(mso_sptCanTextRect), SAL_N_ELEMENTS( mso_sptCanTextRect ), 88, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptCanGluePoints, SAL_N_ELEMENTS( mso_sptCanGluePoints ), - (SvxMSDffHandle*)mso_sptCanHandle, SAL_N_ELEMENTS( mso_sptCanHandle ) // handles + const_cast(mso_sptCanGluePoints), SAL_N_ELEMENTS( mso_sptCanGluePoints ), + const_cast(mso_sptCanHandle), SAL_N_ELEMENTS( mso_sptCanHandle ) // handles }; static const SvxMSDffVertPair mso_sptArrowVert[] = // adjustment1: x 0 - 21600 @@ -712,15 +712,15 @@ static const SvxMSDffHandle mso_sptArrowHandle[] = }; static const mso_CustomShape msoArrow = { - (SvxMSDffVertPair*)mso_sptArrowVert, SAL_N_ELEMENTS( mso_sptArrowVert ), - (sal_uInt16*)mso_sptArrowSegm, sizeof( mso_sptArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptArrowCalc, SAL_N_ELEMENTS( mso_sptArrowCalc ), - (sal_Int32*)mso_sptDefault16200and5400, - (SvxMSDffTextRectangles*)mso_sptArrowTextRect, SAL_N_ELEMENTS( mso_sptArrowTextRect ), + const_cast(mso_sptArrowVert), SAL_N_ELEMENTS( mso_sptArrowVert ), + const_cast(mso_sptArrowSegm), sizeof( mso_sptArrowSegm ) >> 1, + const_cast(mso_sptArrowCalc), SAL_N_ELEMENTS( mso_sptArrowCalc ), + const_cast(mso_sptDefault16200and5400), + const_cast(mso_sptArrowTextRect), SAL_N_ELEMENTS( mso_sptArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptArrowHandle, SAL_N_ELEMENTS( mso_sptArrowHandle ) // handles + const_cast(mso_sptArrowHandle), SAL_N_ELEMENTS( mso_sptArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptLeftArrowVert[] = // adjustment1: x 0 - 21600 @@ -747,15 +747,15 @@ static const SvxMSDffHandle mso_sptLeftArrowHandle[] = }; static const mso_CustomShape msoLeftArrow = { - (SvxMSDffVertPair*)mso_sptLeftArrowVert, SAL_N_ELEMENTS( mso_sptLeftArrowVert ), - (sal_uInt16*)mso_sptLeftArrowSegm, sizeof( mso_sptLeftArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptArrowCalc, SAL_N_ELEMENTS( mso_sptArrowCalc ), - (sal_Int32*)mso_sptLeftArrowDefault, - (SvxMSDffTextRectangles*)mso_sptLeftArrowTextRect, SAL_N_ELEMENTS( mso_sptLeftArrowTextRect ), + const_cast(mso_sptLeftArrowVert), SAL_N_ELEMENTS( mso_sptLeftArrowVert ), + const_cast(mso_sptLeftArrowSegm), sizeof( mso_sptLeftArrowSegm ) >> 1, + const_cast(mso_sptArrowCalc), SAL_N_ELEMENTS( mso_sptArrowCalc ), + const_cast(mso_sptLeftArrowDefault), + const_cast(mso_sptLeftArrowTextRect), SAL_N_ELEMENTS( mso_sptLeftArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptLeftArrowHandle, SAL_N_ELEMENTS( mso_sptLeftArrowHandle ) // handles + const_cast(mso_sptLeftArrowHandle), SAL_N_ELEMENTS( mso_sptLeftArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptDownArrowVert[] = // adjustment1: x 0 - 21600 @@ -778,15 +778,15 @@ static const SvxMSDffHandle mso_sptDownArrowHandle[] = }; static const mso_CustomShape msoDownArrow = { - (SvxMSDffVertPair*)mso_sptDownArrowVert, SAL_N_ELEMENTS( mso_sptDownArrowVert ), - (sal_uInt16*)mso_sptDownArrowSegm, sizeof( mso_sptDownArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptArrowCalc, SAL_N_ELEMENTS( mso_sptArrowCalc ), - (sal_Int32*)mso_sptDefault16200and5400, - (SvxMSDffTextRectangles*)mso_sptDownArrowTextRect, SAL_N_ELEMENTS( mso_sptDownArrowTextRect ), + const_cast(mso_sptDownArrowVert), SAL_N_ELEMENTS( mso_sptDownArrowVert ), + const_cast(mso_sptDownArrowSegm), sizeof( mso_sptDownArrowSegm ) >> 1, + const_cast(mso_sptArrowCalc), SAL_N_ELEMENTS( mso_sptArrowCalc ), + const_cast(mso_sptDefault16200and5400), + const_cast(mso_sptDownArrowTextRect), SAL_N_ELEMENTS( mso_sptDownArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptDownArrowHandle, SAL_N_ELEMENTS( mso_sptDownArrowHandle ) // handles + const_cast(mso_sptDownArrowHandle), SAL_N_ELEMENTS( mso_sptDownArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptUpArrowVert[] = // adjustment1: x 0 - 21600 @@ -813,15 +813,15 @@ static const SvxMSDffHandle mso_sptUpArrowHandle[] = }; static const mso_CustomShape msoUpArrow = { - (SvxMSDffVertPair*)mso_sptUpArrowVert, SAL_N_ELEMENTS( mso_sptUpArrowVert ), - (sal_uInt16*)mso_sptUpArrowSegm, sizeof( mso_sptUpArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptArrowCalc, SAL_N_ELEMENTS( mso_sptArrowCalc ), - (sal_Int32*)mso_sptUpArrowDefault, - (SvxMSDffTextRectangles*)mso_sptUpArrowTextRect, SAL_N_ELEMENTS( mso_sptUpArrowTextRect ), + const_cast(mso_sptUpArrowVert), SAL_N_ELEMENTS( mso_sptUpArrowVert ), + const_cast(mso_sptUpArrowSegm), sizeof( mso_sptUpArrowSegm ) >> 1, + const_cast(mso_sptArrowCalc), SAL_N_ELEMENTS( mso_sptArrowCalc ), + const_cast(mso_sptUpArrowDefault), + const_cast(mso_sptUpArrowTextRect), SAL_N_ELEMENTS( mso_sptUpArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptUpArrowHandle, SAL_N_ELEMENTS( mso_sptUpArrowHandle ) // handles + const_cast(mso_sptUpArrowHandle), SAL_N_ELEMENTS( mso_sptUpArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptLeftRightArrowVert[] = // adjustment1: x 0 - 10800 @@ -862,15 +862,15 @@ static const SvxMSDffHandle mso_sptLeftRightArrowHandle[] = }; static const mso_CustomShape msoLeftRightArrow = { - (SvxMSDffVertPair*)mso_sptLeftRightArrowVert, SAL_N_ELEMENTS( mso_sptLeftRightArrowVert ), - (sal_uInt16*)mso_sptLeftRightArrowSegm, sizeof( mso_sptLeftRightArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptDoubleArrowCalc, SAL_N_ELEMENTS( mso_sptDoubleArrowCalc ), - (sal_Int32*)mso_sptLeftRightArrowDefault, - (SvxMSDffTextRectangles*)mso_sptLeftRightArrowTextRect, SAL_N_ELEMENTS( mso_sptLeftRightArrowTextRect ), + const_cast(mso_sptLeftRightArrowVert), SAL_N_ELEMENTS( mso_sptLeftRightArrowVert ), + const_cast(mso_sptLeftRightArrowSegm), sizeof( mso_sptLeftRightArrowSegm ) >> 1, + const_cast(mso_sptDoubleArrowCalc), SAL_N_ELEMENTS( mso_sptDoubleArrowCalc ), + const_cast(mso_sptLeftRightArrowDefault), + const_cast(mso_sptLeftRightArrowTextRect), SAL_N_ELEMENTS( mso_sptLeftRightArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptLeftRightArrowHandle, SAL_N_ELEMENTS( mso_sptLeftRightArrowHandle ) // handles + const_cast(mso_sptLeftRightArrowHandle), SAL_N_ELEMENTS( mso_sptLeftRightArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptUpDownArrowVert[] = // adjustment1: x 0 - 10800 @@ -898,15 +898,15 @@ static const SvxMSDffHandle mso_sptUpDownArrowHandle[] = }; static const mso_CustomShape msoUpDownArrow = { - (SvxMSDffVertPair*)mso_sptUpDownArrowVert, SAL_N_ELEMENTS( mso_sptUpDownArrowVert ), - (sal_uInt16*)mso_sptUpDownArrowSegm, sizeof( mso_sptUpDownArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptDoubleArrowCalc, SAL_N_ELEMENTS( mso_sptDoubleArrowCalc ), - (sal_Int32*)mso_sptUpDownArrowDefault, - (SvxMSDffTextRectangles*)mso_sptUpDownArrowTextRect, SAL_N_ELEMENTS( mso_sptUpDownArrowTextRect ), + const_cast(mso_sptUpDownArrowVert), SAL_N_ELEMENTS( mso_sptUpDownArrowVert ), + const_cast(mso_sptUpDownArrowSegm), sizeof( mso_sptUpDownArrowSegm ) >> 1, + const_cast(mso_sptDoubleArrowCalc), SAL_N_ELEMENTS( mso_sptDoubleArrowCalc ), + const_cast(mso_sptUpDownArrowDefault), + const_cast(mso_sptUpDownArrowTextRect), SAL_N_ELEMENTS( mso_sptUpDownArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptUpDownArrowHandle, SAL_N_ELEMENTS( mso_sptUpDownArrowHandle ) // handles + const_cast(mso_sptUpDownArrowHandle), SAL_N_ELEMENTS( mso_sptUpDownArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptQuadArrowVert[] = // adjustment1: x 0 - 10800, adjustment2: x 0 - 10800 @@ -948,15 +948,15 @@ static const SvxMSDffHandle mso_sptQuadArrowHandle[] = }; static const mso_CustomShape msoQuadArrow = { - (SvxMSDffVertPair*)mso_sptQuadArrowVert, SAL_N_ELEMENTS( mso_sptQuadArrowVert ), - (sal_uInt16*)mso_sptQuadArrowSegm, sizeof( mso_sptQuadArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptQuadArrowCalc, SAL_N_ELEMENTS( mso_sptQuadArrowCalc ), - (sal_Int32*)mso_sptQuadArrowDefault, - (SvxMSDffTextRectangles*)mso_sptQuadArrowTextRect, SAL_N_ELEMENTS( mso_sptQuadArrowTextRect ), + const_cast(mso_sptQuadArrowVert), SAL_N_ELEMENTS( mso_sptQuadArrowVert ), + const_cast(mso_sptQuadArrowSegm), sizeof( mso_sptQuadArrowSegm ) >> 1, + const_cast(mso_sptQuadArrowCalc), SAL_N_ELEMENTS( mso_sptQuadArrowCalc ), + const_cast(mso_sptQuadArrowDefault), + const_cast(mso_sptQuadArrowTextRect), SAL_N_ELEMENTS( mso_sptQuadArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptQuadArrowHandle, SAL_N_ELEMENTS( mso_sptQuadArrowHandle ) // handles + const_cast(mso_sptQuadArrowHandle), SAL_N_ELEMENTS( mso_sptQuadArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptLeftRightUpArrowVert[] = // adjustment1: x 0 - 10800, adjustment2: x 0 - 10800 @@ -997,15 +997,15 @@ static const SvxMSDffHandle mso_sptLeftRightUpArrowHandle[] = }; static const mso_CustomShape msoLeftRightUpArrow = { - (SvxMSDffVertPair*)mso_sptLeftRightUpArrowVert, SAL_N_ELEMENTS( mso_sptLeftRightUpArrowVert ), - (sal_uInt16*)mso_sptLeftRightUpArrowSegm, sizeof( mso_sptLeftRightUpArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptLeftRightUpArrowCalc, SAL_N_ELEMENTS( mso_sptLeftRightUpArrowCalc ), - (sal_Int32*)mso_sptLeftRightUpArrowDefault, - (SvxMSDffTextRectangles*)mso_sptLeftRightUpArrowTextRect, SAL_N_ELEMENTS( mso_sptLeftRightUpArrowTextRect ), + const_cast(mso_sptLeftRightUpArrowVert), SAL_N_ELEMENTS( mso_sptLeftRightUpArrowVert ), + const_cast(mso_sptLeftRightUpArrowSegm), sizeof( mso_sptLeftRightUpArrowSegm ) >> 1, + const_cast(mso_sptLeftRightUpArrowCalc), SAL_N_ELEMENTS( mso_sptLeftRightUpArrowCalc ), + const_cast(mso_sptLeftRightUpArrowDefault), + const_cast(mso_sptLeftRightUpArrowTextRect), SAL_N_ELEMENTS( mso_sptLeftRightUpArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptLeftRightUpArrowHandle, SAL_N_ELEMENTS( mso_sptLeftRightUpArrowHandle ) // handles + const_cast(mso_sptLeftRightUpArrowHandle), SAL_N_ELEMENTS( mso_sptLeftRightUpArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptBentArrowVert[] = // adjustment1 : x 12427 - 21600 @@ -1041,15 +1041,15 @@ static const SvxMSDffHandle mso_sptBentArrowHandle[] = }; static const mso_CustomShape msoBentArrow = { - (SvxMSDffVertPair*)mso_sptBentArrowVert, SAL_N_ELEMENTS( mso_sptBentArrowVert ), - (sal_uInt16*)mso_sptBentArrowSegm, sizeof( mso_sptBentArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBentArrowCalc, SAL_N_ELEMENTS( mso_sptBentArrowCalc ), - (sal_Int32*)mso_sptBentArrowDefault, - (SvxMSDffTextRectangles*)mso_sptBentArrowTextRect, SAL_N_ELEMENTS( mso_sptBentArrowTextRect ), + const_cast(mso_sptBentArrowVert), SAL_N_ELEMENTS( mso_sptBentArrowVert ), + const_cast(mso_sptBentArrowSegm), sizeof( mso_sptBentArrowSegm ) >> 1, + const_cast(mso_sptBentArrowCalc), SAL_N_ELEMENTS( mso_sptBentArrowCalc ), + const_cast(mso_sptBentArrowDefault), + const_cast(mso_sptBentArrowTextRect), SAL_N_ELEMENTS( mso_sptBentArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptBentArrowHandle, SAL_N_ELEMENTS( mso_sptBentArrowHandle ) // handles + const_cast(mso_sptBentArrowHandle), SAL_N_ELEMENTS( mso_sptBentArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptUturnArrowVert[] = @@ -1072,11 +1072,11 @@ static const SvxMSDffTextRectangles mso_sptUturnArrowTextRect[] = }; static const mso_CustomShape msoUturnArrow = { - (SvxMSDffVertPair*)mso_sptUturnArrowVert, SAL_N_ELEMENTS( mso_sptUturnArrowVert ), - (sal_uInt16*)mso_sptUturnArrowSegm, sizeof( mso_sptUturnArrowSegm ) >> 1, + const_cast(mso_sptUturnArrowVert), SAL_N_ELEMENTS( mso_sptUturnArrowVert ), + const_cast(mso_sptUturnArrowSegm), sizeof( mso_sptUturnArrowSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptUturnArrowTextRect, SAL_N_ELEMENTS( mso_sptUturnArrowTextRect ), + const_cast(mso_sptUturnArrowTextRect), SAL_N_ELEMENTS( mso_sptUturnArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, @@ -1124,15 +1124,15 @@ static const SvxMSDffHandle mso_sptLeftUpArrowHandle[] = }; static const mso_CustomShape msoLeftUpArrow = { - (SvxMSDffVertPair*)mso_sptLeftUpArrowVert, SAL_N_ELEMENTS( mso_sptLeftUpArrowVert ), - (sal_uInt16*)mso_sptLeftUpArrowSegm, sizeof( mso_sptLeftUpArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptLeftUpArrowCalc, SAL_N_ELEMENTS( mso_sptLeftUpArrowCalc ), - (sal_Int32*)mso_sptLeftUpArrowDefault, - (SvxMSDffTextRectangles*)mso_sptLeftUpArrowTextRect, SAL_N_ELEMENTS( mso_sptLeftUpArrowTextRect ), + const_cast(mso_sptLeftUpArrowVert), SAL_N_ELEMENTS( mso_sptLeftUpArrowVert ), + const_cast(mso_sptLeftUpArrowSegm), sizeof( mso_sptLeftUpArrowSegm ) >> 1, + const_cast(mso_sptLeftUpArrowCalc), SAL_N_ELEMENTS( mso_sptLeftUpArrowCalc ), + const_cast(mso_sptLeftUpArrowDefault), + const_cast(mso_sptLeftUpArrowTextRect), SAL_N_ELEMENTS( mso_sptLeftUpArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptLeftUpArrowHandle, SAL_N_ELEMENTS( mso_sptLeftUpArrowHandle ) // handles + const_cast(mso_sptLeftUpArrowHandle), SAL_N_ELEMENTS( mso_sptLeftUpArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptBentUpArrowVert[] = // adjustment1 : x 0 - 21600, adjustment2 : x 0 - 21600 @@ -1177,15 +1177,15 @@ static const SvxMSDffHandle mso_sptBentUpArrowHandle[] = }; static const mso_CustomShape msoBentUpArrow = { - (SvxMSDffVertPair*)mso_sptBentUpArrowVert, SAL_N_ELEMENTS( mso_sptBentUpArrowVert ), - (sal_uInt16*)mso_sptBentUpArrowSegm, sizeof( mso_sptBentUpArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBentUpArrowCalc, SAL_N_ELEMENTS( mso_sptBentUpArrowCalc ), - (sal_Int32*)mso_sptBentUpArrowDefault, - (SvxMSDffTextRectangles*)mso_sptBentUpArrowTextRect, SAL_N_ELEMENTS( mso_sptBentUpArrowTextRect ), + const_cast(mso_sptBentUpArrowVert), SAL_N_ELEMENTS( mso_sptBentUpArrowVert ), + const_cast(mso_sptBentUpArrowSegm), sizeof( mso_sptBentUpArrowSegm ) >> 1, + const_cast(mso_sptBentUpArrowCalc), SAL_N_ELEMENTS( mso_sptBentUpArrowCalc ), + const_cast(mso_sptBentUpArrowDefault), + const_cast(mso_sptBentUpArrowTextRect), SAL_N_ELEMENTS( mso_sptBentUpArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptBentUpArrowHandle, SAL_N_ELEMENTS( mso_sptBentUpArrowHandle ) + const_cast(mso_sptBentUpArrowHandle), SAL_N_ELEMENTS( mso_sptBentUpArrowHandle ) }; static const SvxMSDffVertPair mso_sptCurvedRightVert[] = @@ -1285,15 +1285,15 @@ static const SvxMSDffHandle mso_sptCurvedRightHandles[] = }; static const mso_CustomShape msoCurvedRightArrow = { - (SvxMSDffVertPair*)mso_sptCurvedRightVert, SAL_N_ELEMENTS( mso_sptCurvedRightVert ), - (sal_uInt16*)mso_sptCurvedRightSegm, sizeof( mso_sptCurvedRightSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCurvedRightCalc, SAL_N_ELEMENTS( mso_sptCurvedRightCalc ), - (sal_Int32*)mso_sptCurvedRightDefault, - (SvxMSDffTextRectangles*)mso_sptCurvedRightTextRect, SAL_N_ELEMENTS( mso_sptCurvedRightTextRect ), + const_cast(mso_sptCurvedRightVert), SAL_N_ELEMENTS( mso_sptCurvedRightVert ), + const_cast(mso_sptCurvedRightSegm), sizeof( mso_sptCurvedRightSegm ) >> 1, + const_cast(mso_sptCurvedRightCalc), SAL_N_ELEMENTS( mso_sptCurvedRightCalc ), + const_cast(mso_sptCurvedRightDefault), + const_cast(mso_sptCurvedRightTextRect), SAL_N_ELEMENTS( mso_sptCurvedRightTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptCurvedRightGluePoints, SAL_N_ELEMENTS( mso_sptCurvedRightGluePoints ), - (SvxMSDffHandle*)mso_sptCurvedRightHandles, SAL_N_ELEMENTS( mso_sptCurvedRightHandles ) + const_cast(mso_sptCurvedRightGluePoints), SAL_N_ELEMENTS( mso_sptCurvedRightGluePoints ), + const_cast(mso_sptCurvedRightHandles), SAL_N_ELEMENTS( mso_sptCurvedRightHandles ) }; static const SvxMSDffVertPair mso_sptCurvedDownVert[] = @@ -1340,15 +1340,15 @@ static const SvxMSDffHandle mso_sptCurvedDownHandles[] = static const mso_CustomShape msoCurvedDownArrow = { - (SvxMSDffVertPair*)mso_sptCurvedDownVert, SAL_N_ELEMENTS( mso_sptCurvedDownVert ), - (sal_uInt16*)mso_sptCurvedDownSegm, sizeof( mso_sptCurvedDownSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCurvedRightCalc, SAL_N_ELEMENTS( mso_sptCurvedRightCalc ), - (sal_Int32*)mso_sptCurvedRightDefault, - (SvxMSDffTextRectangles*)mso_sptCurvedDownTextRect, SAL_N_ELEMENTS( mso_sptCurvedDownTextRect ), + const_cast(mso_sptCurvedDownVert), SAL_N_ELEMENTS( mso_sptCurvedDownVert ), + const_cast(mso_sptCurvedDownSegm), sizeof( mso_sptCurvedDownSegm ) >> 1, + const_cast(mso_sptCurvedRightCalc), SAL_N_ELEMENTS( mso_sptCurvedRightCalc ), + const_cast(mso_sptCurvedRightDefault), + const_cast(mso_sptCurvedDownTextRect), SAL_N_ELEMENTS( mso_sptCurvedDownTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptCurvedDownGluePoints, SAL_N_ELEMENTS( mso_sptCurvedDownGluePoints ), - (SvxMSDffHandle*)mso_sptCurvedDownHandles, SAL_N_ELEMENTS( mso_sptCurvedDownHandles ) + const_cast(mso_sptCurvedDownGluePoints), SAL_N_ELEMENTS( mso_sptCurvedDownGluePoints ), + const_cast(mso_sptCurvedDownHandles), SAL_N_ELEMENTS( mso_sptCurvedDownHandles ) }; static const SvxMSDffVertPair mso_sptCurvedUpVert[] = @@ -1446,15 +1446,15 @@ static const SvxMSDffHandle mso_sptCurvedUpHandles[] = }; static const mso_CustomShape msoCurvedUpArrow = { - (SvxMSDffVertPair*)mso_sptCurvedUpVert, SAL_N_ELEMENTS( mso_sptCurvedUpVert ), - (sal_uInt16*)mso_sptCurvedUpSegm, sizeof( mso_sptCurvedUpSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCurvedUpCalc, SAL_N_ELEMENTS( mso_sptCurvedUpCalc ), - (sal_Int32*)mso_sptCurvedUpDefault, - (SvxMSDffTextRectangles*)mso_sptCurvedUpTextRect, SAL_N_ELEMENTS( mso_sptCurvedUpTextRect ), + const_cast(mso_sptCurvedUpVert), SAL_N_ELEMENTS( mso_sptCurvedUpVert ), + const_cast(mso_sptCurvedUpSegm), sizeof( mso_sptCurvedUpSegm ) >> 1, + const_cast(mso_sptCurvedUpCalc), SAL_N_ELEMENTS( mso_sptCurvedUpCalc ), + const_cast(mso_sptCurvedUpDefault), + const_cast(mso_sptCurvedUpTextRect), SAL_N_ELEMENTS( mso_sptCurvedUpTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptCurvedUpGluePoints, SAL_N_ELEMENTS( mso_sptCurvedUpGluePoints ), - (SvxMSDffHandle*)mso_sptCurvedUpHandles, SAL_N_ELEMENTS( mso_sptCurvedUpHandles ) + const_cast(mso_sptCurvedUpGluePoints), SAL_N_ELEMENTS( mso_sptCurvedUpGluePoints ), + const_cast(mso_sptCurvedUpHandles), SAL_N_ELEMENTS( mso_sptCurvedUpHandles ) }; static const SvxMSDffVertPair mso_sptCurvedLeftVert[] = @@ -1499,15 +1499,15 @@ static const SvxMSDffHandle mso_sptCurvedLeftHandles[] = }; static const mso_CustomShape msoCurvedLeftArrow = { - (SvxMSDffVertPair*)mso_sptCurvedLeftVert, SAL_N_ELEMENTS( mso_sptCurvedLeftVert ), - (sal_uInt16*)mso_sptCurvedLeftSegm, sizeof( mso_sptCurvedLeftSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCurvedUpCalc, SAL_N_ELEMENTS( mso_sptCurvedUpCalc ), - (sal_Int32*)mso_sptCurvedUpDefault, - (SvxMSDffTextRectangles*)mso_sptCurvedLeftTextRect, SAL_N_ELEMENTS( mso_sptCurvedLeftTextRect ), + const_cast(mso_sptCurvedLeftVert), SAL_N_ELEMENTS( mso_sptCurvedLeftVert ), + const_cast(mso_sptCurvedLeftSegm), sizeof( mso_sptCurvedLeftSegm ) >> 1, + const_cast(mso_sptCurvedUpCalc), SAL_N_ELEMENTS( mso_sptCurvedUpCalc ), + const_cast(mso_sptCurvedUpDefault), + const_cast(mso_sptCurvedLeftTextRect), SAL_N_ELEMENTS( mso_sptCurvedLeftTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptCurvedLeftGluePoints, SAL_N_ELEMENTS( mso_sptCurvedLeftGluePoints ), - (SvxMSDffHandle*)mso_sptCurvedLeftHandles, SAL_N_ELEMENTS( mso_sptCurvedLeftHandles ) + const_cast(mso_sptCurvedLeftGluePoints), SAL_N_ELEMENTS( mso_sptCurvedLeftGluePoints ), + const_cast(mso_sptCurvedLeftHandles), SAL_N_ELEMENTS( mso_sptCurvedLeftHandles ) }; static const SvxMSDffVertPair mso_sptStripedRightArrowVert[] = // adjustment1 : x 3375 - 21600 @@ -1543,15 +1543,15 @@ static const SvxMSDffHandle mso_sptStripedRightArrowHandle[] = }; static const mso_CustomShape msoStripedRightArrow = { - (SvxMSDffVertPair*)mso_sptStripedRightArrowVert, SAL_N_ELEMENTS( mso_sptStripedRightArrowVert ), - (sal_uInt16*)mso_sptStripedRightArrowSegm, sizeof( mso_sptStripedRightArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptStripedRightArrowCalc, SAL_N_ELEMENTS( mso_sptStripedRightArrowCalc ), - (sal_Int32*)mso_sptDefault16200and5400, - (SvxMSDffTextRectangles*)mso_sptStripedRightArrowTextRect, SAL_N_ELEMENTS( mso_sptStripedRightArrowTextRect ), + const_cast(mso_sptStripedRightArrowVert), SAL_N_ELEMENTS( mso_sptStripedRightArrowVert ), + const_cast(mso_sptStripedRightArrowSegm), sizeof( mso_sptStripedRightArrowSegm ) >> 1, + const_cast(mso_sptStripedRightArrowCalc), SAL_N_ELEMENTS( mso_sptStripedRightArrowCalc ), + const_cast(mso_sptDefault16200and5400), + const_cast(mso_sptStripedRightArrowTextRect), SAL_N_ELEMENTS( mso_sptStripedRightArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptStripedRightArrowHandle, SAL_N_ELEMENTS( mso_sptStripedRightArrowHandle ) + const_cast(mso_sptStripedRightArrowHandle), SAL_N_ELEMENTS( mso_sptStripedRightArrowHandle ) }; static const SvxMSDffVertPair mso_sptNotchedRightArrowVert[] = // adjustment1 : x 0 - 21600 (default 16200) @@ -1580,15 +1580,15 @@ static const SvxMSDffHandle mso_sptNotchedRightArrowHandle[] = }; static const mso_CustomShape msoNotchedRightArrow = { - (SvxMSDffVertPair*)mso_sptNotchedRightArrowVert, SAL_N_ELEMENTS( mso_sptNotchedRightArrowVert ), + const_cast(mso_sptNotchedRightArrowVert), SAL_N_ELEMENTS( mso_sptNotchedRightArrowVert ), NULL, 0, - (SvxMSDffCalculationData*)mso_sptNotchedRightArrowCalc, SAL_N_ELEMENTS( mso_sptNotchedRightArrowCalc ), - (sal_Int32*)mso_sptDefault16200and5400, - (SvxMSDffTextRectangles*)mso_sptNotchedRightArrowTextRect, SAL_N_ELEMENTS( mso_sptNotchedRightArrowTextRect ), + const_cast(mso_sptNotchedRightArrowCalc), SAL_N_ELEMENTS( mso_sptNotchedRightArrowCalc ), + const_cast(mso_sptDefault16200and5400), + const_cast(mso_sptNotchedRightArrowTextRect), SAL_N_ELEMENTS( mso_sptNotchedRightArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptNotchedRightArrowHandle, SAL_N_ELEMENTS( mso_sptNotchedRightArrowHandle ) + const_cast(mso_sptNotchedRightArrowHandle), SAL_N_ELEMENTS( mso_sptNotchedRightArrowHandle ) }; static const SvxMSDffVertPair mso_sptHomePlateVert[] = // adjustment1 : x 0 - 21600 @@ -1619,15 +1619,15 @@ static const SvxMSDffHandle mso_sptHomePlateHandle[] = }; static const mso_CustomShape msoHomePlate = { - (SvxMSDffVertPair*)mso_sptHomePlateVert, SAL_N_ELEMENTS( mso_sptHomePlateVert ), - (sal_uInt16*)mso_sptHomePlateSegm, sizeof( mso_sptHomePlateSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptHomePlateCalc, SAL_N_ELEMENTS( mso_sptHomePlateCalc ), - (sal_Int32*)mso_sptHomePlateDefault, - (SvxMSDffTextRectangles*)mso_sptHomePlateTextRect, SAL_N_ELEMENTS( mso_sptHomePlateTextRect ), + const_cast(mso_sptHomePlateVert), SAL_N_ELEMENTS( mso_sptHomePlateVert ), + const_cast(mso_sptHomePlateSegm), sizeof( mso_sptHomePlateSegm ) >> 1, + const_cast(mso_sptHomePlateCalc), SAL_N_ELEMENTS( mso_sptHomePlateCalc ), + const_cast(mso_sptHomePlateDefault), + const_cast(mso_sptHomePlateTextRect), SAL_N_ELEMENTS( mso_sptHomePlateTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptHomePlateHandle, SAL_N_ELEMENTS( mso_sptHomePlateHandle ) + const_cast(mso_sptHomePlateHandle), SAL_N_ELEMENTS( mso_sptHomePlateHandle ) }; static const SvxMSDffVertPair mso_sptChevronVert[] = // adjustment1 : x 0 - 21600 @@ -1659,15 +1659,15 @@ static const SvxMSDffHandle mso_sptChevronHandle[] = }; static const mso_CustomShape msoChevron = { - (SvxMSDffVertPair*)mso_sptChevronVert, SAL_N_ELEMENTS( mso_sptChevronVert ), - (sal_uInt16*)mso_sptChevronSegm, sizeof( mso_sptChevronSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptChevronCalc, SAL_N_ELEMENTS( mso_sptChevronCalc ), - (sal_Int32*)mso_sptChevronDefault, - (SvxMSDffTextRectangles*)mso_sptChevronTextRect, SAL_N_ELEMENTS( mso_sptChevronTextRect ), + const_cast(mso_sptChevronVert), SAL_N_ELEMENTS( mso_sptChevronVert ), + const_cast(mso_sptChevronSegm), sizeof( mso_sptChevronSegm ) >> 1, + const_cast(mso_sptChevronCalc), SAL_N_ELEMENTS( mso_sptChevronCalc ), + const_cast(mso_sptChevronDefault), + const_cast(mso_sptChevronTextRect), SAL_N_ELEMENTS( mso_sptChevronTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptChevronHandle, SAL_N_ELEMENTS( mso_sptChevronHandle ) + const_cast(mso_sptChevronHandle), SAL_N_ELEMENTS( mso_sptChevronHandle ) }; static const SvxMSDffVertPair mso_sptRightArrowCalloutVert[] = // adjustment1 : x 0 - 21000 @@ -1708,15 +1708,15 @@ static const SvxMSDffHandle mso_sptRightArrowCalloutHandle[] = }; static const mso_CustomShape msoRightArrowCallout = { - (SvxMSDffVertPair*)mso_sptRightArrowCalloutVert, SAL_N_ELEMENTS( mso_sptRightArrowCalloutVert ), - (sal_uInt16*)mso_sptRightArrowCalloutSegm, sizeof( mso_sptRightArrowCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptRightArrowCalloutCalc, SAL_N_ELEMENTS( mso_sptRightArrowCalloutCalc ), - (sal_Int32*)mso_sptRightArrowCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptRightArrowCalloutTextRect, SAL_N_ELEMENTS( mso_sptRightArrowCalloutTextRect ), + const_cast(mso_sptRightArrowCalloutVert), SAL_N_ELEMENTS( mso_sptRightArrowCalloutVert ), + const_cast(mso_sptRightArrowCalloutSegm), sizeof( mso_sptRightArrowCalloutSegm ) >> 1, + const_cast(mso_sptRightArrowCalloutCalc), SAL_N_ELEMENTS( mso_sptRightArrowCalloutCalc ), + const_cast(mso_sptRightArrowCalloutDefault), + const_cast(mso_sptRightArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptRightArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptRightArrowCalloutHandle, SAL_N_ELEMENTS( mso_sptRightArrowCalloutHandle ) + const_cast(mso_sptRightArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptRightArrowCalloutHandle ) }; static const SvxMSDffVertPair mso_sptLeftArrowCalloutVert[] = // adjustment1 : x 0 - 21600, adjustment2 : y 0 - 10800 @@ -1757,15 +1757,15 @@ static const SvxMSDffHandle mso_sptLeftArrowCalloutHandle[] = }; static const mso_CustomShape msoLeftArrowCallout = { - (SvxMSDffVertPair*)mso_sptLeftArrowCalloutVert, SAL_N_ELEMENTS( mso_sptLeftArrowCalloutVert ), - (sal_uInt16*)mso_sptLeftArrowCalloutSegm, sizeof( mso_sptLeftArrowCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptLeftArrowCalloutCalc, SAL_N_ELEMENTS( mso_sptLeftArrowCalloutCalc ), - (sal_Int32*)mso_sptLeftArrowCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptLeftArrowCalloutTextRect, SAL_N_ELEMENTS( mso_sptLeftArrowCalloutTextRect ), + const_cast(mso_sptLeftArrowCalloutVert), SAL_N_ELEMENTS( mso_sptLeftArrowCalloutVert ), + const_cast(mso_sptLeftArrowCalloutSegm), sizeof( mso_sptLeftArrowCalloutSegm ) >> 1, + const_cast(mso_sptLeftArrowCalloutCalc), SAL_N_ELEMENTS( mso_sptLeftArrowCalloutCalc ), + const_cast(mso_sptLeftArrowCalloutDefault), + const_cast(mso_sptLeftArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptLeftArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptLeftArrowCalloutHandle, SAL_N_ELEMENTS( mso_sptLeftArrowCalloutHandle ) + const_cast(mso_sptLeftArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptLeftArrowCalloutHandle ) }; static const SvxMSDffVertPair mso_sptUpArrowCalloutVert[] = @@ -1806,15 +1806,15 @@ static const SvxMSDffHandle mso_sptUpArrowCalloutHandle[] = }; static const mso_CustomShape msoUpArrowCallout = { - (SvxMSDffVertPair*)mso_sptUpArrowCalloutVert, SAL_N_ELEMENTS( mso_sptUpArrowCalloutVert ), - (sal_uInt16*)mso_sptUpArrowCalloutSegm, sizeof( mso_sptUpArrowCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptUpArrowCalloutCalc, SAL_N_ELEMENTS( mso_sptUpArrowCalloutCalc ), - (sal_Int32*)mso_sptUpArrowCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptUpArrowCalloutTextRect, SAL_N_ELEMENTS( mso_sptUpArrowCalloutTextRect ), + const_cast(mso_sptUpArrowCalloutVert), SAL_N_ELEMENTS( mso_sptUpArrowCalloutVert ), + const_cast(mso_sptUpArrowCalloutSegm), sizeof( mso_sptUpArrowCalloutSegm ) >> 1, + const_cast(mso_sptUpArrowCalloutCalc), SAL_N_ELEMENTS( mso_sptUpArrowCalloutCalc ), + const_cast(mso_sptUpArrowCalloutDefault), + const_cast(mso_sptUpArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptUpArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptUpArrowCalloutHandle, SAL_N_ELEMENTS( mso_sptUpArrowCalloutHandle ) + const_cast(mso_sptUpArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptUpArrowCalloutHandle ) }; static const SvxMSDffVertPair mso_sptDownArrowCalloutVert[] = @@ -1855,15 +1855,15 @@ static const SvxMSDffHandle mso_sptDownArrowCalloutHandle[] = }; static const mso_CustomShape msoDownArrowCallout = { - (SvxMSDffVertPair*)mso_sptDownArrowCalloutVert, SAL_N_ELEMENTS( mso_sptDownArrowCalloutVert ), - (sal_uInt16*)mso_sptDownArrowCalloutSegm, sizeof( mso_sptDownArrowCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptDownArrowCalloutCalc, SAL_N_ELEMENTS( mso_sptDownArrowCalloutCalc ), - (sal_Int32*)mso_sptDownArrowCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptDownArrowCalloutTextRect, SAL_N_ELEMENTS( mso_sptDownArrowCalloutTextRect ), + const_cast(mso_sptDownArrowCalloutVert), SAL_N_ELEMENTS( mso_sptDownArrowCalloutVert ), + const_cast(mso_sptDownArrowCalloutSegm), sizeof( mso_sptDownArrowCalloutSegm ) >> 1, + const_cast(mso_sptDownArrowCalloutCalc), SAL_N_ELEMENTS( mso_sptDownArrowCalloutCalc ), + const_cast(mso_sptDownArrowCalloutDefault), + const_cast(mso_sptDownArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptDownArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptDownArrowCalloutHandle, SAL_N_ELEMENTS( mso_sptDownArrowCalloutHandle ) + const_cast(mso_sptDownArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptDownArrowCalloutHandle ) }; static const SvxMSDffVertPair mso_sptLeftRightArrowCalloutVert[] = @@ -1908,15 +1908,15 @@ static const SvxMSDffHandle mso_sptLeftRightArrowCalloutHandle[] = }; static const mso_CustomShape msoLeftRightArrowCallout = { - (SvxMSDffVertPair*)mso_sptLeftRightArrowCalloutVert, SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutVert ), - (sal_uInt16*)mso_sptLeftRightArrowCalloutSegm, sizeof( mso_sptLeftRightArrowCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptLeftRightArrowCalloutCalc, SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutCalc ), - (sal_Int32*)mso_sptLeftRightArrowCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptLeftRightArrowCalloutTextRect, SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutTextRect ), + const_cast(mso_sptLeftRightArrowCalloutVert), SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutVert ), + const_cast(mso_sptLeftRightArrowCalloutSegm), sizeof( mso_sptLeftRightArrowCalloutSegm ) >> 1, + const_cast(mso_sptLeftRightArrowCalloutCalc), SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutCalc ), + const_cast(mso_sptLeftRightArrowCalloutDefault), + const_cast(mso_sptLeftRightArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptLeftRightArrowCalloutHandle, SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutHandle ) + const_cast(mso_sptLeftRightArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptLeftRightArrowCalloutHandle ) }; static const SvxMSDffVertPair mso_sptUpDownArrowCalloutVert[] = @@ -1961,15 +1961,15 @@ static const SvxMSDffHandle mso_sptUpDownArrowCalloutHandle[] = }; static const mso_CustomShape msoUpDownArrowCallout = { - (SvxMSDffVertPair*)mso_sptUpDownArrowCalloutVert, SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutVert ), - (sal_uInt16*)mso_sptUpDownArrowCalloutSegm, sizeof( mso_sptUpDownArrowCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptUpDownArrowCalloutCalc, SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutCalc ), - (sal_Int32*)mso_sptUpDownArrowCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptUpDownArrowCalloutTextRect, SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutTextRect ), + const_cast(mso_sptUpDownArrowCalloutVert), SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutVert ), + const_cast(mso_sptUpDownArrowCalloutSegm), sizeof( mso_sptUpDownArrowCalloutSegm ) >> 1, + const_cast(mso_sptUpDownArrowCalloutCalc), SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutCalc ), + const_cast(mso_sptUpDownArrowCalloutDefault), + const_cast(mso_sptUpDownArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptUpDownArrowCalloutHandle, SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutHandle ) + const_cast(mso_sptUpDownArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptUpDownArrowCalloutHandle ) }; static const SvxMSDffVertPair mso_sptQuadArrowCalloutVert[] = @@ -2017,15 +2017,15 @@ static const SvxMSDffHandle mso_sptQuadArrowCalloutHandle[] = }; static const mso_CustomShape msoQuadArrowCallout = { - (SvxMSDffVertPair*)mso_sptQuadArrowCalloutVert, SAL_N_ELEMENTS( mso_sptQuadArrowCalloutVert ), - (sal_uInt16*)mso_sptQuadArrowCalloutSegm, sizeof( mso_sptQuadArrowCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptQuadArrowCalloutCalc, SAL_N_ELEMENTS( mso_sptQuadArrowCalloutCalc ), - (sal_Int32*)mso_sptQuadArrowCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptQuadArrowCalloutTextRect, SAL_N_ELEMENTS( mso_sptQuadArrowCalloutTextRect ), + const_cast(mso_sptQuadArrowCalloutVert), SAL_N_ELEMENTS( mso_sptQuadArrowCalloutVert ), + const_cast(mso_sptQuadArrowCalloutSegm), sizeof( mso_sptQuadArrowCalloutSegm ) >> 1, + const_cast(mso_sptQuadArrowCalloutCalc), SAL_N_ELEMENTS( mso_sptQuadArrowCalloutCalc ), + const_cast(mso_sptQuadArrowCalloutDefault), + const_cast(mso_sptQuadArrowCalloutTextRect), SAL_N_ELEMENTS( mso_sptQuadArrowCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptQuadArrowCalloutHandle, SAL_N_ELEMENTS( mso_sptQuadArrowCalloutHandle ) + const_cast(mso_sptQuadArrowCalloutHandle), SAL_N_ELEMENTS( mso_sptQuadArrowCalloutHandle ) }; static const SvxMSDffVertPair mso_sptCircularArrowVert[] = @@ -2113,15 +2113,15 @@ static const SvxMSDffHandle mso_sptCircularArrowHandle[] = }; static const mso_CustomShape msoCircularArrow = { - (SvxMSDffVertPair*)mso_sptCircularArrowVert, SAL_N_ELEMENTS( mso_sptCircularArrowVert ), - (sal_uInt16*)mso_sptCircularArrowSegm, sizeof( mso_sptCircularArrowSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCircularArrowCalc, SAL_N_ELEMENTS( mso_sptCircularArrowCalc ), - (sal_Int32*)mso_sptCircularArrowDefault, - (SvxMSDffTextRectangles*)mso_sptCircularArrowTextRect, SAL_N_ELEMENTS( mso_sptCircularArrowTextRect ), + const_cast(mso_sptCircularArrowVert), SAL_N_ELEMENTS( mso_sptCircularArrowVert ), + const_cast(mso_sptCircularArrowSegm), sizeof( mso_sptCircularArrowSegm ) >> 1, + const_cast(mso_sptCircularArrowCalc), SAL_N_ELEMENTS( mso_sptCircularArrowCalc ), + const_cast(mso_sptCircularArrowDefault), + const_cast(mso_sptCircularArrowTextRect), SAL_N_ELEMENTS( mso_sptCircularArrowTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCircularArrowHandle, SAL_N_ELEMENTS( mso_sptCircularArrowHandle ) // handles + const_cast(mso_sptCircularArrowHandle), SAL_N_ELEMENTS( mso_sptCircularArrowHandle ) // handles }; static const SvxMSDffVertPair mso_sptCubeVert[] = @@ -2167,15 +2167,15 @@ static const SvxMSDffVertPair mso_sptCubeGluePoints[] = }; static const mso_CustomShape msoCube = { - (SvxMSDffVertPair*)mso_sptCubeVert, SAL_N_ELEMENTS( mso_sptCubeVert ), - (sal_uInt16*)mso_sptCubeSegm, sizeof( mso_sptCubeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCubeCalc, SAL_N_ELEMENTS( mso_sptCubeCalc ), - (sal_Int32*)mso_sptDefault5400, - (SvxMSDffTextRectangles*)mso_sptCubeTextRect, SAL_N_ELEMENTS( mso_sptCubeTextRect ), + const_cast(mso_sptCubeVert), SAL_N_ELEMENTS( mso_sptCubeVert ), + const_cast(mso_sptCubeSegm), sizeof( mso_sptCubeSegm ) >> 1, + const_cast(mso_sptCubeCalc), SAL_N_ELEMENTS( mso_sptCubeCalc ), + const_cast(mso_sptDefault5400), + const_cast(mso_sptCubeTextRect), SAL_N_ELEMENTS( mso_sptCubeTextRect ), 21600, 21600, 10800, 10800, - (SvxMSDffVertPair*)mso_sptCubeGluePoints, SAL_N_ELEMENTS( mso_sptCubeGluePoints ), - (SvxMSDffHandle*)mso_sptCubeHandle, SAL_N_ELEMENTS( mso_sptCubeHandle ) + const_cast(mso_sptCubeGluePoints), SAL_N_ELEMENTS( mso_sptCubeGluePoints ), + const_cast(mso_sptCubeHandle), SAL_N_ELEMENTS( mso_sptCubeHandle ) }; static const SvxMSDffVertPair mso_sptBevelVert[] = @@ -2212,15 +2212,15 @@ static const SvxMSDffHandle mso_sptBevelHandle[] = }; static const mso_CustomShape msoBevel = { - (SvxMSDffVertPair*)mso_sptBevelVert, SAL_N_ELEMENTS( mso_sptBevelVert ), - (sal_uInt16*)mso_sptBevelSegm, sizeof( mso_sptBevelSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBevelCalc, SAL_N_ELEMENTS( mso_sptBevelCalc ), - (sal_Int32*)mso_sptDefault2700, - (SvxMSDffTextRectangles*)mso_sptBevelTextRect, SAL_N_ELEMENTS( mso_sptBevelTextRect ), + const_cast(mso_sptBevelVert), SAL_N_ELEMENTS( mso_sptBevelVert ), + const_cast(mso_sptBevelSegm), sizeof( mso_sptBevelSegm ) >> 1, + const_cast(mso_sptBevelCalc), SAL_N_ELEMENTS( mso_sptBevelCalc ), + const_cast(mso_sptDefault2700), + const_cast(mso_sptBevelTextRect), SAL_N_ELEMENTS( mso_sptBevelTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptBevelHandle, SAL_N_ELEMENTS( mso_sptBevelHandle ) + const_cast(mso_sptBevelHandle), SAL_N_ELEMENTS( mso_sptBevelHandle ) }; static const SvxMSDffVertPair mso_sptFoldedCornerVert[] = // adjustment1 : x 10800 - 21600 @@ -2264,15 +2264,15 @@ static const SvxMSDffHandle mso_sptFoldedCornerHandle[] = }; static const mso_CustomShape msoFoldedCorner = { - (SvxMSDffVertPair*)mso_sptFoldedCornerVert, SAL_N_ELEMENTS( mso_sptFoldedCornerVert ), - (sal_uInt16*)mso_sptFoldedCornerSegm, sizeof( mso_sptFoldedCornerSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptFoldedCornerCalc, SAL_N_ELEMENTS( mso_sptFoldedCornerCalc ), - (sal_Int32*)mso_sptFoldedCornerDefault, - (SvxMSDffTextRectangles*)mso_sptFoldedCornerTextRect, SAL_N_ELEMENTS( mso_sptFoldedCornerTextRect ), + const_cast(mso_sptFoldedCornerVert), SAL_N_ELEMENTS( mso_sptFoldedCornerVert ), + const_cast(mso_sptFoldedCornerSegm), sizeof( mso_sptFoldedCornerSegm ) >> 1, + const_cast(mso_sptFoldedCornerCalc), SAL_N_ELEMENTS( mso_sptFoldedCornerCalc ), + const_cast(mso_sptFoldedCornerDefault), + const_cast(mso_sptFoldedCornerTextRect), SAL_N_ELEMENTS( mso_sptFoldedCornerTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - (SvxMSDffHandle*)mso_sptFoldedCornerHandle, SAL_N_ELEMENTS( mso_sptFoldedCornerHandle ) + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptFoldedCornerHandle), SAL_N_ELEMENTS( mso_sptFoldedCornerHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonBlankVert[] = @@ -2308,15 +2308,15 @@ static const SvxMSDffHandle mso_sptButtonHandle[] = }; static const mso_CustomShape msoActionButtonBlank = { - (SvxMSDffVertPair*)mso_sptActionButtonBlankVert, SAL_N_ELEMENTS( mso_sptActionButtonBlankVert ), - (sal_uInt16*)mso_sptActionButtonBlankSegm, sizeof( mso_sptActionButtonBlankSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonBlankCalc, SAL_N_ELEMENTS( mso_sptActionButtonBlankCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonBlankTextRect, SAL_N_ELEMENTS( mso_sptActionButtonBlankTextRect ), + const_cast(mso_sptActionButtonBlankVert), SAL_N_ELEMENTS( mso_sptActionButtonBlankVert ), + const_cast(mso_sptActionButtonBlankSegm), sizeof( mso_sptActionButtonBlankSegm ) >> 1, + const_cast(mso_sptActionButtonBlankCalc), SAL_N_ELEMENTS( mso_sptActionButtonBlankCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonBlankTextRect), SAL_N_ELEMENTS( mso_sptActionButtonBlankTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffTextRectangles mso_sptActionButtonTextRect[] = @@ -2396,15 +2396,15 @@ static const SvxMSDffCalculationData mso_sptActionButtonHomeCalc[] = // adj v }; static const mso_CustomShape msoActionButtonHome = { - (SvxMSDffVertPair*)mso_sptActionButtonHomeVert, SAL_N_ELEMENTS( mso_sptActionButtonHomeVert ), - (sal_uInt16*)mso_sptActionButtonHomeSegm, sizeof( mso_sptActionButtonHomeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonHomeCalc, SAL_N_ELEMENTS( mso_sptActionButtonHomeCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonHomeVert), SAL_N_ELEMENTS( mso_sptActionButtonHomeVert ), + const_cast(mso_sptActionButtonHomeSegm), sizeof( mso_sptActionButtonHomeSegm ) >> 1, + const_cast(mso_sptActionButtonHomeCalc), SAL_N_ELEMENTS( mso_sptActionButtonHomeCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonHelpVert[] = @@ -2506,15 +2506,15 @@ static const SvxMSDffCalculationData mso_sptActionButtonHelpCalc[] = // adj v }; static const mso_CustomShape msoActionButtonHelp = { - (SvxMSDffVertPair*)mso_sptActionButtonHelpVert, SAL_N_ELEMENTS( mso_sptActionButtonHelpVert ), - (sal_uInt16*)mso_sptActionButtonHelpSegm, sizeof( mso_sptActionButtonHelpSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonHelpCalc, SAL_N_ELEMENTS( mso_sptActionButtonHelpCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonHelpVert), SAL_N_ELEMENTS( mso_sptActionButtonHelpVert ), + const_cast(mso_sptActionButtonHelpSegm), sizeof( mso_sptActionButtonHelpSegm ) >> 1, + const_cast(mso_sptActionButtonHelpCalc), SAL_N_ELEMENTS( mso_sptActionButtonHelpCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonInformationVert[] = @@ -2594,15 +2594,15 @@ static const SvxMSDffCalculationData mso_sptActionButtonInformationCalc[] = // a }; static const mso_CustomShape msoActionButtonInformation = { - (SvxMSDffVertPair*)mso_sptActionButtonInformationVert, SAL_N_ELEMENTS( mso_sptActionButtonInformationVert ), - (sal_uInt16*)mso_sptActionButtonInformationSegm, sizeof( mso_sptActionButtonInformationSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonInformationCalc, SAL_N_ELEMENTS( mso_sptActionButtonInformationCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonInformationVert), SAL_N_ELEMENTS( mso_sptActionButtonInformationVert ), + const_cast(mso_sptActionButtonInformationSegm), sizeof( mso_sptActionButtonInformationSegm ) >> 1, + const_cast(mso_sptActionButtonInformationCalc), SAL_N_ELEMENTS( mso_sptActionButtonInformationCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonBackPreviousVert[] = @@ -2647,15 +2647,15 @@ static const SvxMSDffCalculationData mso_sptActionButtonForwardBackCalc[] = // a }; static const mso_CustomShape msoActionButtonBackPrevious = { - (SvxMSDffVertPair*)mso_sptActionButtonBackPreviousVert, SAL_N_ELEMENTS( mso_sptActionButtonBackPreviousVert ), - (sal_uInt16*)mso_sptActionButtonForwardBackSegm, sizeof( mso_sptActionButtonForwardBackSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonForwardBackCalc, SAL_N_ELEMENTS( mso_sptActionButtonForwardBackCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonBackPreviousVert), SAL_N_ELEMENTS( mso_sptActionButtonBackPreviousVert ), + const_cast(mso_sptActionButtonForwardBackSegm), sizeof( mso_sptActionButtonForwardBackSegm ) >> 1, + const_cast(mso_sptActionButtonForwardBackCalc), SAL_N_ELEMENTS( mso_sptActionButtonForwardBackCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonForwardNextVert[] = @@ -2670,15 +2670,15 @@ static const SvxMSDffVertPair mso_sptActionButtonForwardNextVert[] = }; static const mso_CustomShape msoActionButtonForwardNext = { - (SvxMSDffVertPair*)mso_sptActionButtonForwardNextVert, SAL_N_ELEMENTS( mso_sptActionButtonForwardNextVert ), - (sal_uInt16*)mso_sptActionButtonForwardBackSegm, sizeof( mso_sptActionButtonForwardBackSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonForwardBackCalc, SAL_N_ELEMENTS( mso_sptActionButtonForwardBackCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonForwardNextVert), SAL_N_ELEMENTS( mso_sptActionButtonForwardNextVert ), + const_cast(mso_sptActionButtonForwardBackSegm), sizeof( mso_sptActionButtonForwardBackSegm ) >> 1, + const_cast(mso_sptActionButtonForwardBackCalc), SAL_N_ELEMENTS( mso_sptActionButtonForwardBackCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonBeginningVert[] = @@ -2737,15 +2737,15 @@ static const SvxMSDffCalculationData mso_sptActionButtonBeginningEndCalc[] = }; static const mso_CustomShape msoActionButtonBeginning = { - (SvxMSDffVertPair*)mso_sptActionButtonBeginningVert, SAL_N_ELEMENTS( mso_sptActionButtonBeginningVert ), - (sal_uInt16*)mso_sptActionButtonBeginningEndSegm, sizeof( mso_sptActionButtonBeginningEndSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonBeginningEndCalc, SAL_N_ELEMENTS( mso_sptActionButtonBeginningEndCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonBeginningVert), SAL_N_ELEMENTS( mso_sptActionButtonBeginningVert ), + const_cast(mso_sptActionButtonBeginningEndSegm), sizeof( mso_sptActionButtonBeginningEndSegm ) >> 1, + const_cast(mso_sptActionButtonBeginningEndCalc), SAL_N_ELEMENTS( mso_sptActionButtonBeginningEndCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonEndVert[] = @@ -2762,15 +2762,15 @@ static const SvxMSDffVertPair mso_sptActionButtonEndVert[] = }; static const mso_CustomShape msoActionButtonEnd = { - (SvxMSDffVertPair*)mso_sptActionButtonEndVert, SAL_N_ELEMENTS( mso_sptActionButtonEndVert ), - (sal_uInt16*)mso_sptActionButtonBeginningEndSegm, sizeof( mso_sptActionButtonBeginningEndSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonBeginningEndCalc, SAL_N_ELEMENTS( mso_sptActionButtonBeginningEndCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonEndVert), SAL_N_ELEMENTS( mso_sptActionButtonEndVert ), + const_cast(mso_sptActionButtonBeginningEndSegm), sizeof( mso_sptActionButtonBeginningEndSegm ) >> 1, + const_cast(mso_sptActionButtonBeginningEndCalc), SAL_N_ELEMENTS( mso_sptActionButtonBeginningEndCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonReturnVert[] = @@ -2851,15 +2851,15 @@ static const SvxMSDffCalculationData mso_sptActionButtonReturnCalc[] = // adj v }; static const mso_CustomShape msoActionButtonReturn = { - (SvxMSDffVertPair*)mso_sptActionButtonReturnVert, SAL_N_ELEMENTS( mso_sptActionButtonReturnVert ), - (sal_uInt16*)mso_sptActionButtonReturnSegm, sizeof( mso_sptActionButtonReturnSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonReturnCalc, SAL_N_ELEMENTS( mso_sptActionButtonReturnCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonReturnVert), SAL_N_ELEMENTS( mso_sptActionButtonReturnVert ), + const_cast(mso_sptActionButtonReturnSegm), sizeof( mso_sptActionButtonReturnSegm ) >> 1, + const_cast(mso_sptActionButtonReturnCalc), SAL_N_ELEMENTS( mso_sptActionButtonReturnCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonDocumentVert[] = @@ -2911,15 +2911,15 @@ static const SvxMSDffCalculationData mso_sptActionButtonDocumentCalc[] = // a }; static const mso_CustomShape msoActionButtonDocument = { - (SvxMSDffVertPair*)mso_sptActionButtonDocumentVert, SAL_N_ELEMENTS( mso_sptActionButtonDocumentVert ), - (sal_uInt16*)mso_sptActionButtonDocumentSegm, sizeof( mso_sptActionButtonDocumentSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonDocumentCalc, SAL_N_ELEMENTS( mso_sptActionButtonDocumentCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonDocumentVert), SAL_N_ELEMENTS( mso_sptActionButtonDocumentVert ), + const_cast(mso_sptActionButtonDocumentSegm), sizeof( mso_sptActionButtonDocumentSegm ) >> 1, + const_cast(mso_sptActionButtonDocumentCalc), SAL_N_ELEMENTS( mso_sptActionButtonDocumentCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonSoundVert[] = @@ -2987,15 +2987,15 @@ static const SvxMSDffCalculationData mso_sptActionButtonSoundCalc[] = // adj v }; static const mso_CustomShape msoActionButtonSound = { - (SvxMSDffVertPair*)mso_sptActionButtonSoundVert, SAL_N_ELEMENTS( mso_sptActionButtonSoundVert ), - (sal_uInt16*)mso_sptActionButtonSoundSegm, sizeof( mso_sptActionButtonSoundSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonSoundCalc, SAL_N_ELEMENTS( mso_sptActionButtonSoundCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonSoundVert), SAL_N_ELEMENTS( mso_sptActionButtonSoundVert ), + const_cast(mso_sptActionButtonSoundSegm), sizeof( mso_sptActionButtonSoundSegm ) >> 1, + const_cast(mso_sptActionButtonSoundCalc), SAL_N_ELEMENTS( mso_sptActionButtonSoundCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptActionButtonMovieVert[] = @@ -3072,15 +3072,15 @@ static const SvxMSDffCalculationData mso_sptActionButtonMovieCalc[] = // adj v }; static const mso_CustomShape msoActionButtonMovie = { - (SvxMSDffVertPair*)mso_sptActionButtonMovieVert, SAL_N_ELEMENTS( mso_sptActionButtonMovieVert ), - (sal_uInt16*)mso_sptActionButtonMovieSegm, sizeof( mso_sptActionButtonMovieSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptActionButtonMovieCalc, SAL_N_ELEMENTS( mso_sptActionButtonMovieCalc ), - (sal_Int32*)mso_sptDefault1400, - (SvxMSDffTextRectangles*)mso_sptActionButtonTextRect, SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), + const_cast(mso_sptActionButtonMovieVert), SAL_N_ELEMENTS( mso_sptActionButtonMovieVert ), + const_cast(mso_sptActionButtonMovieSegm), sizeof( mso_sptActionButtonMovieSegm ) >> 1, + const_cast(mso_sptActionButtonMovieCalc), SAL_N_ELEMENTS( mso_sptActionButtonMovieCalc ), + const_cast(mso_sptDefault1400), + const_cast(mso_sptActionButtonTextRect), SAL_N_ELEMENTS( mso_sptActionButtonTextRect ), 21600, 21600, 10800, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptButtonHandle, SAL_N_ELEMENTS( mso_sptButtonHandle ) + const_cast(mso_sptButtonHandle), SAL_N_ELEMENTS( mso_sptButtonHandle ) }; static const SvxMSDffVertPair mso_sptSmileyFaceVert[] = // adj value 15510 - 17520 @@ -3115,15 +3115,15 @@ static const SvxMSDffHandle mso_sptSmileyHandle[] = }; static const mso_CustomShape msoSmileyFace = { - (SvxMSDffVertPair*)mso_sptSmileyFaceVert, SAL_N_ELEMENTS( mso_sptSmileyFaceVert ), - (sal_uInt16*)mso_sptSmileyFaceSegm, sizeof( mso_sptSmileyFaceSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptSmileyFaceCalc, SAL_N_ELEMENTS( mso_sptSmileyFaceCalc ), - (sal_Int32*)mso_sptSmileyFaceDefault, - (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, SAL_N_ELEMENTS( mso_sptEllipseTextRect ), + const_cast(mso_sptSmileyFaceVert), SAL_N_ELEMENTS( mso_sptSmileyFaceVert ), + const_cast(mso_sptSmileyFaceSegm), sizeof( mso_sptSmileyFaceSegm ) >> 1, + const_cast(mso_sptSmileyFaceCalc), SAL_N_ELEMENTS( mso_sptSmileyFaceCalc ), + const_cast(mso_sptSmileyFaceDefault), + const_cast(mso_sptEllipseTextRect), SAL_N_ELEMENTS( mso_sptEllipseTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptEllipseGluePoints, SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), - (SvxMSDffHandle*)mso_sptSmileyHandle, SAL_N_ELEMENTS( mso_sptSmileyHandle ) // handles + const_cast(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), + const_cast(mso_sptSmileyHandle), SAL_N_ELEMENTS( mso_sptSmileyHandle ) // handles }; static const SvxMSDffVertPair mso_sptDonutVert[] = // adj value 0 - 10800 @@ -3147,15 +3147,15 @@ static const SvxMSDffHandle mso_sptDonutHandle[] = }; static const mso_CustomShape msoDonut = { - (SvxMSDffVertPair*)mso_sptDonutVert, SAL_N_ELEMENTS( mso_sptDonutVert ), - (sal_uInt16*)mso_sptDonutSegm, sizeof( mso_sptDonutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptDonutCalc, SAL_N_ELEMENTS( mso_sptDonutCalc ), - (sal_Int32*)mso_sptDefault5400, - (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, SAL_N_ELEMENTS( mso_sptEllipseTextRect ), + const_cast(mso_sptDonutVert), SAL_N_ELEMENTS( mso_sptDonutVert ), + const_cast(mso_sptDonutSegm), sizeof( mso_sptDonutSegm ) >> 1, + const_cast(mso_sptDonutCalc), SAL_N_ELEMENTS( mso_sptDonutCalc ), + const_cast(mso_sptDefault5400), + const_cast(mso_sptEllipseTextRect), SAL_N_ELEMENTS( mso_sptEllipseTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptEllipseGluePoints, SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), - (SvxMSDffHandle*)mso_sptDonutHandle, SAL_N_ELEMENTS( mso_sptDonutHandle ) // handles + const_cast(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), + const_cast(mso_sptDonutHandle), SAL_N_ELEMENTS( mso_sptDonutHandle ) // handles }; static const SvxMSDffVertPair mso_sptNoSmokingVert[] = // adj value 0 - 7200 @@ -3196,15 +3196,15 @@ static const SvxMSDffHandle mso_sptNoSmokingHandle[] = }; static const mso_CustomShape msoNoSmoking = { - (SvxMSDffVertPair*)mso_sptNoSmokingVert, SAL_N_ELEMENTS( mso_sptNoSmokingVert ), - (sal_uInt16*)mso_sptNoSmokingSegm, sizeof( mso_sptNoSmokingSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptNoSmokingCalc, SAL_N_ELEMENTS( mso_sptNoSmokingCalc ), - (sal_Int32*)mso_sptDefault2700, - (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, SAL_N_ELEMENTS( mso_sptEllipseTextRect ), + const_cast(mso_sptNoSmokingVert), SAL_N_ELEMENTS( mso_sptNoSmokingVert ), + const_cast(mso_sptNoSmokingSegm), sizeof( mso_sptNoSmokingSegm ) >> 1, + const_cast(mso_sptNoSmokingCalc), SAL_N_ELEMENTS( mso_sptNoSmokingCalc ), + const_cast(mso_sptDefault2700), + const_cast(mso_sptEllipseTextRect), SAL_N_ELEMENTS( mso_sptEllipseTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptEllipseGluePoints, SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), - (SvxMSDffHandle*)mso_sptNoSmokingHandle, SAL_N_ELEMENTS( mso_sptNoSmokingHandle ) // handles + const_cast(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), + const_cast(mso_sptNoSmokingHandle), SAL_N_ELEMENTS( mso_sptNoSmokingHandle ) // handles }; static const SvxMSDffVertPair mso_sptBlockArcVert[] = // adj value 0 (degrees) @@ -3239,15 +3239,15 @@ static const SvxMSDffHandle mso_sptBlockArcHandle[] = }; static const mso_CustomShape msoBlockArc = { - (SvxMSDffVertPair*)mso_sptBlockArcVert, SAL_N_ELEMENTS( mso_sptBlockArcVert ), - (sal_uInt16*)mso_sptBlockArcSegm, sizeof( mso_sptBlockArcSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBlockArcCalc, SAL_N_ELEMENTS( mso_sptBlockArcCalc ), - (sal_Int32*)mso_sptBlockArcDefault, + const_cast(mso_sptBlockArcVert), SAL_N_ELEMENTS( mso_sptBlockArcVert ), + const_cast(mso_sptBlockArcSegm), sizeof( mso_sptBlockArcSegm ) >> 1, + const_cast(mso_sptBlockArcCalc), SAL_N_ELEMENTS( mso_sptBlockArcCalc ), + const_cast(mso_sptBlockArcDefault), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptBlockArcHandle, SAL_N_ELEMENTS( mso_sptBlockArcHandle ) // handles + const_cast(mso_sptBlockArcHandle), SAL_N_ELEMENTS( mso_sptBlockArcHandle ) // handles }; // aware : control points are always part of the bounding box @@ -3303,14 +3303,14 @@ static const SvxMSDffVertPair mso_sptHeartGluePoints[] = }; static const mso_CustomShape msoHeart = { - (SvxMSDffVertPair*)mso_sptHeartVert, SAL_N_ELEMENTS( mso_sptHeartVert ), - (sal_uInt16*)mso_sptHeartSegm, sizeof( mso_sptHeartSegm ) >> 1, + const_cast(mso_sptHeartVert), SAL_N_ELEMENTS( mso_sptHeartVert ), + const_cast(mso_sptHeartSegm), sizeof( mso_sptHeartSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptHeartTextRect, SAL_N_ELEMENTS( mso_sptHeartTextRect ), + const_cast(mso_sptHeartTextRect), SAL_N_ELEMENTS( mso_sptHeartTextRect ), 21615, 21602, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptHeartGluePoints, SAL_N_ELEMENTS( mso_sptHeartGluePoints ), + const_cast(mso_sptHeartGluePoints), SAL_N_ELEMENTS( mso_sptHeartGluePoints ), NULL, 0 // handles }; @@ -3331,14 +3331,14 @@ static const SvxMSDffVertPair mso_sptLightningBoldGluePoints[] = }; static const mso_CustomShape msoLightningBold = { - (SvxMSDffVertPair*)mso_sptLightningBoldVert, SAL_N_ELEMENTS( mso_sptLightningBoldVert ), + const_cast(mso_sptLightningBoldVert), SAL_N_ELEMENTS( mso_sptLightningBoldVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptLightningBoldTextRect, SAL_N_ELEMENTS( mso_sptLightningBoldTextRect ), + const_cast(mso_sptLightningBoldTextRect), SAL_N_ELEMENTS( mso_sptLightningBoldTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptLightningBoldGluePoints, SAL_N_ELEMENTS( mso_sptLightningBoldGluePoints ), + const_cast(mso_sptLightningBoldGluePoints), SAL_N_ELEMENTS( mso_sptLightningBoldGluePoints ), NULL, 0 // handles }; @@ -3435,15 +3435,15 @@ static const SvxMSDffHandle mso_sptSunHandle[] = }; static const mso_CustomShape msoSun = { - (SvxMSDffVertPair*)mso_sptSunVert, SAL_N_ELEMENTS( mso_sptSunVert ), - (sal_uInt16*)mso_sptSunSegm, sizeof( mso_sptSunSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptSunCalc, SAL_N_ELEMENTS( mso_sptSunCalc ), - (sal_Int32*)mso_sptDefault5400, - (SvxMSDffTextRectangles*)mso_sptSunTextRect, SAL_N_ELEMENTS( mso_sptSunTextRect ), + const_cast(mso_sptSunVert), SAL_N_ELEMENTS( mso_sptSunVert ), + const_cast(mso_sptSunSegm), sizeof( mso_sptSunSegm ) >> 1, + const_cast(mso_sptSunCalc), SAL_N_ELEMENTS( mso_sptSunCalc ), + const_cast(mso_sptDefault5400), + const_cast(mso_sptSunTextRect), SAL_N_ELEMENTS( mso_sptSunTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - (SvxMSDffHandle*)mso_sptSunHandle, SAL_N_ELEMENTS( mso_sptSunHandle ) // handles + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptSunHandle), SAL_N_ELEMENTS( mso_sptSunHandle ) // handles }; static const SvxMSDffVertPair mso_sptMoonVert[] = // adj value 0 -> 18900 @@ -3487,15 +3487,15 @@ static const SvxMSDffHandle mso_sptMoonHandle[] = }; static const mso_CustomShape msoMoon = { - (SvxMSDffVertPair*)mso_sptMoonVert, SAL_N_ELEMENTS( mso_sptMoonVert ), - (sal_uInt16*)mso_sptMoonSegm, sizeof( mso_sptMoonSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptMoonCalc, SAL_N_ELEMENTS( mso_sptMoonCalc ), - (sal_Int32*)mso_sptDefault10800, - (SvxMSDffTextRectangles*)mso_sptMoonTextRect, SAL_N_ELEMENTS( mso_sptMoonTextRect ), + const_cast(mso_sptMoonVert), SAL_N_ELEMENTS( mso_sptMoonVert ), + const_cast(mso_sptMoonSegm), sizeof( mso_sptMoonSegm ) >> 1, + const_cast(mso_sptMoonCalc), SAL_N_ELEMENTS( mso_sptMoonCalc ), + const_cast(mso_sptDefault10800), + const_cast(mso_sptMoonTextRect), SAL_N_ELEMENTS( mso_sptMoonTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptMoonGluePoints, SAL_N_ELEMENTS( mso_sptMoonGluePoints ), - (SvxMSDffHandle*)mso_sptMoonHandle, SAL_N_ELEMENTS( mso_sptMoonHandle ) // handles + const_cast(mso_sptMoonGluePoints), SAL_N_ELEMENTS( mso_sptMoonGluePoints ), + const_cast(mso_sptMoonHandle), SAL_N_ELEMENTS( mso_sptMoonHandle ) // handles }; static const SvxMSDffVertPair mso_sptBracketPairVert[] = // adj value 0 -> 10800 @@ -3546,15 +3546,15 @@ static const SvxMSDffHandle mso_sptBracketPairHandle[] = }; static const mso_CustomShape msoBracketPair = { - (SvxMSDffVertPair*)mso_sptBracketPairVert, SAL_N_ELEMENTS( mso_sptBracketPairVert ), - (sal_uInt16*)mso_sptBracketPairSegm, sizeof( mso_sptBracketPairSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBracketPairCalc, SAL_N_ELEMENTS( mso_sptBracketPairCalc ), - (sal_Int32*)mso_sptDefault3700, - (SvxMSDffTextRectangles*)mso_sptBracketPairTextRect, SAL_N_ELEMENTS( mso_sptBracketPairTextRect ), + const_cast(mso_sptBracketPairVert), SAL_N_ELEMENTS( mso_sptBracketPairVert ), + const_cast(mso_sptBracketPairSegm), sizeof( mso_sptBracketPairSegm ) >> 1, + const_cast(mso_sptBracketPairCalc), SAL_N_ELEMENTS( mso_sptBracketPairCalc ), + const_cast(mso_sptDefault3700), + const_cast(mso_sptBracketPairTextRect), SAL_N_ELEMENTS( mso_sptBracketPairTextRect ), 21600, 21600, 10800, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - (SvxMSDffHandle*)mso_sptBracketPairHandle, SAL_N_ELEMENTS( mso_sptBracketPairHandle ) // handles + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptBracketPairHandle), SAL_N_ELEMENTS( mso_sptBracketPairHandle ) // handles }; static const sal_uInt16 mso_sptPlaqueSegm[] = @@ -3572,15 +3572,15 @@ static const SvxMSDffHandle mso_sptPlaqueHandle[] = }; static const mso_CustomShape msoPlaque = { - (SvxMSDffVertPair*)mso_sptBracketPairVert, SAL_N_ELEMENTS( mso_sptBracketPairVert ), - (sal_uInt16*)mso_sptPlaqueSegm, sizeof( mso_sptPlaqueSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBracketPairCalc, SAL_N_ELEMENTS( mso_sptBracketPairCalc ), - (sal_Int32*)mso_sptDefault3600, - (SvxMSDffTextRectangles*)mso_sptPlaqueTextRect, SAL_N_ELEMENTS( mso_sptPlaqueTextRect ), + const_cast(mso_sptBracketPairVert), SAL_N_ELEMENTS( mso_sptBracketPairVert ), + const_cast(mso_sptPlaqueSegm), sizeof( mso_sptPlaqueSegm ) >> 1, + const_cast(mso_sptBracketPairCalc), SAL_N_ELEMENTS( mso_sptBracketPairCalc ), + const_cast(mso_sptDefault3600), + const_cast(mso_sptPlaqueTextRect), SAL_N_ELEMENTS( mso_sptPlaqueTextRect ), 21600, 21600, 10800, 10800, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - (SvxMSDffHandle*)mso_sptPlaqueHandle, SAL_N_ELEMENTS( mso_sptPlaqueHandle ) // handles + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptPlaqueHandle), SAL_N_ELEMENTS( mso_sptPlaqueHandle ) // handles }; static const SvxMSDffVertPair mso_sptBracePairVert[] = // adj value 0 -> 5400 @@ -3630,15 +3630,15 @@ static const SvxMSDffHandle mso_sptBracePairHandle[] = }; static const mso_CustomShape msoBracePair = { - (SvxMSDffVertPair*)mso_sptBracePairVert, SAL_N_ELEMENTS( mso_sptBracePairVert ), - (sal_uInt16*)mso_sptBracePairSegm, sizeof( mso_sptBracePairSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBracePairCalc, SAL_N_ELEMENTS( mso_sptBracePairCalc ), - (sal_Int32*)mso_sptDefault1800, - (SvxMSDffTextRectangles*)mso_sptBracePairTextRect, SAL_N_ELEMENTS( mso_sptBracePairTextRect ), + const_cast(mso_sptBracePairVert), SAL_N_ELEMENTS( mso_sptBracePairVert ), + const_cast(mso_sptBracePairSegm), sizeof( mso_sptBracePairSegm ) >> 1, + const_cast(mso_sptBracePairCalc), SAL_N_ELEMENTS( mso_sptBracePairCalc ), + const_cast(mso_sptDefault1800), + const_cast(mso_sptBracePairTextRect), SAL_N_ELEMENTS( mso_sptBracePairTextRect ), 21600, 21600, 10800, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), - (SvxMSDffHandle*)mso_sptBracePairHandle, SAL_N_ELEMENTS( mso_sptBracePairHandle ) // handles + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptBracePairHandle), SAL_N_ELEMENTS( mso_sptBracePairHandle ) // handles }; static const SvxMSDffCalculationData mso_sptBracketCalc[] = @@ -3673,15 +3673,15 @@ static const SvxMSDffHandle mso_sptLeftBracketHandle[] = }; static const mso_CustomShape msoLeftBracket = { - (SvxMSDffVertPair*)mso_sptLeftBracketVert, SAL_N_ELEMENTS( mso_sptLeftBracketVert ), - (sal_uInt16*)mso_sptBracketSegm, sizeof( mso_sptBracketSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBracketCalc, SAL_N_ELEMENTS( mso_sptBracketCalc ), - (sal_Int32*)mso_sptDefault1800, - (SvxMSDffTextRectangles*)mso_sptLeftBracketTextRect, SAL_N_ELEMENTS( mso_sptLeftBracketTextRect ), + const_cast(mso_sptLeftBracketVert), SAL_N_ELEMENTS( mso_sptLeftBracketVert ), + const_cast(mso_sptBracketSegm), sizeof( mso_sptBracketSegm ) >> 1, + const_cast(mso_sptBracketCalc), SAL_N_ELEMENTS( mso_sptBracketCalc ), + const_cast(mso_sptDefault1800), + const_cast(mso_sptLeftBracketTextRect), SAL_N_ELEMENTS( mso_sptLeftBracketTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptLeftBracketGluePoints, SAL_N_ELEMENTS( mso_sptLeftBracketGluePoints ), - (SvxMSDffHandle*)mso_sptLeftBracketHandle, SAL_N_ELEMENTS( mso_sptLeftBracketHandle ) // handles + const_cast(mso_sptLeftBracketGluePoints), SAL_N_ELEMENTS( mso_sptLeftBracketGluePoints ), + const_cast(mso_sptLeftBracketHandle), SAL_N_ELEMENTS( mso_sptLeftBracketHandle ) // handles }; static const SvxMSDffVertPair mso_sptRightBracketVert[] = // adj value 0 -> 10800 { @@ -3703,15 +3703,15 @@ static const SvxMSDffHandle mso_sptRightBracketHandle[] = }; static const mso_CustomShape msoRightBracket = { - (SvxMSDffVertPair*)mso_sptRightBracketVert, SAL_N_ELEMENTS( mso_sptRightBracketVert ), - (sal_uInt16*)mso_sptBracketSegm, sizeof( mso_sptBracketSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBracketCalc, SAL_N_ELEMENTS( mso_sptBracketCalc ), - (sal_Int32*)mso_sptDefault1800, - (SvxMSDffTextRectangles*)mso_sptRightBracketTextRect, SAL_N_ELEMENTS( mso_sptRightBracketTextRect ), + const_cast(mso_sptRightBracketVert), SAL_N_ELEMENTS( mso_sptRightBracketVert ), + const_cast(mso_sptBracketSegm), sizeof( mso_sptBracketSegm ) >> 1, + const_cast(mso_sptBracketCalc), SAL_N_ELEMENTS( mso_sptBracketCalc ), + const_cast(mso_sptDefault1800), + const_cast(mso_sptRightBracketTextRect), SAL_N_ELEMENTS( mso_sptRightBracketTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptRightBracketGluePoints, SAL_N_ELEMENTS( mso_sptRightBracketGluePoints ), - (SvxMSDffHandle*)mso_sptRightBracketHandle, SAL_N_ELEMENTS( mso_sptRightBracketHandle ) // handles + const_cast(mso_sptRightBracketGluePoints), SAL_N_ELEMENTS( mso_sptRightBracketGluePoints ), + const_cast(mso_sptRightBracketHandle), SAL_N_ELEMENTS( mso_sptRightBracketHandle ) // handles }; static const SvxMSDffCalculationData mso_sptBraceCalc[] = @@ -3759,15 +3759,15 @@ static const SvxMSDffHandle mso_sptLeftBraceHandle[] = }; static const mso_CustomShape msoLeftBrace = // adj value0 0 -> 5400 { // adj value1 0 -> 21600 - (SvxMSDffVertPair*)mso_sptLeftBraceVert, SAL_N_ELEMENTS( mso_sptLeftBraceVert ), - (sal_uInt16*)mso_sptBraceSegm, sizeof( mso_sptBraceSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBraceCalc, SAL_N_ELEMENTS( mso_sptBraceCalc ), - (sal_Int32*)mso_sptBraceDefault, - (SvxMSDffTextRectangles*)mso_sptLeftBraceTextRect, SAL_N_ELEMENTS( mso_sptLeftBraceTextRect ), + const_cast(mso_sptLeftBraceVert), SAL_N_ELEMENTS( mso_sptLeftBraceVert ), + const_cast(mso_sptBraceSegm), sizeof( mso_sptBraceSegm ) >> 1, + const_cast(mso_sptBraceCalc), SAL_N_ELEMENTS( mso_sptBraceCalc ), + const_cast(mso_sptBraceDefault), + const_cast(mso_sptLeftBraceTextRect), SAL_N_ELEMENTS( mso_sptLeftBraceTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptLeftBracketGluePoints, SAL_N_ELEMENTS( mso_sptLeftBracketGluePoints ), - (SvxMSDffHandle*)mso_sptLeftBraceHandle, SAL_N_ELEMENTS( mso_sptLeftBraceHandle ) // handles + const_cast(mso_sptLeftBracketGluePoints), SAL_N_ELEMENTS( mso_sptLeftBracketGluePoints ), + const_cast(mso_sptLeftBraceHandle), SAL_N_ELEMENTS( mso_sptLeftBraceHandle ) // handles }; static const SvxMSDffVertPair mso_sptRightBraceVert[] = { @@ -3792,15 +3792,15 @@ static const SvxMSDffHandle mso_sptRightBraceHandle[] = }; static const mso_CustomShape msoRightBrace = // adj value0 0 -> 5400 { // adj value1 0 -> 21600 - (SvxMSDffVertPair*)mso_sptRightBraceVert, SAL_N_ELEMENTS( mso_sptRightBraceVert ), - (sal_uInt16*)mso_sptBraceSegm, sizeof( mso_sptBraceSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBraceCalc, SAL_N_ELEMENTS( mso_sptBraceCalc ), - (sal_Int32*)mso_sptBraceDefault, - (SvxMSDffTextRectangles*)mso_sptRightBraceTextRect, SAL_N_ELEMENTS( mso_sptRightBraceTextRect ), + const_cast(mso_sptRightBraceVert), SAL_N_ELEMENTS( mso_sptRightBraceVert ), + const_cast(mso_sptBraceSegm), sizeof( mso_sptBraceSegm ) >> 1, + const_cast(mso_sptBraceCalc), SAL_N_ELEMENTS( mso_sptBraceCalc ), + const_cast(mso_sptBraceDefault), + const_cast(mso_sptRightBraceTextRect), SAL_N_ELEMENTS( mso_sptRightBraceTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptRightBracketGluePoints, SAL_N_ELEMENTS( mso_sptRightBracketGluePoints ), - (SvxMSDffHandle*)mso_sptRightBraceHandle, SAL_N_ELEMENTS( mso_sptRightBraceHandle ) // handles + const_cast(mso_sptRightBracketGluePoints), SAL_N_ELEMENTS( mso_sptRightBracketGluePoints ), + const_cast(mso_sptRightBraceHandle), SAL_N_ELEMENTS( mso_sptRightBraceHandle ) // handles }; static const SvxMSDffVertPair mso_sptIrregularSeal1Vert[] = @@ -3822,14 +3822,14 @@ static const SvxMSDffVertPair mso_sptIrregularSeal1GluePoints[] = }; static const mso_CustomShape msoIrregularSeal1 = { - (SvxMSDffVertPair*)mso_sptIrregularSeal1Vert, SAL_N_ELEMENTS( mso_sptIrregularSeal1Vert ), + const_cast(mso_sptIrregularSeal1Vert), SAL_N_ELEMENTS( mso_sptIrregularSeal1Vert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptIrregularSeal1TextRect, SAL_N_ELEMENTS( mso_sptIrregularSeal1TextRect ), + const_cast(mso_sptIrregularSeal1TextRect), SAL_N_ELEMENTS( mso_sptIrregularSeal1TextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptIrregularSeal1GluePoints, SAL_N_ELEMENTS( mso_sptIrregularSeal1GluePoints ), + const_cast(mso_sptIrregularSeal1GluePoints), SAL_N_ELEMENTS( mso_sptIrregularSeal1GluePoints ), NULL, 0 // handles }; @@ -3854,14 +3854,14 @@ static const SvxMSDffVertPair mso_sptIrregularSeal2GluePoints[] = }; static const mso_CustomShape msoIrregularSeal2 = { - (SvxMSDffVertPair*)mso_sptIrregularSeal2Vert, SAL_N_ELEMENTS( mso_sptIrregularSeal2Vert ), + const_cast(mso_sptIrregularSeal2Vert), SAL_N_ELEMENTS( mso_sptIrregularSeal2Vert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptIrregularSeal2TextRect, SAL_N_ELEMENTS( mso_sptIrregularSeal2TextRect ), + const_cast(mso_sptIrregularSeal2TextRect), SAL_N_ELEMENTS( mso_sptIrregularSeal2TextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptIrregularSeal2GluePoints, SAL_N_ELEMENTS( mso_sptIrregularSeal2GluePoints ), + const_cast(mso_sptIrregularSeal2GluePoints), SAL_N_ELEMENTS( mso_sptIrregularSeal2GluePoints ), NULL, 0 // handles }; @@ -3890,15 +3890,15 @@ static const SvxMSDffHandle mso_sptSealHandle[] = }; static const mso_CustomShape msoSeal4 = { - (SvxMSDffVertPair*)mso_sptSeal4Vert, SAL_N_ELEMENTS( mso_sptSeal4Vert ), + const_cast(mso_sptSeal4Vert), SAL_N_ELEMENTS( mso_sptSeal4Vert ), NULL, 0, - (SvxMSDffCalculationData*)mso_sptSeal4Calc, SAL_N_ELEMENTS( mso_sptSeal4Calc ), - (sal_Int32*)mso_sptDefault8100, - (SvxMSDffTextRectangles*)mso_sptSeal4TextRect, SAL_N_ELEMENTS( mso_sptSeal4TextRect ), + const_cast(mso_sptSeal4Calc), SAL_N_ELEMENTS( mso_sptSeal4Calc ), + const_cast(mso_sptDefault8100), + const_cast(mso_sptSeal4TextRect), SAL_N_ELEMENTS( mso_sptSeal4TextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptSealHandle, SAL_N_ELEMENTS( mso_sptSealHandle ) // handles + const_cast(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) // handles }; static const SvxMSDffVertPair mso_sptStarVert[] = @@ -3913,11 +3913,11 @@ static const SvxMSDffTextRectangles mso_sptStarTextRect[] = }; static const mso_CustomShape msoStar = { - (SvxMSDffVertPair*)mso_sptStarVert, SAL_N_ELEMENTS( mso_sptStarVert ), + const_cast(mso_sptStarVert), SAL_N_ELEMENTS( mso_sptStarVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptStarTextRect, SAL_N_ELEMENTS( mso_sptStarTextRect ), + const_cast(mso_sptStarTextRect), SAL_N_ELEMENTS( mso_sptStarTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, @@ -4042,15 +4042,15 @@ static const SvxMSDffTextRectangles mso_sptSealTextRect[] = }; static const mso_CustomShape msoSeal8 = { - (SvxMSDffVertPair*)mso_sptSeal8Vert, SAL_N_ELEMENTS( mso_sptSeal8Vert ), + const_cast(mso_sptSeal8Vert), SAL_N_ELEMENTS( mso_sptSeal8Vert ), NULL, 0, - (SvxMSDffCalculationData*)mso_sptSeal24Calc, SAL_N_ELEMENTS( mso_sptSeal24Calc ), - (sal_Int32*)mso_sptDefault2500, - (SvxMSDffTextRectangles*)mso_sptSealTextRect, SAL_N_ELEMENTS( mso_sptSealTextRect ), + const_cast(mso_sptSeal24Calc), SAL_N_ELEMENTS( mso_sptSeal24Calc ), + const_cast(mso_sptDefault2500), + const_cast(mso_sptSealTextRect), SAL_N_ELEMENTS( mso_sptSealTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptSealHandle, SAL_N_ELEMENTS( mso_sptSealHandle ) // handles + const_cast(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) // handles }; static const SvxMSDffVertPair mso_sptSeal16Vert[] = // adj value 0 -> 10800 { @@ -4138,15 +4138,15 @@ static const SvxMSDffCalculationData mso_sptSeal16Calc[] = }; static const mso_CustomShape msoSeal16 = { - (SvxMSDffVertPair*)mso_sptSeal16Vert, SAL_N_ELEMENTS( mso_sptSeal16Vert ), + const_cast(mso_sptSeal16Vert), SAL_N_ELEMENTS( mso_sptSeal16Vert ), NULL, 0, - (SvxMSDffCalculationData*)mso_sptSeal16Calc, SAL_N_ELEMENTS( mso_sptSeal16Calc ), - (sal_Int32*)mso_sptDefault2500, - (SvxMSDffTextRectangles*)mso_sptSealTextRect, SAL_N_ELEMENTS( mso_sptSealTextRect ), + const_cast(mso_sptSeal16Calc), SAL_N_ELEMENTS( mso_sptSeal16Calc ), + const_cast(mso_sptDefault2500), + const_cast(mso_sptSealTextRect), SAL_N_ELEMENTS( mso_sptSealTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptSealHandle, SAL_N_ELEMENTS( mso_sptSealHandle ) // handles + const_cast(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) // handles }; static const SvxMSDffVertPair mso_sptSeal24Vert[] = { @@ -4166,15 +4166,15 @@ static const SvxMSDffVertPair mso_sptSeal24Vert[] = }; static const mso_CustomShape msoSeal24 = { - (SvxMSDffVertPair*)mso_sptSeal24Vert, SAL_N_ELEMENTS( mso_sptSeal24Vert ), + const_cast(mso_sptSeal24Vert), SAL_N_ELEMENTS( mso_sptSeal24Vert ), NULL, 0, - (SvxMSDffCalculationData*)mso_sptSeal24Calc, SAL_N_ELEMENTS( mso_sptSeal24Calc ), - (sal_Int32*)mso_sptDefault2500, - (SvxMSDffTextRectangles*)mso_sptSealTextRect, SAL_N_ELEMENTS( mso_sptSealTextRect ), + const_cast(mso_sptSeal24Calc), SAL_N_ELEMENTS( mso_sptSeal24Calc ), + const_cast(mso_sptDefault2500), + const_cast(mso_sptSealTextRect), SAL_N_ELEMENTS( mso_sptSealTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptSealHandle, SAL_N_ELEMENTS( mso_sptSealHandle ) // handles + const_cast(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) // handles }; static const SvxMSDffCalculationData mso_sptSeal32Calc[] = { @@ -4334,15 +4334,15 @@ static const SvxMSDffVertPair mso_sptSeal32Vert[] = }; static const mso_CustomShape msoSeal32 = { - (SvxMSDffVertPair*)mso_sptSeal32Vert, SAL_N_ELEMENTS( mso_sptSeal32Vert ), + const_cast(mso_sptSeal32Vert), SAL_N_ELEMENTS( mso_sptSeal32Vert ), NULL, 0, - (SvxMSDffCalculationData*)mso_sptSeal32Calc, SAL_N_ELEMENTS( mso_sptSeal32Calc ), - (sal_Int32*)mso_sptDefault2500, - (SvxMSDffTextRectangles*)mso_sptSealTextRect, SAL_N_ELEMENTS( mso_sptSealTextRect ), + const_cast(mso_sptSeal32Calc), SAL_N_ELEMENTS( mso_sptSeal32Calc ), + const_cast(mso_sptDefault2500), + const_cast(mso_sptSealTextRect), SAL_N_ELEMENTS( mso_sptSealTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptSealHandle, SAL_N_ELEMENTS( mso_sptSealHandle ) + const_cast(mso_sptSealHandle), SAL_N_ELEMENTS( mso_sptSealHandle ) }; static const SvxMSDffVertPair mso_sptRibbon2Vert[] = // adjustment1 : x 2700 - 8100 def 5400 @@ -4431,15 +4431,15 @@ static const SvxMSDffHandle mso_sptRibbon2Handle[] = }; static const mso_CustomShape msoRibbon2 = { - (SvxMSDffVertPair*)mso_sptRibbon2Vert, SAL_N_ELEMENTS( mso_sptRibbon2Vert ), - (sal_uInt16*)mso_sptRibbon2Segm, sizeof( mso_sptRibbon2Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptRibbon2Calc, SAL_N_ELEMENTS( mso_sptRibbon2Calc ), - (sal_Int32*)mso_sptRibbon2Default, - (SvxMSDffTextRectangles*)mso_sptRibbon2TextRect, SAL_N_ELEMENTS( mso_sptRibbon2TextRect ), + const_cast(mso_sptRibbon2Vert), SAL_N_ELEMENTS( mso_sptRibbon2Vert ), + const_cast(mso_sptRibbon2Segm), sizeof( mso_sptRibbon2Segm ) >> 1, + const_cast(mso_sptRibbon2Calc), SAL_N_ELEMENTS( mso_sptRibbon2Calc ), + const_cast(mso_sptRibbon2Default), + const_cast(mso_sptRibbon2TextRect), SAL_N_ELEMENTS( mso_sptRibbon2TextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptRibbon2Handle, SAL_N_ELEMENTS( mso_sptRibbon2Handle ) + const_cast(mso_sptRibbon2Handle), SAL_N_ELEMENTS( mso_sptRibbon2Handle ) }; static const SvxMSDffVertPair mso_sptRibbonVert[] = @@ -4512,15 +4512,15 @@ static const SvxMSDffHandle mso_sptRibbonHandle[] = }; static const mso_CustomShape msoRibbon = { - (SvxMSDffVertPair*)mso_sptRibbonVert, SAL_N_ELEMENTS( mso_sptRibbonVert ), - (sal_uInt16*)mso_sptRibbonSegm, sizeof( mso_sptRibbonSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptRibbonCalc, SAL_N_ELEMENTS( mso_sptRibbonCalc ), - (sal_Int32*)mso_sptRibbonDefault, - (SvxMSDffTextRectangles*)mso_sptRibbonTextRect, SAL_N_ELEMENTS( mso_sptRibbonTextRect ), + const_cast(mso_sptRibbonVert), SAL_N_ELEMENTS( mso_sptRibbonVert ), + const_cast(mso_sptRibbonSegm), sizeof( mso_sptRibbonSegm ) >> 1, + const_cast(mso_sptRibbonCalc), SAL_N_ELEMENTS( mso_sptRibbonCalc ), + const_cast(mso_sptRibbonDefault), + const_cast(mso_sptRibbonTextRect), SAL_N_ELEMENTS( mso_sptRibbonTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptRibbonGluePoints, SAL_N_ELEMENTS( mso_sptRibbonGluePoints ), - (SvxMSDffHandle*)mso_sptRibbonHandle, SAL_N_ELEMENTS( mso_sptRibbonHandle ) + const_cast(mso_sptRibbonGluePoints), SAL_N_ELEMENTS( mso_sptRibbonGluePoints ), + const_cast(mso_sptRibbonHandle), SAL_N_ELEMENTS( mso_sptRibbonHandle ) }; //msosptEllipseRibbon //svg path = ar@9@38@8@37,0@27@0@26@9@13@8@4@0@25@22@25@9@38@8@37@22@26@3@27l@7@40@3,wa@9@35@8@10@3,0@21@33@9@36@8@1@21@31@20@31@9@35@8@10@20@33,,l@5@40xewr@9@36@8@1@20@31@0@32nfl@20@33ear@9@36@8@1@21@31@22@32nfl@21@33em@0@26nfl@0@32em@22@26nfl@22@32e @@ -4657,15 +4657,15 @@ static const SvxMSDffHandle mso_sptEllipseRibbonHandle[] = static const mso_CustomShape msosptEllipseRibbon = { - (SvxMSDffVertPair*)mso_sptEllipseRibbonVert, sizeof( mso_sptEllipseRibbonVert ) / sizeof( SvxMSDffVertPair ), - (sal_uInt16*)mso_sptEllipseRibbonSegm, sizeof( mso_sptEllipseRibbonSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptEllipseRibbonCalc, sizeof( mso_sptEllipseRibbonCalc ) / sizeof( SvxMSDffCalculationData ), - (sal_Int32*)mso_sptEllipseRibbonDefault, - (SvxMSDffTextRectangles*)mso_sptEllipseRibbonTextRect, sizeof( mso_sptEllipseRibbonTextRect ) / sizeof( SvxMSDffTextRectangles ), + const_cast(mso_sptEllipseRibbonVert), sizeof( mso_sptEllipseRibbonVert ) / sizeof( SvxMSDffVertPair ), + const_cast(mso_sptEllipseRibbonSegm), sizeof( mso_sptEllipseRibbonSegm ) >> 1, + const_cast(mso_sptEllipseRibbonCalc), sizeof( mso_sptEllipseRibbonCalc ) / sizeof( SvxMSDffCalculationData ), + const_cast(mso_sptEllipseRibbonDefault), + const_cast(mso_sptEllipseRibbonTextRect), sizeof( mso_sptEllipseRibbonTextRect ) / sizeof( SvxMSDffTextRectangles ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptEllipseRibbonHandle, sizeof( mso_sptEllipseRibbonHandle ) / sizeof( SvxMSDffHandle ) + const_cast(mso_sptEllipseRibbonHandle), sizeof( mso_sptEllipseRibbonHandle ) / sizeof( SvxMSDffHandle ) }; //msosptEllipseRibbon2 @@ -4797,15 +4797,15 @@ static const SvxMSDffHandle mso_sptEllipseRibbon2Handle[] = static const mso_CustomShape msosptEllipseRibbon2 = { - (SvxMSDffVertPair*)mso_sptEllipseRibbon2Vert, sizeof( mso_sptEllipseRibbon2Vert ) / sizeof( SvxMSDffVertPair ), - (sal_uInt16*)mso_sptEllipseRibbon2Segm, sizeof( mso_sptEllipseRibbon2Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptEllipseRibbon2Calc, sizeof( mso_sptEllipseRibbon2Calc ) / sizeof( SvxMSDffCalculationData ), - (sal_Int32*)mso_sptEllipseRibbon2Default, - (SvxMSDffTextRectangles*)mso_sptEllipseRibbon2TextRect, sizeof( mso_sptEllipseRibbon2TextRect ) / sizeof( SvxMSDffTextRectangles ), + const_cast(mso_sptEllipseRibbon2Vert), sizeof( mso_sptEllipseRibbon2Vert ) / sizeof( SvxMSDffVertPair ), + const_cast(mso_sptEllipseRibbon2Segm), sizeof( mso_sptEllipseRibbon2Segm ) >> 1, + const_cast(mso_sptEllipseRibbon2Calc), sizeof( mso_sptEllipseRibbon2Calc ) / sizeof( SvxMSDffCalculationData ), + const_cast(mso_sptEllipseRibbon2Default), + const_cast(mso_sptEllipseRibbon2TextRect), sizeof( mso_sptEllipseRibbon2TextRect ) / sizeof( SvxMSDffTextRectangles ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptEllipseRibbon2Handle, sizeof( mso_sptEllipseRibbon2Handle ) / sizeof( SvxMSDffHandle ) + const_cast(mso_sptEllipseRibbon2Handle), sizeof( mso_sptEllipseRibbon2Handle ) / sizeof( SvxMSDffHandle ) }; // End static const SvxMSDffVertPair mso_sptVerticalScrollVert[] = // adjustment1 : 0 - 5400 @@ -4863,15 +4863,15 @@ static const SvxMSDffHandle mso_sptVerticalScrollHandle[] = }; static const mso_CustomShape msoVerticalScroll = { - (SvxMSDffVertPair*)mso_sptVerticalScrollVert, SAL_N_ELEMENTS( mso_sptVerticalScrollVert ), - (sal_uInt16*)mso_sptVerticalScrollSegm, sizeof( mso_sptVerticalScrollSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptScrollCalc, SAL_N_ELEMENTS( mso_sptScrollCalc ), - (sal_Int32*)mso_sptDefault2700, - (SvxMSDffTextRectangles*)mso_sptScrollTextRect, SAL_N_ELEMENTS( mso_sptScrollTextRect ), + const_cast(mso_sptVerticalScrollVert), SAL_N_ELEMENTS( mso_sptVerticalScrollVert ), + const_cast(mso_sptVerticalScrollSegm), sizeof( mso_sptVerticalScrollSegm ) >> 1, + const_cast(mso_sptScrollCalc), SAL_N_ELEMENTS( mso_sptScrollCalc ), + const_cast(mso_sptDefault2700), + const_cast(mso_sptScrollTextRect), SAL_N_ELEMENTS( mso_sptScrollTextRect ), 21600, 21600, 11000, 10800, NULL, 0, - (SvxMSDffHandle*)mso_sptVerticalScrollHandle, SAL_N_ELEMENTS( mso_sptVerticalScrollHandle ) + const_cast(mso_sptVerticalScrollHandle), SAL_N_ELEMENTS( mso_sptVerticalScrollHandle ) }; static const SvxMSDffVertPair mso_sptHorizontalScrollVert[] = // adjustment1 : 0 - 5400 { @@ -4909,15 +4909,15 @@ static const SvxMSDffHandle mso_sptHorizontalScrollHandle[] = }; static const mso_CustomShape msoHorizontalScroll = { - (SvxMSDffVertPair*)mso_sptHorizontalScrollVert, SAL_N_ELEMENTS( mso_sptHorizontalScrollVert ), - (sal_uInt16*)mso_sptHorizontalScrollSegm, sizeof( mso_sptHorizontalScrollSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptScrollCalc, SAL_N_ELEMENTS( mso_sptScrollCalc ), - (sal_Int32*)mso_sptDefault2700, - (SvxMSDffTextRectangles*)mso_sptScrollTextRect, SAL_N_ELEMENTS( mso_sptScrollTextRect ), + const_cast(mso_sptHorizontalScrollVert), SAL_N_ELEMENTS( mso_sptHorizontalScrollVert ), + const_cast(mso_sptHorizontalScrollSegm), sizeof( mso_sptHorizontalScrollSegm ) >> 1, + const_cast(mso_sptScrollCalc), SAL_N_ELEMENTS( mso_sptScrollCalc ), + const_cast(mso_sptDefault2700), + const_cast(mso_sptScrollTextRect), SAL_N_ELEMENTS( mso_sptScrollTextRect ), 21600, 21600, 10800, 11000, NULL, 0, - (SvxMSDffHandle*)mso_sptHorizontalScrollHandle, SAL_N_ELEMENTS( mso_sptHorizontalScrollHandle ) + const_cast(mso_sptHorizontalScrollHandle), SAL_N_ELEMENTS( mso_sptHorizontalScrollHandle ) }; static const SvxMSDffVertPair mso_sptFlowChartProcessVert[] = @@ -4926,14 +4926,14 @@ static const SvxMSDffVertPair mso_sptFlowChartProcessVert[] = }; static const mso_CustomShape msoFlowChartProcess = { - (SvxMSDffVertPair*)mso_sptFlowChartProcessVert, SAL_N_ELEMENTS( mso_sptFlowChartProcessVert ), + const_cast(mso_sptFlowChartProcessVert), SAL_N_ELEMENTS( mso_sptFlowChartProcessVert ), NULL, 0, NULL, 0, NULL, NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -4963,14 +4963,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartAlternateProcessTextRect[] = }; static const mso_CustomShape msoFlowChartAlternateProcess = { - (SvxMSDffVertPair*)mso_sptFlowChartAlternateProcessVert, SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessVert ), - (sal_uInt16*)mso_sptFlowChartAlternateProcessSegm, sizeof( mso_sptFlowChartAlternateProcessSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptFlowChartAlternateProcessCalc, SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessCalc ), + const_cast(mso_sptFlowChartAlternateProcessVert), SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessVert ), + const_cast(mso_sptFlowChartAlternateProcessSegm), sizeof( mso_sptFlowChartAlternateProcessSegm ) >> 1, + const_cast(mso_sptFlowChartAlternateProcessCalc), SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessCalc ), NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartAlternateProcessTextRect, SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessTextRect ), + const_cast(mso_sptFlowChartAlternateProcessTextRect), SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -4984,14 +4984,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartDecisionTextRect[] = }; static const mso_CustomShape msoFlowChartDecision = { - (SvxMSDffVertPair*)mso_sptFlowChartDecisionVert, SAL_N_ELEMENTS( mso_sptFlowChartDecisionVert ), + const_cast(mso_sptFlowChartDecisionVert), SAL_N_ELEMENTS( mso_sptFlowChartDecisionVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartDecisionTextRect, SAL_N_ELEMENTS( mso_sptFlowChartDecisionTextRect ), + const_cast(mso_sptFlowChartDecisionTextRect), SAL_N_ELEMENTS( mso_sptFlowChartDecisionTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -5009,14 +5009,14 @@ static const SvxMSDffVertPair mso_sptFlowChartInputOutputGluePoints[] = }; static const mso_CustomShape msoFlowChartInputOutput = { - (SvxMSDffVertPair*)mso_sptFlowChartInputOutputVert, SAL_N_ELEMENTS( mso_sptFlowChartInputOutputVert ), + const_cast(mso_sptFlowChartInputOutputVert), SAL_N_ELEMENTS( mso_sptFlowChartInputOutputVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartInputOutputTextRect, SAL_N_ELEMENTS( mso_sptFlowChartInputOutputTextRect ), + const_cast(mso_sptFlowChartInputOutputTextRect), SAL_N_ELEMENTS( mso_sptFlowChartInputOutputTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartInputOutputGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartInputOutputGluePoints ), + const_cast(mso_sptFlowChartInputOutputGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartInputOutputGluePoints ), NULL, 0 // handles }; @@ -5040,11 +5040,11 @@ static const SvxMSDffTextRectangles mso_sptFlowChartPredefinedProcessTextRect[] }; static const mso_CustomShape msoFlowChartPredefinedProcess = { - (SvxMSDffVertPair*)mso_sptFlowChartPredefinedProcessVert, SAL_N_ELEMENTS( mso_sptFlowChartPredefinedProcessVert ), - (sal_uInt16*)mso_sptFlowChartPredefinedProcessSegm, sizeof( mso_sptFlowChartPredefinedProcessSegm ) >> 1, + const_cast(mso_sptFlowChartPredefinedProcessVert), SAL_N_ELEMENTS( mso_sptFlowChartPredefinedProcessVert ), + const_cast(mso_sptFlowChartPredefinedProcessSegm), sizeof( mso_sptFlowChartPredefinedProcessSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartPredefinedProcessTextRect, SAL_N_ELEMENTS( mso_sptFlowChartPredefinedProcessTextRect ), + const_cast(mso_sptFlowChartPredefinedProcessTextRect), SAL_N_ELEMENTS( mso_sptFlowChartPredefinedProcessTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, @@ -5071,11 +5071,11 @@ static const SvxMSDffTextRectangles mso_sptFlowChartInternalStorageTextRect[] = }; static const mso_CustomShape msoFlowChartInternalStorage = { - (SvxMSDffVertPair*)mso_sptFlowChartInternalStorageVert, SAL_N_ELEMENTS( mso_sptFlowChartInternalStorageVert ), - (sal_uInt16*)mso_sptFlowChartInternalStorageSegm, sizeof( mso_sptFlowChartInternalStorageSegm ) >> 1, + const_cast(mso_sptFlowChartInternalStorageVert), SAL_N_ELEMENTS( mso_sptFlowChartInternalStorageVert ), + const_cast(mso_sptFlowChartInternalStorageSegm), sizeof( mso_sptFlowChartInternalStorageSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartInternalStorageTextRect, SAL_N_ELEMENTS( mso_sptFlowChartInternalStorageTextRect ), + const_cast(mso_sptFlowChartInternalStorageTextRect), SAL_N_ELEMENTS( mso_sptFlowChartInternalStorageTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, @@ -5102,14 +5102,14 @@ static const SvxMSDffVertPair mso_sptFlowChartDocumentGluePoints[] = }; static const mso_CustomShape msoFlowChartDocument = { - (SvxMSDffVertPair*)mso_sptFlowChartDocumentVert, SAL_N_ELEMENTS( mso_sptFlowChartDocumentVert ), - (sal_uInt16*)mso_sptFlowChartDocumentSegm, sizeof( mso_sptFlowChartDocumentSegm ) >> 1, + const_cast(mso_sptFlowChartDocumentVert), SAL_N_ELEMENTS( mso_sptFlowChartDocumentVert ), + const_cast(mso_sptFlowChartDocumentSegm), sizeof( mso_sptFlowChartDocumentSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartDocumentTextRect, SAL_N_ELEMENTS( mso_sptFlowChartDocumentTextRect ), + const_cast(mso_sptFlowChartDocumentTextRect), SAL_N_ELEMENTS( mso_sptFlowChartDocumentTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartDocumentGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartDocumentGluePoints ), + const_cast(mso_sptFlowChartDocumentGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartDocumentGluePoints ), NULL, 0 // handles }; @@ -5141,14 +5141,14 @@ static const SvxMSDffVertPair mso_sptFlowChartMultidocumentGluePoints[] = }; static const mso_CustomShape msoFlowChartMultidocument = { - (SvxMSDffVertPair*)mso_sptFlowChartMultidocumentVert, SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentVert ), - (sal_uInt16*)mso_sptFlowChartMultidocumentSegm, sizeof( mso_sptFlowChartMultidocumentSegm ) >> 1, + const_cast(mso_sptFlowChartMultidocumentVert), SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentVert ), + const_cast(mso_sptFlowChartMultidocumentSegm), sizeof( mso_sptFlowChartMultidocumentSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartMultidocumentTextRect, SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentTextRect ), + const_cast(mso_sptFlowChartMultidocumentTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartMultidocumentGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentGluePoints ), + const_cast(mso_sptFlowChartMultidocumentGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartMultidocumentGluePoints ), NULL, 0 // handles }; @@ -5167,14 +5167,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartTerminatorTextRect[] = }; static const mso_CustomShape msoFlowChartTerminator = { - (SvxMSDffVertPair*)mso_sptFlowChartTerminatorVert, SAL_N_ELEMENTS( mso_sptFlowChartTerminatorVert ), - (sal_uInt16*)mso_sptFlowChartTerminatorSegm, sizeof( mso_sptFlowChartTerminatorSegm ) >> 1, + const_cast(mso_sptFlowChartTerminatorVert), SAL_N_ELEMENTS( mso_sptFlowChartTerminatorVert ), + const_cast(mso_sptFlowChartTerminatorSegm), sizeof( mso_sptFlowChartTerminatorSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartTerminatorTextRect, SAL_N_ELEMENTS( mso_sptFlowChartTerminatorTextRect ), + const_cast(mso_sptFlowChartTerminatorTextRect), SAL_N_ELEMENTS( mso_sptFlowChartTerminatorTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -5189,14 +5189,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartPreparationTextRect[] = }; static const mso_CustomShape msoFlowChartPreparation = { - (SvxMSDffVertPair*)mso_sptFlowChartPreparationVert, SAL_N_ELEMENTS( mso_sptFlowChartPreparationVert ), + const_cast(mso_sptFlowChartPreparationVert), SAL_N_ELEMENTS( mso_sptFlowChartPreparationVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartPreparationTextRect, SAL_N_ELEMENTS( mso_sptFlowChartPreparationTextRect ), + const_cast(mso_sptFlowChartPreparationTextRect), SAL_N_ELEMENTS( mso_sptFlowChartPreparationTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -5214,14 +5214,14 @@ static const SvxMSDffVertPair mso_sptFlowChartManualInputGluePoints[] = }; static const mso_CustomShape msoFlowChartManualInput = { - (SvxMSDffVertPair*)mso_sptFlowChartManualInputVert, SAL_N_ELEMENTS( mso_sptFlowChartManualInputVert ), + const_cast(mso_sptFlowChartManualInputVert), SAL_N_ELEMENTS( mso_sptFlowChartManualInputVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartManualInputTextRect, SAL_N_ELEMENTS( mso_sptFlowChartManualInputTextRect ), + const_cast(mso_sptFlowChartManualInputTextRect), SAL_N_ELEMENTS( mso_sptFlowChartManualInputTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartManualInputGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartManualInputGluePoints ), + const_cast(mso_sptFlowChartManualInputGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartManualInputGluePoints ), NULL, 0 // handles }; @@ -5239,14 +5239,14 @@ static const SvxMSDffVertPair mso_sptFlowChartManualOperationGluePoints[] = }; static const mso_CustomShape msoFlowChartManualOperation = { - (SvxMSDffVertPair*)mso_sptFlowChartManualOperationVert, SAL_N_ELEMENTS( mso_sptFlowChartManualOperationVert ), + const_cast(mso_sptFlowChartManualOperationVert), SAL_N_ELEMENTS( mso_sptFlowChartManualOperationVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartManualOperationTextRect, SAL_N_ELEMENTS( mso_sptFlowChartManualOperationTextRect ), + const_cast(mso_sptFlowChartManualOperationTextRect), SAL_N_ELEMENTS( mso_sptFlowChartManualOperationTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartManualOperationGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartManualOperationGluePoints ), + const_cast(mso_sptFlowChartManualOperationGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartManualOperationGluePoints ), NULL, 0 // handles }; @@ -5264,14 +5264,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartConnectorTextRect[] = }; static const mso_CustomShape msoFlowChartConnector = { - (SvxMSDffVertPair*)mso_sptFlowChartConnectorVert, SAL_N_ELEMENTS( mso_sptFlowChartConnectorVert ), - (sal_uInt16*)mso_sptFlowChartConnectorSegm, sizeof( mso_sptFlowChartConnectorSegm ) >> 1, + const_cast(mso_sptFlowChartConnectorVert), SAL_N_ELEMENTS( mso_sptFlowChartConnectorVert ), + const_cast(mso_sptFlowChartConnectorSegm), sizeof( mso_sptFlowChartConnectorSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartConnectorTextRect, SAL_N_ELEMENTS( mso_sptFlowChartConnectorTextRect ), + const_cast(mso_sptFlowChartConnectorTextRect), SAL_N_ELEMENTS( mso_sptFlowChartConnectorTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptEllipseGluePoints, SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), + const_cast(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), NULL, 0 // handles }; @@ -5286,14 +5286,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartOffpageConnectorTextRect[] = }; static const mso_CustomShape msoFlowChartOffpageConnector = { - (SvxMSDffVertPair*)mso_sptFlowChartOffpageConnectorVert, SAL_N_ELEMENTS( mso_sptFlowChartOffpageConnectorVert ), + const_cast(mso_sptFlowChartOffpageConnectorVert), SAL_N_ELEMENTS( mso_sptFlowChartOffpageConnectorVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartOffpageConnectorTextRect, SAL_N_ELEMENTS( mso_sptFlowChartOffpageConnectorTextRect ), + const_cast(mso_sptFlowChartOffpageConnectorTextRect), SAL_N_ELEMENTS( mso_sptFlowChartOffpageConnectorTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -5308,14 +5308,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartPunchedCardTextRect[] = }; static const mso_CustomShape msoFlowChartPunchedCard = { - (SvxMSDffVertPair*)mso_sptFlowChartPunchedCardVert, SAL_N_ELEMENTS( mso_sptFlowChartPunchedCardVert ), + const_cast(mso_sptFlowChartPunchedCardVert), SAL_N_ELEMENTS( mso_sptFlowChartPunchedCardVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartPunchedCardTextRect, SAL_N_ELEMENTS( mso_sptFlowChartPunchedCardTextRect ), + const_cast(mso_sptFlowChartPunchedCardTextRect), SAL_N_ELEMENTS( mso_sptFlowChartPunchedCardTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -5346,14 +5346,14 @@ static const SvxMSDffVertPair mso_sptFlowChartPunchedTapeGluePoints[] = }; static const mso_CustomShape msoFlowChartPunchedTape = { - (SvxMSDffVertPair*)mso_sptFlowChartPunchedTapeVert, SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeVert ), - (sal_uInt16*)mso_sptFlowChartPunchedTapeSegm, sizeof( mso_sptFlowChartPunchedTapeSegm ) >> 1, + const_cast(mso_sptFlowChartPunchedTapeVert), SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeVert ), + const_cast(mso_sptFlowChartPunchedTapeSegm), sizeof( mso_sptFlowChartPunchedTapeSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartPunchedTapeTextRect, SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeTextRect ), + const_cast(mso_sptFlowChartPunchedTapeTextRect), SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartPunchedTapeGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeGluePoints ), + const_cast(mso_sptFlowChartPunchedTapeGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartPunchedTapeGluePoints ), NULL, 0 // handles }; @@ -5379,14 +5379,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartSummingJunctionTextRect[] = }; static const mso_CustomShape msoFlowChartSummingJunction = { - (SvxMSDffVertPair*)mso_sptFlowChartSummingJunctionVert, SAL_N_ELEMENTS( mso_sptFlowChartSummingJunctionVert ), - (sal_uInt16*)mso_sptFlowChartSummingJunctionSegm, sizeof( mso_sptFlowChartSummingJunctionSegm ) >> 1, + const_cast(mso_sptFlowChartSummingJunctionVert), SAL_N_ELEMENTS( mso_sptFlowChartSummingJunctionVert ), + const_cast(mso_sptFlowChartSummingJunctionSegm), sizeof( mso_sptFlowChartSummingJunctionSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartSummingJunctionTextRect, SAL_N_ELEMENTS( mso_sptFlowChartSummingJunctionTextRect ), + const_cast(mso_sptFlowChartSummingJunctionTextRect), SAL_N_ELEMENTS( mso_sptFlowChartSummingJunctionTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptEllipseGluePoints, SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), + const_cast(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), NULL, 0 // handles }; @@ -5410,14 +5410,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartOrTextRect[] = }; static const mso_CustomShape msoFlowChartOr = { - (SvxMSDffVertPair*)mso_sptFlowChartOrVert, SAL_N_ELEMENTS( mso_sptFlowChartOrVert ), - (sal_uInt16*)mso_sptFlowChartOrSegm, sizeof( mso_sptFlowChartOrSegm ) >> 1, + const_cast(mso_sptFlowChartOrVert), SAL_N_ELEMENTS( mso_sptFlowChartOrVert ), + const_cast(mso_sptFlowChartOrSegm), sizeof( mso_sptFlowChartOrSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartOrTextRect, SAL_N_ELEMENTS( mso_sptFlowChartOrTextRect ), + const_cast(mso_sptFlowChartOrTextRect), SAL_N_ELEMENTS( mso_sptFlowChartOrTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptEllipseGluePoints, SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), + const_cast(mso_sptEllipseGluePoints), SAL_N_ELEMENTS( mso_sptEllipseGluePoints ), NULL, 0 // handles }; @@ -5435,14 +5435,14 @@ static const SvxMSDffVertPair mso_sptFlowChartCollateGluePoints[] = }; static const mso_CustomShape msoFlowChartCollate = { - (SvxMSDffVertPair*)mso_sptFlowChartCollateVert, SAL_N_ELEMENTS( mso_sptFlowChartCollateVert ), + const_cast(mso_sptFlowChartCollateVert), SAL_N_ELEMENTS( mso_sptFlowChartCollateVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartCollateTextRect, SAL_N_ELEMENTS( mso_sptFlowChartCollateTextRect ), + const_cast(mso_sptFlowChartCollateTextRect), SAL_N_ELEMENTS( mso_sptFlowChartCollateTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartCollateGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartCollateGluePoints ), + const_cast(mso_sptFlowChartCollateGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartCollateGluePoints ), NULL, 0 // handles }; @@ -5463,11 +5463,11 @@ static const SvxMSDffTextRectangles mso_sptFlowChartSortTextRect[] = }; static const mso_CustomShape msoFlowChartSort = { - (SvxMSDffVertPair*)mso_sptFlowChartSortVert, SAL_N_ELEMENTS( mso_sptFlowChartSortVert ), - (sal_uInt16*)mso_sptFlowChartSortSegm, sizeof( mso_sptFlowChartSortSegm ) >> 1, + const_cast(mso_sptFlowChartSortVert), SAL_N_ELEMENTS( mso_sptFlowChartSortVert ), + const_cast(mso_sptFlowChartSortSegm), sizeof( mso_sptFlowChartSortSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartSortTextRect, SAL_N_ELEMENTS( mso_sptFlowChartSortTextRect ), + const_cast(mso_sptFlowChartSortTextRect), SAL_N_ELEMENTS( mso_sptFlowChartSortTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, @@ -5488,14 +5488,14 @@ static const SvxMSDffVertPair mso_sptFlowChartExtractGluePoints[] = }; static const mso_CustomShape msoFlowChartExtract = { - (SvxMSDffVertPair*)mso_sptFlowChartExtractVert, SAL_N_ELEMENTS( mso_sptFlowChartExtractVert ), + const_cast(mso_sptFlowChartExtractVert), SAL_N_ELEMENTS( mso_sptFlowChartExtractVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartExtractTextRect, SAL_N_ELEMENTS( mso_sptFlowChartExtractTextRect ), + const_cast(mso_sptFlowChartExtractTextRect), SAL_N_ELEMENTS( mso_sptFlowChartExtractTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartExtractGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartExtractGluePoints ), + const_cast(mso_sptFlowChartExtractGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartExtractGluePoints ), NULL, 0 // handles }; @@ -5509,14 +5509,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartMergeTextRect[] = }; static const mso_CustomShape msoFlowChartMerge = { - (SvxMSDffVertPair*)mso_sptFlowChartMergeVert, SAL_N_ELEMENTS( mso_sptFlowChartMergeVert ), + const_cast(mso_sptFlowChartMergeVert), SAL_N_ELEMENTS( mso_sptFlowChartMergeVert ), NULL, 0, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartMergeTextRect, SAL_N_ELEMENTS( mso_sptFlowChartMergeTextRect ), + const_cast(mso_sptFlowChartMergeTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMergeTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartExtractGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartExtractGluePoints ), + const_cast(mso_sptFlowChartExtractGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartExtractGluePoints ), NULL, 0 // handles }; @@ -5539,14 +5539,14 @@ static const SvxMSDffVertPair mso_sptFlowChartOnlineStorageGluePoints[] = }; static const mso_CustomShape msoFlowChartOnlineStorage = { - (SvxMSDffVertPair*)mso_sptFlowChartOnlineStorageVert, SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageVert ), - (sal_uInt16*)mso_sptFlowChartOnlineStorageSegm, sizeof( mso_sptFlowChartOnlineStorageSegm ) >> 1, + const_cast(mso_sptFlowChartOnlineStorageVert), SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageVert ), + const_cast(mso_sptFlowChartOnlineStorageSegm), sizeof( mso_sptFlowChartOnlineStorageSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartOnlineStorageTextRect, SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageTextRect ), + const_cast(mso_sptFlowChartOnlineStorageTextRect), SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartOnlineStorageGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageGluePoints ), + const_cast(mso_sptFlowChartOnlineStorageGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartOnlineStorageGluePoints ), NULL, 0 // handles }; @@ -5565,14 +5565,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartDelayTextRect[] = }; static const mso_CustomShape msoFlowChartDelay = { - (SvxMSDffVertPair*)mso_sptFlowChartDelayVert, SAL_N_ELEMENTS( mso_sptFlowChartDelayVert ), - (sal_uInt16*)mso_sptFlowChartDelaySegm, sizeof( mso_sptFlowChartDelaySegm ) >> 1, + const_cast(mso_sptFlowChartDelayVert), SAL_N_ELEMENTS( mso_sptFlowChartDelayVert ), + const_cast(mso_sptFlowChartDelaySegm), sizeof( mso_sptFlowChartDelaySegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartDelayTextRect, SAL_N_ELEMENTS( mso_sptFlowChartDelayTextRect ), + const_cast(mso_sptFlowChartDelayTextRect), SAL_N_ELEMENTS( mso_sptFlowChartDelayTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -5594,14 +5594,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartMagneticTapeTextRect[] = }; static const mso_CustomShape msoFlowChartMagneticTape = { - (SvxMSDffVertPair*)mso_sptFlowChartMagneticTapeVert, SAL_N_ELEMENTS( mso_sptFlowChartMagneticTapeVert ), - (sal_uInt16*)mso_sptFlowChartMagneticTapeSegm, sizeof( mso_sptFlowChartMagneticTapeSegm ) >> 1, + const_cast(mso_sptFlowChartMagneticTapeVert), SAL_N_ELEMENTS( mso_sptFlowChartMagneticTapeVert ), + const_cast(mso_sptFlowChartMagneticTapeSegm), sizeof( mso_sptFlowChartMagneticTapeSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartMagneticTapeTextRect, SAL_N_ELEMENTS( mso_sptFlowChartMagneticTapeTextRect ), + const_cast(mso_sptFlowChartMagneticTapeTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMagneticTapeTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -5627,14 +5627,14 @@ static const SvxMSDffVertPair mso_sptFlowChartMagneticDiskGluePoints[] = }; static const mso_CustomShape msoFlowChartMagneticDisk = { - (SvxMSDffVertPair*)mso_sptFlowChartMagneticDiskVert, SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskVert ), - (sal_uInt16*)mso_sptFlowChartMagneticDiskSegm, sizeof( mso_sptFlowChartMagneticDiskSegm ) >> 1, + const_cast(mso_sptFlowChartMagneticDiskVert), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskVert ), + const_cast(mso_sptFlowChartMagneticDiskSegm), sizeof( mso_sptFlowChartMagneticDiskSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartMagneticDiskTextRect, SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskTextRect ), + const_cast(mso_sptFlowChartMagneticDiskTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartMagneticDiskGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskGluePoints ), + const_cast(mso_sptFlowChartMagneticDiskGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDiskGluePoints ), NULL, 0 // handles }; @@ -5660,14 +5660,14 @@ static const SvxMSDffVertPair mso_sptFlowChartMagneticDrumGluePoints[] = }; static const mso_CustomShape msoFlowChartMagneticDrum = { - (SvxMSDffVertPair*)mso_sptFlowChartMagneticDrumVert, SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumVert ), - (sal_uInt16*)mso_sptFlowChartMagneticDrumSegm, sizeof( mso_sptFlowChartMagneticDrumSegm ) >> 1, + const_cast(mso_sptFlowChartMagneticDrumVert), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumVert ), + const_cast(mso_sptFlowChartMagneticDrumSegm), sizeof( mso_sptFlowChartMagneticDrumSegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartMagneticDrumTextRect, SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumTextRect ), + const_cast(mso_sptFlowChartMagneticDrumTextRect), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptFlowChartMagneticDrumGluePoints, SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumGluePoints ), + const_cast(mso_sptFlowChartMagneticDrumGluePoints), SAL_N_ELEMENTS( mso_sptFlowChartMagneticDrumGluePoints ), NULL, 0 // handles }; @@ -5686,14 +5686,14 @@ static const SvxMSDffTextRectangles mso_sptFlowChartDisplayTextRect[] = }; static const mso_CustomShape msoFlowChartDisplay = { - (SvxMSDffVertPair*)mso_sptFlowChartDisplayVert, SAL_N_ELEMENTS( mso_sptFlowChartDisplayVert ), - (sal_uInt16*)mso_sptFlowChartDisplaySegm, sizeof( mso_sptFlowChartDisplaySegm ) >> 1, + const_cast(mso_sptFlowChartDisplayVert), SAL_N_ELEMENTS( mso_sptFlowChartDisplayVert ), + const_cast(mso_sptFlowChartDisplaySegm), sizeof( mso_sptFlowChartDisplaySegm ) >> 1, NULL, 0, NULL, - (SvxMSDffTextRectangles*)mso_sptFlowChartDisplayTextRect, SAL_N_ELEMENTS( mso_sptFlowChartDisplayTextRect ), + const_cast(mso_sptFlowChartDisplayTextRect), SAL_N_ELEMENTS( mso_sptFlowChartDisplayTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptStandardGluePoints, SAL_N_ELEMENTS( mso_sptStandardGluePoints ), + const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS( mso_sptStandardGluePoints ), NULL, 0 // handles }; @@ -5779,15 +5779,15 @@ static const SvxMSDffHandle mso_sptCalloutHandle[] = }; static const mso_CustomShape msoWedgeRectCallout = { - (SvxMSDffVertPair*)mso_sptWedgeRectCalloutVert, SAL_N_ELEMENTS( mso_sptWedgeRectCalloutVert ), + const_cast(mso_sptWedgeRectCalloutVert), SAL_N_ELEMENTS( mso_sptWedgeRectCalloutVert ), NULL, 0, - (SvxMSDffCalculationData*)mso_sptWedgeRectCalloutCalc, SAL_N_ELEMENTS( mso_sptWedgeRectCalloutCalc ), - (sal_Int32*)mso_sptWedgeRectCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptWedgeRectCalloutTextRect, SAL_N_ELEMENTS( mso_sptWedgeRectCalloutTextRect ), + const_cast(mso_sptWedgeRectCalloutCalc), SAL_N_ELEMENTS( mso_sptWedgeRectCalloutCalc ), + const_cast(mso_sptWedgeRectCalloutDefault), + const_cast(mso_sptWedgeRectCalloutTextRect), SAL_N_ELEMENTS( mso_sptWedgeRectCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptWedgeRectCalloutGluePoints, SAL_N_ELEMENTS( mso_sptWedgeRectCalloutGluePoints ), - (SvxMSDffHandle*)mso_sptCalloutHandle, SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles + const_cast(mso_sptWedgeRectCalloutGluePoints), SAL_N_ELEMENTS( mso_sptWedgeRectCalloutGluePoints ), + const_cast(mso_sptCalloutHandle), SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles }; static const SvxMSDffVertPair mso_sptWedgeRRectCalloutVert[] = { @@ -5815,15 +5815,15 @@ static const SvxMSDffTextRectangles mso_sptWedgeRRectCalloutTextRect[] = }; static const mso_CustomShape msoWedgeRRectCallout = { - (SvxMSDffVertPair*)mso_sptWedgeRRectCalloutVert, SAL_N_ELEMENTS( mso_sptWedgeRRectCalloutVert ), - (sal_uInt16*)mso_sptWedgeRRectCalloutSegm, sizeof( mso_sptWedgeRRectCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptWedgeRectCalloutCalc, SAL_N_ELEMENTS( mso_sptWedgeRectCalloutCalc ), - (sal_Int32*)mso_sptWedgeRectCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptWedgeRRectCalloutTextRect, SAL_N_ELEMENTS( mso_sptWedgeRRectCalloutTextRect ), + const_cast(mso_sptWedgeRRectCalloutVert), SAL_N_ELEMENTS( mso_sptWedgeRRectCalloutVert ), + const_cast(mso_sptWedgeRRectCalloutSegm), sizeof( mso_sptWedgeRRectCalloutSegm ) >> 1, + const_cast(mso_sptWedgeRectCalloutCalc), SAL_N_ELEMENTS( mso_sptWedgeRectCalloutCalc ), + const_cast(mso_sptWedgeRectCalloutDefault), + const_cast(mso_sptWedgeRRectCalloutTextRect), SAL_N_ELEMENTS( mso_sptWedgeRRectCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle, SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles + const_cast(mso_sptCalloutHandle), SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles }; static const SvxMSDffVertPair mso_sptBalloonVert[] = { @@ -5854,15 +5854,15 @@ static const SvxMSDffTextRectangles mso_sptBalloonTextRect[] = }; static const mso_CustomShape msoBalloon = { - (SvxMSDffVertPair*)mso_sptBalloonVert, SAL_N_ELEMENTS( mso_sptBalloonVert ), - (sal_uInt16*)mso_sptBalloonSegm, sizeof( mso_sptBalloonSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptWedgeRectCalloutCalc, SAL_N_ELEMENTS( mso_sptWedgeRectCalloutCalc ), - (sal_Int32*)mso_sptWedgeRectCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptBalloonTextRect, SAL_N_ELEMENTS( mso_sptBalloonTextRect ), + const_cast(mso_sptBalloonVert), SAL_N_ELEMENTS( mso_sptBalloonVert ), + const_cast(mso_sptBalloonSegm), sizeof( mso_sptBalloonSegm ) >> 1, + const_cast(mso_sptWedgeRectCalloutCalc), SAL_N_ELEMENTS( mso_sptWedgeRectCalloutCalc ), + const_cast(mso_sptWedgeRectCalloutDefault), + const_cast(mso_sptBalloonTextRect), SAL_N_ELEMENTS( mso_sptBalloonTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptBalloonHandle, SAL_N_ELEMENTS( mso_sptBalloonHandle ) // handles + const_cast(mso_sptBalloonHandle), SAL_N_ELEMENTS( mso_sptBalloonHandle ) // handles }; static const SvxMSDffVertPair mso_sptWedgeEllipseCalloutVert[] = { @@ -5913,15 +5913,15 @@ static const SvxMSDffTextRectangles mso_sptWedgeEllipseCalloutTextRect[] = }; static const mso_CustomShape msoWedgeEllipseCallout = { - (SvxMSDffVertPair*)mso_sptWedgeEllipseCalloutVert, SAL_N_ELEMENTS( mso_sptWedgeEllipseCalloutVert ), - (sal_uInt16*)mso_sptWedgeEllipseCalloutSegm, sizeof( mso_sptWedgeEllipseCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptWedgeEllipseCalloutCalc, SAL_N_ELEMENTS( mso_sptWedgeEllipseCalloutCalc ), - (sal_Int32*)mso_sptWedgeEllipseCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptWedgeEllipseCalloutTextRect, SAL_N_ELEMENTS( mso_sptWedgeEllipseCalloutTextRect ), + const_cast(mso_sptWedgeEllipseCalloutVert), SAL_N_ELEMENTS( mso_sptWedgeEllipseCalloutVert ), + const_cast(mso_sptWedgeEllipseCalloutSegm), sizeof( mso_sptWedgeEllipseCalloutSegm ) >> 1, + const_cast(mso_sptWedgeEllipseCalloutCalc), SAL_N_ELEMENTS( mso_sptWedgeEllipseCalloutCalc ), + const_cast(mso_sptWedgeEllipseCalloutDefault), + const_cast(mso_sptWedgeEllipseCalloutTextRect), SAL_N_ELEMENTS( mso_sptWedgeEllipseCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptWedgeEllipseCalloutGluePoints, SAL_N_ELEMENTS( mso_sptWedgeEllipseCalloutGluePoints ), - (SvxMSDffHandle*)mso_sptCalloutHandle, SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles + const_cast(mso_sptWedgeEllipseCalloutGluePoints), SAL_N_ELEMENTS( mso_sptWedgeEllipseCalloutGluePoints ), + const_cast(mso_sptCalloutHandle), SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles }; static const SvxMSDffVertPair mso_sptCloudCalloutVert[] = @@ -6018,15 +6018,15 @@ static const SvxMSDffTextRectangles mso_sptCloudCalloutTextRect[] = }; static const mso_CustomShape msoCloudCallout = { - (SvxMSDffVertPair*)mso_sptCloudCalloutVert, SAL_N_ELEMENTS( mso_sptCloudCalloutVert ), - (sal_uInt16*)mso_sptCloudCalloutSegm, sizeof( mso_sptCloudCalloutSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCloudCalloutCalc, SAL_N_ELEMENTS( mso_sptCloudCalloutCalc ), - (sal_Int32*)mso_sptCloudCalloutDefault, - (SvxMSDffTextRectangles*)mso_sptCloudCalloutTextRect, SAL_N_ELEMENTS( mso_sptCloudCalloutTextRect ), + const_cast(mso_sptCloudCalloutVert), SAL_N_ELEMENTS( mso_sptCloudCalloutVert ), + const_cast(mso_sptCloudCalloutSegm), sizeof( mso_sptCloudCalloutSegm ) >> 1, + const_cast(mso_sptCloudCalloutCalc), SAL_N_ELEMENTS( mso_sptCloudCalloutCalc ), + const_cast(mso_sptCloudCalloutDefault), + const_cast(mso_sptCloudCalloutTextRect), SAL_N_ELEMENTS( mso_sptCloudCalloutTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle, SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles + const_cast(mso_sptCalloutHandle), SAL_N_ELEMENTS( mso_sptCalloutHandle ) // handles }; static const SvxMSDffVertPair mso_sptWaveVert[] = // adjustment1 : 0 - 4460 @@ -6096,15 +6096,15 @@ static const SvxMSDffTextRectangles mso_sptWaveTextRect[] = }; static const mso_CustomShape msoWave = { - (SvxMSDffVertPair*)mso_sptWaveVert, SAL_N_ELEMENTS( mso_sptWaveVert ), - (sal_uInt16*)mso_sptWaveSegm, sizeof( mso_sptWaveSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptWaveCalc, SAL_N_ELEMENTS( mso_sptWaveCalc ), - (sal_Int32*)mso_sptWaveDefault, - (SvxMSDffTextRectangles*)mso_sptWaveTextRect, SAL_N_ELEMENTS( mso_sptWaveTextRect ), + const_cast(mso_sptWaveVert), SAL_N_ELEMENTS( mso_sptWaveVert ), + const_cast(mso_sptWaveSegm), sizeof( mso_sptWaveSegm ) >> 1, + const_cast(mso_sptWaveCalc), SAL_N_ELEMENTS( mso_sptWaveCalc ), + const_cast(mso_sptWaveDefault), + const_cast(mso_sptWaveTextRect), SAL_N_ELEMENTS( mso_sptWaveTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptWaveGluePoints, SAL_N_ELEMENTS( mso_sptWaveGluePoints ), - (SvxMSDffHandle*)mso_sptWaveHandle, SAL_N_ELEMENTS( mso_sptWaveHandle ) + const_cast(mso_sptWaveGluePoints), SAL_N_ELEMENTS( mso_sptWaveGluePoints ), + const_cast(mso_sptWaveHandle), SAL_N_ELEMENTS( mso_sptWaveHandle ) }; static const SvxMSDffVertPair mso_sptDoubleWaveVert[] = // adjustment1 : 0 - 2230 @@ -6178,15 +6178,15 @@ static const SvxMSDffTextRectangles mso_sptDoubleWaveTextRect[] = }; static const mso_CustomShape msoDoubleWave = { - (SvxMSDffVertPair*)mso_sptDoubleWaveVert, SAL_N_ELEMENTS( mso_sptDoubleWaveVert ), - (sal_uInt16*)mso_sptDoubleWaveSegm, sizeof( mso_sptDoubleWaveSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptDoubleWaveCalc, SAL_N_ELEMENTS( mso_sptDoubleWaveCalc ), - (sal_Int32*)mso_sptDoubleWaveDefault, - (SvxMSDffTextRectangles*)mso_sptDoubleWaveTextRect, SAL_N_ELEMENTS( mso_sptDoubleWaveTextRect ), + const_cast(mso_sptDoubleWaveVert), SAL_N_ELEMENTS( mso_sptDoubleWaveVert ), + const_cast(mso_sptDoubleWaveSegm), sizeof( mso_sptDoubleWaveSegm ) >> 1, + const_cast(mso_sptDoubleWaveCalc), SAL_N_ELEMENTS( mso_sptDoubleWaveCalc ), + const_cast(mso_sptDoubleWaveDefault), + const_cast(mso_sptDoubleWaveTextRect), SAL_N_ELEMENTS( mso_sptDoubleWaveTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptDoubleWaveGluePoints, SAL_N_ELEMENTS( mso_sptDoubleWaveGluePoints ), - (SvxMSDffHandle*)mso_sptDoubleWaveHandle, SAL_N_ELEMENTS( mso_sptDoubleWaveHandle ) + const_cast(mso_sptDoubleWaveGluePoints), SAL_N_ELEMENTS( mso_sptDoubleWaveGluePoints ), + const_cast(mso_sptDoubleWaveHandle), SAL_N_ELEMENTS( mso_sptDoubleWaveHandle ) }; // for each shapetype a bit of 1 is indicating that the shape is NOT filled by default @@ -6293,15 +6293,15 @@ static const SvxMSDffHandle mso_sptTextPlainTextHandle[] = }; static const mso_CustomShape msoTextPlainText = { - (SvxMSDffVertPair*)mso_sptTextPlainTextVert, SAL_N_ELEMENTS( mso_sptTextPlainTextVert ), - (sal_uInt16*)mso_sptTextPlainTextSegm, sizeof( mso_sptTextPlainTextSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextPlainTextCalc, SAL_N_ELEMENTS( mso_sptTextPlainTextCalc ), - (sal_Int32*)mso_sptDefault10800, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextPlainTextVert), SAL_N_ELEMENTS( mso_sptTextPlainTextVert ), + const_cast(mso_sptTextPlainTextSegm), sizeof( mso_sptTextPlainTextSegm ) >> 1, + const_cast(mso_sptTextPlainTextCalc), SAL_N_ELEMENTS( mso_sptTextPlainTextCalc ), + const_cast(mso_sptDefault10800), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextPlainTextHandle, SAL_N_ELEMENTS( mso_sptTextPlainTextHandle ) + const_cast(mso_sptTextPlainTextHandle), SAL_N_ELEMENTS( mso_sptTextPlainTextHandle ) }; static const SvxMSDffVertPair mso_sptTextStopVert[] = @@ -6330,15 +6330,15 @@ static const SvxMSDffHandle mso_sptTextStopHandle[] = }; static const mso_CustomShape msoTextStop = { - (SvxMSDffVertPair*)mso_sptTextStopVert, SAL_N_ELEMENTS( mso_sptTextStopVert ), - (sal_uInt16*)mso_sptTextStopSegm, sizeof( mso_sptTextStopSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextStopCalc, SAL_N_ELEMENTS( mso_sptTextStopCalc ), - (sal_Int32*)mso_sptTextStopDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextStopVert), SAL_N_ELEMENTS( mso_sptTextStopVert ), + const_cast(mso_sptTextStopSegm), sizeof( mso_sptTextStopSegm ) >> 1, + const_cast(mso_sptTextStopCalc), SAL_N_ELEMENTS( mso_sptTextStopCalc ), + const_cast(mso_sptTextStopDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextStopHandle, SAL_N_ELEMENTS( mso_sptTextStopHandle ) + const_cast(mso_sptTextStopHandle), SAL_N_ELEMENTS( mso_sptTextStopHandle ) }; static const SvxMSDffVertPair mso_sptTextTriangleVert[] = @@ -6361,15 +6361,15 @@ static const SvxMSDffHandle mso_sptTextTriangleHandle[] = }; static const mso_CustomShape msoTextTriangle = { - (SvxMSDffVertPair*)mso_sptTextTriangleVert, SAL_N_ELEMENTS( mso_sptTextTriangleVert ), - (sal_uInt16*)mso_sptTextTriangleSegm, sizeof( mso_sptTextTriangleSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextTriangleCalc, SAL_N_ELEMENTS( mso_sptTextTriangleCalc ), - (sal_Int32*)mso_sptDefault10800, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextTriangleVert), SAL_N_ELEMENTS( mso_sptTextTriangleVert ), + const_cast(mso_sptTextTriangleSegm), sizeof( mso_sptTextTriangleSegm ) >> 1, + const_cast(mso_sptTextTriangleCalc), SAL_N_ELEMENTS( mso_sptTextTriangleCalc ), + const_cast(mso_sptDefault10800), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextTriangleHandle, SAL_N_ELEMENTS( mso_sptTextTriangleHandle ) + const_cast(mso_sptTextTriangleHandle), SAL_N_ELEMENTS( mso_sptTextTriangleHandle ) }; static const SvxMSDffVertPair mso_sptTextTriangleInvertedVert[] = { @@ -6382,15 +6382,15 @@ static const sal_uInt16 mso_sptTextTriangleInvertedSegm[] = }; static const mso_CustomShape msoTextTriangleInverted = { - (SvxMSDffVertPair*)mso_sptTextTriangleInvertedVert, SAL_N_ELEMENTS( mso_sptTextTriangleInvertedVert ), - (sal_uInt16*)mso_sptTextTriangleInvertedSegm, sizeof( mso_sptTextTriangleInvertedSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextTriangleCalc, SAL_N_ELEMENTS( mso_sptTextTriangleCalc ), - (sal_Int32*)mso_sptDefault10800, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextTriangleInvertedVert), SAL_N_ELEMENTS( mso_sptTextTriangleInvertedVert ), + const_cast(mso_sptTextTriangleInvertedSegm), sizeof( mso_sptTextTriangleInvertedSegm ) >> 1, + const_cast(mso_sptTextTriangleCalc), SAL_N_ELEMENTS( mso_sptTextTriangleCalc ), + const_cast(mso_sptDefault10800), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextTriangleHandle, SAL_N_ELEMENTS( mso_sptTextTriangleHandle ) + const_cast(mso_sptTextTriangleHandle), SAL_N_ELEMENTS( mso_sptTextTriangleHandle ) }; static const SvxMSDffVertPair mso_sptTextChevronVert[] = @@ -6414,15 +6414,15 @@ static const SvxMSDffHandle mso_sptTextChevronHandle[] = }; static const mso_CustomShape msoTextChevron = { - (SvxMSDffVertPair*)mso_sptTextChevronVert, SAL_N_ELEMENTS( mso_sptTextChevronVert ), - (sal_uInt16*)mso_sptTextChevronSegm, sizeof( mso_sptTextChevronSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextChevronCalc, SAL_N_ELEMENTS( mso_sptTextChevronCalc ), - (sal_Int32*)mso_sptDefault5400, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextChevronVert), SAL_N_ELEMENTS( mso_sptTextChevronVert ), + const_cast(mso_sptTextChevronSegm), sizeof( mso_sptTextChevronSegm ) >> 1, + const_cast(mso_sptTextChevronCalc), SAL_N_ELEMENTS( mso_sptTextChevronCalc ), + const_cast(mso_sptDefault5400), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextChevronHandle, SAL_N_ELEMENTS( mso_sptTextChevronHandle ) + const_cast(mso_sptTextChevronHandle), SAL_N_ELEMENTS( mso_sptTextChevronHandle ) }; static const SvxMSDffVertPair mso_sptTextChevronInvertedVert[] = @@ -6446,15 +6446,15 @@ static const SvxMSDffHandle mso_sptTextChevronInvertedHandle[] = }; static const mso_CustomShape msoTextChevronInverted = { - (SvxMSDffVertPair*)mso_sptTextChevronInvertedVert, SAL_N_ELEMENTS( mso_sptTextChevronInvertedVert ), - (sal_uInt16*)mso_sptTextChevronInvertedSegm, sizeof( mso_sptTextChevronInvertedSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextChevronInvertedCalc, SAL_N_ELEMENTS( mso_sptTextChevronInvertedCalc ), - (sal_Int32*)mso_sptDefault16200, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextChevronInvertedVert), SAL_N_ELEMENTS( mso_sptTextChevronInvertedVert ), + const_cast(mso_sptTextChevronInvertedSegm), sizeof( mso_sptTextChevronInvertedSegm ) >> 1, + const_cast(mso_sptTextChevronInvertedCalc), SAL_N_ELEMENTS( mso_sptTextChevronInvertedCalc ), + const_cast(mso_sptDefault16200), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextChevronInvertedHandle, SAL_N_ELEMENTS( mso_sptTextChevronInvertedHandle ) + const_cast(mso_sptTextChevronInvertedHandle), SAL_N_ELEMENTS( mso_sptTextChevronInvertedHandle ) }; //V 0 0 21600 ?f2 0 ?f0 21600 ?f0 //W 0 0 21600 ?f2 21600 ?f0 0 ?f0 N @@ -6487,15 +6487,15 @@ static const SvxMSDffHandle mso_sptTextRingInsideHandle[] = }; static const mso_CustomShape msoTextRingInside = { - (SvxMSDffVertPair*)mso_sptTextRingInsideVert, sizeof( mso_sptTextRingInsideVert ) / sizeof( SvxMSDffVertPair ), - (sal_uInt16*)mso_sptTextRingInsideSegm, sizeof( mso_sptTextRingInsideSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextRingInsideCalc, sizeof( mso_sptTextRingInsideCalc ) / sizeof( SvxMSDffCalculationData ), - (sal_Int32*)mso_sptDefault13500, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ), + const_cast(mso_sptTextRingInsideVert), sizeof( mso_sptTextRingInsideVert ) / sizeof( SvxMSDffVertPair ), + const_cast(mso_sptTextRingInsideSegm), sizeof( mso_sptTextRingInsideSegm ) >> 1, + const_cast(mso_sptTextRingInsideCalc), sizeof( mso_sptTextRingInsideCalc ) / sizeof( SvxMSDffCalculationData ), + const_cast(mso_sptDefault13500), + const_cast(mso_sptFontWorkTextRect), sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextRingInsideHandle, sizeof( mso_sptTextRingInsideHandle ) / sizeof( SvxMSDffHandle ) + const_cast(mso_sptTextRingInsideHandle), sizeof( mso_sptTextRingInsideHandle ) / sizeof( SvxMSDffHandle ) }; //mso_sptTextRingOutside //path = U 10800 ?f0 21600 ?f2 180 539 N U 10800 ?f1 21600 ?f2 180 539 N @@ -6525,15 +6525,15 @@ static const SvxMSDffHandle mso_sptTextRingOutsideHandle[] = }; static const mso_CustomShape msoTextRingOutside = { - (SvxMSDffVertPair*)mso_sptTextRingOutsideVert, SAL_N_ELEMENTS( mso_sptTextRingOutsideVert ), - (sal_uInt16*)mso_sptTextRingOutsideSegm, sizeof( mso_sptTextRingOutsideSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextRingOutsideCalc, SAL_N_ELEMENTS( mso_sptTextRingOutsideCalc ), - (sal_Int32*)mso_sptDefault13500, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextRingOutsideVert), SAL_N_ELEMENTS( mso_sptTextRingOutsideVert ), + const_cast(mso_sptTextRingOutsideSegm), sizeof( mso_sptTextRingOutsideSegm ) >> 1, + const_cast(mso_sptTextRingOutsideCalc), SAL_N_ELEMENTS( mso_sptTextRingOutsideCalc ), + const_cast(mso_sptDefault13500), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextRingOutsideHandle, SAL_N_ELEMENTS( mso_sptTextRingOutsideHandle ) + const_cast(mso_sptTextRingOutsideHandle), SAL_N_ELEMENTS( mso_sptTextRingOutsideHandle ) }; static const SvxMSDffVertPair mso_sptTextFadeRightVert[] = @@ -6557,15 +6557,15 @@ static const SvxMSDffHandle mso_sptTextFadeRightHandle[] = }; static const mso_CustomShape msoTextFadeRight = { - (SvxMSDffVertPair*)mso_sptTextFadeRightVert, SAL_N_ELEMENTS( mso_sptTextFadeRightVert ), - (sal_uInt16*)mso_sptTextFadeSegm, sizeof( mso_sptTextFadeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextFadeCalc, SAL_N_ELEMENTS( mso_sptTextFadeCalc ), - (sal_Int32*)mso_sptDefault7200, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextFadeRightVert), SAL_N_ELEMENTS( mso_sptTextFadeRightVert ), + const_cast(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm ) >> 1, + const_cast(mso_sptTextFadeCalc), SAL_N_ELEMENTS( mso_sptTextFadeCalc ), + const_cast(mso_sptDefault7200), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextFadeRightHandle, SAL_N_ELEMENTS( mso_sptTextFadeRightHandle ) + const_cast(mso_sptTextFadeRightHandle), SAL_N_ELEMENTS( mso_sptTextFadeRightHandle ) }; static const SvxMSDffVertPair mso_sptTextFadeLeftVert[] = @@ -6579,15 +6579,15 @@ static const SvxMSDffHandle mso_sptTextFadeLeftHandle[] = }; static const mso_CustomShape msoTextFadeLeft = { - (SvxMSDffVertPair*)mso_sptTextFadeLeftVert, SAL_N_ELEMENTS( mso_sptTextFadeLeftVert ), - (sal_uInt16*)mso_sptTextFadeSegm, sizeof( mso_sptTextFadeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextFadeCalc, SAL_N_ELEMENTS( mso_sptTextFadeCalc ), - (sal_Int32*)mso_sptDefault7200, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextFadeLeftVert), SAL_N_ELEMENTS( mso_sptTextFadeLeftVert ), + const_cast(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm ) >> 1, + const_cast(mso_sptTextFadeCalc), SAL_N_ELEMENTS( mso_sptTextFadeCalc ), + const_cast(mso_sptDefault7200), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextFadeLeftHandle, SAL_N_ELEMENTS( mso_sptTextFadeLeftHandle ) + const_cast(mso_sptTextFadeLeftHandle), SAL_N_ELEMENTS( mso_sptTextFadeLeftHandle ) }; static const SvxMSDffVertPair mso_sptTextFadeUpVert[] = @@ -6601,15 +6601,15 @@ static const SvxMSDffHandle mso_sptTextFadeUpHandle[] = }; static const mso_CustomShape msoTextFadeUp = { - (SvxMSDffVertPair*)mso_sptTextFadeUpVert, SAL_N_ELEMENTS( mso_sptTextFadeUpVert ), - (sal_uInt16*)mso_sptTextFadeSegm, sizeof( mso_sptTextFadeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextFadeCalc, SAL_N_ELEMENTS( mso_sptTextFadeCalc ), - (sal_Int32*)mso_sptDefault7200, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextFadeUpVert), SAL_N_ELEMENTS( mso_sptTextFadeUpVert ), + const_cast(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm ) >> 1, + const_cast(mso_sptTextFadeCalc), SAL_N_ELEMENTS( mso_sptTextFadeCalc ), + const_cast(mso_sptDefault7200), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextFadeUpHandle, SAL_N_ELEMENTS( mso_sptTextFadeUpHandle ) + const_cast(mso_sptTextFadeUpHandle), SAL_N_ELEMENTS( mso_sptTextFadeUpHandle ) }; static const SvxMSDffVertPair mso_sptTextFadeDownVert[] = @@ -6623,15 +6623,15 @@ static const SvxMSDffHandle mso_sptTextFadeDownHandle[] = }; static const mso_CustomShape msoTextFadeDown = { - (SvxMSDffVertPair*)mso_sptTextFadeDownVert, SAL_N_ELEMENTS( mso_sptTextFadeDownVert ), - (sal_uInt16*)mso_sptTextFadeSegm, sizeof( mso_sptTextFadeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextFadeCalc, SAL_N_ELEMENTS( mso_sptTextFadeCalc ), - (sal_Int32*)mso_sptDefault7200, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextFadeDownVert), SAL_N_ELEMENTS( mso_sptTextFadeDownVert ), + const_cast(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm ) >> 1, + const_cast(mso_sptTextFadeCalc), SAL_N_ELEMENTS( mso_sptTextFadeCalc ), + const_cast(mso_sptDefault7200), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextFadeDownHandle, SAL_N_ELEMENTS( mso_sptTextFadeDownHandle ) + const_cast(mso_sptTextFadeDownHandle), SAL_N_ELEMENTS( mso_sptTextFadeDownHandle ) }; static const SvxMSDffVertPair mso_sptTextSlantUpVert[] = @@ -6645,15 +6645,15 @@ static const SvxMSDffHandle mso_sptTextSlantUpHandle[] = }; static const mso_CustomShape msoTextSlantUp = { - (SvxMSDffVertPair*)mso_sptTextSlantUpVert, SAL_N_ELEMENTS( mso_sptTextSlantUpVert ), - (sal_uInt16*)mso_sptTextFadeSegm, sizeof( mso_sptTextFadeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextFadeCalc, SAL_N_ELEMENTS( mso_sptTextFadeCalc ), - (sal_Int32*)mso_sptDefault12000, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextSlantUpVert), SAL_N_ELEMENTS( mso_sptTextSlantUpVert ), + const_cast(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm ) >> 1, + const_cast(mso_sptTextFadeCalc), SAL_N_ELEMENTS( mso_sptTextFadeCalc ), + const_cast(mso_sptDefault12000), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextSlantUpHandle, SAL_N_ELEMENTS( mso_sptTextSlantUpHandle ) + const_cast(mso_sptTextSlantUpHandle), SAL_N_ELEMENTS( mso_sptTextSlantUpHandle ) }; static const SvxMSDffVertPair mso_sptTextSlantDownVert[] = @@ -6667,15 +6667,15 @@ static const SvxMSDffHandle mso_sptTextSlantDownHandle[] = }; static const mso_CustomShape msoTextSlantDown = { - (SvxMSDffVertPair*)mso_sptTextSlantDownVert, SAL_N_ELEMENTS( mso_sptTextSlantDownVert ), - (sal_uInt16*)mso_sptTextFadeSegm, sizeof( mso_sptTextFadeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextFadeCalc, SAL_N_ELEMENTS( mso_sptTextFadeCalc ), - (sal_Int32*)mso_sptDefault12000, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextSlantDownVert), SAL_N_ELEMENTS( mso_sptTextSlantDownVert ), + const_cast(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm ) >> 1, + const_cast(mso_sptTextFadeCalc), SAL_N_ELEMENTS( mso_sptTextFadeCalc ), + const_cast(mso_sptDefault12000), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextSlantDownHandle, SAL_N_ELEMENTS( mso_sptTextSlantDownHandle ) + const_cast(mso_sptTextSlantDownHandle), SAL_N_ELEMENTS( mso_sptTextSlantDownHandle ) }; static const SvxMSDffVertPair mso_sptTextCascadeUpVert[] = @@ -6695,15 +6695,15 @@ static const SvxMSDffHandle mso_sptTextCascadeUpHandle[] = }; static const mso_CustomShape msoTextCascadeUp = { - (SvxMSDffVertPair*)mso_sptTextCascadeUpVert, SAL_N_ELEMENTS( mso_sptTextCascadeUpVert ), - (sal_uInt16*)mso_sptTextFadeSegm, sizeof( mso_sptTextFadeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextCascadeCalc, SAL_N_ELEMENTS( mso_sptTextCascadeCalc ), - (sal_Int32*)mso_sptDefault9600, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextCascadeUpVert), SAL_N_ELEMENTS( mso_sptTextCascadeUpVert ), + const_cast(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm ) >> 1, + const_cast(mso_sptTextCascadeCalc), SAL_N_ELEMENTS( mso_sptTextCascadeCalc ), + const_cast(mso_sptDefault9600), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextCascadeUpHandle, SAL_N_ELEMENTS( mso_sptTextCascadeUpHandle ) + const_cast(mso_sptTextCascadeUpHandle), SAL_N_ELEMENTS( mso_sptTextCascadeUpHandle ) }; static const SvxMSDffVertPair mso_sptTextCascadeDownVert[] = @@ -6717,15 +6717,15 @@ static const SvxMSDffHandle mso_sptTextCascadeDownHandle[] = }; static const mso_CustomShape msoTextCascadeDown = { - (SvxMSDffVertPair*)mso_sptTextCascadeDownVert, SAL_N_ELEMENTS( mso_sptTextCascadeDownVert ), - (sal_uInt16*)mso_sptTextFadeSegm, sizeof( mso_sptTextFadeSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextCascadeCalc, SAL_N_ELEMENTS( mso_sptTextCascadeCalc ), - (sal_Int32*)mso_sptDefault9600, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextCascadeDownVert), SAL_N_ELEMENTS( mso_sptTextCascadeDownVert ), + const_cast(mso_sptTextFadeSegm), sizeof( mso_sptTextFadeSegm ) >> 1, + const_cast(mso_sptTextCascadeCalc), SAL_N_ELEMENTS( mso_sptTextCascadeCalc ), + const_cast(mso_sptDefault9600), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextCascadeDownHandle, SAL_N_ELEMENTS( mso_sptTextCascadeDownHandle ) + const_cast(mso_sptTextCascadeDownHandle), SAL_N_ELEMENTS( mso_sptTextCascadeDownHandle ) }; static const SvxMSDffVertPair mso_sptTextArchUpCurveVert[] = @@ -6755,15 +6755,15 @@ static const sal_Int32 mso_sptTextArchUpCurveDefault[] = }; static const mso_CustomShape msoTextArchUpCurve = { - (SvxMSDffVertPair*)mso_sptTextArchUpCurveVert, SAL_N_ELEMENTS( mso_sptTextArchUpCurveVert ), - (sal_uInt16*)mso_sptTextArchUpCurveSegm, sizeof( mso_sptTextArchUpCurveSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextArchCurveCalc, SAL_N_ELEMENTS( mso_sptTextArchCurveCalc ), - (sal_Int32*)mso_sptTextArchUpCurveDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextArchUpCurveVert), SAL_N_ELEMENTS( mso_sptTextArchUpCurveVert ), + const_cast(mso_sptTextArchUpCurveSegm), sizeof( mso_sptTextArchUpCurveSegm ) >> 1, + const_cast(mso_sptTextArchCurveCalc), SAL_N_ELEMENTS( mso_sptTextArchCurveCalc ), + const_cast(mso_sptTextArchUpCurveDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextArchUpCurveHandle, SAL_N_ELEMENTS( mso_sptTextArchUpCurveHandle ) + const_cast(mso_sptTextArchUpCurveHandle), SAL_N_ELEMENTS( mso_sptTextArchUpCurveHandle ) }; static const SvxMSDffVertPair mso_sptTextArchDownCurveVert[] = @@ -6785,15 +6785,15 @@ static const sal_Int32 mso_sptTextArchDownCurveDefault[] = }; static const mso_CustomShape msoTextArchDownCurve = { - (SvxMSDffVertPair*)mso_sptTextArchDownCurveVert, SAL_N_ELEMENTS( mso_sptTextArchDownCurveVert ), - (sal_uInt16*)mso_sptTextArchDownCurveSegm, sizeof( mso_sptTextArchDownCurveSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextArchCurveCalc, SAL_N_ELEMENTS( mso_sptTextArchCurveCalc ), - (sal_Int32*)mso_sptTextArchDownCurveDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextArchDownCurveVert), SAL_N_ELEMENTS( mso_sptTextArchDownCurveVert ), + const_cast(mso_sptTextArchDownCurveSegm), sizeof( mso_sptTextArchDownCurveSegm ) >> 1, + const_cast(mso_sptTextArchCurveCalc), SAL_N_ELEMENTS( mso_sptTextArchCurveCalc ), + const_cast(mso_sptTextArchDownCurveDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextArchDownCurveHandle, SAL_N_ELEMENTS( mso_sptTextArchDownCurveHandle ) + const_cast(mso_sptTextArchDownCurveHandle), SAL_N_ELEMENTS( mso_sptTextArchDownCurveHandle ) }; static const SvxMSDffVertPair mso_sptTextCircleCurveVert[] = @@ -6823,15 +6823,15 @@ static const sal_Int32 mso_sptTextCircleCurveDefault[] = }; static const mso_CustomShape msoTextCircleCurve = { - (SvxMSDffVertPair*)mso_sptTextCircleCurveVert, SAL_N_ELEMENTS( mso_sptTextCircleCurveVert ), - (sal_uInt16*)mso_sptTextCircleCurveSegm, sizeof( mso_sptTextCircleCurveSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextCircleCurveCalc, SAL_N_ELEMENTS( mso_sptTextCircleCurveCalc ), - (sal_Int32*)mso_sptTextCircleCurveDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextCircleCurveVert), SAL_N_ELEMENTS( mso_sptTextCircleCurveVert ), + const_cast(mso_sptTextCircleCurveSegm), sizeof( mso_sptTextCircleCurveSegm ) >> 1, + const_cast(mso_sptTextCircleCurveCalc), SAL_N_ELEMENTS( mso_sptTextCircleCurveCalc ), + const_cast(mso_sptTextCircleCurveDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextCircleCurveHandle, SAL_N_ELEMENTS( mso_sptTextCircleCurveHandle ) + const_cast(mso_sptTextCircleCurveHandle), SAL_N_ELEMENTS( mso_sptTextCircleCurveHandle ) }; static const SvxMSDffVertPair mso_sptTextButtonCurveVert[] = @@ -6866,15 +6866,15 @@ static const sal_Int32 mso_sptTextButtonCurveDefault[] = }; static const mso_CustomShape msoTextButtonCurve = { - (SvxMSDffVertPair*)mso_sptTextButtonCurveVert, SAL_N_ELEMENTS( mso_sptTextButtonCurveVert ), - (sal_uInt16*)mso_sptTextButtonCurveSegm, sizeof( mso_sptTextButtonCurveSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextButtonCurveCalc, SAL_N_ELEMENTS( mso_sptTextButtonCurveCalc ), - (sal_Int32*)mso_sptTextButtonCurveDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextButtonCurveVert), SAL_N_ELEMENTS( mso_sptTextButtonCurveVert ), + const_cast(mso_sptTextButtonCurveSegm), sizeof( mso_sptTextButtonCurveSegm ) >> 1, + const_cast(mso_sptTextButtonCurveCalc), SAL_N_ELEMENTS( mso_sptTextButtonCurveCalc ), + const_cast(mso_sptTextButtonCurveDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextButtonCurveHandle, SAL_N_ELEMENTS( mso_sptTextButtonCurveHandle ) + const_cast(mso_sptTextButtonCurveHandle), SAL_N_ELEMENTS( mso_sptTextButtonCurveHandle ) }; static const SvxMSDffVertPair mso_sptTextArchUpPourVert[] = @@ -6912,15 +6912,15 @@ static const sal_Int32 mso_sptTextArchUpPourDefault[] = }; static const mso_CustomShape msoTextArchUpPour = { - (SvxMSDffVertPair*)mso_sptTextArchUpPourVert, SAL_N_ELEMENTS( mso_sptTextArchUpPourVert ), - (sal_uInt16*)mso_sptTextArchUpPourSegm, sizeof( mso_sptTextArchUpPourSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextArchPourCalc, SAL_N_ELEMENTS( mso_sptTextArchPourCalc ), - (sal_Int32*)mso_sptTextArchUpPourDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextArchUpPourVert), SAL_N_ELEMENTS( mso_sptTextArchUpPourVert ), + const_cast(mso_sptTextArchUpPourSegm), sizeof( mso_sptTextArchUpPourSegm ) >> 1, + const_cast(mso_sptTextArchPourCalc), SAL_N_ELEMENTS( mso_sptTextArchPourCalc ), + const_cast(mso_sptTextArchUpPourDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextArchPourHandle, SAL_N_ELEMENTS( mso_sptTextArchPourHandle ) + const_cast(mso_sptTextArchPourHandle), SAL_N_ELEMENTS( mso_sptTextArchPourHandle ) }; static const SvxMSDffVertPair mso_sptTextArchDownPourVert[] = @@ -6938,15 +6938,15 @@ static const sal_Int32 mso_sptTextArchDownPourDefault[] = }; static const mso_CustomShape msoTextArchDownPour = { - (SvxMSDffVertPair*)mso_sptTextArchDownPourVert, SAL_N_ELEMENTS( mso_sptTextArchDownPourVert ), - (sal_uInt16*)mso_sptTextArchDownPourSegm, sizeof( mso_sptTextArchDownPourSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextArchPourCalc, SAL_N_ELEMENTS( mso_sptTextArchPourCalc ), - (sal_Int32*)mso_sptTextArchDownPourDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextArchDownPourVert), SAL_N_ELEMENTS( mso_sptTextArchDownPourVert ), + const_cast(mso_sptTextArchDownPourSegm), sizeof( mso_sptTextArchDownPourSegm ) >> 1, + const_cast(mso_sptTextArchPourCalc), SAL_N_ELEMENTS( mso_sptTextArchPourCalc ), + const_cast(mso_sptTextArchDownPourDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextArchPourHandle, SAL_N_ELEMENTS( mso_sptTextArchPourHandle ) + const_cast(mso_sptTextArchPourHandle), SAL_N_ELEMENTS( mso_sptTextArchPourHandle ) }; static const SvxMSDffVertPair mso_sptTextCirclePourVert[] = @@ -6985,15 +6985,15 @@ static const sal_Int32 mso_sptTextCirclePourDefault[] = }; static const mso_CustomShape msoTextCirclePour = { - (SvxMSDffVertPair*)mso_sptTextCirclePourVert, SAL_N_ELEMENTS( mso_sptTextCirclePourVert ), - (sal_uInt16*)mso_sptTextCirclePourSegm, sizeof( mso_sptTextCirclePourSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextCirclePourCalc, SAL_N_ELEMENTS( mso_sptTextCirclePourCalc ), - (sal_Int32*)mso_sptTextCirclePourDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextCirclePourVert), SAL_N_ELEMENTS( mso_sptTextCirclePourVert ), + const_cast(mso_sptTextCirclePourSegm), sizeof( mso_sptTextCirclePourSegm ) >> 1, + const_cast(mso_sptTextCirclePourCalc), SAL_N_ELEMENTS( mso_sptTextCirclePourCalc ), + const_cast(mso_sptTextCirclePourDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextCirclePourHandle, SAL_N_ELEMENTS( mso_sptTextCirclePourHandle ) + const_cast(mso_sptTextCirclePourHandle), SAL_N_ELEMENTS( mso_sptTextCirclePourHandle ) }; static const SvxMSDffVertPair mso_sptTextButtonPourVert[] = @@ -7053,15 +7053,15 @@ static const sal_Int32 mso_sptTextButtonPourDefault[] = }; static const mso_CustomShape msoTextButtonPour = { - (SvxMSDffVertPair*)mso_sptTextButtonPourVert, SAL_N_ELEMENTS( mso_sptTextButtonPourVert ), - (sal_uInt16*)mso_sptTextButtonPourSegm, sizeof( mso_sptTextButtonPourSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextButtonPourCalc, SAL_N_ELEMENTS( mso_sptTextButtonPourCalc ), - (sal_Int32*)mso_sptTextButtonPourDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextButtonPourVert), SAL_N_ELEMENTS( mso_sptTextButtonPourVert ), + const_cast(mso_sptTextButtonPourSegm), sizeof( mso_sptTextButtonPourSegm ) >> 1, + const_cast(mso_sptTextButtonPourCalc), SAL_N_ELEMENTS( mso_sptTextButtonPourCalc ), + const_cast(mso_sptTextButtonPourDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextButtonPourHandle, SAL_N_ELEMENTS( mso_sptTextButtonPourHandle ) + const_cast(mso_sptTextButtonPourHandle), SAL_N_ELEMENTS( mso_sptTextButtonPourHandle ) }; static const SvxMSDffVertPair mso_sptTextCurveUpVert[] = @@ -7093,15 +7093,15 @@ static const sal_Int32 mso_sptTextCurveUpDefault[] = }; static const mso_CustomShape msoTextCurveUp = { - (SvxMSDffVertPair*)mso_sptTextCurveUpVert, SAL_N_ELEMENTS( mso_sptTextCurveUpVert ), - (sal_uInt16*)mso_sptTextCurveUpSegm, sizeof( mso_sptTextCurveUpSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextCurveUpCalc, SAL_N_ELEMENTS( mso_sptTextCurveUpCalc ), - (sal_Int32*)mso_sptTextCurveUpDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextCurveUpVert), SAL_N_ELEMENTS( mso_sptTextCurveUpVert ), + const_cast(mso_sptTextCurveUpSegm), sizeof( mso_sptTextCurveUpSegm ) >> 1, + const_cast(mso_sptTextCurveUpCalc), SAL_N_ELEMENTS( mso_sptTextCurveUpCalc ), + const_cast(mso_sptTextCurveUpDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextCurveUpHandle, SAL_N_ELEMENTS( mso_sptTextCurveUpHandle ) + const_cast(mso_sptTextCurveUpHandle), SAL_N_ELEMENTS( mso_sptTextCurveUpHandle ) }; static const SvxMSDffVertPair mso_sptTextCurveDownVert[] = @@ -7119,15 +7119,15 @@ static const SvxMSDffHandle mso_sptTextCurveDownHandle[] = }; static const mso_CustomShape msoTextCurveDown = { - (SvxMSDffVertPair*)mso_sptTextCurveDownVert, SAL_N_ELEMENTS( mso_sptTextCurveDownVert ), - (sal_uInt16*)mso_sptTextCurveUpSegm, sizeof( mso_sptTextCurveUpSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextCurveUpCalc, SAL_N_ELEMENTS( mso_sptTextCurveUpCalc ), - (sal_Int32*)mso_sptTextCurveUpDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextCurveDownVert), SAL_N_ELEMENTS( mso_sptTextCurveDownVert ), + const_cast(mso_sptTextCurveUpSegm), sizeof( mso_sptTextCurveUpSegm ) >> 1, + const_cast(mso_sptTextCurveUpCalc), SAL_N_ELEMENTS( mso_sptTextCurveUpCalc ), + const_cast(mso_sptTextCurveUpDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextCurveDownHandle, SAL_N_ELEMENTS( mso_sptTextCurveDownHandle ) + const_cast(mso_sptTextCurveDownHandle), SAL_N_ELEMENTS( mso_sptTextCurveDownHandle ) }; static const SvxMSDffVertPair mso_sptTextCanUpVert[] = @@ -7159,15 +7159,15 @@ static const sal_Int32 mso_sptTextCanUpDefault[] = }; static const mso_CustomShape msoTextCanUp = { - (SvxMSDffVertPair*)mso_sptTextCanUpVert, SAL_N_ELEMENTS( mso_sptTextCanUpVert ), - (sal_uInt16*)mso_sptTextCanUpSegm, sizeof( mso_sptTextCanUpSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextCanUpCalc, SAL_N_ELEMENTS( mso_sptTextCanUpCalc ), - (sal_Int32*)mso_sptTextCanUpDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextCanUpVert), SAL_N_ELEMENTS( mso_sptTextCanUpVert ), + const_cast(mso_sptTextCanUpSegm), sizeof( mso_sptTextCanUpSegm ) >> 1, + const_cast(mso_sptTextCanUpCalc), SAL_N_ELEMENTS( mso_sptTextCanUpCalc ), + const_cast(mso_sptTextCanUpDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextCanUpHandle, SAL_N_ELEMENTS( mso_sptTextCanUpHandle ) + const_cast(mso_sptTextCanUpHandle), SAL_N_ELEMENTS( mso_sptTextCanUpHandle ) }; static const SvxMSDffVertPair mso_sptTextCanDownVert[] = @@ -7192,15 +7192,15 @@ static const sal_Int32 mso_sptTextCanDownDefault[] = }; static const mso_CustomShape msoTextCanDown = { - (SvxMSDffVertPair*)mso_sptTextCanDownVert, SAL_N_ELEMENTS( mso_sptTextCanDownVert ), - (sal_uInt16*)mso_sptTextCanUpSegm, sizeof( mso_sptTextCanUpSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextCanDownCalc, SAL_N_ELEMENTS( mso_sptTextCanDownCalc ), - (sal_Int32*)mso_sptTextCanDownDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextCanDownVert), SAL_N_ELEMENTS( mso_sptTextCanDownVert ), + const_cast(mso_sptTextCanUpSegm), sizeof( mso_sptTextCanUpSegm ) >> 1, + const_cast(mso_sptTextCanDownCalc), SAL_N_ELEMENTS( mso_sptTextCanDownCalc ), + const_cast(mso_sptTextCanDownDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextCanDownHandle, SAL_N_ELEMENTS( mso_sptTextCanDownHandle ) + const_cast(mso_sptTextCanDownHandle), SAL_N_ELEMENTS( mso_sptTextCanDownHandle ) }; static const SvxMSDffVertPair mso_sptTextInflateVert[] = @@ -7226,15 +7226,15 @@ static const sal_Int32 mso_sptTextInflateDefault[] = }; static const mso_CustomShape msoTextInflate = { - (SvxMSDffVertPair*)mso_sptTextInflateVert, SAL_N_ELEMENTS( mso_sptTextInflateVert ), - (sal_uInt16*)mso_sptTextCanUpSegm, sizeof( mso_sptTextCanUpSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextInflateCalc, SAL_N_ELEMENTS( mso_sptTextInflateCalc ), - (sal_Int32*)mso_sptTextInflateDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextInflateVert), SAL_N_ELEMENTS( mso_sptTextInflateVert ), + const_cast(mso_sptTextCanUpSegm), sizeof( mso_sptTextCanUpSegm ) >> 1, + const_cast(mso_sptTextInflateCalc), SAL_N_ELEMENTS( mso_sptTextInflateCalc ), + const_cast(mso_sptTextInflateDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextInflateHandle, SAL_N_ELEMENTS( mso_sptTextInflateHandle ) + const_cast(mso_sptTextInflateHandle), SAL_N_ELEMENTS( mso_sptTextInflateHandle ) }; static const SvxMSDffVertPair mso_sptTextDeflateVert[] = @@ -7256,15 +7256,15 @@ static const SvxMSDffHandle mso_sptTextDeflateHandle[] = }; static const mso_CustomShape msoTextDeflate = { - (SvxMSDffVertPair*)mso_sptTextDeflateVert, SAL_N_ELEMENTS( mso_sptTextDeflateVert ), - (sal_uInt16*)mso_sptTextCanUpSegm, sizeof( mso_sptTextCanUpSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextDeflateCalc, SAL_N_ELEMENTS( mso_sptTextDeflateCalc ), - (sal_Int32*)mso_sptDefault8100, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextDeflateVert), SAL_N_ELEMENTS( mso_sptTextDeflateVert ), + const_cast(mso_sptTextCanUpSegm), sizeof( mso_sptTextCanUpSegm ) >> 1, + const_cast(mso_sptTextDeflateCalc), SAL_N_ELEMENTS( mso_sptTextDeflateCalc ), + const_cast(mso_sptDefault8100), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextDeflateHandle, SAL_N_ELEMENTS( mso_sptTextDeflateHandle ) + const_cast(mso_sptTextDeflateHandle), SAL_N_ELEMENTS( mso_sptTextDeflateHandle ) }; static const SvxMSDffVertPair mso_sptTextInflateBottomVert[] = @@ -7295,15 +7295,15 @@ static const sal_Int32 mso_sptTextInflateBottomDefault[] = }; static const mso_CustomShape msoTextInflateBottom = { - (SvxMSDffVertPair*)mso_sptTextInflateBottomVert, SAL_N_ELEMENTS( mso_sptTextInflateBottomVert ), - (sal_uInt16*)mso_sptTextInflateBottomSegm, sizeof( mso_sptTextInflateBottomSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextInflateBottomCalc, SAL_N_ELEMENTS( mso_sptTextInflateBottomCalc ), - (sal_Int32*)mso_sptTextInflateBottomDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextInflateBottomVert), SAL_N_ELEMENTS( mso_sptTextInflateBottomVert ), + const_cast(mso_sptTextInflateBottomSegm), sizeof( mso_sptTextInflateBottomSegm ) >> 1, + const_cast(mso_sptTextInflateBottomCalc), SAL_N_ELEMENTS( mso_sptTextInflateBottomCalc ), + const_cast(mso_sptTextInflateBottomDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextInflateBottomHandle, SAL_N_ELEMENTS( mso_sptTextInflateBottomHandle ) + const_cast(mso_sptTextInflateBottomHandle), SAL_N_ELEMENTS( mso_sptTextInflateBottomHandle ) }; static const SvxMSDffVertPair mso_sptTextDeflateBottomVert[] = @@ -7334,15 +7334,15 @@ static const sal_Int32 mso_sptTextDeflateBottomDefault[] = }; static const mso_CustomShape msoTextDeflateBottom = { - (SvxMSDffVertPair*)mso_sptTextDeflateBottomVert, SAL_N_ELEMENTS( mso_sptTextDeflateBottomVert ), - (sal_uInt16*)mso_sptTextDeflateBottomSegm, sizeof( mso_sptTextDeflateBottomSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextDeflateBottomCalc, SAL_N_ELEMENTS( mso_sptTextDeflateBottomCalc ), - (sal_Int32*)mso_sptTextDeflateBottomDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextDeflateBottomVert), SAL_N_ELEMENTS( mso_sptTextDeflateBottomVert ), + const_cast(mso_sptTextDeflateBottomSegm), sizeof( mso_sptTextDeflateBottomSegm ) >> 1, + const_cast(mso_sptTextDeflateBottomCalc), SAL_N_ELEMENTS( mso_sptTextDeflateBottomCalc ), + const_cast(mso_sptTextDeflateBottomDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextDeflateBottomHandle, SAL_N_ELEMENTS( mso_sptTextDeflateBottomHandle ) + const_cast(mso_sptTextDeflateBottomHandle), SAL_N_ELEMENTS( mso_sptTextDeflateBottomHandle ) }; static const SvxMSDffVertPair mso_sptTextInflateTopVert[] = @@ -7371,15 +7371,15 @@ static const sal_Int32 mso_sptTextInflateTopDefault[] = }; static const mso_CustomShape msoTextInflateTop = { - (SvxMSDffVertPair*)mso_sptTextInflateTopVert, SAL_N_ELEMENTS( mso_sptTextInflateTopVert ), - (sal_uInt16*)mso_sptTextInflateTopSegm, sizeof( mso_sptTextInflateTopSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextInflateTopCalc, SAL_N_ELEMENTS( mso_sptTextInflateTopCalc ), - (sal_Int32*)mso_sptTextInflateTopDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextInflateTopVert), SAL_N_ELEMENTS( mso_sptTextInflateTopVert ), + const_cast(mso_sptTextInflateTopSegm), sizeof( mso_sptTextInflateTopSegm ) >> 1, + const_cast(mso_sptTextInflateTopCalc), SAL_N_ELEMENTS( mso_sptTextInflateTopCalc ), + const_cast(mso_sptTextInflateTopDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextInflateTopHandle, SAL_N_ELEMENTS( mso_sptTextInflateTopHandle ) + const_cast(mso_sptTextInflateTopHandle), SAL_N_ELEMENTS( mso_sptTextInflateTopHandle ) }; static const SvxMSDffVertPair mso_sptTextDeflateTopVert[] = @@ -7408,15 +7408,15 @@ static const sal_Int32 mso_sptTextDeflateTopDefault[] = }; static const mso_CustomShape msoTextDeflateTop = { - (SvxMSDffVertPair*)mso_sptTextDeflateTopVert, SAL_N_ELEMENTS( mso_sptTextDeflateTopVert ), - (sal_uInt16*)mso_sptTextDeflateTopSegm, sizeof( mso_sptTextDeflateTopSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextDeflateTopCalc, SAL_N_ELEMENTS( mso_sptTextDeflateTopCalc ), - (sal_Int32*)mso_sptTextDeflateTopDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextDeflateTopVert), SAL_N_ELEMENTS( mso_sptTextDeflateTopVert ), + const_cast(mso_sptTextDeflateTopSegm), sizeof( mso_sptTextDeflateTopSegm ) >> 1, + const_cast(mso_sptTextDeflateTopCalc), SAL_N_ELEMENTS( mso_sptTextDeflateTopCalc ), + const_cast(mso_sptTextDeflateTopDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextDeflateTopHandle, SAL_N_ELEMENTS( mso_sptTextDeflateTopHandle ) + const_cast(mso_sptTextDeflateTopHandle), SAL_N_ELEMENTS( mso_sptTextDeflateTopHandle ) }; static const SvxMSDffVertPair mso_sptTextDeflateInflateVert[] = @@ -7454,15 +7454,15 @@ static const sal_Int32 mso_sptTextDeflateInflateDefault[] = }; static const mso_CustomShape msoTextDeflateInflate = { - (SvxMSDffVertPair*)mso_sptTextDeflateInflateVert, SAL_N_ELEMENTS( mso_sptTextDeflateInflateVert ), - (sal_uInt16*)mso_sptTextDeflateInflateSegm, sizeof( mso_sptTextDeflateInflateSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextDeflateInflateCalc, SAL_N_ELEMENTS( mso_sptTextDeflateInflateCalc ), - (sal_Int32*)mso_sptTextDeflateInflateDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextDeflateInflateVert), SAL_N_ELEMENTS( mso_sptTextDeflateInflateVert ), + const_cast(mso_sptTextDeflateInflateSegm), sizeof( mso_sptTextDeflateInflateSegm ) >> 1, + const_cast(mso_sptTextDeflateInflateCalc), SAL_N_ELEMENTS( mso_sptTextDeflateInflateCalc ), + const_cast(mso_sptTextDeflateInflateDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextDeflateInflateHandle, SAL_N_ELEMENTS( mso_sptTextDeflateInflateHandle ) + const_cast(mso_sptTextDeflateInflateHandle), SAL_N_ELEMENTS( mso_sptTextDeflateInflateHandle ) }; static const SvxMSDffVertPair mso_sptTextDeflateInflateDeflateVert[] = @@ -7508,15 +7508,15 @@ static const sal_Int32 mso_sptTextDeflateInflateDeflateDefault[] = }; static const mso_CustomShape msoTextDeflateInflateDeflate = { - (SvxMSDffVertPair*)mso_sptTextDeflateInflateDeflateVert, SAL_N_ELEMENTS( mso_sptTextDeflateInflateDeflateVert ), - (sal_uInt16*)mso_sptTextDeflateInflateDeflateSegm, sizeof( mso_sptTextDeflateInflateDeflateSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTextDeflateInflateDeflateCalc, SAL_N_ELEMENTS( mso_sptTextDeflateInflateDeflateCalc ), - (sal_Int32*)mso_sptTextDeflateInflateDeflateDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextDeflateInflateDeflateVert), SAL_N_ELEMENTS( mso_sptTextDeflateInflateDeflateVert ), + const_cast(mso_sptTextDeflateInflateDeflateSegm), sizeof( mso_sptTextDeflateInflateDeflateSegm ) >> 1, + const_cast(mso_sptTextDeflateInflateDeflateCalc), SAL_N_ELEMENTS( mso_sptTextDeflateInflateDeflateCalc ), + const_cast(mso_sptTextDeflateInflateDeflateDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTextDeflateInflateDeflateHandle, SAL_N_ELEMENTS( mso_sptTextDeflateInflateDeflateHandle ) + const_cast(mso_sptTextDeflateInflateDeflateHandle), SAL_N_ELEMENTS( mso_sptTextDeflateInflateDeflateHandle ) }; static const SvxMSDffVertPair mso_sptTextWave1Vert[] = // adjustment1 : 0 - 4459 @@ -7531,15 +7531,15 @@ static const sal_uInt16 mso_sptTextWave1Segm[] = }; static const mso_CustomShape msoTextWave1 = { - (SvxMSDffVertPair*)mso_sptTextWave1Vert, SAL_N_ELEMENTS( mso_sptTextWave1Vert ), - (sal_uInt16*)mso_sptTextWave1Segm, sizeof( mso_sptTextWave1Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptWaveCalc, SAL_N_ELEMENTS( mso_sptWaveCalc ), - (sal_Int32*)mso_sptWaveDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextWave1Vert), SAL_N_ELEMENTS( mso_sptTextWave1Vert ), + const_cast(mso_sptTextWave1Segm), sizeof( mso_sptTextWave1Segm ) >> 1, + const_cast(mso_sptWaveCalc), SAL_N_ELEMENTS( mso_sptWaveCalc ), + const_cast(mso_sptWaveDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptWaveGluePoints, SAL_N_ELEMENTS( mso_sptWaveGluePoints ), - (SvxMSDffHandle*)mso_sptWaveHandle, SAL_N_ELEMENTS( mso_sptWaveHandle ) + const_cast(mso_sptWaveGluePoints), SAL_N_ELEMENTS( mso_sptWaveGluePoints ), + const_cast(mso_sptWaveHandle), SAL_N_ELEMENTS( mso_sptWaveHandle ) }; static const SvxMSDffVertPair mso_sptTextWave2Vert[] = // adjustment1 : 0 - 4459 @@ -7549,15 +7549,15 @@ static const SvxMSDffVertPair mso_sptTextWave2Vert[] = // adjustment1 : 0 - 445 }; static const mso_CustomShape msoTextWave2 = { - (SvxMSDffVertPair*)mso_sptTextWave2Vert, SAL_N_ELEMENTS( mso_sptTextWave2Vert ), - (sal_uInt16*)mso_sptTextWave1Segm, sizeof( mso_sptTextWave1Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptWaveCalc, SAL_N_ELEMENTS( mso_sptWaveCalc ), - (sal_Int32*)mso_sptWaveDefault, - (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), + const_cast(mso_sptTextWave2Vert), SAL_N_ELEMENTS( mso_sptTextWave2Vert ), + const_cast(mso_sptTextWave1Segm), sizeof( mso_sptTextWave1Segm ) >> 1, + const_cast(mso_sptWaveCalc), SAL_N_ELEMENTS( mso_sptWaveCalc ), + const_cast(mso_sptWaveDefault), + const_cast(mso_sptFontWorkTextRect), SAL_N_ELEMENTS( mso_sptFontWorkTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptWaveGluePoints, SAL_N_ELEMENTS( mso_sptWaveGluePoints ), - (SvxMSDffHandle*)mso_sptWaveHandle, SAL_N_ELEMENTS( mso_sptWaveHandle ) + const_cast(mso_sptWaveGluePoints), SAL_N_ELEMENTS( mso_sptWaveGluePoints ), + const_cast(mso_sptWaveHandle), SAL_N_ELEMENTS( mso_sptWaveHandle ) }; static const SvxMSDffVertPair mso_sptTextWave3Vert[] = // adjustment1 : 0 - 2230 @@ -7572,15 +7572,15 @@ static const sal_uInt16 mso_sptTextWave3Segm[] = }; static const mso_CustomShape msoTextWave3 = { - (SvxMSDffVertPair*)mso_sptTextWave3Vert, SAL_N_ELEMENTS( mso_sptTextWave3Vert ), - (sal_uInt16*)mso_sptTextWave3Segm, sizeof( mso_sptTextWave3Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptDoubleWaveCalc, SAL_N_ELEMENTS( mso_sptDoubleWaveCalc ), - (sal_Int32*)mso_sptDoubleWaveDefault, - (SvxMSDffTextRectangles*)mso_sptDoubleWaveTextRect, SAL_N_ELEMENTS( mso_sptDoubleWaveTextRect ), + const_cast(mso_sptTextWave3Vert), SAL_N_ELEMENTS( mso_sptTextWave3Vert ), + const_cast(mso_sptTextWave3Segm), sizeof( mso_sptTextWave3Segm ) >> 1, + const_cast(mso_sptDoubleWaveCalc), SAL_N_ELEMENTS( mso_sptDoubleWaveCalc ), + const_cast(mso_sptDoubleWaveDefault), + const_cast(mso_sptDoubleWaveTextRect), SAL_N_ELEMENTS( mso_sptDoubleWaveTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptDoubleWaveGluePoints, SAL_N_ELEMENTS( mso_sptDoubleWaveGluePoints ), - (SvxMSDffHandle*)mso_sptDoubleWaveHandle, SAL_N_ELEMENTS( mso_sptDoubleWaveHandle ) + const_cast(mso_sptDoubleWaveGluePoints), SAL_N_ELEMENTS( mso_sptDoubleWaveGluePoints ), + const_cast(mso_sptDoubleWaveHandle), SAL_N_ELEMENTS( mso_sptDoubleWaveHandle ) }; static const SvxMSDffVertPair mso_sptTextWave4Vert[] = // adjustment1 : 0 - 2230 @@ -7590,15 +7590,15 @@ static const SvxMSDffVertPair mso_sptTextWave4Vert[] = // adjustment1 : 0 - 223 }; static const mso_CustomShape msoTextWave4 = { - (SvxMSDffVertPair*)mso_sptTextWave4Vert, SAL_N_ELEMENTS( mso_sptTextWave4Vert ), - (sal_uInt16*)mso_sptTextWave3Segm, sizeof( mso_sptTextWave3Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptDoubleWaveCalc, SAL_N_ELEMENTS( mso_sptDoubleWaveCalc ), - (sal_Int32*)mso_sptDoubleWaveDefault, - (SvxMSDffTextRectangles*)mso_sptDoubleWaveTextRect, SAL_N_ELEMENTS( mso_sptDoubleWaveTextRect ), + const_cast(mso_sptTextWave4Vert), SAL_N_ELEMENTS( mso_sptTextWave4Vert ), + const_cast(mso_sptTextWave3Segm), sizeof( mso_sptTextWave3Segm ) >> 1, + const_cast(mso_sptDoubleWaveCalc), SAL_N_ELEMENTS( mso_sptDoubleWaveCalc ), + const_cast(mso_sptDoubleWaveDefault), + const_cast(mso_sptDoubleWaveTextRect), SAL_N_ELEMENTS( mso_sptDoubleWaveTextRect ), 21600, 21600, MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptDoubleWaveGluePoints, SAL_N_ELEMENTS( mso_sptDoubleWaveGluePoints ), - (SvxMSDffHandle*)mso_sptDoubleWaveHandle, SAL_N_ELEMENTS( mso_sptDoubleWaveHandle ) + const_cast(mso_sptDoubleWaveGluePoints), SAL_N_ELEMENTS( mso_sptDoubleWaveGluePoints ), + const_cast(mso_sptDoubleWaveHandle), SAL_N_ELEMENTS( mso_sptDoubleWaveHandle ) }; static const sal_Int32 mso_sptCalloutDefault1[] = @@ -7757,195 +7757,195 @@ static const SvxMSDffCalculationData mso_sptCalloutCalc[] = static const mso_CustomShape msoCallout90 = { - (SvxMSDffVertPair*)mso_sptCalloutVert1, SAL_N_ELEMENTS( mso_sptCalloutVert1 ), - (sal_uInt16*)mso_sptCalloutSegm1b, sizeof( mso_sptCalloutSegm1b ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault1, + const_cast(mso_sptCalloutVert1), SAL_N_ELEMENTS( mso_sptCalloutVert1 ), + const_cast(mso_sptCalloutSegm1b), sizeof( mso_sptCalloutSegm1b ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault1), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle1, SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) + const_cast(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoCallout1 = { - (SvxMSDffVertPair*)mso_sptCalloutVert1, SAL_N_ELEMENTS( mso_sptCalloutVert1 ), - (sal_uInt16*)mso_sptCalloutSegm1b, sizeof( mso_sptCalloutSegm1b ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault2, + const_cast(mso_sptCalloutVert1), SAL_N_ELEMENTS( mso_sptCalloutVert1 ), + const_cast(mso_sptCalloutSegm1b), sizeof( mso_sptCalloutSegm1b ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault2), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle1, SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) + const_cast(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoCallout2 = { - (SvxMSDffVertPair*)mso_sptCallout2Verta, SAL_N_ELEMENTS( mso_sptCallout2Verta ), - (sal_uInt16*)mso_sptCallout2Segm1b, sizeof( mso_sptCallout2Segm1b ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault3, + const_cast(mso_sptCallout2Verta), SAL_N_ELEMENTS( mso_sptCallout2Verta ), + const_cast(mso_sptCallout2Segm1b), sizeof( mso_sptCallout2Segm1b ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault3), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle2, SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) + const_cast(mso_sptCalloutHandle2), SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) }; static const mso_CustomShape msoCallout3 = { - (SvxMSDffVertPair*)mso_sptCallout3Verta, SAL_N_ELEMENTS( mso_sptCallout3Verta ), - (sal_uInt16*)mso_sptCallout3Segm1b, sizeof( mso_sptCallout3Segm1b ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault4, + const_cast(mso_sptCallout3Verta), SAL_N_ELEMENTS( mso_sptCallout3Verta ), + const_cast(mso_sptCallout3Segm1b), sizeof( mso_sptCallout3Segm1b ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault4), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle3, SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) + const_cast(mso_sptCalloutHandle3), SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) }; static const mso_CustomShape msoAccentCallout90 = { - (SvxMSDffVertPair*)mso_sptCalloutVert1, SAL_N_ELEMENTS( mso_sptCalloutVert1 ), - (sal_uInt16*)mso_sptCalloutSegm1b, sizeof( mso_sptCalloutSegm1b ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault1, + const_cast(mso_sptCalloutVert1), SAL_N_ELEMENTS( mso_sptCalloutVert1 ), + const_cast(mso_sptCalloutSegm1b), sizeof( mso_sptCalloutSegm1b ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault1), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle1, SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) + const_cast(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoAccentCallout1 = { - (SvxMSDffVertPair*)mso_sptCallout1Vert, SAL_N_ELEMENTS( mso_sptCallout1Vert ), - (sal_uInt16*)mso_sptCallout1Segm1b, sizeof( mso_sptCallout1Segm1b ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault2, + const_cast(mso_sptCallout1Vert), SAL_N_ELEMENTS( mso_sptCallout1Vert ), + const_cast(mso_sptCallout1Segm1b), sizeof( mso_sptCallout1Segm1b ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault2), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle1, SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) + const_cast(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoAccentCallout2 = { - (SvxMSDffVertPair*)mso_sptCallout2Vertb, SAL_N_ELEMENTS( mso_sptCallout2Vertb ), - (sal_uInt16*)mso_sptCallout2Segm1d, sizeof( mso_sptCallout2Segm1d ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault3, + const_cast(mso_sptCallout2Vertb), SAL_N_ELEMENTS( mso_sptCallout2Vertb ), + const_cast(mso_sptCallout2Segm1d), sizeof( mso_sptCallout2Segm1d ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault3), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle2, SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) + const_cast(mso_sptCalloutHandle2), SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) }; static const mso_CustomShape msoAccentCallout3 = { - (SvxMSDffVertPair*)mso_sptCallout3Vertb, SAL_N_ELEMENTS( mso_sptCallout3Vertb ), - (sal_uInt16*)mso_sptCallout3Segm1d, sizeof( mso_sptCallout3Segm1d ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault4, + const_cast(mso_sptCallout3Vertb), SAL_N_ELEMENTS( mso_sptCallout3Vertb ), + const_cast(mso_sptCallout3Segm1d), sizeof( mso_sptCallout3Segm1d ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault4), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle3, SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) + const_cast(mso_sptCalloutHandle3), SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) }; static const mso_CustomShape msoBorderCallout90 = { - (SvxMSDffVertPair*)mso_sptCalloutVert1, SAL_N_ELEMENTS( mso_sptCalloutVert1 ), - (sal_uInt16*)mso_sptCalloutSegm1a, sizeof( mso_sptCalloutSegm1a ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault1, + const_cast(mso_sptCalloutVert1), SAL_N_ELEMENTS( mso_sptCalloutVert1 ), + const_cast(mso_sptCalloutSegm1a), sizeof( mso_sptCalloutSegm1a ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault1), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle1, SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) + const_cast(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoBorderCallout1 = { - (SvxMSDffVertPair*)mso_sptCalloutVert1, SAL_N_ELEMENTS( mso_sptCalloutVert1 ), - (sal_uInt16*)mso_sptCalloutSegm1a, sizeof( mso_sptCalloutSegm1a ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault2, + const_cast(mso_sptCalloutVert1), SAL_N_ELEMENTS( mso_sptCalloutVert1 ), + const_cast(mso_sptCalloutSegm1a), sizeof( mso_sptCalloutSegm1a ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault2), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle1, SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) + const_cast(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoBorderCallout2 = { - (SvxMSDffVertPair*)mso_sptCallout2Verta, SAL_N_ELEMENTS( mso_sptCallout2Verta ), - (sal_uInt16*)mso_sptCallout2Segm1a, sizeof( mso_sptCallout2Segm1a ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault3, + const_cast(mso_sptCallout2Verta), SAL_N_ELEMENTS( mso_sptCallout2Verta ), + const_cast(mso_sptCallout2Segm1a), sizeof( mso_sptCallout2Segm1a ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault3), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle2, SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) + const_cast(mso_sptCalloutHandle2), SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) }; static const mso_CustomShape msoBorderCallout3 = { - (SvxMSDffVertPair*)mso_sptCallout3Verta, SAL_N_ELEMENTS( mso_sptCallout3Verta ), - (sal_uInt16*)mso_sptCallout3Segm1a, sizeof( mso_sptCallout3Segm1a ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault4, + const_cast(mso_sptCallout3Verta), SAL_N_ELEMENTS( mso_sptCallout3Verta ), + const_cast(mso_sptCallout3Segm1a), sizeof( mso_sptCallout3Segm1a ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault4), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle3, SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) + const_cast(mso_sptCalloutHandle3), SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) }; static const mso_CustomShape msoAccentBorderCallout90 = { - (SvxMSDffVertPair*)mso_sptCalloutVert1, SAL_N_ELEMENTS( mso_sptCalloutVert1 ), - (sal_uInt16*)mso_sptCalloutSegm1a, sizeof( mso_sptCalloutSegm1a ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault1, + const_cast(mso_sptCalloutVert1), SAL_N_ELEMENTS( mso_sptCalloutVert1 ), + const_cast(mso_sptCalloutSegm1a), sizeof( mso_sptCalloutSegm1a ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault1), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle1, SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) + const_cast(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoAccentBorderCallout1 = { - (SvxMSDffVertPair*)mso_sptCallout1Vert, SAL_N_ELEMENTS( mso_sptCallout1Vert ), - (sal_uInt16*)mso_sptCallout1Segm1a, sizeof( mso_sptCallout1Segm1a ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault2, + const_cast(mso_sptCallout1Vert), SAL_N_ELEMENTS( mso_sptCallout1Vert ), + const_cast(mso_sptCallout1Segm1a), sizeof( mso_sptCallout1Segm1a ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault2), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle1, SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) + const_cast(mso_sptCalloutHandle1), SAL_N_ELEMENTS( mso_sptCalloutHandle1 ) }; static const mso_CustomShape msoAccentBorderCallout2 = { - (SvxMSDffVertPair*)mso_sptCallout2Vertb, SAL_N_ELEMENTS( mso_sptCallout2Vertb ), - (sal_uInt16*)mso_sptCallout2Segm1c, sizeof( mso_sptCallout2Segm1c ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault3, + const_cast(mso_sptCallout2Vertb), SAL_N_ELEMENTS( mso_sptCallout2Vertb ), + const_cast(mso_sptCallout2Segm1c), sizeof( mso_sptCallout2Segm1c ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault3), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle2, SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) + const_cast(mso_sptCalloutHandle2), SAL_N_ELEMENTS( mso_sptCalloutHandle2 ) }; static const mso_CustomShape msoAccentBorderCallout3 = { - (SvxMSDffVertPair*)mso_sptCallout3Vertb, SAL_N_ELEMENTS( mso_sptCallout3Vertb ), - (sal_uInt16*)mso_sptCallout3Segm1c, sizeof( mso_sptCallout3Segm1c ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalloutCalc, SAL_N_ELEMENTS( mso_sptCalloutCalc ), - (sal_Int32*)mso_sptCalloutDefault4, + const_cast(mso_sptCallout3Vertb), SAL_N_ELEMENTS( mso_sptCallout3Vertb ), + const_cast(mso_sptCallout3Segm1c), sizeof( mso_sptCallout3Segm1c ) >> 1, + const_cast(mso_sptCalloutCalc), SAL_N_ELEMENTS( mso_sptCalloutCalc ), + const_cast(mso_sptCalloutDefault4), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCalloutHandle3, SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) + const_cast(mso_sptCalloutHandle3), SAL_N_ELEMENTS( mso_sptCalloutHandle3 ) }; static const SvxMSDffVertPair mso_sptStraightConnector1Vert[] = @@ -7958,8 +7958,8 @@ static const sal_uInt16 mso_sptStraightConnector1Segm[] = }; static const mso_CustomShape msoStraightConnector1 = { - (SvxMSDffVertPair*)mso_sptStraightConnector1Vert, SAL_N_ELEMENTS( mso_sptStraightConnector1Vert ), - (sal_uInt16*)mso_sptStraightConnector1Segm, sizeof( mso_sptStraightConnector1Segm ) >> 1, + const_cast(mso_sptStraightConnector1Vert), SAL_N_ELEMENTS( mso_sptStraightConnector1Vert ), + const_cast(mso_sptStraightConnector1Segm), sizeof( mso_sptStraightConnector1Segm ) >> 1, (SvxMSDffCalculationData*)NULL, 0, (sal_Int32*)NULL, NULL, 0, @@ -7979,8 +7979,8 @@ static const sal_uInt16 mso_sptBentConnector2Segm[] = }; static const mso_CustomShape msoBentConnector2 = { - (SvxMSDffVertPair*)mso_sptBentConnector2Vert, SAL_N_ELEMENTS( mso_sptBentConnector2Vert ), - (sal_uInt16*)mso_sptBentConnector2Segm, sizeof( mso_sptBentConnector2Segm ) >> 1, + const_cast(mso_sptBentConnector2Vert), SAL_N_ELEMENTS( mso_sptBentConnector2Vert ), + const_cast(mso_sptBentConnector2Segm), sizeof( mso_sptBentConnector2Segm ) >> 1, (SvxMSDffCalculationData*)NULL, 0, (sal_Int32*)NULL, NULL, 0, @@ -8013,15 +8013,15 @@ static const SvxMSDffHandle mso_sptBentConnector3Handle[] = }; static const mso_CustomShape msoBentConnector3 = { - (SvxMSDffVertPair*)mso_sptBentConnector3Vert, SAL_N_ELEMENTS( mso_sptBentConnector3Vert ), - (sal_uInt16*)mso_sptBentConnector3Segm, sizeof( mso_sptBentConnector3Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBentConnector3Calc, SAL_N_ELEMENTS( mso_sptBentConnector3Calc ), - (sal_Int32*)mso_sptBentConnector3Default, + const_cast(mso_sptBentConnector3Vert), SAL_N_ELEMENTS( mso_sptBentConnector3Vert ), + const_cast(mso_sptBentConnector3Segm), sizeof( mso_sptBentConnector3Segm ) >> 1, + const_cast(mso_sptBentConnector3Calc), SAL_N_ELEMENTS( mso_sptBentConnector3Calc ), + const_cast(mso_sptBentConnector3Default), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptBentConnector3Handle, SAL_N_ELEMENTS( mso_sptBentConnector3Handle ) + const_cast(mso_sptBentConnector3Handle), SAL_N_ELEMENTS( mso_sptBentConnector3Handle ) }; static const SvxMSDffVertPair mso_sptBentConnector4Vert[] = @@ -8053,15 +8053,15 @@ static const SvxMSDffHandle mso_sptBentConnector4Handle[] = }; static const mso_CustomShape msoBentConnector4 = { - (SvxMSDffVertPair*)mso_sptBentConnector4Vert, SAL_N_ELEMENTS( mso_sptBentConnector4Vert ), - (sal_uInt16*)mso_sptBentConnector4Segm, sizeof( mso_sptBentConnector4Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBentConnector4Calc, SAL_N_ELEMENTS( mso_sptBentConnector4Calc ), - (sal_Int32*)mso_sptBentConnector4Default, + const_cast(mso_sptBentConnector4Vert), SAL_N_ELEMENTS( mso_sptBentConnector4Vert ), + const_cast(mso_sptBentConnector4Segm), sizeof( mso_sptBentConnector4Segm ) >> 1, + const_cast(mso_sptBentConnector4Calc), SAL_N_ELEMENTS( mso_sptBentConnector4Calc ), + const_cast(mso_sptBentConnector4Default), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptBentConnector4Handle, SAL_N_ELEMENTS( mso_sptBentConnector4Handle ) + const_cast(mso_sptBentConnector4Handle), SAL_N_ELEMENTS( mso_sptBentConnector4Handle ) }; static const SvxMSDffVertPair mso_sptBentConnector5Vert[] = @@ -8098,15 +8098,15 @@ static const SvxMSDffHandle mso_sptBentConnector5Handle[] = }; static const mso_CustomShape msoBentConnector5 = { - (SvxMSDffVertPair*)mso_sptBentConnector5Vert, SAL_N_ELEMENTS( mso_sptBentConnector5Vert ), - (sal_uInt16*)mso_sptBentConnector5Segm, sizeof( mso_sptBentConnector5Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptBentConnector5Calc, SAL_N_ELEMENTS( mso_sptBentConnector5Calc ), - (sal_Int32*)mso_sptBentConnector5Default, + const_cast(mso_sptBentConnector5Vert), SAL_N_ELEMENTS( mso_sptBentConnector5Vert ), + const_cast(mso_sptBentConnector5Segm), sizeof( mso_sptBentConnector5Segm ) >> 1, + const_cast(mso_sptBentConnector5Calc), SAL_N_ELEMENTS( mso_sptBentConnector5Calc ), + const_cast(mso_sptBentConnector5Default), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptBentConnector5Handle, SAL_N_ELEMENTS( mso_sptBentConnector5Handle ) + const_cast(mso_sptBentConnector5Handle), SAL_N_ELEMENTS( mso_sptBentConnector5Handle ) }; static const SvxMSDffVertPair mso_sptCurvedConnector2Vert[] = @@ -8119,8 +8119,8 @@ static const sal_uInt16 mso_sptCurvedConnector2Segm[] = }; static const mso_CustomShape msoCurvedConnector2 = { - (SvxMSDffVertPair*)mso_sptCurvedConnector2Vert, SAL_N_ELEMENTS( mso_sptCurvedConnector2Vert ), - (sal_uInt16*)mso_sptCurvedConnector2Segm, sizeof( mso_sptCurvedConnector2Segm ) >> 1, + const_cast(mso_sptCurvedConnector2Vert), SAL_N_ELEMENTS( mso_sptCurvedConnector2Vert ), + const_cast(mso_sptCurvedConnector2Segm), sizeof( mso_sptCurvedConnector2Segm ) >> 1, (SvxMSDffCalculationData*)NULL, 0, (sal_Int32*)NULL, NULL, 0, @@ -8156,15 +8156,15 @@ static const SvxMSDffHandle mso_sptCurvedConnector3Handle[] = }; static const mso_CustomShape msoCurvedConnector3 = { - (SvxMSDffVertPair*)mso_sptCurvedConnector3Vert, SAL_N_ELEMENTS( mso_sptCurvedConnector3Vert ), - (sal_uInt16*)mso_sptCurvedConnector3Segm, sizeof( mso_sptCurvedConnector3Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCurvedConnector3Calc, SAL_N_ELEMENTS( mso_sptCurvedConnector3Calc ), - (sal_Int32*)mso_sptCurvedConnector3Default, + const_cast(mso_sptCurvedConnector3Vert), SAL_N_ELEMENTS( mso_sptCurvedConnector3Vert ), + const_cast(mso_sptCurvedConnector3Segm), sizeof( mso_sptCurvedConnector3Segm ) >> 1, + const_cast(mso_sptCurvedConnector3Calc), SAL_N_ELEMENTS( mso_sptCurvedConnector3Calc ), + const_cast(mso_sptCurvedConnector3Default), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCurvedConnector3Handle, SAL_N_ELEMENTS( mso_sptCurvedConnector3Handle ) + const_cast(mso_sptCurvedConnector3Handle), SAL_N_ELEMENTS( mso_sptCurvedConnector3Handle ) }; static const SvxMSDffVertPair mso_sptCurvedConnector4Vert[] = @@ -8209,15 +8209,15 @@ static const SvxMSDffHandle mso_sptCurvedConnector4Handle[] = }; static const mso_CustomShape msoCurvedConnector4 = { - (SvxMSDffVertPair*)mso_sptCurvedConnector4Vert, SAL_N_ELEMENTS( mso_sptCurvedConnector4Vert ), - (sal_uInt16*)mso_sptCurvedConnector4Segm, sizeof( mso_sptCurvedConnector4Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCurvedConnector4Calc, SAL_N_ELEMENTS( mso_sptCurvedConnector4Calc ), - (sal_Int32*)mso_sptCurvedConnector4Default, + const_cast(mso_sptCurvedConnector4Vert), SAL_N_ELEMENTS( mso_sptCurvedConnector4Vert ), + const_cast(mso_sptCurvedConnector4Segm), sizeof( mso_sptCurvedConnector4Segm ) >> 1, + const_cast(mso_sptCurvedConnector4Calc), SAL_N_ELEMENTS( mso_sptCurvedConnector4Calc ), + const_cast(mso_sptCurvedConnector4Default), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCurvedConnector4Handle, SAL_N_ELEMENTS( mso_sptCurvedConnector4Handle ) + const_cast(mso_sptCurvedConnector4Handle), SAL_N_ELEMENTS( mso_sptCurvedConnector4Handle ) }; static const SvxMSDffVertPair mso_sptCurvedConnector5Vert[] = @@ -8272,15 +8272,15 @@ static const SvxMSDffHandle mso_sptCurvedConnector5Handle[] = }; static const mso_CustomShape msoCurvedConnector5 = { - (SvxMSDffVertPair*)mso_sptCurvedConnector5Vert, SAL_N_ELEMENTS( mso_sptCurvedConnector5Vert ), - (sal_uInt16*)mso_sptCurvedConnector5Segm, sizeof( mso_sptCurvedConnector5Segm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCurvedConnector5Calc, SAL_N_ELEMENTS( mso_sptCurvedConnector5Calc ), - (sal_Int32*)mso_sptCurvedConnector5Default, + const_cast(mso_sptCurvedConnector5Vert), SAL_N_ELEMENTS( mso_sptCurvedConnector5Vert ), + const_cast(mso_sptCurvedConnector5Segm), sizeof( mso_sptCurvedConnector5Segm ) >> 1, + const_cast(mso_sptCurvedConnector5Calc), SAL_N_ELEMENTS( mso_sptCurvedConnector5Calc ), + const_cast(mso_sptCurvedConnector5Default), NULL, 0, 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptCurvedConnector5Handle, SAL_N_ELEMENTS( mso_sptCurvedConnector5Handle ) + const_cast(mso_sptCurvedConnector5Handle), SAL_N_ELEMENTS( mso_sptCurvedConnector5Handle ) }; /////////////////////////////teardrop @@ -8333,15 +8333,15 @@ static const sal_Int32 mso_sptTearDropDefault[] = static const mso_CustomShape msoTearDrop = { - (SvxMSDffVertPair*)mso_sptTearDropVert, sizeof( mso_sptTearDropVert ) / sizeof( SvxMSDffVertPair ), - (sal_uInt16*)mso_sptTearDropSegm, sizeof( mso_sptTearDropSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptTearDropCalc, sizeof(mso_sptTearDropCalc)/sizeof(SvxMSDffCalculationData), - (sal_Int32*)mso_sptTearDropDefault, - (SvxMSDffTextRectangles*)mso_sptTearDropTextRect, sizeof( mso_sptTearDropTextRect ) / sizeof( SvxMSDffTextRectangles ), + const_cast(mso_sptTearDropVert), sizeof( mso_sptTearDropVert ) / sizeof( SvxMSDffVertPair ), + const_cast(mso_sptTearDropSegm), sizeof( mso_sptTearDropSegm ) >> 1, + const_cast(mso_sptTearDropCalc), sizeof(mso_sptTearDropCalc)/sizeof(SvxMSDffCalculationData), + const_cast(mso_sptTearDropDefault), + const_cast(mso_sptTearDropTextRect), sizeof( mso_sptTearDropTextRect ) / sizeof( SvxMSDffTextRectangles ), 21600, 21600, MIN_INT32, MIN_INT32, NULL, 0, - (SvxMSDffHandle*)mso_sptTearDropHandle, sizeof(mso_sptTearDropHandle)/sizeof(SvxMSDffHandle) // handles + const_cast(mso_sptTearDropHandle), sizeof(mso_sptTearDropHandle)/sizeof(SvxMSDffHandle) // handles }; diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index c74b2c21774d..aa5b5104e2a2 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1364,12 +1364,12 @@ bool CheckFrameBorderConnectable( const Style& rLBorder, const Style& rRBorder, double lcl_GetExtent( const Style& rBorder, const Style& rSide, const Style& rOpposite, long nAngleSide = 9000, long nAngleOpposite = 9000 ) { - Style aOtherBorder = const_cast< Style& >( rSide ); + Style aOtherBorder = rSide; long nOtherAngle = nAngleSide; if ( rSide.GetWidth() == 0 && rOpposite.GetWidth() > 0 ) { nOtherAngle = nAngleOpposite; - aOtherBorder = const_cast< Style& >( rOpposite ); + aOtherBorder = rOpposite; } else if ( rSide.GetWidth() == 0 && rOpposite.GetWidth() == 0 ) { diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index ab4be910413a..c62b4b13c96f 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -269,7 +269,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) } // Size - SvxSizeItem aSizeItem( const_cast( static_cast(rOldSet.Get( nWSize )) )); + SvxSizeItem aSizeItem( static_cast(rOldSet.Get( nWSize )) ); Size aSize( aSizeItem.GetSize() ); long nDist = GetCoreValue( *m_pDistEdit, eUnit ); long nH = GetCoreValue( *m_pHeightEdit, eUnit ); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 17304463c412..83340bf09f1f 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -190,7 +190,7 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet ) if( IsInvalidItem( pItem ) ) { nWhich = rSet.GetWhichByPos( aIter.GetCurPos() ); - aItem.pItem = (SfxPoolItem*)pItem; + aItem.pItem = const_cast(pItem); } else { diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index d746f4ecce4c..9805fb54e589 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -273,7 +273,7 @@ sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const if(nObjCount > 1) { - ((E3dScene*)this)->mp3DDepthRemapper = new Imp3DDepthRemapper((E3dScene&)(*this)); + const_cast(this)->mp3DDepthRemapper = new Imp3DDepthRemapper((E3dScene&)(*this)); } } @@ -399,7 +399,7 @@ E3dScene* E3dScene::GetScene() const if(GetParentObj()) return GetParentObj()->GetScene(); else - return (E3dScene*)this; + return const_cast(this); } void E3dScene::removeAllNonSelectedObjects() diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 16150b417904..6de3c9602ca2 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -383,7 +383,7 @@ SdrModel* E3dView::GetMarkedObjModel() const // scenes as selected objects SdrMarkList aOldML(GetMarkedObjectList()); SdrMarkList aNewML; - SdrMarkList& rCurrentMarkList = ((E3dView*)this)->GetMarkedObjectListWriteAccess(); + SdrMarkList& rCurrentMarkList = const_cast(this)->GetMarkedObjectListWriteAccess(); rCurrentMarkList = aNewML; for(size_t nObjs = 0; nObjs < nCount; ++nObjs) @@ -396,7 +396,7 @@ SdrModel* E3dView::GetMarkedObjModel() const if(pScene && !IsObjMarked(pScene) && GetSdrPageView()) { - ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), false, true); + const_cast(this)->MarkObj(pScene, GetSdrPageView(), false, true); } } } diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 16a37bd1200a..f905336585ac 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1952,7 +1952,7 @@ void FmGridControl::Select() sal_uInt16 nSelectedColumn = pColumnSelection && pColumnSelection->GetSelectCount() ? sal::static_int_cast< sal_uInt16 >( - ((MultiSelection*)pColumnSelection)->FirstSelected()) + const_cast(pColumnSelection)->FirstSelected()) : SAL_MAX_UINT16; // die HandleColumn wird nicht selektiert switch (nSelectedColumn) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index d9f70df92f52..60fb2cc05071 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1582,7 +1582,7 @@ void DbGridControl::RemoveColumns() DbGridColumn* DbGridControl::CreateColumn(sal_uInt16 nId) const { - return new DbGridColumn(nId, *(DbGridControl*)this); + return new DbGridColumn(nId, *const_cast(this)); } sal_uInt16 DbGridControl::AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nModelPos, sal_uInt16 nId) diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 914b81b9fd4f..bdec9ce5af2b 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -254,7 +254,7 @@ bool FmFormShell::PrepareClose(bool bUI) SdrPageView* pCurPageView = m_pFormView->GetSdrPageView(); // sal_uInt16 nPos = pCurPageView ? pCurPageView->GetWinList().Find((OutputDevice*)m_pFormView->GetActualOutDev()) : SDRPAGEVIEWWIN_NOTFOUND; - SdrPageWindow* pWindow = pCurPageView ? pCurPageView->FindPageWindow(*((OutputDevice*)m_pFormView->GetActualOutDev())) : 0L; + SdrPageWindow* pWindow = pCurPageView ? pCurPageView->FindPageWindow(*const_cast(m_pFormView->GetActualOutDev())) : 0L; if(pWindow) { diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 6caf40bfbd8c..131481633058 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -294,12 +294,12 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { case HINT_OBJINSERTED: { - SdrObject* pSdrObj = (SdrObject*)pSdrHint->GetObject(); + SdrObject* pSdrObj = const_cast(pSdrHint->GetObject()); Inserted( pSdrObj ); } break; case HINT_OBJREMOVED: { - SdrObject* pSdrObj = (SdrObject*)pSdrHint->GetObject(); + SdrObject* pSdrObj = const_cast(pSdrHint->GetObject()); Removed( pSdrObj ); } break; diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 607ae18c1a58..145dd97739cf 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -199,7 +199,7 @@ void GalleryBrowser1::ImplAdjustControls() void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData ) { - rData.pTheme = (GalleryTheme*) pThm; + rData.pTheme = const_cast(pThm); rData.aEditedTitle = pThm->GetName(); try diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 399f145a108c..32b14eb3e2d9 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -626,7 +626,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry) { try { - pTheme = new GalleryTheme( this, (GalleryThemeEntry*) pThemeEntry ); + pTheme = new GalleryTheme( this, const_cast(pThemeEntry) ); ReadGalleryTheme( *pIStm, *pTheme ); if( pIStm->GetError() ) diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index c95be5bf51ff..f7dc2cb19cae 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -970,7 +970,7 @@ bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPo if( xOStm.Is() && !xOStm->GetError() ) { SvMemoryStream aMemStm( 65535, 65535 ); - FmFormModel* pFormModel = (FmFormModel*) &rModel; + FmFormModel* pFormModel = const_cast(&rModel); pFormModel->BurnInStyleSheetAttributes(); diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 133adfa71a1b..0a10cbaccd30 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -888,7 +888,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector& r // format (nCurFormatKey) that was set in FormatChanged() after // matching the format string entered in the dialog. bAdaptSelPos = true; - pCurCurrencyEntry = (NfCurrencyEntry*)pTmpCurrencyEntry; + pCurCurrencyEntry = const_cast(pTmpCurrencyEntry); bBankingSymbol = bTmpBanking; nCurCurrencyEntryPos = FindCurrencyFormat(pTmpCurrencyEntry,bTmpBanking); } @@ -1218,7 +1218,7 @@ void SvxNumberFormatShell::SetComment4Entry(short nEntry, const OUString& aEntSt SvNumberformat *pNumEntry; if(nEntry<0) return; sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; - pNumEntry = (SvNumberformat*)pFormatter->GetEntry(nMyNfEntry); + pNumEntry = const_cast(pFormatter->GetEntry(nMyNfEntry)); if(pNumEntry!=NULL) pNumEntry->SetComment(aEntStr); } @@ -1512,7 +1512,7 @@ void SvxNumberFormatShell::SetCurrencySymbol(sal_uInt32 nPos) sal_uInt16 nCurrencyPos=aCurCurrencyList[nPos]; if(nCurrencyPos!=(sal_uInt16)-1) { - pCurCurrencyEntry=(NfCurrencyEntry*)&rCurrencyTable[nCurrencyPos]; + pCurCurrencyEntry=const_cast(&rCurrencyTable[nCurrencyPos]); nCurCurrencyEntryPos=nPos; } else diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 7ab63888fc60..c59fdb2eafa2 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -391,7 +391,7 @@ namespace sdr { namespace contact { Reference< XControlContainer > SdrPageViewAccess::getControlContainer( const OutputDevice& _rDevice ) const { Reference< XControlContainer > xControlContainer = m_rPageView.GetControlContainer( _rDevice ); - DBG_ASSERT( xControlContainer.is() || NULL == m_rPageView.FindPageWindow( ( const_cast< OutputDevice& >( _rDevice ) ) ), + DBG_ASSERT( xControlContainer.is() || NULL == m_rPageView.FindPageWindow( _rDevice ), "SdrPageViewAccess::getControlContainer: the output device is known, but there is no control container for it?" ); return xControlContainer; } diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 09a42d215165..518db4aab118 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -116,7 +116,7 @@ namespace sdr const bool bMapModeWasEnabledDest(getOutputDevice().IsMapModeEnabled()); const bool bMapModeWasEnabledSource(maBufferDevice.IsMapModeEnabled()); getOutputDevice().EnableMapMode(false); - ((OverlayManagerBuffered*)this)->maBufferDevice.EnableMapMode(false); + const_cast(this)->maBufferDevice.EnableMapMode(false); // local region RectangleVector aRectangles; @@ -148,7 +148,7 @@ namespace sdr // restore MapModes getOutputDevice().EnableMapMode(bMapModeWasEnabledDest); - ((OverlayManagerBuffered*)this)->maBufferDevice.EnableMapMode(bMapModeWasEnabledSource); + const_cast(this)->maBufferDevice.EnableMapMode(bMapModeWasEnabledSource); } void OverlayManagerBuffered::ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice) @@ -415,7 +415,7 @@ namespace sdr if(!rRegion.IsEmpty()) { // save new background - ((OverlayManagerBuffered*)this)->ImpSaveBackground(rRegion, pPreRenderDevice); + const_cast(this)->ImpSaveBackground(rRegion, pPreRenderDevice); } // call parent diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 978a4f5d09d7..51a71598e842 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -215,7 +215,7 @@ namespace sdr // force ItemSet mpItemSet->Put(*pResultItem); // delete item if it was a generated one - delete (SfxPoolItem*)pResultItem; + delete pResultItem; } else mpItemSet->Put(*pNewItem); diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 4bbf384afbd7..6673521ac3b5 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -81,8 +81,8 @@ namespace sdr { if(!mpItemSet) { - ((DefaultProperties*)this)->mpItemSet = ((DefaultProperties*)this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()); - ((DefaultProperties*)this)->ForceDefaultAttributes(); + const_cast(this)->mpItemSet = const_cast(this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()); + const_cast(this)->ForceDefaultAttributes(); } assert(mpItemSet && "Could not create an SfxItemSet(!)"); diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index 7d28a7dc4feb..e78aa4075b95 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -71,7 +71,7 @@ namespace sdr { if(!mpEmptyItemSet) { - ((EmptyProperties*)this)->mpEmptyItemSet = ((EmptyProperties*)this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()); + const_cast(this)->mpEmptyItemSet = const_cast(this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()); } DBG_ASSERT(mpEmptyItemSet, "Could not create an SfxItemSet(!)"); diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index 6e3604648742..d8fa1228490d 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -60,7 +60,7 @@ namespace sdr { if(!mpEmptyItemSet) { - ((PageProperties*)this)->mpEmptyItemSet = ((PageProperties*)this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()); + const_cast(this)->mpEmptyItemSet = const_cast(this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()); } DBG_ASSERT(mpEmptyItemSet, "Could not create an SfxItemSet(!)"); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 0a61c42ed54d..65a457f51e51 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1046,7 +1046,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) { SdrHint aHint(HINT_ENDEDIT); aHint.SetObject(pTEObj); - ((SfxBroadcaster*)pTEObj->GetBroadcaster())->Broadcast(aHint); + const_cast(pTEObj->GetBroadcaster())->Broadcast(aHint); } if(pUndoEditUndoManager) diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 85affa680634..abd7259e721a 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -54,7 +54,7 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co SdrGluePointList* pGPL=NULL; if (bConst) { const SdrGluePointList* pConstGPL=pObj->GetGluePointList(); - pGPL=(SdrGluePointList*)pConstGPL; + pGPL=const_cast(pConstGPL); } else { pGPL=pObj->ForceGluePointList(); } @@ -106,7 +106,7 @@ SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) cons ForceUndirtyMrkPnt(); bool bFirst=true; sal_uInt16 nRet=0; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,true,&bFirst,&nThisEsc,&nRet); + const_cast(this)->ImpDoMarkedGluePoints(ImpGetEscDir,true,&bFirst,&nThisEsc,&nRet); return (SDR_TRISTATE)nRet; } @@ -144,7 +144,7 @@ SDR_TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const ForceUndirtyMrkPnt(); bool bFirst=true; sal_uInt16 nRet=sal_True; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,true,&bFirst,&nRet); + const_cast(this)->ImpDoMarkedGluePoints(ImpGetPercent,true,&bFirst,&nRet); return (SDR_TRISTATE)nRet; } @@ -196,7 +196,7 @@ sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(bool bVert) const bool bFirst=true; bool bDontCare=false; sal_uInt16 nRet=0; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,true,&bFirst,&bDontCare,&bVert,&nRet); + const_cast(this)->ImpDoMarkedGluePoints(ImpGetAlign,true,&bFirst,&bDontCare,&bVert,&nRet); return nRet; } diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 3b71ed1f3454..46092955266f 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -269,7 +269,7 @@ sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool bInherited) { - return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName, bInherited)); + return const_cast(((const SdrLayerAdmin*)this)->GetLayer(rName, bInherited)); } const SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool /*bInherited*/) const diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index a32044277aeb..b1f8464b0076 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -245,7 +245,7 @@ void SdrMarkList::ForceSort() const { if(!mbSorted) { - ((SdrMarkList*)this)->ImpForceSort(); + const_cast(this)->ImpForceSort(); } } @@ -522,7 +522,7 @@ bool SdrMarkList::InsertPageView(const SdrPageView& rPV) if(bDoIt) { - SdrMark* pM = new SdrMark(pObj, (SdrPageView*)&rPV); + SdrMark* pM = new SdrMark(pObj, const_cast(&rPV)); maList.push_back(pM); SetNameDirty(); bChgd = true; @@ -544,7 +544,7 @@ const OUString& SdrMarkList::GetMarkDescription() const if(!pTextObj || !pTextObj->IsTextFrame()) { - ((SdrMarkList*)(this))->mbNameOk = false; + const_cast(this)->mbNameOk = false; } } @@ -790,7 +790,7 @@ namespace sdr { if(mbEdgesOfMarkedNodesDirty) { - ((ViewSelection*)this)->ImpForceEdgesOfMarkedNodes(); + const_cast(this)->ImpForceEdgesOfMarkedNodes(); } return maEdgesOfMarkedNodes; @@ -800,7 +800,7 @@ namespace sdr { if(mbEdgesOfMarkedNodesDirty) { - ((ViewSelection*)this)->ImpForceEdgesOfMarkedNodes(); + const_cast(this)->ImpForceEdgesOfMarkedNodes(); } return maMarkedEdgesOfMarkedNodes; @@ -809,7 +809,7 @@ namespace sdr const std::vector& ViewSelection::GetAllMarkedObjects() const { if(mbEdgesOfMarkedNodesDirty) - ((ViewSelection*)this)->ImpForceEdgesOfMarkedNodes(); + const_cast(this)->ImpForceEdgesOfMarkedNodes(); return maAllMarkedObjects; } diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 69aadc58c094..2f7366b6933a 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1870,7 +1870,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe if( pResultItem ) { pDestSet->Put(*pResultItem); - delete (SfxPoolItem*)pResultItem; + delete pResultItem; } else pDestSet->Put(*pPoolItem); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 060472daa055..fbd803d71e66 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1972,7 +1972,7 @@ Point SdrMarkView::GetGridOffset() const const Rectangle& SdrMarkView::GetMarkedObjRect() const { if (bMarkedObjRectDirty) { - ((SdrMarkView*)this)->bMarkedObjRectDirty=false; + const_cast(this)->bMarkedObjRectDirty=false; Rectangle aRect; Rectangle aRect2; for (size_t nm=0; nmaMarkedObjRect=aRect; - ((SdrMarkView*)this)->aMarkedObjRectNoOffset=aRect2; + const_cast(this)->aMarkedObjRect=aRect; + const_cast(this)->aMarkedObjRectNoOffset=aRect2; } return aMarkedObjRect; } diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 1bf0d86227f3..81668a5d3926 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -301,9 +301,9 @@ void SdrMarkView::ImpSetPointsRects() const } } } - ((SdrMarkView*)this)->aMarkedPointsRect=aPnts; - ((SdrMarkView*)this)->aMarkedGluePointsRect=aGlue; - ((SdrMarkView*)this)->bMarkedPointsRectsDirty=false; + const_cast(this)->aMarkedPointsRect=aPnts; + const_cast(this)->aMarkedGluePointsRect=aGlue; + const_cast(this)->bMarkedPointsRectsDirty=false; } @@ -369,8 +369,8 @@ void SdrMarkView::UndirtyMrkPnt() const } } } - if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=true; - ((SdrMarkView*)this)->bMrkPntDirty=false; + if (bChg) const_cast(this)->bMarkedPointsRectsDirty=true; + const_cast(this)->bMrkPntDirty=false; } @@ -475,14 +475,14 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16 if (!IsGluePointEditMode()) return false; bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; - OutputDevice* pOut=(OutputDevice*)pActualOutDev; + OutputDevice* pOut=const_cast(pActualOutDev); if (pOut==NULL) pOut=GetFirstOutputDevice(); if (pOut==NULL) return false; SortMarkedObjects(); const size_t nMarkCount=GetMarkedObjectCount(); size_t nMarkNum=bBack ? 0 : nMarkCount; if (bNext) { - nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0); + nMarkNum=TryToFindMarkedObject(pObj0); if (nMarkNum==SAL_MAX_SIZE) return false; if (!bBack) nMarkNum++; } @@ -550,7 +550,7 @@ bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const { ForceUndirtyMrkPnt(); bool bRet=false; - const size_t nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting to NonConst + const size_t nPos=TryToFindMarkedObject(pObj); // casting to NonConst if (nPos!=SAL_MAX_SIZE) { const SdrMark* pM=GetSdrMarkByIndex(nPos); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 36ee5c1e4997..d96f92d1e218 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -95,8 +95,8 @@ const Rectangle& SdrAttrObj::GetSnapRect() const { if(bSnapRectDirty) { - ((SdrAttrObj*)this)->RecalcSnapRect(); - ((SdrAttrObj*)this)->bSnapRectDirty = false; + const_cast(this)->RecalcSnapRect(); + const_cast(this)->bSnapRectDirty = false; } return maSnapRect; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 9897ad87ab22..51c713d2aeb3 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -855,7 +855,7 @@ sal_uInt32 SdrObject::GetOrdNum() const if (pObjList->IsObjOrdNumsDirty()) { pObjList->RecalcObjOrdNums(); } - } else ((SdrObject*)this)->nOrdNum=0; + } else const_cast(this)->nOrdNum=0; return nOrdNum; } diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index f0a3591f6b32..27f476321ad2 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -379,7 +379,7 @@ const Rectangle& SdrEdgeObj::GetCurrentBoundRect() const { if(bEdgeTrackDirty) { - ((SdrEdgeObj*)this)->ImpRecalcEdgeTrack(); + const_cast(this)->ImpRecalcEdgeTrack(); } return SdrTextObj::GetCurrentBoundRect(); @@ -389,7 +389,7 @@ const Rectangle& SdrEdgeObj::GetSnapRect() const { if(bEdgeTrackDirty) { - ((SdrEdgeObj*)this)->ImpRecalcEdgeTrack(); + const_cast(this)->ImpRecalcEdgeTrack(); } return SdrTextObj::GetSnapRect(); @@ -1672,7 +1672,7 @@ basegfx::B2DPolyPolygon SdrEdgeObj::TakeXorPoly() const if (bEdgeTrackDirty) { - ((SdrEdgeObj*)this)->ImpRecalcEdgeTrack(); + const_cast(this)->ImpRecalcEdgeTrack(); } if(pEdgeTrack) @@ -1708,7 +1708,7 @@ basegfx::B2DPolyPolygon SdrEdgeObj::GetEdgeTrackPath() const basegfx::B2DPolyPolygon aPolyPolygon; if (bEdgeTrackDirty) - ((SdrEdgeObj*)this)->ImpRecalcEdgeTrack(); + const_cast(this)->ImpRecalcEdgeTrack(); aPolyPolygon.append( pEdgeTrack->getB2DPolygon() ); @@ -2388,7 +2388,7 @@ sal_uInt32 SdrEdgeObj::GetSnapPointCount() const Point SdrEdgeObj::GetSnapPoint(sal_uInt32 i) const { - ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack(); + const_cast(this)->ImpUndirtyEdgeTrack(); sal_uInt16 nCount=pEdgeTrack->GetPointCount(); if (i==0) return (*pEdgeTrack)[0]; else return (*pEdgeTrack)[nCount-1]; @@ -2406,7 +2406,7 @@ sal_uInt32 SdrEdgeObj::GetPointCount() const Point SdrEdgeObj::GetPoint(sal_uInt32 i) const { - ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack(); + const_cast(this)->ImpUndirtyEdgeTrack(); sal_uInt16 nCount=pEdgeTrack->GetPointCount(); if (0L == i) return (*pEdgeTrack)[0]; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 9ed745f233a1..d3f9a931b1c1 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -485,7 +485,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const ( aGeo.nRotationAngle && aGeo.nRotationAngle != 18000 ) && ( GRAPHIC_NONE != eType ); // Need cropping info earlier - ( (SdrGrafObj*) this )->ImpSetAttrToGrafInfo(); + const_cast(this)->ImpSetAttrToGrafInfo(); GraphicAttr aActAttr; if( SDRGRAFOBJ_TRANSFORMATTR_NONE != nTransformFlags && diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 264c6179b7a4..531f2b4e9de8 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -634,9 +634,9 @@ void SdrMeasureObj::UndirtyText() const Size aSiz(rOutliner.CalcTextSize()); rOutliner.Clear(); // cast to nonconst three times - ((SdrMeasureObj*)this)->aTextSize=aSiz; - ((SdrMeasureObj*)this)->bTextSizeDirty=false; - ((SdrMeasureObj*)this)->bTextDirty=false; + const_cast(this)->aTextSize=aSiz; + const_cast(this)->bTextSizeDirty=false; + const_cast(this)->bTextDirty=false; } } @@ -720,18 +720,18 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const } } if (aMPol.nTextAngle!=aGeo.nRotationAngle) { - ((SdrMeasureObj*)this)->aGeo.nRotationAngle=aMPol.nTextAngle; - ((SdrMeasureObj*)this)->aGeo.RecalcSinCos(); + const_cast(this)->aGeo.nRotationAngle=aMPol.nTextAngle; + const_cast(this)->aGeo.RecalcSinCos(); } RotatePoint(aTextPos,aPt1b,aMPol.nLineSin,aMPol.nLineCos); aTextSize2.Width()++; aTextSize2.Height()++; // because of the Rect-Ctor's odd behavior rRect=Rectangle(aTextPos,aTextSize2); rRect.Justify(); - ((SdrMeasureObj*)this)->maRect=rRect; + const_cast(this)->maRect=rRect; if (aMPol.nTextAngle!=aGeo.nRotationAngle) { - ((SdrMeasureObj*)this)->aGeo.nRotationAngle=aMPol.nTextAngle; - ((SdrMeasureObj*)this)->aGeo.RecalcSinCos(); + const_cast(this)->aGeo.nRotationAngle=aMPol.nTextAngle; + const_cast(this)->aGeo.RecalcSinCos(); } } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index a02fed98cdb7..efd6a03fb692 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -590,13 +590,13 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const bMultiPointDrag = false; } - ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = new ImpSdrPathDragData(mrSdrPathObject,*pHdl,bMultiPointDrag,rDrag); + const_cast(this)->mpSdrPathDragData = new ImpSdrPathDragData(mrSdrPathObject,*pHdl,bMultiPointDrag,rDrag); if(!mpSdrPathDragData || !mpSdrPathDragData->bValid) { OSL_FAIL("ImpPathForDragAndCreate::BegDrag(): ImpSdrPathDragData is invalid."); delete mpSdrPathDragData; - ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = 0; + const_cast(this)->mpSdrPathDragData = 0; return false; } @@ -2158,7 +2158,7 @@ bool SdrPathObj::hasSpecialDrag() const bool SdrPathObj::beginSpecialDrag(SdrDragStat& rDrag) const { - ImpPathForDragAndCreate aDragAndCreate(*((SdrPathObj*)this)); + ImpPathForDragAndCreate aDragAndCreate(*const_cast(this)); return aDragAndCreate.beginPathDrag(rDrag); } @@ -2202,7 +2202,7 @@ OUString SdrPathObj::getSpecialDragComment(const SdrDragStat& rDrag) const } else { - ImpPathForDragAndCreate aDragAndCreate(*((SdrPathObj*)this)); + ImpPathForDragAndCreate aDragAndCreate(*const_cast(this)); bool bDidWork(aDragAndCreate.beginPathDrag((SdrDragStat&)rDrag)); if(bDidWork) @@ -2217,7 +2217,7 @@ OUString SdrPathObj::getSpecialDragComment(const SdrDragStat& rDrag) const basegfx::B2DPolyPolygon SdrPathObj::getSpecialDragPoly(const SdrDragStat& rDrag) const { basegfx::B2DPolyPolygon aRetval; - ImpPathForDragAndCreate aDragAndCreate(*((SdrPathObj*)this)); + ImpPathForDragAndCreate aDragAndCreate(*const_cast(this)); bool bDidWork(aDragAndCreate.beginPathDrag((SdrDragStat&)rDrag)); if(bDidWork) @@ -2839,7 +2839,7 @@ ImpPathForDragAndCreate& SdrPathObj::impGetDAC() const { if(!mpDAC) { - ((SdrPathObj*)this)->mpDAC = new ImpPathForDragAndCreate(*((SdrPathObj*)this)); + const_cast(this)->mpDAC = new ImpPathForDragAndCreate(*const_cast(this)); } return *mpDAC; @@ -2850,7 +2850,7 @@ void SdrPathObj::impDeleteDAC() const if(mpDAC) { delete mpDAC; - ((SdrPathObj*)this)->mpDAC = 0L; + const_cast(this)->mpDAC = 0L; } } diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 024d1387913a..7e33566f3513 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -160,7 +160,7 @@ const XPolygon& SdrRectObj::GetXPoly() const { if(!mpXPoly) { - ((SdrRectObj*)this)->RecalcXPoly(); + const_cast(this)->RecalcXPoly(); } return *mpXPoly; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 597777dcfa8a..116efe2a54be 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -289,8 +289,8 @@ const Size& SdrTextObj::GetTextSize() const rOutliner.Clear(); } // casting to nonconst twice - ((SdrTextObj*)this)->aTextSize=aSiz; - ((SdrTextObj*)this)->bTextSizeDirty=false; + const_cast(this)->aTextSize=aSiz; + const_cast(this)->bTextSizeDirty=false; } return aTextSize; } diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 8670db8b5a9b..5cea7776090f 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -116,15 +116,15 @@ SdrObjList* SdrVirtObj::GetSubList() const const Rectangle& SdrVirtObj::GetCurrentBoundRect() const { - ((SdrVirtObj*)this)->aOutRect=rRefObj.GetCurrentBoundRect(); // TODO: Optimize this. - ((SdrVirtObj*)this)->aOutRect+=aAnchor; + const_cast(this)->aOutRect=rRefObj.GetCurrentBoundRect(); // TODO: Optimize this. + const_cast(this)->aOutRect+=aAnchor; return aOutRect; } const Rectangle& SdrVirtObj::GetLastBoundRect() const { - ((SdrVirtObj*)this)->aOutRect=rRefObj.GetLastBoundRect(); // TODO: Optimize this. - ((SdrVirtObj*)this)->aOutRect+=aAnchor; + const_cast(this)->aOutRect=rRefObj.GetLastBoundRect(); // TODO: Optimize this. + const_cast(this)->aOutRect+=aAnchor; return aOutRect; } @@ -286,7 +286,7 @@ SdrObject* SdrVirtObj::getFullDragClone() const } else { - SdrObject& rReferencedObject = ((SdrVirtObj*)this)->ReferencedObj(); + SdrObject& rReferencedObject = const_cast(this)->ReferencedObj(); pRetval = new SdrGrafObj(SdrDragView::GetObjGraphic(GetModel(), &rReferencedObject), GetLogicRect()); } @@ -440,8 +440,8 @@ void SdrVirtObj::RecalcSnapRect() const Rectangle& SdrVirtObj::GetSnapRect() const { - ((SdrVirtObj*)this)->aSnapRect=rRefObj.GetSnapRect(); - ((SdrVirtObj*)this)->aSnapRect+=aAnchor; + const_cast(this)->aSnapRect=rRefObj.GetSnapRect(); + const_cast(this)->aSnapRect+=aAnchor; return aSnapRect; } @@ -469,8 +469,8 @@ void SdrVirtObj::NbcSetSnapRect(const Rectangle& rRect) const Rectangle& SdrVirtObj::GetLogicRect() const { - ((SdrVirtObj*)this)->aSnapRect=rRefObj.GetLogicRect(); // An abuse of aSnapRect! - ((SdrVirtObj*)this)->aSnapRect+=aAnchor; // If there's trouble, we need another Rectangle Member (or a Heap). + const_cast(this)->aSnapRect=rRefObj.GetLogicRect(); // An abuse of aSnapRect! + const_cast(this)->aSnapRect+=aAnchor; // If there's trouble, we need another Rectangle Member (or a Heap). return aSnapRect; } diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 84bad358cc50..590f847a62cb 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -604,8 +604,8 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) const Rectangle& SdrObjList::GetAllObjSnapRect() const { if (bRectsDirty) { - ((SdrObjList*)this)->RecalcRects(); - ((SdrObjList*)this)->bRectsDirty=false; + const_cast(this)->RecalcRects(); + const_cast(this)->bRectsDirty=false; } return aSnapRect; } @@ -619,8 +619,8 @@ const Rectangle& SdrObjList::GetAllObjBoundRect() const // it's a step in the right direction. if (bRectsDirty || aOutRect.IsEmpty()) { - ((SdrObjList*)this)->RecalcRects(); - ((SdrObjList*)this)->bRectsDirty=false; + const_cast(this)->RecalcRects(); + const_cast(this)->bRectsDirty=false; } return aOutRect; } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 907ec59116d3..5c7de983fc31 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -310,8 +310,8 @@ void SdrPaintView::FlushComeBackTimer() const { if (bSomeObjChgdFlag) { // casting to nonconst - ((SdrPaintView*)this)->ImpComeBackHdl(&((SdrPaintView*)this)->aComeBackIdle); - ((SdrPaintView*)this)->aComeBackIdle.Stop(); + const_cast(this)->ImpComeBackHdl(&const_cast(this)->aComeBackIdle); + const_cast(this)->aComeBackIdle.Stop(); } } @@ -410,8 +410,8 @@ sal_uInt16 SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pO void SdrPaintView::TheresNewMapMode() { if (pActualOutDev!=NULL) { - nHitTolLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width(); - nMinMovLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width(); + nHitTolLog=(sal_uInt16)pActualOutDev->PixelToLogic(Size(nHitTolPix,0)).Width(); + nMinMovLog=(sal_uInt16)pActualOutDev->PixelToLogic(Size(nMinMovPix,0)).Width(); } } @@ -1240,7 +1240,7 @@ void SdrPaintView::VisAreaChanged(const OutputDevice* pOut) { if (pOut) { - SdrPageWindow* pWindow = mpPageView->FindPageWindow(*((OutputDevice*)pOut)); + SdrPageWindow* pWindow = mpPageView->FindPageWindow(*const_cast(pOut)); if(pWindow) { diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 26ab01ae14b0..dbfab5ab2e88 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1003,7 +1003,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* aVEvt.bMouseDown=!bLeftDown; // What if ..? aVEvt.bMouseUp=bLeftDown; // What if ..? if (pOut!=NULL) - ((SdrView*)this)->SetActualWin(pOut); + const_cast(this)->SetActualWin(pOut); SdrHitKind eHit=PickAnything(rMousePos,aVEvt); SdrEventKind eEvent=aVEvt.eEvent; switch (eEvent) @@ -1030,7 +1030,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* aHitRec.nTol=nHitTolLog; aHitRec.pVisiLayer=&aVEvt.pPV->GetVisibleLayers(); aHitRec.pPageView=aVEvt.pPV; - aHitRec.pOut=(OutputDevice*)pOut; + aHitRec.pOut=const_cast(pOut); return aVEvt.pObj->GetMacroPointer(aHitRec); } default: break; diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index d9c690262426..70fbe737279d 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -558,7 +558,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB pSdrView->BegUndo( aStr ); pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } - SdrCustomShapeGeometryItem aGeometryItem( const_cast(static_cast(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )))); + SdrCustomShapeGeometryItem aGeometryItem( static_cast(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ))); impl_execute( pSdrView, rReq, aGeometryItem, pObj ); pObj->SetMergedItem( aGeometryItem ); pObj->BroadcastObjectChange(); diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index b5e282bae891..9177eb8db70a 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -463,7 +463,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi pSdrView->BegUndo( aStr ); pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } - SdrCustomShapeGeometryItem aGeometryItem( const_cast(static_cast(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )))); + SdrCustomShapeGeometryItem aGeometryItem( static_cast(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ))); GetGeometryForCustomShape( aGeometryItem, aCustomShape ); pObj->SetMergedItem( aGeometryItem ); @@ -538,7 +538,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi pSdrView->BegUndo( aStr ); pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) ); } - SdrCustomShapeGeometryItem aGeometryItem( const_cast(static_cast(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )))); + SdrCustomShapeGeometryItem aGeometryItem( static_cast(pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ))); impl_execute( pSdrView, rReq, aGeometryItem, pObj ); pObj->SetMergedItem( aGeometryItem ); pObj->BroadcastObjectChange(); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index b03bd7656be2..e772e09e47df 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -278,8 +278,8 @@ void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ) IMPL_LINK( DictionaryList, CompareHdl, SvSortData*, pData ) { - SvTreeListEntry* pLeft = (SvTreeListEntry*)(pData->pLeft ); - SvTreeListEntry* pRight = (SvTreeListEntry*)(pData->pRight ); + SvTreeListEntry* pLeft = const_cast(pData->pLeft); + SvTreeListEntry* pRight = const_cast(pData->pRight); return (long) ColumnCompare(pLeft,pRight); } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 7ef851568cdb..288b7bf6025f 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -832,7 +832,7 @@ Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj ) const Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(), pObj->GetObjInventor(), pObj, - (SvxDrawPage*)this)); + const_cast(this))); return xShape; } diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 07e516832a7a..377cf00d4eda 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -599,9 +599,9 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() mpOutliner->SetTextObjNoInit( pTextObj ); if( mbIsLocked ) { - ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( false ); - mbOldUndoMode = ((EditEngine*)&(mpOutliner->GetEditEngine()))->IsUndoEnabled(); - ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( false ); + const_cast(&(mpOutliner->GetEditEngine()))->SetUpdateMode( false ); + mbOldUndoMode = const_cast(&(mpOutliner->GetEditEngine()))->IsUndoEnabled(); + const_cast(&(mpOutliner->GetEditEngine()))->EnableUndo( false ); } if ( !m_xLinguServiceManager.is() ) @@ -896,9 +896,9 @@ void SvxTextEditSourceImpl::lock() mbIsLocked = true; if( mpOutliner ) { - ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( false ); - mbOldUndoMode = ((EditEngine*)&(mpOutliner->GetEditEngine()))->IsUndoEnabled(); - ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( false ); + const_cast(&(mpOutliner->GetEditEngine()))->SetUpdateMode( false ); + mbOldUndoMode = const_cast(&(mpOutliner->GetEditEngine()))->IsUndoEnabled(); + const_cast(&(mpOutliner->GetEditEngine()))->EnableUndo( false ); } } @@ -914,8 +914,8 @@ void SvxTextEditSourceImpl::unlock() if( mpOutliner ) { - ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( true ); - ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( mbOldUndoMode ); + const_cast(&(mpOutliner->GetEditEngine()))->SetUpdateMode( true ); + const_cast(&(mpOutliner->GetEditEngine()))->EnableUndo( mbOldUndoMode ); } } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index fe93cad652a4..e977f02f2283 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -133,7 +133,7 @@ Bitmap XOBitmap::GetBitmap() const const GraphicObject& XOBitmap::GetGraphicObject() const { if( bGraphicDirty ) - ( (XOBitmap*) this )->Array2Bitmap(); + const_cast(this)->Array2Bitmap(); return aGraphicObject; } diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 166c873f27da..c5cd0c549602 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -134,8 +134,8 @@ long XPropertyList::Count() const { if( mbListDirty ) { - if( !( (XPropertyList*) this )->Load() ) - ( (XPropertyList*) this )->Create(); + if( !const_cast(this)->Load() ) + const_cast(this)->Create(); } return maList.size(); } @@ -144,8 +144,8 @@ XPropertyEntry* XPropertyList::Get( long nIndex ) const { if( mbListDirty ) { - if( !( (XPropertyList*) this )->Load() ) - ( (XPropertyList*) this )->Create(); + if( !const_cast(this)->Load() ) + const_cast(this)->Create(); } return ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : NULL; } @@ -154,8 +154,8 @@ long XPropertyList::GetIndex(const OUString& rName) const { if( mbListDirty ) { - if( !( (XPropertyList*) this )->Load() ) - ( (XPropertyList*) this )->Create(); + if( !const_cast(this)->Load() ) + const_cast(this)->Create(); } for( long i = 0, n = maList.size(); i < n; ++i ) { -- cgit v1.2.3