summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-01-11 17:36:44 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-01-11 17:36:44 +0100
commit4c799fa83a5a51f27301110ae165855ffbc7a596 (patch)
treedf3483964cb88c56e8b3e7e92659ac90573fb33b /svx
parenta31b7a941eee06efaa92a54a49c955c914fd20aa (diff)
loplugin:redundantcast: svx
(after a to-be-committed improved loplugin:cstylecast would have rewritten the C-style casts into static_casts) Change-Id: Icd1f084d4ffab286fd3c7c02693444eaf7799354
Diffstat (limited to 'svx')
-rw-r--r--svx/source/engine3d/float3d.cxx2
-rw-r--r--svx/source/engine3d/view3d.cxx2
-rw-r--r--svx/source/form/dataaccessdescriptor.cxx2
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanelBase.cxx16
-rw-r--r--svx/source/sidebar/line/LinePropertyPanelBase.cxx2
-rw-r--r--svx/source/svdraw/svdattr.cxx6
-rw-r--r--svx/source/svdraw/svdobj.cxx2
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx2
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx22
-rw-r--r--svx/source/tbxctrls/linectrl.cxx2
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx8
-rw-r--r--svx/source/xoutdev/xattr.cxx22
-rw-r--r--svx/source/xoutdev/xattr2.cxx2
13 files changed, 45 insertions, 45 deletions
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index e8e025c7493c..7d1664cc7b8e 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -567,7 +567,7 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs )
eState = rAttrs.GetItemState(XATTR_FILLSTYLE);
if(eState != SfxItemState::DONTCARE)
{
- drawing::FillStyle eXFS = (drawing::FillStyle)rAttrs.Get(XATTR_FILLSTYLE).GetValue();
+ drawing::FillStyle eXFS = rAttrs.Get(XATTR_FILLSTYLE).GetValue();
bBitmap = (eXFS == drawing::FillStyle_BITMAP || eXFS == drawing::FillStyle_GRADIENT || eXFS == drawing::FillStyle_HATCH);
}
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 797588a097fe..f880ad4b854b 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -676,7 +676,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj)
{
const SfxItemSet& rSet = pObj->GetMergedItemSet();
sal_Int32 nLineWidth = rSet.Get(XATTR_LINEWIDTH).GetValue();
- drawing::LineStyle eLineStyle = (drawing::LineStyle)rSet.Get(XATTR_LINESTYLE).GetValue();
+ drawing::LineStyle eLineStyle = rSet.Get(XATTR_LINESTYLE).GetValue();
drawing::FillStyle eFillStyle = rSet.Get(XATTR_FILLSTYLE).GetValue();
if(static_cast<SdrPathObj*>(pObj)->IsClosed()
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 974c40334b9a..d3b94afe6f04 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -110,7 +110,7 @@ namespace svx
MapString2PropertyEntry::const_iterator aPropPos = rProperties.find( pValues->Name );
if ( aPropPos != rProperties.end() )
{
- DataAccessDescriptorProperty eProperty = (DataAccessDescriptorProperty)aPropPos->second->mnHandle;
+ DataAccessDescriptorProperty eProperty = aPropPos->second->mnHandle;
m_aValues[eProperty] = pValues->Value;
}
else
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 6238a607f2f7..9e74d3315f07 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -812,7 +812,7 @@ void AreaPropertyPanelBase::updateFillStyle(bool bDisabled, bool bDefaultOrSet,
mpStyleItem.reset(dynamic_cast< XFillStyleItem* >(pItem->Clone()));
mpLbFillType->Enable();
mpColorTextFT->Enable();
- drawing::FillStyle eXFS = (drawing::FillStyle)mpStyleItem->GetValue();
+ drawing::FillStyle eXFS = mpStyleItem->GetValue();
eFillStyle nPos = NONE;
switch(eXFS)
{
@@ -870,7 +870,7 @@ void AreaPropertyPanelBase::updateFillGradient(bool bDisabled, bool bDefaultOrSe
mpFillGradientItem.reset(pItem ? static_cast<XFillGradientItem*>(pItem->Clone()) : nullptr);
}
- if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_GRADIENT == mpStyleItem->GetValue())
{
mpLbFillAttr->Hide();
mpLbFillGradFrom->Show();
@@ -909,7 +909,7 @@ void AreaPropertyPanelBase::updateFillHatch(bool bDisabled, bool bDefaultOrSet,
mpHatchItem.reset(pItem ? static_cast<XFillHatchItem*>(pItem->Clone()) : nullptr);
}
- if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_HATCH == mpStyleItem->GetValue())
{
mpLbFillAttr->Show();
mpToolBoxColor->Hide();
@@ -940,7 +940,7 @@ void AreaPropertyPanelBase::updateFillColor(bool bDefaultOrSet, const SfxPoolIte
mpColorItem.reset(pItem ? static_cast<XFillColorItem*>(pItem->Clone()) : nullptr);
}
- if(mpStyleItem && drawing::FillStyle_SOLID == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_SOLID == mpStyleItem->GetValue())
{
mpLbFillAttr->Hide();
mpToolBoxColor->Show();
@@ -957,7 +957,7 @@ void AreaPropertyPanelBase::updateFillBitmap(bool bDisabled, bool bDefaultOrSet,
mpBitmapItem.reset(pItem ? static_cast<XFillBitmapItem*>(pItem->Clone()) : nullptr);
}
- if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_BITMAP == mpStyleItem->GetValue())
{
mpLbFillAttr->Show();
mpToolBoxColor->Hide();
@@ -1019,7 +1019,7 @@ void AreaPropertyPanelBase::NotifyItemUpdate(
{
if(bDefault)
{
- if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_GRADIENT == mpStyleItem->GetValue())
{
if(mpFillGradientItem)
{
@@ -1044,7 +1044,7 @@ void AreaPropertyPanelBase::NotifyItemUpdate(
{
if(bDefault)
{
- if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_HATCH == mpStyleItem->GetValue())
{
if(mpHatchItem)
{
@@ -1070,7 +1070,7 @@ void AreaPropertyPanelBase::NotifyItemUpdate(
{
if(bDefault)
{
- if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_BITMAP == mpStyleItem->GetValue())
{
if(mpBitmapItem)
{
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 43a1867ae3cf..6e98dcc87885 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -795,7 +795,7 @@ void LinePropertyPanelBase::SelectLineStyle()
return;
}
- const drawing::LineStyle eXLS(mpStyleItem ? (drawing::LineStyle)mpStyleItem->GetValue() : drawing::LineStyle_NONE);
+ const drawing::LineStyle eXLS(mpStyleItem ? mpStyleItem->GetValue() : drawing::LineStyle_NONE);
bool bSelected(false);
switch(eXLS)
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index e7447041e23b..af28e4d9cafb 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -969,7 +969,7 @@ void SdrTextFitToSizeTypeItem::SetBoolValue(bool bVal)
bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
- drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue();
+ drawing::TextFitToSizeType eFS = GetValue();
rVal <<= eFS;
return true;
@@ -1530,7 +1530,7 @@ bool SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
- rVal <<= (drawing::MeasureTextHorzPos)GetValue();
+ rVal <<= GetValue();
return true;
}
@@ -1575,7 +1575,7 @@ bool SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
- rVal <<= (drawing::MeasureTextVertPos)GetValue();
+ rVal <<= GetValue();
return true;
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index b0587cfe4e97..a582eda43e54 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -927,7 +927,7 @@ void SdrObject::SingleObjectPainter(OutputDevice& rOut) const
bool SdrObject::LineGeometryUsageIsNecessary() const
{
- drawing::LineStyle eXLS = (drawing::LineStyle)GetMergedItem(XATTR_LINESTYLE).GetValue();
+ drawing::LineStyle eXLS = GetMergedItem(XATTR_LINESTYLE).GetValue();
return (eXLS != drawing::LineStyle_NONE);
}
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 6571d3086eb3..032af70d3a6e 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -408,7 +408,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl, ValueSet*, void)
pView->GetAttributes( aAttrSet );
if ( aAttrSet.GetItemState( XATTR_LINESTYLE ) != SfxItemState::DONTCARE )
{
- drawing::LineStyle eXLS = (drawing::LineStyle)
+ drawing::LineStyle eXLS =
aAttrSet.Get( XATTR_LINESTYLE ).GetValue();
if ( eXLS == drawing::LineStyle_NONE )
{
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 661ce1700f76..3274fe577afb 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -114,7 +114,7 @@ void SvxFillToolBoxControl::StateChanged(
{
mpStyleItem.reset(dynamic_cast< XFillStyleItem* >(pItem->Clone()));
mpLbFillType->Enable();
- drawing::FillStyle eXFS = (drawing::FillStyle)mpStyleItem->GetValue();
+ drawing::FillStyle eXFS = mpStyleItem->GetValue();
meLastXFS = eXFS;
mpLbFillType->SelectEntryPos(sal::static_int_cast< sal_Int32 >(eXFS));
@@ -145,7 +145,7 @@ void SvxFillToolBoxControl::StateChanged(
mpColorItem.reset(pState ? static_cast<XFillColorItem*>(pState->Clone()) : nullptr);
}
- if(mpStyleItem && drawing::FillStyle_SOLID == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_SOLID == mpStyleItem->GetValue())
{
mpLbFillAttr->Hide();
mpToolBoxColor->Show();
@@ -161,7 +161,7 @@ void SvxFillToolBoxControl::StateChanged(
mpFillGradientItem.reset(pState ? static_cast<XFillGradientItem*>(pState->Clone()) : nullptr);
}
- if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_GRADIENT == mpStyleItem->GetValue())
{
mpLbFillAttr->Show();
mpToolBoxColor->Hide();
@@ -190,7 +190,7 @@ void SvxFillToolBoxControl::StateChanged(
mpHatchItem.reset(pState ? static_cast<XFillHatchItem*>(pState->Clone()) : nullptr);
}
- if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_HATCH == mpStyleItem->GetValue())
{
mpLbFillAttr->Show();
mpToolBoxColor->Hide();
@@ -219,7 +219,7 @@ void SvxFillToolBoxControl::StateChanged(
mpBitmapItem.reset(pState ? static_cast<XFillBitmapItem*>(pState->Clone()) : nullptr);
}
- if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_BITMAP == mpStyleItem->GetValue())
{
mpLbFillAttr->Show();
mpToolBoxColor->Hide();
@@ -245,7 +245,7 @@ void SvxFillToolBoxControl::StateChanged(
{
if(SfxItemState::DEFAULT == eState)
{
- if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_GRADIENT == mpStyleItem->GetValue())
{
if(mpFillGradientItem)
{
@@ -270,7 +270,7 @@ void SvxFillToolBoxControl::StateChanged(
{
if(SfxItemState::DEFAULT == eState)
{
- if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_HATCH == mpStyleItem->GetValue())
{
if(mpHatchItem)
{
@@ -295,7 +295,7 @@ void SvxFillToolBoxControl::StateChanged(
{
if(SfxItemState::DEFAULT == eState)
{
- if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue())
+ if(mpStyleItem && drawing::FillStyle_BITMAP == mpStyleItem->GetValue())
{
if(mpBitmapItem)
{
@@ -323,7 +323,7 @@ void SvxFillToolBoxControl::Update()
{
if(mpStyleItem)
{
- const drawing::FillStyle eXFS = (drawing::FillStyle)mpStyleItem->GetValue();
+ const drawing::FillStyle eXFS = mpStyleItem->GetValue();
SfxObjectShell* pSh = SfxObjectShell::Current();
switch( eXFS )
@@ -572,7 +572,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void)
{
const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectedEntryPos();
- if((drawing::FillStyle)meLastXFS != eXFS)
+ if(meLastXFS != eXFS)
{
mpLbFillAttr->Clear();
SfxObjectShell* pSh = SfxObjectShell::Current();
@@ -751,7 +751,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void)
// #i122676# dependent from bFillStyleChange, do execute a single or two
// changes in one Execute call
- const bool bFillStyleChange((drawing::FillStyle) meLastXFS != eXFS);
+ const bool bFillStyleChange(meLastXFS != eXFS);
switch(eXFS)
{
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 54d30c89687c..1e1734ae331f 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -134,7 +134,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState )
drawing::LineStyle eXLS;
if ( pStyleItem )
- eXLS = ( drawing::LineStyle )pStyleItem->GetValue();
+ eXLS = pStyleItem->GetValue();
else
eXLS = drawing::LineStyle_NONE;
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index c3361936613c..ce2134dbf3d0 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -461,7 +461,7 @@ uno::Any SvxUnoXHatchTable::getAny( const XPropertyEntry* pEntry ) const throw()
drawing::Hatch aUnoHatch;
- aUnoHatch.Style = (drawing::HatchStyle)aHatch.GetHatchStyle();
+ aUnoHatch.Style = aHatch.GetHatchStyle();
aUnoHatch.Color = aHatch.GetColor().GetColor();
aUnoHatch.Distance = aHatch.GetDistance();
aUnoHatch.Angle = aHatch.GetAngle();
@@ -476,7 +476,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXHatchTable::createEntry(const OUString& r
return std::unique_ptr<XHatchEntry>();
XHatch aXHatch;
- aXHatch.SetHatchStyle( (css::drawing::HatchStyle)aUnoHatch.Style );
+ aXHatch.SetHatchStyle( aUnoHatch.Style );
aXHatch.SetColor( aUnoHatch.Color );
aXHatch.SetDistance( aUnoHatch.Distance );
aXHatch.SetAngle( aUnoHatch.Angle );
@@ -532,7 +532,7 @@ uno::Any SvxUnoXGradientTable::getAny( const XPropertyEntry* pEntry ) const thro
const XGradient& aXGradient = static_cast<const XGradientEntry*>(pEntry)->GetGradient();
awt::Gradient aGradient;
- aGradient.Style = (awt::GradientStyle) aXGradient.GetGradientStyle();
+ aGradient.Style = aXGradient.GetGradientStyle();
aGradient.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
aGradient.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient.Angle = (short)aXGradient.GetAngle();
@@ -554,7 +554,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXGradientTable::createEntry(const OUString
XGradient aXGradient;
- aXGradient.SetGradientStyle( (css::awt::GradientStyle) aGradient.Style );
+ aXGradient.SetGradientStyle( aGradient.Style );
aXGradient.SetStartColor( aGradient.StartColor );
aXGradient.SetEndColor( aGradient.EndColor );
aXGradient.SetAngle( aGradient.Angle );
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index f4f185de8ec3..024f41d93d2f 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -352,7 +352,7 @@ bool XLineStyleItem::GetPresentation
bool XLineStyleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
- css::drawing::LineStyle eLS = (css::drawing::LineStyle)GetValue();
+ css::drawing::LineStyle eLS = GetValue();
rVal <<= eLS;
return true;
}
@@ -1798,7 +1798,7 @@ sal_uInt16 XFillStyleItem::GetValueCount() const
bool XFillStyleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
- css::drawing::FillStyle eFS = (css::drawing::FillStyle)GetValue();
+ css::drawing::FillStyle eFS = GetValue();
rVal <<= eFS;
@@ -2045,7 +2045,7 @@ bool XFillGradientItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) c
css::awt::Gradient aGradient2;
const XGradient& aXGradient = GetGradientValue();
- aGradient2.Style = (css::awt::GradientStyle) aXGradient.GetGradientStyle();
+ aGradient2.Style = aXGradient.GetGradientStyle();
aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient2.Angle = (short)aXGradient.GetAngle();
@@ -2069,7 +2069,7 @@ bool XFillGradientItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) c
const XGradient& aXGradient = GetGradientValue();
css::awt::Gradient aGradient2;
- aGradient2.Style = (css::awt::GradientStyle) aXGradient.GetGradientStyle();
+ aGradient2.Style = aXGradient.GetGradientStyle();
aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient2.Angle = (short)aXGradient.GetAngle();
@@ -2138,7 +2138,7 @@ bool XFillGradientItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId
{
XGradient aXGradient;
- aXGradient.SetGradientStyle( (css::awt::GradientStyle) aGradient2.Style );
+ aXGradient.SetGradientStyle( aGradient2.Style );
aXGradient.SetStartColor( aGradient2.StartColor );
aXGradient.SetEndColor( aGradient2.EndColor );
aXGradient.SetAngle( aGradient2.Angle );
@@ -2175,7 +2175,7 @@ bool XFillGradientItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId
XGradient aXGradient;
- aXGradient.SetGradientStyle( (css::awt::GradientStyle) aGradient2.Style );
+ aXGradient.SetGradientStyle( aGradient2.Style );
aXGradient.SetStartColor( aGradient2.StartColor );
aXGradient.SetEndColor( aGradient2.EndColor );
aXGradient.SetAngle( aGradient2.Angle );
@@ -2462,7 +2462,7 @@ bool XFillHatchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) cons
css::drawing::Hatch aUnoHatch;
- aUnoHatch.Style = (css::drawing::HatchStyle)aHatch.GetHatchStyle();
+ aUnoHatch.Style = aHatch.GetHatchStyle();
aUnoHatch.Color = aHatch.GetColor().GetColor();
aUnoHatch.Distance = aHatch.GetDistance();
aUnoHatch.Angle = aHatch.GetAngle();
@@ -2479,7 +2479,7 @@ bool XFillHatchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) cons
{
css::drawing::Hatch aUnoHatch;
- aUnoHatch.Style = (css::drawing::HatchStyle)aHatch.GetHatchStyle();
+ aUnoHatch.Style = aHatch.GetHatchStyle();
aUnoHatch.Color = aHatch.GetColor().GetColor();
aUnoHatch.Distance = aHatch.GetDistance();
aUnoHatch.Angle = aHatch.GetAngle();
@@ -2494,7 +2494,7 @@ bool XFillHatchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) cons
}
case MID_HATCH_STYLE:
- rVal <<= (css::drawing::HatchStyle)aHatch.GetHatchStyle(); break;
+ rVal <<= aHatch.GetHatchStyle(); break;
case MID_HATCH_COLOR:
rVal <<= (sal_Int32)aHatch.GetColor().GetColor(); break;
case MID_HATCH_DISTANCE:
@@ -2536,7 +2536,7 @@ bool XFillHatchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
SetName( aName );
if ( bHatch )
{
- aHatch.SetHatchStyle( (css::drawing::HatchStyle)aUnoHatch.Style );
+ aHatch.SetHatchStyle( aUnoHatch.Style );
aHatch.SetColor( aUnoHatch.Color );
aHatch.SetDistance( aUnoHatch.Distance );
aHatch.SetAngle( aUnoHatch.Angle );
@@ -2554,7 +2554,7 @@ bool XFillHatchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
if(!(rVal >>= aUnoHatch))
return false;
- aHatch.SetHatchStyle( (css::drawing::HatchStyle)aUnoHatch.Style );
+ aHatch.SetHatchStyle( aUnoHatch.Style );
aHatch.SetColor( aUnoHatch.Color );
aHatch.SetDistance( aUnoHatch.Distance );
aHatch.SetAngle( aUnoHatch.Angle );
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 3a1fd0404a0c..86b1188e7be9 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -318,7 +318,7 @@ sal_uInt16 XLineCapItem::GetValueCount() const
css::drawing::LineCap XLineCapItem::GetValue() const
{
- const css::drawing::LineCap eRetval((css::drawing::LineCap)SfxEnumItem::GetValue());
+ const css::drawing::LineCap eRetval(SfxEnumItem::GetValue());
OSL_ENSURE(css::drawing::LineCap_BUTT == eRetval
|| css::drawing::LineCap_ROUND == eRetval
|| css::drawing::LineCap_SQUARE == eRetval, "Unknown enum value in XATTR_LINECAP (!)");