diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-15 09:00:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-15 09:00:57 +0100 |
| commit | 9dab60931e65220049b7c39579a57aebf0f9de5e (patch) | |
| tree | 14ca37e3f41ee344e010334f69806afbe6317d15 /xmloff | |
| parent | b5ed99e5a5adc097283f1409a06d770949fb22af (diff) | |
More loplugin:cstylecast: xmloff
Change-Id: I870bc9fd1c7361913b073411065ec723f6b080da
Diffstat (limited to 'xmloff')
43 files changed, 110 insertions, 110 deletions
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 8c5158e9f138..93285f84ae77 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -268,7 +268,7 @@ const SvXMLEnumMapEntry<css::chart::ChartAxisLabelPosition> aXMLChartAxisLabelPo { ::xmloff::token::XML_OUTSIDE_END, css::chart::ChartAxisLabelPosition_OUTSIDE_END }, { ::xmloff::token::XML_OUTSIDE_MINIMUM, css::chart::ChartAxisLabelPosition_OUTSIDE_START },//#i114142# { ::xmloff::token::XML_OUTSIDE_MAXIMUM, css::chart::ChartAxisLabelPosition_OUTSIDE_END },//#i114142# - { ::xmloff::token::XML_TOKEN_INVALID, (css::chart::ChartAxisLabelPosition)0 } + { ::xmloff::token::XML_TOKEN_INVALID, css::chart::ChartAxisLabelPosition(0) } }; const SvXMLEnumMapEntry<css::chart::ChartAxisMarkPosition> aXMLChartAxisMarkPositionEnumMap[] = @@ -276,7 +276,7 @@ const SvXMLEnumMapEntry<css::chart::ChartAxisMarkPosition> aXMLChartAxisMarkPosi { ::xmloff::token::XML_AT_LABELS, css::chart::ChartAxisMarkPosition_AT_LABELS }, { ::xmloff::token::XML_AT_AXIS, css::chart::ChartAxisMarkPosition_AT_AXIS }, { ::xmloff::token::XML_AT_LABELS_AND_AXIS, css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS }, - { ::xmloff::token::XML_TOKEN_INVALID, (css::chart::ChartAxisMarkPosition)0 } + { ::xmloff::token::XML_TOKEN_INVALID, css::chart::ChartAxisMarkPosition(0) } }; const SvXMLEnumMapEntry<css::chart::ChartAxisArrangeOrderType> aXMLChartAxisArrangementEnumMap[] = @@ -284,7 +284,7 @@ const SvXMLEnumMapEntry<css::chart::ChartAxisArrangeOrderType> aXMLChartAxisArra { ::xmloff::token::XML_SIDE_BY_SIDE, css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE }, { ::xmloff::token::XML_STAGGER_EVEN, css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN }, { ::xmloff::token::XML_STAGGER_ODD, css::chart::ChartAxisArrangeOrderType_STAGGER_ODD }, - { ::xmloff::token::XML_TOKEN_INVALID, (css::chart::ChartAxisArrangeOrderType)0 } + { ::xmloff::token::XML_TOKEN_INVALID, css::chart::ChartAxisArrangeOrderType(0) } }; const SvXMLEnumMapEntry<sal_Int32> aXMLChartErrorBarStyleEnumMap[] = @@ -313,7 +313,7 @@ const SvXMLEnumMapEntry<css::chart::ChartDataRowSource> aXMLChartDataRowSourceTy { { ::xmloff::token::XML_COLUMNS, css::chart::ChartDataRowSource_COLUMNS }, { ::xmloff::token::XML_ROWS, css::chart::ChartDataRowSource_ROWS }, - { ::xmloff::token::XML_TOKEN_INVALID, (css::chart::ChartDataRowSource)0 } + { ::xmloff::token::XML_TOKEN_INVALID, css::chart::ChartDataRowSource(0) } }; const SvXMLEnumMapEntry<sal_Int32> aXMLChartInterpolationTypeEnumMap[] = diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 0808a83721ef..76f4fda22a2b 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -74,7 +74,7 @@ SvXMLEnumMapEntry<drawing::LineStyle> const aLineStyleMap[] = { XML_NONE, drawing::LineStyle_NONE }, { XML_SOLID, drawing::LineStyle_SOLID }, { XML_DASH, drawing::LineStyle_DASH }, - { XML_TOKEN_INVALID, (drawing::LineStyle)0 } + { XML_TOKEN_INVALID, drawing::LineStyle(0) } }; } diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index fb186a947687..bb8c2ac91e92 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -56,7 +56,7 @@ static const SvXMLEnumMapEntry<SchXMLAxisDimension> aXMLAxisDimensionMap[] = { XML_X, SCH_XML_AXIS_X }, { XML_Y, SCH_XML_AXIS_Y }, { XML_Z, SCH_XML_AXIS_Z }, - { XML_TOKEN_INVALID, (SchXMLAxisDimension)0 } + { XML_TOKEN_INVALID, SchXMLAxisDimension(0) } }; static const SvXMLEnumMapEntry<sal_uInt16> aXMLAxisTypeMap[] = diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx index fcaf78a0a386..13480c808d2e 100644 --- a/xmloff/source/chart/SchXMLEnumConverter.cxx +++ b/xmloff/source/chart/SchXMLEnumConverter.cxx @@ -34,7 +34,7 @@ const SvXMLEnumMapEntry<chart::ChartLegendPosition> aXMLLegendPositionEnumMap[] { XML_TOP, chart::ChartLegendPosition_TOP }, { XML_END, chart::ChartLegendPosition_RIGHT }, { XML_BOTTOM, chart::ChartLegendPosition_BOTTOM }, - { XML_TOKEN_INVALID, (chart::ChartLegendPosition)0 } + { XML_TOKEN_INVALID, chart::ChartLegendPosition(0) } }; class XMLLegendPositionPropertyHdl : public XMLEnumPropertyHdl @@ -54,7 +54,7 @@ const SvXMLEnumMapEntry<chart::ChartLegendExpansion> aXMLLegendExpansionEnumMap[ { XML_HIGH, chart::ChartLegendExpansion_HIGH }, { XML_BALANCED, chart::ChartLegendExpansion_BALANCED }, { XML_CUSTOM, chart::ChartLegendExpansion_CUSTOM }, - { XML_TOKEN_INVALID, (chart::ChartLegendExpansion)0 } + { XML_TOKEN_INVALID, chart::ChartLegendExpansion(0) } }; class XMLLegendExpansionPropertyHdl : public XMLEnumPropertyHdl diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 9d213e56ffe5..d978ba79300c 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -185,7 +185,7 @@ void XMLImageMapObjectContext::StartElement( OUString sValue = xAttrList->getValueByIndex(nAttr); ProcessAttribute( - (enum XMLImageMapToken)aMap.Get(nPrefix, sLocalName), sValue); + static_cast<enum XMLImageMapToken>(aMap.Get(nPrefix, sLocalName)), sValue); } } diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index f448c4cccc5f..c0073838559b 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -178,7 +178,7 @@ void SdXMLImplSetEffect( AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDir eEffect = AnimationEffect_NONE; } - const Effect& rEffect = AnimationEffectMap[(int)eEffect]; + const Effect& rEffect = AnimationEffectMap[static_cast<int>(eEffect)]; eKind = rEffect.meKind; eDirection = rEffect.meDirection; nStartScale = rEffect.mnStartScale; diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 25ecd4c750c0..7e6fe99f379b 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -67,7 +67,7 @@ const SvXMLEnumMapEntry<XMLEffect> aXML_AnimationEffect_EnumMap[] = { XML_CHECKERBOARD, EK_checkerboard }, { XML_ROTATE, EK_rotate }, { XML_STRETCH, EK_stretch }, - { XML_TOKEN_INVALID, (XMLEffect)0 } + { XML_TOKEN_INVALID, XMLEffect(0) } }; const SvXMLEnumMapEntry<XMLEffectDirection> aXML_AnimationDirection_EnumMap[] = @@ -100,7 +100,7 @@ const SvXMLEnumMapEntry<XMLEffectDirection> aXML_AnimationDirection_EnumMap[] = { XML_TO_CENTER, ED_to_center }, { XML_CLOCKWISE, ED_clockwise }, { XML_COUNTER_CLOCKWISE,ED_cclockwise }, - { XML_TOKEN_INVALID, (XMLEffectDirection)0 } + { XML_TOKEN_INVALID, XMLEffectDirection(0) } }; const SvXMLEnumMapEntry<AnimationSpeed> aXML_AnimationSpeed_EnumMap[] = @@ -108,7 +108,7 @@ const SvXMLEnumMapEntry<AnimationSpeed> aXML_AnimationSpeed_EnumMap[] = { XML_SLOW, AnimationSpeed_SLOW }, { XML_MEDIUM, AnimationSpeed_MEDIUM }, { XML_FAST, AnimationSpeed_FAST }, - { XML_TOKEN_INVALID, (AnimationSpeed)0 } + { XML_TOKEN_INVALID, AnimationSpeed(0) } }; AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool /*bIn*/ ) diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index fd5c76714190..4da85b134646 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -66,7 +66,7 @@ SvXMLEnumMapEntry<ClickAction> const aXML_EventActions_EnumMap[] = { XML_VERB, ClickAction_VERB }, { XML_FADE_OUT, ClickAction_VANISH }, { XML_SOUND, ClickAction_SOUND }, - { XML_TOKEN_INVALID, (ClickAction)0 } + { XML_TOKEN_INVALID, ClickAction(0) } }; class SdXMLEventContext : public SvXMLImportContext diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index e90c0b7eee76..9d6b2a36bfbe 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -370,7 +370,7 @@ static SvXMLEnumMapEntry<drawing::LineStyle> const aXML_LineStyle_EnumMap[] = { XML_NONE, drawing::LineStyle_NONE }, { XML_SOLID, drawing::LineStyle_SOLID }, { XML_DASH, drawing::LineStyle_DASH }, - { XML_TOKEN_INVALID, (drawing::LineStyle)0 } + { XML_TOKEN_INVALID, drawing::LineStyle(0) } }; static SvXMLEnumMapEntry<drawing::LineJoint> const aXML_LineJoint_EnumMap[] = @@ -380,7 +380,7 @@ static SvXMLEnumMapEntry<drawing::LineJoint> const aXML_LineJoint_EnumMap[] = { XML_ROUND, drawing::LineJoint_ROUND }, { XML_BEVEL, drawing::LineJoint_BEVEL }, { XML_MIDDLE, drawing::LineJoint_MIDDLE }, - { XML_TOKEN_INVALID, (drawing::LineJoint)0 } + { XML_TOKEN_INVALID, drawing::LineJoint(0) } }; static SvXMLEnumMapEntry<drawing::LineCap> const aXML_LineCap_EnumMap[] = @@ -389,7 +389,7 @@ static SvXMLEnumMapEntry<drawing::LineCap> const aXML_LineCap_EnumMap[] = { XML_ROUND, drawing::LineCap_ROUND }, // use XML_GRADIENTSTYLE_SQUARE as XML_SQUARE, is defined as "square" already { XML_GRADIENTSTYLE_SQUARE, drawing::LineCap_SQUARE }, - { XML_TOKEN_INVALID, (drawing::LineCap)0 } + { XML_TOKEN_INVALID, drawing::LineCap(0) } }; SvXMLEnumMapEntry<drawing::FillStyle> const aXML_FillStyle_EnumMap[] = @@ -399,7 +399,7 @@ SvXMLEnumMapEntry<drawing::FillStyle> const aXML_FillStyle_EnumMap[] = { XML_BITMAP, drawing::FillStyle_BITMAP }, { XML_GRADIENT, drawing::FillStyle_GRADIENT }, { XML_HATCH, drawing::FillStyle_HATCH }, - { XML_TOKEN_INVALID, (drawing::FillStyle)0 } + { XML_TOKEN_INVALID, drawing::FillStyle(0) } }; static SvXMLEnumMapEntry<sal_Int32> const aXML_PresChange_EnumMap[] = @@ -415,7 +415,7 @@ static SvXMLEnumMapEntry<presentation::AnimationSpeed> const aXML_TransSpeed_Enu { XML_FAST, presentation::AnimationSpeed_FAST }, { XML_MEDIUM, presentation::AnimationSpeed_MEDIUM }, { XML_SLOW, presentation::AnimationSpeed_SLOW }, - { XML_TOKEN_INVALID, (presentation::AnimationSpeed)0 } + { XML_TOKEN_INVALID, presentation::AnimationSpeed(0) } }; static SvXMLEnumMapEntry<presentation::FadeEffect> const aXML_FadeEffect_EnumMap[] = @@ -477,7 +477,7 @@ static SvXMLEnumMapEntry<presentation::FadeEffect> const aXML_FadeEffect_EnumMap { XML_UNCOVER_TO_LOWERLEFT, presentation::FadeEffect_UNCOVER_TO_LOWERLEFT }, { XML_VERTICAL_CHECKERBOARD,presentation::FadeEffect_VERTICAL_CHECKERBOARD }, { XML_HORIZONTAL_CHECKERBOARD,presentation::FadeEffect_HORIZONTAL_CHECKERBOARD }, - { XML_TOKEN_INVALID, (presentation::FadeEffect)0 } + { XML_TOKEN_INVALID, presentation::FadeEffect(0) } }; SvXMLEnumMapEntry<drawing::ConnectorType> const aXML_ConnectionKind_EnumMap[] = @@ -486,7 +486,7 @@ SvXMLEnumMapEntry<drawing::ConnectorType> const aXML_ConnectionKind_EnumMap[] = { XML_CURVE, drawing::ConnectorType_CURVE }, { XML_LINE, drawing::ConnectorType_LINE }, { XML_LINES, drawing::ConnectorType_LINES }, - { XML_TOKEN_INVALID, (drawing::ConnectorType)0 } + { XML_TOKEN_INVALID, drawing::ConnectorType(0) } }; SvXMLEnumMapEntry<drawing::BitmapMode> const aXML_BitmapMode_EnumMap[] = @@ -494,7 +494,7 @@ SvXMLEnumMapEntry<drawing::BitmapMode> const aXML_BitmapMode_EnumMap[] = { XML_REPEAT, drawing::BitmapMode_REPEAT }, { XML_STRETCH, drawing::BitmapMode_STRETCH }, { XML_BACKGROUND_NO_REPEAT, drawing::BitmapMode_NO_REPEAT }, - { XML_TOKEN_INVALID, (drawing::BitmapMode)0 } + { XML_TOKEN_INVALID, drawing::BitmapMode(0) } }; // 3D EnumMaps @@ -504,7 +504,7 @@ static SvXMLEnumMapEntry<drawing::NormalsKind> const aXML_NormalsKind_EnumMap[] { XML_OBJECT, drawing::NormalsKind_SPECIFIC }, { XML_FLAT, drawing::NormalsKind_FLAT }, { XML_SPHERE, drawing::NormalsKind_SPHERE }, - { XML_TOKEN_INVALID, (drawing::NormalsKind)0 } + { XML_TOKEN_INVALID, drawing::NormalsKind(0) } }; static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerationX_EnumMap[] = @@ -512,7 +512,7 @@ static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerati { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, { XML_SPHERE, drawing::TextureProjectionMode_SPHERE }, - { XML_TOKEN_INVALID, (drawing::TextureProjectionMode)0 } + { XML_TOKEN_INVALID, drawing::TextureProjectionMode(0) } }; static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerationY_EnumMap[] = @@ -520,14 +520,14 @@ static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerati { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, { XML_SPHERE, drawing::TextureProjectionMode_SPHERE }, - { XML_TOKEN_INVALID, (drawing::TextureProjectionMode)0 } + { XML_TOKEN_INVALID, drawing::TextureProjectionMode(0) } }; static SvXMLEnumMapEntry<drawing::TextureKind> const aXML_TexKind_EnumMap[] = { { XML_LUMINANCE, drawing::TextureKind_LUMINANCE }, { XML_COLOR, drawing::TextureKind_COLOR }, - { XML_TOKEN_INVALID, (drawing::TextureKind)0 } + { XML_TOKEN_INVALID, drawing::TextureKind(0) } }; static SvXMLEnumMapEntry<drawing::TextureMode> const aXML_TexMode_EnumMap[] = @@ -535,7 +535,7 @@ static SvXMLEnumMapEntry<drawing::TextureMode> const aXML_TexMode_EnumMap[] = { XML_REPLACE, drawing::TextureMode_REPLACE }, { XML_MODULATE, drawing::TextureMode_MODULATE }, { XML_BLEND, drawing::TextureMode_BLEND }, - { XML_TOKEN_INVALID, (drawing::TextureMode)0 } + { XML_TOKEN_INVALID, drawing::TextureMode(0) } }; SvXMLEnumMapEntry<drawing::RectanglePoint> const aXML_RefPoint_EnumMap[] = @@ -549,7 +549,7 @@ SvXMLEnumMapEntry<drawing::RectanglePoint> const aXML_RefPoint_EnumMap[] = { XML_BOTTOM_LEFT, drawing::RectanglePoint_LEFT_BOTTOM }, { XML_BOTTOM, drawing::RectanglePoint_MIDDLE_BOTTOM }, { XML_BOTTOM_RIGHT, drawing::RectanglePoint_RIGHT_BOTTOM }, - { XML_TOKEN_INVALID, (drawing::RectanglePoint)0 } + { XML_TOKEN_INVALID, drawing::RectanglePoint(0) } }; SvXMLEnumMapEntry<drawing::CircleKind> const aXML_CircleKind_EnumMap[] = @@ -558,14 +558,14 @@ SvXMLEnumMapEntry<drawing::CircleKind> const aXML_CircleKind_EnumMap[] = { XML_SECTION, drawing::CircleKind_SECTION }, { XML_CUT, drawing::CircleKind_CUT }, { XML_ARC, drawing::CircleKind_ARC }, - { XML_TOKEN_INVALID, (drawing::CircleKind)0 } + { XML_TOKEN_INVALID, drawing::CircleKind(0) } }; static SvXMLEnumMapEntry<text::WritingMode> const aXML_WritingMode_EnumMap[] = { { XML_TB_RL, text::WritingMode_TB_RL }, { XML_LR_TB, text::WritingMode_LR_TB }, - { XML_TOKEN_INVALID, (text::WritingMode)0 } + { XML_TOKEN_INVALID, text::WritingMode(0) } }; static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Enum[] = @@ -575,7 +575,7 @@ static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_En { XML_SCROLL, drawing::TextAnimationKind_SCROLL }, { XML_ALTERNATE, drawing::TextAnimationKind_ALTERNATE }, { XML_SLIDE, drawing::TextAnimationKind_SLIDE }, - { XML_TOKEN_INVALID, (drawing::TextAnimationKind)0 } + { XML_TOKEN_INVALID, drawing::TextAnimationKind(0) } }; static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Blinking_Enum[] = @@ -585,7 +585,7 @@ static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Bl { XML_FALSE, drawing::TextAnimationKind_SCROLL }, { XML_FALSE, drawing::TextAnimationKind_ALTERNATE }, { XML_FALSE, drawing::TextAnimationKind_SLIDE }, - { XML_TOKEN_INVALID, (drawing::TextAnimationKind)0 } + { XML_TOKEN_INVALID, drawing::TextAnimationKind(0) } }; static SvXMLEnumMapEntry<drawing::TextAnimationDirection> const pXML_TextAnimationDirection_Enum[] = @@ -594,7 +594,7 @@ static SvXMLEnumMapEntry<drawing::TextAnimationDirection> const pXML_TextAnimati { XML_RIGHT, drawing::TextAnimationDirection_RIGHT }, // will be filtered { XML_UP, drawing::TextAnimationDirection_UP }, { XML_DOWN, drawing::TextAnimationDirection_DOWN }, - { XML_TOKEN_INVALID, (drawing::TextAnimationDirection)0 } + { XML_TOKEN_INVALID, drawing::TextAnimationDirection(0) } }; static SvXMLEnumMapEntry<drawing::TextHorizontalAdjust> const pXML_TextAlign_Enum[] = @@ -603,7 +603,7 @@ static SvXMLEnumMapEntry<drawing::TextHorizontalAdjust> const pXML_TextAlign_Enu { XML_CENTER, drawing::TextHorizontalAdjust_CENTER }, { XML_RIGHT, drawing::TextHorizontalAdjust_RIGHT }, { XML_JUSTIFY, drawing::TextHorizontalAdjust_BLOCK }, - { XML_TOKEN_INVALID, (drawing::TextHorizontalAdjust)0 } + { XML_TOKEN_INVALID, drawing::TextHorizontalAdjust(0) } }; static SvXMLEnumMapEntry<drawing::TextVerticalAdjust> const pXML_VerticalAlign_Enum[] = @@ -612,7 +612,7 @@ static SvXMLEnumMapEntry<drawing::TextVerticalAdjust> const pXML_VerticalAlign_E { XML_MIDDLE, drawing::TextVerticalAdjust_CENTER }, { XML_BOTTOM, drawing::TextVerticalAdjust_BOTTOM }, { XML_JUSTIFY, drawing::TextVerticalAdjust_BLOCK }, - { XML_TOKEN_INVALID, (drawing::TextVerticalAdjust)0 } + { XML_TOKEN_INVALID, drawing::TextVerticalAdjust(0) } }; // note: PROPORTIONAL and ALLLINES are the same thing now! @@ -622,7 +622,7 @@ static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum_O { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, { XML_TRUE, drawing::TextFitToSizeType_ALLLINES }, { XML_FALSE, drawing::TextFitToSizeType_AUTOFIT }, - { XML_TOKEN_INVALID, (drawing::TextFitToSizeType)0 } + { XML_TOKEN_INVALID, drawing::TextFitToSizeType(0) } }; static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum[] = @@ -631,7 +631,7 @@ static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum[] { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, { XML_ALL, drawing::TextFitToSizeType_ALLLINES }, { XML_SHRINK_TO_FIT,drawing::TextFitToSizeType_AUTOFIT }, - { XML_TOKEN_INVALID, (drawing::TextFitToSizeType)0 } + { XML_TOKEN_INVALID, drawing::TextFitToSizeType(0) } }; static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_ShrinkToFit_Enum[] = @@ -640,7 +640,7 @@ static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_ShrinkToFit_Enum { XML_FALSE, drawing::TextFitToSizeType_PROPORTIONAL }, { XML_FALSE, drawing::TextFitToSizeType_ALLLINES }, { XML_TRUE, drawing::TextFitToSizeType_AUTOFIT }, - { XML_TOKEN_INVALID, (drawing::TextFitToSizeType)0 } + { XML_TOKEN_INVALID, drawing::TextFitToSizeType(0) } }; static SvXMLEnumMapEntry<sal_Int32> const pXML_MeasureUnit_Enum[] = @@ -664,7 +664,7 @@ static SvXMLEnumMapEntry<drawing::MeasureTextHorzPos> const pXML_Measure_HAlign_ { XML_LEFT_OUTSIDE, drawing::MeasureTextHorzPos_LEFTOUTSIDE }, { XML_INSIDE, drawing::MeasureTextHorzPos_INSIDE }, { XML_RIGHT_OUTSIDE, drawing::MeasureTextHorzPos_RIGHTOUTSIDE}, - { XML_TOKEN_INVALID, (drawing::MeasureTextHorzPos)0 } + { XML_TOKEN_INVALID, drawing::MeasureTextHorzPos(0) } }; static SvXMLEnumMapEntry<drawing::MeasureTextVertPos> const pXML_Measure_VAlign_Enum[] = @@ -673,7 +673,7 @@ static SvXMLEnumMapEntry<drawing::MeasureTextVertPos> const pXML_Measure_VAlign_ { XML_ABOVE, drawing::MeasureTextVertPos_EAST }, { XML_BELOW, drawing::MeasureTextVertPos_WEST }, { XML_CENTER, drawing::MeasureTextVertPos_CENTERED }, - { XML_TOKEN_INVALID, (drawing::MeasureTextVertPos)0 } + { XML_TOKEN_INVALID, drawing::MeasureTextVertPos(0) } }; // #FontWork# diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 03b9d351061f..02f1b2ec8108 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -106,7 +106,7 @@ SvXMLEnumMapEntry<drawing::Alignment> const aXML_GlueAlignment_EnumMap[] = { XML_BOTTOM_LEFT, drawing::Alignment_BOTTOM_LEFT }, { XML_BOTTOM, drawing::Alignment_BOTTOM }, { XML_BOTTOM_RIGHT, drawing::Alignment_BOTTOM_RIGHT }, - { XML_TOKEN_INVALID, (drawing::Alignment)0 } + { XML_TOKEN_INVALID, drawing::Alignment(0) } }; SvXMLEnumMapEntry<drawing::EscapeDirection> const aXML_GlueEscapeDirection_EnumMap[] = @@ -118,7 +118,7 @@ SvXMLEnumMapEntry<drawing::EscapeDirection> const aXML_GlueEscapeDirection_EnumM { XML_DOWN, drawing::EscapeDirection_DOWN }, { XML_HORIZONTAL, drawing::EscapeDirection_HORIZONTAL }, { XML_VERTICAL, drawing::EscapeDirection_VERTICAL }, - { XML_TOKEN_INVALID, (drawing::EscapeDirection)0 } + { XML_TOKEN_INVALID, drawing::EscapeDirection(0) } }; static bool ImpIsEmptyURL( const OUString& rURL ) diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 193e771bdc4b..82516023b67f 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -97,7 +97,7 @@ namespace xmloff { if ( s_sElementTranslations.empty() ) { // initialize - for (ElementType eType=(ElementType)0; eType<UNKNOWN; ++eType) + for (ElementType eType=ElementType(0); eType<UNKNOWN; ++eType) s_sElementTranslations[OUString::createFromAscii(getElementName(eType))] = eType; } MapString2Element::const_iterator aPos = s_sElementTranslations.find(_rName); diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index f8a1feb08201..62d1e7e418e4 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -49,13 +49,13 @@ const SvXMLEnumMapEntry<FormSubmitEncoding> aSubmitEncodingMap[] = { XML_APPLICATION_X_WWW_FORM_URLENCODED, FormSubmitEncoding_URL }, { XML_MULTIPART_FORMDATA, FormSubmitEncoding_MULTIPART }, { XML_APPLICATION_TEXT, FormSubmitEncoding_TEXT }, - { XML_TOKEN_INVALID, (FormSubmitEncoding)0 } + { XML_TOKEN_INVALID, FormSubmitEncoding(0) } }; const SvXMLEnumMapEntry<FormSubmitMethod> aSubmitMethodMap[] = { { XML_GET, FormSubmitMethod_GET }, { XML_POST, FormSubmitMethod_POST }, - { XML_TOKEN_INVALID, (FormSubmitMethod)0 } + { XML_TOKEN_INVALID, FormSubmitMethod(0) } }; const SvXMLEnumMapEntry<sal_Int32> aCommandTypeMap[] = { @@ -69,14 +69,14 @@ const SvXMLEnumMapEntry<NavigationBarMode> aNavigationTypeMap[] = { XML_NONE, NavigationBarMode_NONE }, { XML_CURRENT, NavigationBarMode_CURRENT }, { XML_PARENT, NavigationBarMode_PARENT }, - { XML_TOKEN_INVALID, (NavigationBarMode)0 } + { XML_TOKEN_INVALID, NavigationBarMode(0) } }; const SvXMLEnumMapEntry<TabulatorCycle> aTabulatorCycleMap[] = { { XML_RECORDS, TabulatorCycle_RECORDS }, { XML_CURRENT, TabulatorCycle_CURRENT }, { XML_PAGE, TabulatorCycle_PAGE }, - { XML_TOKEN_INVALID, (TabulatorCycle)0 } + { XML_TOKEN_INVALID, TabulatorCycle(0) } }; const SvXMLEnumMapEntry<FormButtonType> aFormButtonTypeMap[] = { @@ -84,7 +84,7 @@ const SvXMLEnumMapEntry<FormButtonType> aFormButtonTypeMap[] = { XML_SUBMIT, FormButtonType_SUBMIT }, { XML_RESET, FormButtonType_RESET }, { XML_URL, FormButtonType_URL }, - { XML_TOKEN_INVALID, (FormButtonType)0 } + { XML_TOKEN_INVALID, FormButtonType(0) } }; const SvXMLEnumMapEntry<ListSourceType> aListSourceTypeMap[] = { @@ -94,7 +94,7 @@ const SvXMLEnumMapEntry<ListSourceType> aListSourceTypeMap[] = { XML_SQL, ListSourceType_SQL }, { XML_SQL_PASS_THROUGH, ListSourceType_SQLPASSTHROUGH }, { XML_TABLE_FIELDS, ListSourceType_TABLEFIELDS }, - { XML_TOKEN_INVALID, (ListSourceType)0 } + { XML_TOKEN_INVALID, ListSourceType(0) } }; // check state of a checkbox const SvXMLEnumMapEntry<TriState> aCheckStateMap[] = @@ -102,7 +102,7 @@ const SvXMLEnumMapEntry<TriState> aCheckStateMap[] = { XML_UNCHECKED, TRISTATE_FALSE }, { XML_CHECKED, TRISTATE_TRUE }, { XML_UNKNOWN, TRISTATE_INDET }, - { XML_TOKEN_INVALID, (TriState)0 } + { XML_TOKEN_INVALID, TriState(0) } }; const SvXMLEnumMapEntry<sal_Int16> aTextAlignMap[] = { diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index db8970a07e23..e980a6967f05 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -100,7 +100,7 @@ namespace xmloff const AlignmentTranslationEntry* pTranslation = AlignmentTranslations; while ( ParagraphAdjust::ParagraphAdjust_MAKE_FIXED_SIZE != pTranslation->nParagraphValue) { - if ( (ParagraphAdjust)nValue == pTranslation->nParagraphValue) + if ( static_cast<ParagraphAdjust>(nValue) == pTranslation->nParagraphValue) { rValue <<= pTranslation->nControlValue; return; diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index e9087b00b8b3..bba930eda041 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -69,7 +69,7 @@ SvXMLEnumMapEntry<drawing::DashStyle> const pXML_DashStyle_Enum[] = { XML_ROUND, drawing::DashStyle_ROUND }, { XML_RECT, drawing::DashStyle_RECTRELATIVE }, { XML_ROUND, drawing::DashStyle_ROUNDRELATIVE }, - { XML_TOKEN_INVALID, (drawing::DashStyle)0 } + { XML_TOKEN_INVALID, drawing::DashStyle(0) } }; // Import diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 53ec6158763c..b91cb3c53f67 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -62,7 +62,7 @@ SvXMLEnumMapEntry<awt::GradientStyle> const pXML_GradientStyle_Enum[] = { XML_GRADIENTSTYLE_ELLIPSOID, awt::GradientStyle_ELLIPTICAL }, { XML_GRADIENTSTYLE_SQUARE, awt::GradientStyle_SQUARE }, { XML_GRADIENTSTYLE_RECTANGULAR, awt::GradientStyle_RECT }, - { XML_TOKEN_INVALID, (awt::GradientStyle)0 } + { XML_TOKEN_INVALID, awt::GradientStyle(0) } }; // Import diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index 99111dcdd359..bcc24c5d0c78 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -53,7 +53,7 @@ SvXMLEnumMapEntry<drawing::HatchStyle> const pXML_HatchStyle_Enum[] = { XML_HATCHSTYLE_SINGLE, drawing::HatchStyle_SINGLE }, { XML_HATCHSTYLE_DOUBLE, drawing::HatchStyle_DOUBLE }, { XML_HATCHSTYLE_TRIPLE, drawing::HatchStyle_TRIPLE }, - { XML_TOKEN_INVALID, (drawing::HatchStyle)0 } + { XML_TOKEN_INVALID, drawing::HatchStyle(0) } }; // Import diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 4162e036ac46..6ff3eb1da0f2 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -59,7 +59,7 @@ SvXMLEnumMapEntry<awt::GradientStyle> const pXML_GradientStyle_Enum[] = { XML_GRADIENTSTYLE_ELLIPSOID, awt::GradientStyle_ELLIPTICAL }, { XML_GRADIENTSTYLE_SQUARE, awt::GradientStyle_SQUARE }, { XML_GRADIENTSTYLE_RECTANGULAR, awt::GradientStyle_RECT }, - { XML_TOKEN_INVALID, (awt::GradientStyle)0 } + { XML_TOKEN_INVALID, awt::GradientStyle(0) } }; // Import diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 2f89ef6299e3..28c421f43bb8 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -74,14 +74,14 @@ static const SvXMLEnumMapEntry<GraphicLocation> psXML_BrushHoriPos[] = { { XML_LEFT, GraphicLocation_LEFT_MIDDLE }, { XML_RIGHT, GraphicLocation_RIGHT_MIDDLE }, - { XML_TOKEN_INVALID, (GraphicLocation)0 } + { XML_TOKEN_INVALID, GraphicLocation(0) } }; static const SvXMLEnumMapEntry<GraphicLocation> psXML_BrushVertPos[] = { { XML_TOP, GraphicLocation_MIDDLE_TOP }, { XML_BOTTOM, GraphicLocation_MIDDLE_BOTTOM }, - { XML_TOKEN_INVALID, (GraphicLocation)0 } + { XML_TOKEN_INVALID, GraphicLocation(0) } }; static void lcl_xmlbic_MergeHoriPos( GraphicLocation& ePos, @@ -288,7 +288,7 @@ void XMLBackgroundImageContext::ProcessAttrs( { XML_BACKGROUND_REPEAT, GraphicLocation_TILED }, { XML_BACKGROUND_NO_REPEAT, GraphicLocation_MIDDLE_MIDDLE }, { XML_BACKGROUND_STRETCH, GraphicLocation_AREA }, - { XML_TOKEN_INVALID, (GraphicLocation)0 } + { XML_TOKEN_INVALID, GraphicLocation(0) } }; if( SvXMLUnitConverter::convertEnum( nPos, rValue, psXML_BrushRepeat ) ) diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 74ca184edcfc..5446398e5e72 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -150,7 +150,7 @@ void XMLFootnoteSeparatorExport::exportXML( { XML_LEFT, text::HorizontalAdjust_LEFT }, { XML_CENTER, text::HorizontalAdjust_CENTER }, { XML_RIGHT, text::HorizontalAdjust_RIGHT }, - { XML_TOKEN_INVALID, (text::HorizontalAdjust)0 } + { XML_TOKEN_INVALID, text::HorizontalAdjust(0) } }; if (SvXMLUnitConverter::convertEnum( diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index f12db97c6c0f..5ec390c459cc 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -121,7 +121,7 @@ void XMLFootnoteSeparatorImport::StartElement( { XML_LEFT, text::HorizontalAdjust_LEFT }, { XML_CENTER, text::HorizontalAdjust_CENTER }, { XML_RIGHT, text::HorizontalAdjust_RIGHT }, - { XML_TOKEN_INVALID, (text::HorizontalAdjust)0 } + { XML_TOKEN_INVALID, text::HorizontalAdjust(0) } }; SvXMLUnitConverter::convertEnum( diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx index 0b2c1f99d59e..d6b9e6958f5c 100644 --- a/xmloff/source/style/adjushdl.cxx +++ b/xmloff/source/style/adjushdl.cxx @@ -37,7 +37,7 @@ SvXMLEnumMapEntry<style::ParagraphAdjust> const pXML_Para_Adjust_Enum[] = { XML_JUSTIFIED, style::ParagraphAdjust_BLOCK }, // obsolete { XML_LEFT, style::ParagraphAdjust_LEFT }, { XML_RIGHT, style::ParagraphAdjust_RIGHT }, - { XML_TOKEN_INVALID, (style::ParagraphAdjust)0 } + { XML_TOKEN_INVALID, style::ParagraphAdjust(0) } }; SvXMLEnumMapEntry<style::ParagraphAdjust> const pXML_Para_Align_Last_Enum[] = @@ -46,7 +46,7 @@ SvXMLEnumMapEntry<style::ParagraphAdjust> const pXML_Para_Align_Last_Enum[] = { XML_CENTER, style::ParagraphAdjust_CENTER }, { XML_JUSTIFY, style::ParagraphAdjust_BLOCK }, { XML_JUSTIFIED, style::ParagraphAdjust_BLOCK }, // obsolete - { XML_TOKEN_INVALID, (style::ParagraphAdjust)0 } + { XML_TOKEN_INVALID, style::ParagraphAdjust(0) } }; @@ -63,7 +63,7 @@ bool XMLParaAdjustPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rV style::ParagraphAdjust eAdjust; bool bRet = SvXMLUnitConverter::convertEnum( eAdjust, rStrImpValue, pXML_Para_Adjust_Enum ); if( bRet ) - rValue <<= (sal_Int16)eAdjust; + rValue <<= static_cast<sal_Int16>(eAdjust); return bRet; } @@ -77,7 +77,7 @@ bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV rValue >>= nVal; - bool bRet = SvXMLUnitConverter::convertEnum( aOut, (style::ParagraphAdjust)nVal, pXML_Para_Adjust_Enum, XML_START ); + bool bRet = SvXMLUnitConverter::convertEnum( aOut, static_cast<style::ParagraphAdjust>(nVal), pXML_Para_Adjust_Enum, XML_START ); rStrExpValue = aOut.makeStringAndClear(); @@ -98,7 +98,7 @@ bool XMLLastLineAdjustPropHdl::importXML( const OUString& rStrImpValue, uno::Any style::ParagraphAdjust eAdjust; bool bRet = SvXMLUnitConverter::convertEnum( eAdjust, rStrImpValue, pXML_Para_Align_Last_Enum ); if( bRet ) - rValue <<= (sal_Int16)eAdjust; + rValue <<= static_cast<sal_Int16>(eAdjust); return bRet; } @@ -111,8 +111,8 @@ bool XMLLastLineAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any rValue >>= nVal; - if( (style::ParagraphAdjust)nVal != style::ParagraphAdjust_LEFT ) - bRet = SvXMLUnitConverter::convertEnum( aOut, (style::ParagraphAdjust)nVal, pXML_Para_Align_Last_Enum, XML_START ); + if( static_cast<style::ParagraphAdjust>(nVal) != style::ParagraphAdjust_LEFT ) + bRet = SvXMLUnitConverter::convertEnum( aOut, static_cast<style::ParagraphAdjust>(nVal), pXML_Para_Align_Last_Enum, XML_START ); rStrExpValue = aOut.makeStringAndClear(); diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index 74236713c2c3..ed0b56d98784 100644 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx @@ -31,14 +31,14 @@ SvXMLEnumMapEntry<style::GraphicLocation> const pXML_BrushHorizontalPos[] = { { XML_LEFT, style::GraphicLocation_LEFT_MIDDLE }, { XML_RIGHT, style::GraphicLocation_RIGHT_MIDDLE }, - { XML_TOKEN_INVALID, (style::GraphicLocation)0 } + { XML_TOKEN_INVALID, style::GraphicLocation(0) } }; SvXMLEnumMapEntry<style::GraphicLocation> const pXML_BrushVerticalPos[] = { { XML_TOP, style::GraphicLocation_MIDDLE_TOP }, { XML_BOTTOM, style::GraphicLocation_MIDDLE_BOTTOM }, - { XML_TOKEN_INVALID, (style::GraphicLocation)0 } + { XML_TOKEN_INVALID, style::GraphicLocation(0) } }; @@ -130,7 +130,7 @@ bool XMLBackGraphicPositionPropHdl::importXML( const OUString& rStrImpValue, uno bRet &= style::GraphicLocation_NONE != ePos; if( bRet ) - rValue <<= (style::GraphicLocation)(sal_uInt16)ePos; + rValue <<= static_cast<style::GraphicLocation>(static_cast<sal_uInt16>(ePos)); return bRet; } @@ -145,7 +145,7 @@ bool XMLBackGraphicPositionPropHdl::exportXML( OUString& rStrExpValue, const uno { sal_Int32 nValue = 0; if( rValue >>= nValue ) - eLocation = (style::GraphicLocation)nValue; + eLocation = static_cast<style::GraphicLocation>(nValue); else bRet = false; } diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx index 9a0d844478e2..9acc14bff932 100644 --- a/xmloff/source/style/breakhdl.cxx +++ b/xmloff/source/style/breakhdl.cxx @@ -81,7 +81,7 @@ bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno::Any if( !( rValue >>= nValue ) ) return false; - eBreak = (style::BreakType) nValue; + eBreak = static_cast<style::BreakType>(nValue); } sal_uInt16 nEnum = 0; @@ -151,7 +151,7 @@ bool XMLFmtBreakAfterPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& if( !( rValue >>= nValue ) ) return false; - eBreak = (style::BreakType) nValue; + eBreak = static_cast<style::BreakType>(nValue); } sal_uInt16 nEnum = 0; diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index 794972a2948d..0a2d0d9b8514 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -41,7 +41,7 @@ static const SvXMLEnumMapEntry<FontFamily>* lcl_getFontFamilyGenericMapping() { XML_SCRIPT, FAMILY_SCRIPT }, { XML_SWISS, FAMILY_SWISS }, { XML_SYSTEM, FAMILY_SYSTEM }, - { XML_TOKEN_INVALID, (FontFamily)0 } + { XML_TOKEN_INVALID, FontFamily(0) } }; return aFontFamilyGenericMapping; } @@ -50,7 +50,7 @@ static SvXMLEnumMapEntry<FontPitch> const aFontPitchMapping[] = { { XML_FIXED, PITCH_FIXED }, { XML_VARIABLE, PITCH_VARIABLE }, - { XML_TOKEN_INVALID, (FontPitch)0 } + { XML_TOKEN_INVALID, FontPitch(0) } }; // class XMLFontFamilyNamePropHdl @@ -209,7 +209,7 @@ bool XMLFontFamilyPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV sal_Int16 nFamily = sal_Int16(); if( rValue >>= nFamily ) { - FontFamily eFamily = (FontFamily)nFamily; + FontFamily eFamily = static_cast<FontFamily>(nFamily); if( eFamily != FAMILY_DONTKNOW ) bRet = SvXMLUnitConverter::convertEnum( aOut, eFamily, lcl_getFontFamilyGenericMapping() ); } @@ -278,7 +278,7 @@ bool XMLFontPitchPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rVa FontPitch ePitch = PITCH_DONTKNOW; if( rValue >>= nPitch ) - ePitch = (FontPitch)nPitch; + ePitch = static_cast<FontPitch>(nPitch); if( PITCH_DONTKNOW != ePitch ) { diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx index 8f457c51f969..d4df03c70c08 100644 --- a/xmloff/source/style/postuhdl.cxx +++ b/xmloff/source/style/postuhdl.cxx @@ -34,7 +34,7 @@ SvXMLEnumMapEntry<FontItalic> const aPostureGenericMapping[] = { XML_POSTURE_NORMAL, ITALIC_NONE }, { XML_POSTURE_ITALIC, ITALIC_NORMAL }, { XML_POSTURE_OBLIQUE, ITALIC_OBLIQUE }, - { XML_TOKEN_INVALID, (FontItalic)0 } + { XML_TOKEN_INVALID, FontItalic(0) } }; @@ -67,7 +67,7 @@ bool XMLPosturePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValu if( !( rValue >>= nValue ) ) return false; - eSlant = (awt::FontSlant)nValue; + eSlant = static_cast<awt::FontSlant>(nValue); } OUStringBuffer aOut; diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index 8fae927244e9..0b18917c02ee 100644 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx @@ -65,7 +65,7 @@ static SvXMLEnumMapEntry<drawing::ColorMode> const aXML_ColorMode_EnumMap[] = { XML_MONO, drawing::ColorMode_MONO }, { XML_WATERMARK, drawing::ColorMode_WATERMARK }, { XML_STANDARD, drawing::ColorMode_STANDARD }, - { XML_TOKEN_INVALID, (drawing::ColorMode)0 } + { XML_TOKEN_INVALID, drawing::ColorMode(0) } }; static SvXMLEnumMapEntry<text::HorizontalAdjust> const aXML_HorizontalAdjust_Enum[] = @@ -73,7 +73,7 @@ static SvXMLEnumMapEntry<text::HorizontalAdjust> const aXML_HorizontalAdjust_Enu { XML_LEFT, text::HorizontalAdjust_LEFT }, { XML_CENTER, text::HorizontalAdjust_CENTER }, { XML_RIGHT, text::HorizontalAdjust_RIGHT }, - { XML_TOKEN_INVALID, (text::HorizontalAdjust)0 } + { XML_TOKEN_INVALID, text::HorizontalAdjust(0) } }; // aXML_WritingDirection_Enum is used with and without 'page' diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 059bf8739600..1fd79f01be4e 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -1031,8 +1031,8 @@ static bool lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, bool bSystem return false; // additional elements else { - NfIndexTableOffset eFound = (NfIndexTableOffset) SvXMLNumFmtDefaults::GetDefaultDateFormat( - eDateDOW, eDateDay, eDateMonth, eDateYear, eDateHours, eDateMins, eDateSecs, bSystemDate ); + NfIndexTableOffset eFound = static_cast<NfIndexTableOffset>(SvXMLNumFmtDefaults::GetDefaultDateFormat( + eDateDOW, eDateDay, eDateMonth, eDateYear, eDateHours, eDateMins, eDateSecs, bSystemDate )); return ( eFound == eBuiltIn ); } diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 1eedc4000bd3..e3576285f3da 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1709,9 +1709,9 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) // check for default date formats if ( nType == XML_TOK_STYLES_DATE_STYLE && bAutoOrder && !bDateNoDefault ) { - NfIndexTableOffset eFormat = (NfIndexTableOffset) SvXMLNumFmtDefaults::GetDefaultDateFormat( + NfIndexTableOffset eFormat = static_cast<NfIndexTableOffset>(SvXMLNumFmtDefaults::GetDefaultDateFormat( eDateDOW, eDateDay, eDateMonth, eDateYear, - eDateHours, eDateMins, eDateSecs, bFromSystem ); + eDateHours, eDateMins, eDateSecs, bFromSystem )); if ( eFormat < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS ) { // #109651# if a date format has the automatic-order attribute and diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 262dce7f32a3..752c5bbf0701 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -102,9 +102,9 @@ void SvXMLStyleContext::SetAttribute( sal_uInt16 nPrefixKey, if( IsXMLToken( rLocalName, XML_FAMILY ) ) { if( IsXMLToken( rValue, XML_PARAGRAPH ) ) - mnFamily = (sal_uInt16)SfxStyleFamily::Para; + mnFamily = sal_uInt16(SfxStyleFamily::Para); else if( IsXMLToken( rValue, XML_TEXT ) ) - mnFamily = (sal_uInt16)SfxStyleFamily::Char; + mnFamily = sal_uInt16(SfxStyleFamily::Char); } else if( IsXMLToken( rLocalName, XML_NAME ) ) { diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index c63c47d78df2..9fde295abfee 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -39,7 +39,7 @@ SvXMLEnumMapEntry<style::TabAlign> const pXML_tabstop_style[] = { XML_RIGHT, style::TabAlign_RIGHT }, { XML_CHAR, style::TabAlign_DECIMAL }, { XML_DEFAULT, style::TabAlign_DEFAULT }, // ????????????????????????????????????? - { XML_TOKEN_INVALID, (style::TabAlign)0 } + { XML_TOKEN_INVALID, style::TabAlign(0) } }; void SvxXMLTabStopExport::exportTabStop( const css::style::TabStop* pTabStop ) diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index b9f98671d256..b8e2b0b4e7b8 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -175,7 +175,7 @@ void XMLIndexSourceBaseContext::StartElement( sal_uInt16 nToken = aTokenMap.Get(nPrefix, sLocalName); // process attribute - ProcessAttribute((enum IndexSourceParamEnum)nToken, + ProcessAttribute(static_cast<enum IndexSourceParamEnum>(nToken), xAttrList->getValueByIndex(i)); } } diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index ce73f0052e57..52323ea4f404 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -89,7 +89,7 @@ SvXMLEnumMapEntry<IndexTypeEnum> const aIndexTypeMap[] = { XML_BIBLIOGRAPHY, TEXT_INDEX_BIBLIOGRAPHY }, { XML_USER_INDEX, TEXT_INDEX_USER }, { XML_ILLUSTRATION_INDEX, TEXT_INDEX_ILLUSTRATION }, - { XML_TOKEN_INVALID, (IndexTypeEnum)0 } + { XML_TOKEN_INVALID, IndexTypeEnum(0) } }; diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 7d26498110d6..61ee6c03648b 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -207,7 +207,7 @@ SvXMLEnumMapEntry<TemplateTokenType> const aTemplateTokenTypeMap[] = { XML_INDEX_ENTRY_LINK_START, XML_TOK_INDEX_TYPE_LINK_START }, { XML_INDEX_ENTRY_LINK_END, XML_TOK_INDEX_TYPE_LINK_END }, { XML_INDEX_ENTRY_BIBLIOGRAPHY, XML_TOK_INDEX_TYPE_BIBLIOGRAPHY }, - { XML_TOKEN_INVALID, (TemplateTokenType)0 } + { XML_TOKEN_INVALID, TemplateTokenType(0) } }; SvXMLImportContextRef XMLIndexTemplateContext::CreateChildContext( diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index cfa2350c37d0..4bf0fc2669fc 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -117,7 +117,7 @@ void XMLLineNumberingImportContext::StartElement( GetKeyByAttrName( xAttrList->getNameByIndex(i), &sLocalName ); ProcessAttribute( - (enum LineNumberingToken)aTokenMap.Get(nPrefix, sLocalName), + static_cast<enum LineNumberingToken>(aTokenMap.Get(nPrefix, sLocalName)), xAttrList->getValueByIndex(i)); } } diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 1249b773e2fa..e6a6875244c2 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -328,7 +328,7 @@ SvXMLEnumStringMapEntry<SectionTypeEnum> const aIndexTypeMap[] = ENUM_STRING_MAP_ENTRY( "com.sun.star.text.Bibliography", TEXT_SECTION_TYPE_BIBLIOGRAPHY ), ENUM_STRING_MAP_ENTRY( "com.sun.star.text.UserIndex", TEXT_SECTION_TYPE_USER ), ENUM_STRING_MAP_ENTRY( "com.sun.star.text.IllustrationsIndex", TEXT_SECTION_TYPE_ILLUSTRATION ), - { nullptr, 0, (SectionTypeEnum)0 } + { nullptr, 0, SectionTypeEnum(0) } }; enum SectionTypeEnum XMLSectionExport::MapSectionType( @@ -1080,7 +1080,7 @@ SvXMLEnumStringMapEntry<TemplateTypeEnum> const aTemplateTypeMap[] = ENUM_STRING_MAP_ENTRY( "TokenHyperlinkStart", TOK_TTYPE_HYPERLINK_START ), ENUM_STRING_MAP_ENTRY( "TokenHyperlinkEnd", TOK_TTYPE_HYPERLINK_END ), ENUM_STRING_MAP_ENTRY( "TokenBibliographyDataField", TOK_TTYPE_BIBLIOGRAPHY ), - { nullptr, 0, (TemplateTypeEnum)0} + { nullptr, 0, TemplateTypeEnum(0)} }; SvXMLEnumStringMapEntry<TemplateParamEnum> const aTemplateParamMap[] = @@ -1096,7 +1096,7 @@ SvXMLEnumStringMapEntry<TemplateParamEnum> const aTemplateParamMap[] = ENUM_STRING_MAP_ENTRY( "ChapterFormat", TOK_TPARAM_CHAPTER_FORMAT ), ENUM_STRING_MAP_ENTRY( "ChapterLevel", TOK_TPARAM_CHAPTER_LEVEL ),//i53420 ENUM_STRING_MAP_ENTRY( "BibliographyDataField", TOK_TPARAM_BIBLIOGRAPHY_DATA ), - { nullptr, 0, (TemplateParamEnum)0} + { nullptr, 0, TemplateParamEnum(0)} }; SvXMLEnumMapEntry<sal_Int16> const aBibliographyDataFieldMap[] = diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index e827b6858ae7..feff3ca8d05a 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -88,7 +88,7 @@ static SvXMLEnumMapEntry<VerticalAlignment> const pXML_Sep_Align_Enum[] = { XML_TOP, VerticalAlignment_TOP }, { XML_MIDDLE, VerticalAlignment_MIDDLE }, { XML_BOTTOM, VerticalAlignment_BOTTOM }, - { XML_TOKEN_INVALID, (VerticalAlignment)0 } + { XML_TOKEN_INVALID, VerticalAlignment(0) } }; class XMLTextColumnContext_Impl: public SvXMLImportContext diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 379ecbe6385a..28f3f71fdd24 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -122,7 +122,7 @@ static SvXMLEnumMapEntry<lcl_MarkType> const lcl_aMarkTypeMap[] = { XML_FIELDMARK, TypeFieldmark }, { XML_FIELDMARK_START, TypeFieldmarkStart }, { XML_FIELDMARK_END, TypeFieldmarkEnd }, - { XML_TOKEN_INVALID, (lcl_MarkType)0 }, + { XML_TOKEN_INVALID, lcl_MarkType(0) }, }; diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 235637437b58..946b5f847df3 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -243,7 +243,7 @@ SvXMLEnumStringMapEntry<FieldIdEnum> const aFieldServiceNameMapping[] = ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_TABLE_FORMULA, FIELD_ID_TABLE_FORMULA ), ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_DROP_DOWN, FIELD_ID_DROP_DOWN ), - { nullptr, 0, (FieldIdEnum)0 } + { nullptr, 0, FieldIdEnum(0) } }; diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 9a0f33cafb96..963d0ce3fa50 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -725,7 +725,7 @@ static SvXMLEnumMapEntry<PageNumberType> const lcl_aSelectPageAttrMap[] = { XML_PREVIOUS, PageNumberType_PREV }, { XML_CURRENT, PageNumberType_CURRENT }, { XML_NEXT, PageNumberType_NEXT }, - { XML_TOKEN_INVALID, (PageNumberType)0 }, + { XML_TOKEN_INVALID, PageNumberType(0) }, }; XMLPageContinuationImportContext::XMLPageContinuationImportContext( diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index d57944f89b3c..67fb156aff9a 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -1652,28 +1652,28 @@ SvXMLImportContextRef XMLImpSpanContext_Impl::CreateChildContext( case XML_TOK_TEXT_TOC_MARK_START: pContext = new XMLTOCMarkImportContext_Impl( rImport, nPrefix, rLocalName, - (enum XMLTextPElemTokens)nToken, rHints); + static_cast<enum XMLTextPElemTokens>(nToken), rHints); break; case XML_TOK_TEXT_USER_INDEX_MARK: case XML_TOK_TEXT_USER_INDEX_MARK_START: pContext = new XMLUserIndexMarkImportContext_Impl( rImport, nPrefix, rLocalName, - (enum XMLTextPElemTokens)nToken, rHints); + static_cast<enum XMLTextPElemTokens>(nToken), rHints); break; case XML_TOK_TEXT_ALPHA_INDEX_MARK: case XML_TOK_TEXT_ALPHA_INDEX_MARK_START: pContext = new XMLAlphaIndexMarkImportContext_Impl( rImport, nPrefix, rLocalName, - (enum XMLTextPElemTokens)nToken, rHints); + static_cast<enum XMLTextPElemTokens>(nToken), rHints); break; case XML_TOK_TEXT_TOC_MARK_END: case XML_TOK_TEXT_USER_INDEX_MARK_END: case XML_TOK_TEXT_ALPHA_INDEX_MARK_END: pContext = new XMLIndexMarkImportContext_Impl( - rImport, nPrefix, rLocalName, (enum XMLTextPElemTokens)nToken, + rImport, nPrefix, rLocalName, static_cast<enum XMLTextPElemTokens>(nToken), rHints); break; diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index f87f0b130675..382c283e1a57 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -195,7 +195,7 @@ static SvXMLEnumMapEntry<RubyAdjust> const pXML_RubyAdjust_Enum[] = { XML_RIGHT, RubyAdjust_RIGHT }, { XML_DISTRIBUTE_LETTER, RubyAdjust_BLOCK }, { XML_DISTRIBUTE_SPACE, RubyAdjust_INDENT_BLOCK }, - { XML_TOKEN_INVALID, (RubyAdjust)0 } + { XML_TOKEN_INVALID, RubyAdjust(0) } }; static SvXMLEnumMapEntry<sal_uInt16> const pXML_FontRelief_Enum[] = @@ -232,7 +232,7 @@ static SvXMLEnumMapEntry<drawing::TextVerticalAdjust> const pXML_VerticalAlign_E { XML_MIDDLE, drawing::TextVerticalAdjust_CENTER }, { XML_BOTTOM, drawing::TextVerticalAdjust_BOTTOM }, { XML_JUSTIFY, drawing::TextVerticalAdjust_BLOCK }, - { XML_TOKEN_INVALID, (drawing::TextVerticalAdjust)0 } + { XML_TOKEN_INVALID, drawing::TextVerticalAdjust(0) } }; class XMLDropCapPropHdl_Impl : public XMLPropertyHandler @@ -428,7 +428,7 @@ SvXMLEnumMapEntry<WrapTextMode> const pXML_Wrap_Enum[] = { XML_DYNAMIC, WrapTextMode_DYNAMIC }, { XML_LEFT, WrapTextMode_LEFT }, { XML_RIGHT, WrapTextMode_RIGHT }, - { XML_TOKEN_INVALID, (WrapTextMode)0 } + { XML_TOKEN_INVALID, WrapTextMode(0) } }; class XMLWrapPropHdl_Impl : public XMLPropertyHandler @@ -554,7 +554,7 @@ SvXMLEnumMapEntry<TextContentAnchorType> const pXML_Anchor_Enum[] = { XML_FRAME, TextContentAnchorType_AT_FRAME }, { XML_PARAGRAPH, TextContentAnchorType_AT_PARAGRAPH }, { XML_AS_CHAR, TextContentAnchorType_AS_CHARACTER }, - { XML_TOKEN_INVALID, (TextContentAnchorType)0 } + { XML_TOKEN_INVALID, TextContentAnchorType(0) } }; bool XMLAnchorTypePropHdl::importXML( diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index b47bb9b59654..b45ffe132f47 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -1084,7 +1084,7 @@ static SvXMLEnumMapEntry<ValueType> const aValueTypeMap[] = { XML_TIME, XML_VALUE_TYPE_TIME }, { XML_BOOLEAN, XML_VALUE_TYPE_BOOLEAN }, { XML_STRING, XML_VALUE_TYPE_STRING }, - { XML_TOKEN_INVALID, (ValueType)0 } + { XML_TOKEN_INVALID, ValueType(0) } }; XMLValueImportHelper::XMLValueImportHelper( diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 738f1e7622d7..b0dfbd7d0b0d 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -411,7 +411,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( { pContext->AddAttribute( sAttrName, sAttrValue ); XMLTypedPropertiesOOoTContext_Impl *pContext2 = - GetPropContext( (XMLPropType)aAction.m_nParam1 ); + GetPropContext( static_cast<XMLPropType>(aAction.m_nParam1) ); if( pContext2 ) pContext2->AddAttribute( sAttrName, sAttrValue ); } @@ -468,7 +468,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( XMLTransformerBase::ReplaceSingleInchWithIn( aAttrValue ); pContext->AddAttribute( sAttrName, aAttrValue ); XMLTypedPropertiesOOoTContext_Impl *pContext2 = - GetPropContext( (XMLPropType)aAction.m_nParam1 ); + GetPropContext( static_cast<XMLPropType>(aAction.m_nParam1) ); if( pContext2 ) pContext2->AddAttribute( sAttrName, aAttrValue ); } |