diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/EnhancedCustomShapeFunctionParser.hxx | 2 | ||||
| -rw-r--r-- | include/svx/chrtitem.hxx | 8 | ||||
| -rw-r--r-- | include/svx/scene3d.hxx | 2 | ||||
| -rw-r--r-- | include/svx/swframetypes.hxx | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx index bc1d97bd5879..30873c5eb644 100644 --- a/include/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx @@ -126,7 +126,7 @@ inline std::basic_ostream<charT, traits> & operator <<( case ExpressionFunct::TernaryIf : return stream << "if"; - default: return stream << "?(" << (int)eFunc << ")"; + default: return stream << "?(" << static_cast<int>(eFunc) << ")"; } } diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 71bf9ab2cfc1..d852cd10f0dc 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -38,7 +38,7 @@ enum class SvxChartTextOrder Auto }; -#define CHTXTORDER_COUNT ((sal_uInt16)SvxChartTextOrder::Auto + 1) +#define CHTXTORDER_COUNT (sal_uInt16(SvxChartTextOrder::Auto) + 1) enum class SvxChartKindError { @@ -52,7 +52,7 @@ enum class SvxChartKindError Range }; -#define CHERROR_COUNT ((sal_uInt16)SvxChartKindError::Range + 1) +#define CHERROR_COUNT (sal_uInt16(SvxChartKindError::Range) + 1) enum class SvxChartIndicate { @@ -62,7 +62,7 @@ enum class SvxChartIndicate Down }; -#define CHINDICATE_COUNT ((sal_uInt16)SvxChartIndicate::Down + 1) +#define CHINDICATE_COUNT (sal_uInt16(SvxChartIndicate::Down) + 1) enum class SvxChartRegress { @@ -77,7 +77,7 @@ enum class SvxChartRegress Unknown }; -#define CHREGRESS_COUNT ((sal_uInt16)SvxChartRegress::Unknown + 1) +#define CHREGRESS_COUNT (sal_uInt16(SvxChartRegress::Unknown) + 1) class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem<SvxChartRegress> { diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index 17351e83d9fd..b6562093a6f1 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -104,7 +104,7 @@ public: // Perspective: enum ProjectionType { ProjectionType::Parallel, ProjectionType::Perspective } ProjectionType GetPerspective() const - { return (ProjectionType) GetObjectItemSet().Get(SDRATTR_3DSCENE_PERSPECTIVE).GetValue(); } + { return static_cast<ProjectionType>(GetObjectItemSet().Get(SDRATTR_3DSCENE_PERSPECTIVE).GetValue()); } // Distance: double GetDistance() const diff --git a/include/svx/swframetypes.hxx b/include/svx/swframetypes.hxx index 34cab05c4b9e..cd33ae4779b4 100644 --- a/include/svx/swframetypes.hxx +++ b/include/svx/swframetypes.hxx @@ -29,11 +29,11 @@ enum class RndStdIds UNKNOWN = -1, // return value used by SwFEShell::GetAnchorId // the following 5 values are deliberately the same as the values in css::text::TextContentAnchorType - FLY_AT_PARA = (int)css::text::TextContentAnchorType_AT_PARAGRAPH, // Anchored at paragraph. - FLY_AS_CHAR = (int)css::text::TextContentAnchorType_AS_CHARACTER, // Anchored as character. - FLY_AT_PAGE = (int)css::text::TextContentAnchorType_AT_PAGE, // Anchored at page. - FLY_AT_FLY = (int)css::text::TextContentAnchorType_AT_FRAME, // Anchored at frame. - FLY_AT_CHAR = (int)css::text::TextContentAnchorType_AT_CHARACTER, // Anchored at character. + FLY_AT_PARA = int(css::text::TextContentAnchorType_AT_PARAGRAPH), // Anchored at paragraph. + FLY_AS_CHAR = int(css::text::TextContentAnchorType_AS_CHARACTER), // Anchored as character. + FLY_AT_PAGE = int(css::text::TextContentAnchorType_AT_PAGE), // Anchored at page. + FLY_AT_FLY = int(css::text::TextContentAnchorType_AT_FRAME), // Anchored at frame. + FLY_AT_CHAR = int(css::text::TextContentAnchorType_AT_CHARACTER), // Anchored at character. HEADER, FOOTER, |