summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/EnhancedCustomShapeGeometry.hxx2
-rw-r--r--include/svx/flagsdef.hxx12
-rw-r--r--include/svx/gridctrl.hxx4
-rw-r--r--include/svx/scene3d.hxx2
-rw-r--r--include/svx/sdasitm.hxx2
-rw-r--r--include/svx/svdtrans.hxx6
-rw-r--r--include/svx/transfrmhelper.hxx8
7 files changed, 18 insertions, 18 deletions
diff --git a/include/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx
index d67d6832a057..3befba19fa57 100644
--- a/include/svx/EnhancedCustomShapeGeometry.hxx
+++ b/include/svx/EnhancedCustomShapeGeometry.hxx
@@ -88,7 +88,7 @@ struct mso_CustomShape
sal_uInt32 nHandles;
};
-#define MSO_I | (sal_Int32)0x80000000
+#define MSO_I | sal_Int32(0x80000000)
bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType );
SVX_DLLPUBLIC bool IsCustomShapeFilledByDefault( MSO_SPT eSpType );
diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx
index 30b1ff401203..1b09540e7198 100644
--- a/include/svx/flagsdef.hxx
+++ b/include/svx/flagsdef.hxx
@@ -53,13 +53,13 @@ namespace o3tl
// flags for SvxBorderTabPage
#define SVX_HIDESHADOWCTL 0x01
-#define DISABLE_CASEMAP ((sal_uInt16)0x0001)
-#define DISABLE_WORDLINE ((sal_uInt16)0x0002)
-#define DISABLE_BLINK ((sal_uInt16)0x0004)
-#define DISABLE_UNDERLINE_COLOR ((sal_uInt16)0x0008)
+#define DISABLE_CASEMAP (sal_uInt16(0x0001))
+#define DISABLE_WORDLINE (sal_uInt16(0x0002))
+#define DISABLE_BLINK (sal_uInt16(0x0004))
+#define DISABLE_UNDERLINE_COLOR (sal_uInt16(0x0008))
-#define DISABLE_LANGUAGE ((sal_uInt16)0x0010)
-#define DISABLE_HIDE_LANGUAGE ((sal_uInt16)0x0020)
+#define DISABLE_LANGUAGE (sal_uInt16(0x0010))
+#define DISABLE_HIDE_LANGUAGE (sal_uInt16(0x0020))
// flags for SvxCharBasePage's child class
#define SVX_PREVIEW_CHARACTER 0x01
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 17755af8f086..d3d3c778b5bc 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -325,7 +325,7 @@ protected:
virtual bool SaveModified() override;
virtual bool IsModified() const override;
- virtual sal_uInt16 AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = (sal_uInt16)-1) override;
+ virtual sal_uInt16 AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = sal_uInt16(-1)) override;
void RemoveColumn(sal_uInt16 nId);
DbGridColumn* CreateColumn(sal_uInt16 nId) const;
virtual void ColumnMoved(sal_uInt16 nId) override;
@@ -418,7 +418,7 @@ public:
// the number of columns in the model
sal_uInt16 GetViewColCount() const { return ColCount() - 1; }
- sal_uInt16 GetModelColCount() const { return (sal_uInt16)m_aColumns.size(); }
+ sal_uInt16 GetModelColCount() const { return static_cast<sal_uInt16>(m_aColumns.size()); }
// reverse to GetViewColumnPos: Id of position, the first non-handle column has position 0
sal_uInt16 GetColumnIdFromViewPos( sal_uInt16 nPos ) const { return GetColumnId(nPos + 1); }
sal_uInt16 GetColumnIdFromModelPos( sal_uInt16 nPos ) const;
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index c0a9a247746b..17351e83d9fd 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -108,7 +108,7 @@ public:
// Distance:
double GetDistance() const
- { return (double)GetObjectItemSet().Get(SDRATTR_3DSCENE_DISTANCE).GetValue(); }
+ { return static_cast<double>(GetObjectItemSet().Get(SDRATTR_3DSCENE_DISTANCE).GetValue()); }
// Focal length: before cm, now 1/10th mm (*100)
double GetFocalLength() const
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 3af42c9c19ba..254aba0a7c4d 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -84,7 +84,7 @@ inline SdrOnOffItem makeSdrTextWordWrapItem( bool bAuto ) {
inline size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const
{
- return (size_t)r1.first.hashCode() + r1.second.hashCode();
+ return static_cast<size_t>(r1.first.hashCode()) + r1.second.hashCode();
};
#endif
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 6ad879d3a822..f3e25203ff2e 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -51,7 +51,7 @@ class XPolygon;
class XPolyPolygon;
namespace svx
{
- inline long Round(double a) { return a>0.0 ? (long)(a+0.5) : -(long)((-a)+0.5); }
+ inline long Round(double a) { return a>0.0 ? static_cast<long>(a+0.5) : -static_cast<long>((-a)+0.5); }
}
inline void MoveRect(tools::Rectangle& rRect, const Size& S) { rRect.Move(S.Width(),S.Height()); }
@@ -145,11 +145,11 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad
double nAngle;
if (bVertical) {
long dy=rPnt.Y()-rCenter.Y();
- nAngle=(double)dy/(double)rRad.Y();
+ nAngle=static_cast<double>(dy)/static_cast<double>(rRad.Y());
rPnt.Y()=rCenter.Y();
} else {
long dx=rCenter.X()-rPnt.X();
- nAngle=(double)dx/(double)rRad.X();
+ nAngle=static_cast<double>(dx)/static_cast<double>(rRad.X());
rPnt.X()=rCenter.X();
}
return nAngle;
diff --git a/include/svx/transfrmhelper.hxx b/include/svx/transfrmhelper.hxx
index d5f293dbc10a..ddc542c8a533 100644
--- a/include/svx/transfrmhelper.hxx
+++ b/include/svx/transfrmhelper.hxx
@@ -30,11 +30,11 @@ public:
static void ConvertRect(basegfx::B2DRange& rRange, const sal_uInt16 nDigits, const MapUnit ePoolUnit, const FieldUnit eDlgUnit)
{
const basegfx::B2DPoint aTopLeft(
- (double)MetricField::ConvertValue(basegfx::fround(rRange.getMinX()), nDigits, ePoolUnit, eDlgUnit),
- (double)MetricField::ConvertValue(basegfx::fround(rRange.getMinY()), nDigits, ePoolUnit, eDlgUnit));
+ static_cast<double>(MetricField::ConvertValue(basegfx::fround(rRange.getMinX()), nDigits, ePoolUnit, eDlgUnit)),
+ static_cast<double>(MetricField::ConvertValue(basegfx::fround(rRange.getMinY()), nDigits, ePoolUnit, eDlgUnit)));
const basegfx::B2DPoint aBottomRight(
- (double)MetricField::ConvertValue(basegfx::fround(rRange.getMaxX()), nDigits, ePoolUnit, eDlgUnit),
- (double)MetricField::ConvertValue(basegfx::fround(rRange.getMaxY()), nDigits, ePoolUnit, eDlgUnit));
+ static_cast<double>(MetricField::ConvertValue(basegfx::fround(rRange.getMaxX()), nDigits, ePoolUnit, eDlgUnit)),
+ static_cast<double>(MetricField::ConvertValue(basegfx::fround(rRange.getMaxY()), nDigits, ePoolUnit, eDlgUnit)));
rRange = basegfx::B2DRange(aTopLeft, aBottomRight);
}
generated by cgit (git 2.34.1) at 2024-12-25 18:43:30 +0000