summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-01-12 20:17:13 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-01-12 20:17:13 +0100
commit681783c9adf85bde36348f11c03d3a483bf545be (patch)
treea5b8a4eab1695275b3d2516738b43c0d3f6ee158 /sc/inc
parentfe45359ab818659186672a0ca05979b589dedbfc (diff)
More loplugin:cstylecast: sc
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable loplugin:cstylecast for some more cases" plus solenv/clang-format/reformat-formatted-files Change-Id: I987ac3a6d062600a5e21c3462c70595dfaa51796
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/appluno.hxx24
-rw-r--r--sc/inc/bigrange.hxx6
-rw-r--r--sc/inc/chartpos.hxx2
-rw-r--r--sc/inc/chgtrack.hxx2
-rw-r--r--sc/inc/convuno.hxx6
-rw-r--r--sc/inc/viewopti.hxx4
6 files changed, 22 insertions, 22 deletions
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 58ec1563319c..36b6e9ac92d3 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -106,7 +106,7 @@ public:
virtual sal_Bool SAL_CALL getMoveSelection() override
{ return getPropertyBool("MoveSelection"); }
virtual void SAL_CALL setMoveSelection(sal_Bool p1) override
- { setProperty("MoveSelection", (bool)p1); }
+ { setProperty("MoveSelection", static_cast<bool>(p1)); }
virtual sal_Int16 SAL_CALL getMoveDirection() override
{ return getPropertyInt16("MoveDirection"); }
virtual void SAL_CALL setMoveDirection(sal_Int16 p1) override
@@ -114,27 +114,27 @@ public:
virtual sal_Bool SAL_CALL getEnterEdit() override
{ return getPropertyBool("EnterEdit"); }
virtual void SAL_CALL setEnterEdit(sal_Bool p1) override
- { setProperty("EnterEdit", (bool)p1); }
+ { setProperty("EnterEdit", static_cast<bool>(p1)); }
virtual sal_Bool SAL_CALL getExtendFormat() override
{ return getPropertyBool("ExtendFormat"); }
virtual void SAL_CALL setExtendFormat(sal_Bool p1) override
- { setProperty("ExtendFormat", (bool)p1); }
+ { setProperty("ExtendFormat", static_cast<bool>(p1)); }
virtual sal_Bool SAL_CALL getRangeFinder() override
{ return getPropertyBool("RangeFinder"); }
virtual void SAL_CALL setRangeFinder(sal_Bool p1) override
- { setProperty("RangeFinder", (bool)p1); }
+ { setProperty("RangeFinder", static_cast<bool>(p1)); }
virtual sal_Bool SAL_CALL getExpandReferences() override
{ return getPropertyBool("ExpandReferences"); }
virtual void SAL_CALL setExpandReferences(sal_Bool p1) override
- { setProperty("ExpandReferences", (bool)p1); }
+ { setProperty("ExpandReferences", static_cast<bool>(p1)); }
virtual sal_Bool SAL_CALL getMarkHeader() override
{ return getPropertyBool("MarkHeader"); }
virtual void SAL_CALL setMarkHeader(sal_Bool p1) override
- { setProperty("MarkHeader", (bool)p1); }
+ { setProperty("MarkHeader", static_cast<bool>(p1)); }
virtual sal_Bool SAL_CALL getUseTabCol() override
{ return getPropertyBool("UseTabCol"); }
virtual void SAL_CALL setUseTabCol(sal_Bool p1) override
- { setProperty("UseTabCol", (bool)p1); }
+ { setProperty("UseTabCol", static_cast<bool>(p1)); }
virtual sal_Int16 SAL_CALL getMetric() override
{ return getPropertyInt16("Metric"); }
virtual void SAL_CALL setMetric(sal_Int16 p1) override
@@ -146,7 +146,7 @@ public:
virtual sal_Bool SAL_CALL getDoAutoComplete() override
{ return getPropertyBool("DoAutoComplete"); }
virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) override
- { setProperty("DoAutoComplete", (bool)p1); }
+ { setProperty("DoAutoComplete", static_cast<bool>(p1)); }
virtual sal_Int16 SAL_CALL getStatusBarFunction() override
{ return getPropertyInt16("StatusBarFunction"); }
virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) override
@@ -167,19 +167,19 @@ public:
virtual sal_Bool SAL_CALL getPrintAllSheets() override
{ return getPropertyBool("PrintAllSheets"); }
virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) override
- { setProperty("PrintAllSheets", (bool)p1); }
+ { setProperty("PrintAllSheets", static_cast<bool>(p1)); }
virtual sal_Bool SAL_CALL getPrintEmptyPages() override
{ return getPropertyBool("PrintEmptyPages"); }
virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) override
- { setProperty("PrintEmptyPages", (bool)p1); }
+ { setProperty("PrintEmptyPages", static_cast<bool>(p1)); }
virtual sal_Bool SAL_CALL getUsePrinterMetrics() override
{ return getPropertyBool("UsePrinterMetrics"); }
virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) override
- { setProperty("UsePrinterMetrics", (bool)p1); }
+ { setProperty("UsePrinterMetrics", static_cast<bool>(p1)); }
virtual sal_Bool SAL_CALL getReplaceCellsWarning() override
{ return getPropertyBool("ReplaceCellsWarning"); }
virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) override
- { setProperty("ReplaceCellsWarning", (bool)p1); }
+ { setProperty("ReplaceCellsWarning", static_cast<bool>(p1)); }
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo >
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 5c8fbb5bfab8..995b03d1a36a 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -83,21 +83,21 @@ inline ScAddress ScBigAddress::MakeAddress() const
else if ( nCol > MAXCOL )
nColA = MAXCOL;
else
- nColA = (SCCOL) nCol;
+ nColA = static_cast<SCCOL>(nCol);
if ( nRow < 0 )
nRowA = 0;
else if ( nRow > MAXROW )
nRowA = MAXROW;
else
- nRowA = (SCROW) nRow;
+ nRowA = static_cast<SCROW>(nRow);
if ( nTab < 0 )
nTabA = 0;
else if ( nTab > MAXTAB )
nTabA = MAXTAB;
else
- nTabA = (SCTAB) nTab;
+ nTabA = static_cast<SCTAB>(nTab);
return ScAddress( nColA, nRowA, nTabA );
}
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index 8666919df0fa..db699ef2e062 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -61,7 +61,7 @@ public:
{ return nCol < nColCount && nRow < nRowCount; }
// data column by column
sal_uLong GetIndex( SCCOL nCol, SCROW nRow ) const
- { return (sal_uLong) nCol * nRowCount + nRow; }
+ { return static_cast<sal_uLong>(nCol) * nRowCount + nRow; }
const ScAddress* GetPosition( sal_uLong nIndex ) const
{
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index c1bc13f20ae1..fa0da691da9e 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -849,7 +849,7 @@ enum ScChangeTrackMergeState
// Internally generated actions start at this value (nearly all bits set)
// and are decremented, to keep values in a table separated from "normal" actions.
-#define SC_CHGTRACK_GENERATED_START ((sal_uInt32) 0xfffffff0)
+#define SC_CHGTRACK_GENERATED_START (sal_uInt32(0xfffffff0))
class ScChangeTrack : public utl::ConfigurationListener
{
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index 8c8f3d55c949..4786ace2a096 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -65,7 +65,7 @@ inline void ScUnoConversion::FillScAddress(
ScAddress& rScAddress,
const css::table::CellAddress& rApiAddress )
{
- rScAddress.Set( (SCCOL)rApiAddress.Column, (SCROW)rApiAddress.Row, (SCTAB)rApiAddress.Sheet );
+ rScAddress.Set( static_cast<SCCOL>(rApiAddress.Column), static_cast<SCROW>(rApiAddress.Row), static_cast<SCTAB>(rApiAddress.Sheet) );
}
inline void ScUnoConversion::FillApiAddress(
@@ -81,8 +81,8 @@ inline void ScUnoConversion::FillScRange(
ScRange& rScRange,
const css::table::CellRangeAddress& rApiRange )
{
- rScRange.aStart.Set( (SCCOL)rApiRange.StartColumn, (SCROW)rApiRange.StartRow, (SCTAB)rApiRange.Sheet );
- rScRange.aEnd.Set( (SCCOL)rApiRange.EndColumn, (SCROW)rApiRange.EndRow, (SCTAB)rApiRange.Sheet );
+ rScRange.aStart.Set( static_cast<SCCOL>(rApiRange.StartColumn), static_cast<SCROW>(rApiRange.StartRow), static_cast<SCTAB>(rApiRange.Sheet) );
+ rScRange.aEnd.Set( static_cast<SCCOL>(rApiRange.EndColumn), static_cast<SCROW>(rApiRange.EndRow), static_cast<SCTAB>(rApiRange.Sheet) );
}
inline void ScUnoConversion::FillApiRange(
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 375daefc5013..8bc3d380b28a 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -55,8 +55,8 @@ enum ScVObjType
VOBJ_TYPE_DRAW
};
-#define MAX_OPT (sal_uInt16)VOPT_CLIPMARKS+1
-#define MAX_TYPE (sal_uInt16)VOBJ_TYPE_DRAW+1
+#define MAX_OPT sal_uInt16(VOPT_CLIPMARKS)+1
+#define MAX_TYPE sal_uInt16(VOBJ_TYPE_DRAW)+1
#define SC_STD_GRIDCOLOR COL_LIGHTGRAY