summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-03-20 09:01:33 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-03-22 06:47:35 +0000
commit7299481834b15c920f996f4b0f3b5f821a82a10d (patch)
tree6cbc8a64399046dd2c83e4a4ef778c65ec00a34a /svx
parente9c7d259e8ed3144d4226aef7c3de351e4706b79 (diff)
loplugin:redundantcast find redundant c-style enum casts
Change-Id: I2dab376d87804521aed6b6bd41ad7762830fa349 Reviewed-on: https://gerrit.libreoffice.org/35467 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/fntctrl.cxx8
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx2
-rw-r--r--svx/source/sidebar/line/LinePropertyPanelBase.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.cxx8
-rw-r--r--svx/source/sidebar/nbdtmg.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx38
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx8
-rw-r--r--svx/source/xoutdev/_xpoly.cxx6
9 files changed, 39 insertions, 39 deletions
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 0632773624cc..626065a5c412 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -890,8 +890,8 @@ void SvxFontPrevWindow::SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, S
if (GetWhich(rSet, nSlot, nWhich))
{
nH = LogicToLogic(static_cast<const SvxFontHeightItem&>(rSet.Get(nWhich)).GetHeight(),
- (MapUnit) rSet.GetPool()->GetMetric(nWhich),
- MapUnit::MapTwip);
+ rSet.GetPool()->GetMetric(nWhich),
+ MapUnit::MapTwip);
}
else
nH = 240;// as default 12pt
@@ -1107,7 +1107,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack
{
const SvxKerningItem& rItem = static_cast<const SvxKerningItem&>( rSet.Get( nWhich ) );
short nKern = ( short )
- LogicToLogic( rItem.GetValue(), ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), MapUnit::MapTwip );
+ LogicToLogic( rItem.GetValue(), rSet.GetPool()->GetMetric( nWhich ), MapUnit::MapTwip );
rFont.SetFixKerning( nKern );
rCJKFont.SetFixKerning( nKern );
rCTLFont.SetFixKerning( nKern );
@@ -1351,7 +1351,7 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet)
{
const SvxKerningItem& rItem = static_cast<const SvxKerningItem&>( rSet.Get( nWhich ) );
short nKern = ( short )
- LogicToLogic( rItem.GetValue(), ( MapUnit ) rSet.GetPool()->GetMetric( nWhich ), MapUnit::MapTwip );
+ LogicToLogic( rItem.GetValue(), rSet.GetPool()->GetMetric( nWhich ), MapUnit::MapTwip );
rFont.SetFixKerning( nKern );
rCJKFont.SetFixKerning( nKern );
rCTLFont.SetFixKerning( nKern );
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 6bef1b477a4d..d04fdf41579f 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -655,7 +655,7 @@ namespace drawinglayer
}
// convert size and MapMode to destination logical size and MapMode
- const MapUnit aDestinationMapUnit((MapUnit)rSet.GetPool()->GetMetric(0));
+ const MapUnit aDestinationMapUnit(rSet.GetPool()->GetMetric(0));
basegfx::B2DVector aGraphicLogicSize(aGraphic.GetPrefSize().Width(), aGraphic.GetPrefSize().Height());
if(aGraphic.GetPrefMapMode() != aDestinationMapUnit)
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index daf2816cf763..7a57b4dce02e 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -704,7 +704,7 @@ void LinePropertyPanelBase::SetWidthIcon()
return;
}
- long nVal = LogicToLogic(mnWidthCoreValue * 10,(MapUnit)meMapUnit , MapUnit::MapPoint);
+ long nVal = LogicToLogic(mnWidthCoreValue * 10, meMapUnit, MapUnit::MapPoint);
const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH);
if(nVal <= 6)
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index e89b2d707eef..cce33f314726 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -116,7 +116,7 @@ IMPL_LINK(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void)
sal_uInt16 iPos = m_xVSWidth->GetSelectItemId();
if (iPos >= 1 && iPos <= 8)
{
- sal_IntPtr nVal = LogicToLogic(reinterpret_cast<sal_IntPtr>(m_xVSWidth->GetItemData( iPos )), MapUnit::MapPoint, (MapUnit)m_eMapUnit);
+ sal_IntPtr nVal = LogicToLogic(reinterpret_cast<sal_IntPtr>(m_xVSWidth->GetItemData( iPos )), MapUnit::MapPoint, m_eMapUnit);
nVal = m_xMFWidth->Denormalize(nVal);
XLineWidthItem aWidthItem( nVal );
m_rParent.setLineWidth(aWidthItem);
@@ -130,7 +130,7 @@ IMPL_LINK(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void)
//modified
if (m_bCustom)
{
- long nVal = LogicToLogic(m_nCustomWidth , MapUnit::MapPoint, (MapUnit)m_eMapUnit);
+ long nVal = LogicToLogic(m_nCustomWidth , MapUnit::MapPoint, m_eMapUnit);
nVal = m_xMFWidth->Denormalize(nVal);
XLineWidthItem aWidthItem( nVal );
m_rParent.setLineWidth(aWidthItem);
@@ -165,7 +165,7 @@ IMPL_LINK(LineWidthPopup, MFModifyHdl, Edit&, /*rControl*/, void)
m_xVSWidth->StartSelection();
}
long nTmp = static_cast<long>(m_xMFWidth->GetValue());
- long nVal = LogicToLogic( nTmp, MapUnit::MapPoint, (MapUnit)m_eMapUnit );
+ long nVal = LogicToLogic( nTmp, MapUnit::MapPoint, m_eMapUnit );
sal_Int32 nNewWidth = (short)m_xMFWidth->Denormalize( nVal );
XLineWidthItem aWidthItem(nNewWidth);
m_rParent.setLineWidth(aWidthItem);
@@ -208,7 +208,7 @@ void LineWidthPopup::SetWidthSelect(long lValue, bool bValuable, MapUnit eMapUni
if (bValuable)
{
- sal_Int64 nVal = OutputDevice::LogicToLogic(lValue, (MapUnit) eMapUnit, MapUnit::Map100thMM );
+ sal_Int64 nVal = OutputDevice::LogicToLogic(lValue, eMapUnit, MapUnit::Map100thMM );
nVal = m_xMFWidth->Normalize(nVal);
m_xMFWidth->SetValue( nVal, FUNIT_100TH_MM );
}
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index b753deb2b891..b1c1f6a4386f 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -928,7 +928,7 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
aSize = SvxNumberFormat::GetGraphicSizeMM100( pGrf );
}
}
- aSize = OutputDevice::LogicToLogic(aSize, MapUnit::Map100thMM, (MapUnit)GetMapUnit());
+ aSize = OutputDevice::LogicToLogic(aSize, MapUnit::Map100thMM, GetMapUnit());
aFmt.SetGraphicBrush( pLevelSettings->pBrushItem, &aSize, &eOrient );
}
} else
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 5511a633dc67..2e290a1ea4e9 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -213,8 +213,8 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, v
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
maTxtLeft += INDENT_STEP;
- sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(MapUnit::MapTwip), MapUnit::Map100thMM );
- nVal = OutputDevice::LogicToLogic( (long)nVal, MapUnit::Map100thMM, (MapUnit)m_eLRSpaceUnit );
+ sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, MapUnit::MapTwip, MapUnit::Map100thMM );
+ nVal = OutputDevice::LogicToLogic( (long)nVal, MapUnit::Map100thMM, m_eLRSpaceUnit );
aMargin.SetTextLeft( (const long)nVal );
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
@@ -246,8 +246,8 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, v
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
- sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(MapUnit::MapTwip), MapUnit::Map100thMM );
- nVal = OutputDevice::LogicToLogic( (long)nVal, MapUnit::Map100thMM, (MapUnit)m_eLRSpaceUnit );
+ sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, MapUnit::MapTwip, MapUnit::Map100thMM );
+ nVal = OutputDevice::LogicToLogic( (long)nVal, MapUnit::Map100thMM, m_eLRSpaceUnit );
aMargin.SetTextLeft( (const long)nVal );
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
@@ -357,18 +357,18 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
{
const SvxLRSpaceItem* pSpace = static_cast<const SvxLRSpaceItem*>(pState);
maTxtLeft = pSpace->GetTextLeft();
- maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)m_eLRSpaceUnit, MapUnit::Map100thMM );
- maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MapUnit::Map100thMM, (MapUnit)(MapUnit::MapTwip) );
+ maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, m_eLRSpaceUnit, MapUnit::Map100thMM );
+ maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MapUnit::Map100thMM, MapUnit::MapTwip );
long aTxtRight = pSpace->GetRight();
- aTxtRight = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)m_eLRSpaceUnit, MapUnit::Map100thMM );
- aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MapUnit::Map100thMM, (MapUnit)(MapUnit::MapTwip) );
+ aTxtRight = OutputDevice::LogicToLogic( aTxtRight, m_eLRSpaceUnit, MapUnit::Map100thMM );
+ aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MapUnit::Map100thMM, MapUnit::MapTwip );
long aTxtFirstLineOfst = pSpace->GetTextFirstLineOfst();
- aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)m_eLRSpaceUnit, MapUnit::Map100thMM );
- aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MapUnit::Map100thMM, (MapUnit)(MapUnit::MapTwip) );
+ aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, m_eLRSpaceUnit, MapUnit::Map100thMM );
+ aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MapUnit::Map100thMM, MapUnit::MapTwip );
- long nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(MapUnit::MapTwip), MapUnit::Map100thMM );
+ long nVal = OutputDevice::LogicToLogic( maTxtLeft, MapUnit::MapTwip, MapUnit::Map100thMM );
nVal = (long)mpLeftIndent->Normalize( (long)nVal );
if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Text)
@@ -378,7 +378,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
mpFLineIndent->SetMin( nVal*(-1), FUNIT_100TH_MM );
}
- long nrVal = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)(MapUnit::MapTwip), MapUnit::Map100thMM );
+ long nrVal = OutputDevice::LogicToLogic( aTxtRight, MapUnit::MapTwip, MapUnit::Map100thMM );
nrVal = (long)mpRightIndent->Normalize( (long)nrVal );
switch (maContext.GetCombinedContext_DI())
@@ -409,7 +409,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
mpLeftIndent->SetValue( nVal, FUNIT_100TH_MM );
mpRightIndent->SetValue( nrVal, FUNIT_100TH_MM );
- long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)(MapUnit::MapTwip), MapUnit::Map100thMM );
+ long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MapUnit::MapTwip, MapUnit::Map100thMM );
nfVal = (long)mpFLineIndent->Normalize( (long)nfVal );
mpFLineIndent->SetValue( nfVal, FUNIT_100TH_MM );
@@ -463,18 +463,18 @@ void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eS
const SvxULSpaceItem* pOldItem = static_cast<const SvxULSpaceItem*>(pState);
maUpper = pOldItem->GetUpper();
- maUpper = OutputDevice::LogicToLogic( maUpper, (MapUnit)m_eULSpaceUnit, MapUnit::Map100thMM );
- maUpper = OutputDevice::LogicToLogic( maUpper, MapUnit::Map100thMM, (MapUnit)(MapUnit::MapTwip) );
+ maUpper = OutputDevice::LogicToLogic( maUpper, m_eULSpaceUnit, MapUnit::Map100thMM );
+ maUpper = OutputDevice::LogicToLogic( maUpper, MapUnit::Map100thMM, MapUnit::MapTwip );
maLower = pOldItem->GetLower();
- maLower = OutputDevice::LogicToLogic( maLower, (MapUnit)m_eULSpaceUnit, MapUnit::Map100thMM );
- maLower = OutputDevice::LogicToLogic( maLower, MapUnit::Map100thMM, (MapUnit)(MapUnit::MapTwip) );
+ maLower = OutputDevice::LogicToLogic( maLower, m_eULSpaceUnit, MapUnit::Map100thMM );
+ maLower = OutputDevice::LogicToLogic( maLower, MapUnit::Map100thMM, MapUnit::MapTwip );
- sal_Int64 nVal = OutputDevice::LogicToLogic( maUpper, (MapUnit)(MapUnit::MapTwip), MapUnit::Map100thMM );
+ sal_Int64 nVal = OutputDevice::LogicToLogic( maUpper, MapUnit::MapTwip, MapUnit::Map100thMM );
nVal = mpTopDist->Normalize( nVal );
mpTopDist->SetValue( nVal, FUNIT_100TH_MM );
- nVal = OutputDevice::LogicToLogic( maLower, (MapUnit)(MapUnit::MapTwip), MapUnit::Map100thMM );
+ nVal = OutputDevice::LogicToLogic( maLower, MapUnit::MapTwip, MapUnit::Map100thMM );
nVal = mpBottomDist->Normalize( nVal );
mpBottomDist->SetValue( nVal, FUNIT_100TH_MM );
}
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index eb13510ad924..7bbd9a0129d3 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -125,7 +125,7 @@ void TextCharacterSpacingControl::Initialize()
if(eState >= SfxItemState::DEFAULT)
{
MapUnit eUnit = GetCoreMetric();
- MapUnit eOrgUnit = (MapUnit)eUnit;
+ MapUnit eOrgUnit = eUnit;
MapUnit ePntUnit(MapUnit::MapPoint);
long nBig = maEditKerning->Normalize(nKerning);
nKerning = LogicToLogic(nBig, eOrgUnit, ePntUnit);
@@ -150,7 +150,7 @@ void TextCharacterSpacingControl::ExecuteCharacterSpacing(long nValue, bool bClo
long nSign = (nValue < 0) ? -1 : 1;
nValue = nValue * nSign;
- long nVal = LogicToLogic(nValue, MapUnit::MapPoint, (MapUnit)eUnit);
+ long nVal = LogicToLogic(nValue, MapUnit::MapPoint, eUnit);
short nKern = (nValue == 0) ? 0 : (short)maEditKerning->Denormalize(nVal);
SvxKerningItem aKernItem(nSign * nKern, SID_ATTR_CHAR_KERNING);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 7320c1c7aa66..ca28596f8666 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -931,10 +931,10 @@ bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper *) const
{
long nValue=GetValue();
- SdrFormatter aFmt((MapUnit)eCoreMetric,(MapUnit)ePresMetric);
+ SdrFormatter aFmt(eCoreMetric,ePresMetric);
aFmt.TakeStr(nValue,rText);
OUString aStr;
- SdrFormatter::TakeUnitStr((MapUnit)ePresMetric,aStr);
+ SdrFormatter::TakeUnitStr(ePresMetric,aStr);
rText += " " + aStr;
if (ePres==SfxItemPresentation::Complete) {
OUString aStr2;
@@ -1320,11 +1320,11 @@ bool SdrTextAniAmountItem::GetPresentation(
}
else
{
- SdrFormatter aFmt((MapUnit)eCoreMetric, (MapUnit)ePresMetric);
+ SdrFormatter aFmt(eCoreMetric, ePresMetric);
OUString aStr;
aFmt.TakeStr(nValue, rText);
- SdrFormatter::TakeUnitStr((MapUnit)ePresMetric, aStr);
+ SdrFormatter::TakeUnitStr(ePresMetric, aStr);
rText += aStr;
}
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index e289a45627d6..ce8ff47d37cf 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -474,7 +474,7 @@ bool XPolygon::operator==( const XPolygon& rXPoly ) const
PolyFlags XPolygon::GetFlags( sal_uInt16 nPos ) const
{
pImpXPolygon->CheckPointDelete();
- return (PolyFlags) pImpXPolygon->pFlagAry[nPos];
+ return pImpXPolygon->pFlagAry[nPos];
}
/// set the flags for the point at the given position
@@ -487,13 +487,13 @@ void XPolygon::SetFlags( sal_uInt16 nPos, PolyFlags eFlags )
/// short path to read the CONTROL flag directly (TODO: better explain what the sense behind this flag is!)
bool XPolygon::IsControl(sal_uInt16 nPos) const
{
- return ( (PolyFlags) pImpXPolygon->pFlagAry[nPos] == PolyFlags::Control );
+ return pImpXPolygon->pFlagAry[nPos] == PolyFlags::Control;
}
/// short path to read the SMOOTH and SYMMTR flag directly (TODO: better explain what the sense behind these flags is!)
bool XPolygon::IsSmooth(sal_uInt16 nPos) const
{
- PolyFlags eFlag = (PolyFlags) pImpXPolygon->pFlagAry[nPos];
+ PolyFlags eFlag = pImpXPolygon->pFlagAry[nPos];
return ( eFlag == PolyFlags::Smooth || eFlag == PolyFlags::Symmetric );
}