summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-24 11:22:18 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-28 10:17:47 +0000
commit198c41c4fe8be4ce8a6ddab43ae0c5f17a4889ac (patch)
tree041d55126e9770b81f68fadfaaa69e82313786b3 /editeng
parentd3981b3e8c021ee03a2ca7103a73e56cca18df81 (diff)
new loplugin unoany
Change-Id: I5d6c4a67cb2a09e7cd5bd620c6b262d188701b89 Reviewed-on: https://gerrit.libreoffice.org/34714 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/items/frmitems.cxx40
-rw-r--r--editeng/source/items/paraitem.cxx2
-rw-r--r--editeng/source/items/textitem.cxx18
3 files changed, 30 insertions, 30 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index f8b6695e5a10..3fd113b75e91 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -471,7 +471,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
break;
case MID_FIRST_AUTO:
- rVal = css::uno::makeAny<bool>(IsAutoFirst());
+ rVal <<= (bool) IsAutoFirst();
break;
default:
@@ -1200,7 +1200,7 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
return false;
}
- rVal = css::uno::makeAny<bool>( bValue );
+ rVal <<= (bool) bValue;
return true;
}
@@ -1696,16 +1696,16 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// 4 Borders and 5 distances
uno::Sequence< uno::Any > aSeq( 9 );
- aSeq[0] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetLeft(), bConvert) );
- aSeq[1] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetRight(), bConvert) );
- aSeq[2] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetBottom(), bConvert) );
- aSeq[3] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetTop(), bConvert) );
- aSeq[4] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( GetSmallestDistance()) : GetSmallestDistance()));
- aSeq[5] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nTopDist ) : nTopDist ));
- aSeq[6] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nBottomDist ) : nBottomDist ));
- aSeq[7] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nLeftDist ) : nLeftDist ));
- aSeq[8] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nRightDist ) : nRightDist ));
- rVal = uno::makeAny( aSeq );
+ aSeq[0] <<= SvxBoxItem::SvxLineToLine(GetLeft(), bConvert);
+ aSeq[1] <<= SvxBoxItem::SvxLineToLine(GetRight(), bConvert);
+ aSeq[2] <<= SvxBoxItem::SvxLineToLine(GetBottom(), bConvert);
+ aSeq[3] <<= SvxBoxItem::SvxLineToLine(GetTop(), bConvert);
+ aSeq[4] <<= (sal_Int32)(bConvert ? convertTwipToMm100( GetSmallestDistance()) : GetSmallestDistance());
+ aSeq[5] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nTopDist ) : nTopDist );
+ aSeq[6] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nBottomDist ) : nBottomDist );
+ aSeq[7] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nLeftDist ) : nLeftDist );
+ aSeq[8] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nRightDist ) : nRightDist );
+ rVal <<= aSeq;
return true;
}
case MID_LEFT_BORDER:
@@ -2703,18 +2703,18 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// 2 BorderLines, flags, valid flags and distance
css::uno::Sequence< css::uno::Any > aSeq( 5 );
- aSeq[0] = css::uno::makeAny( SvxBoxItem::SvxLineToLine( pHori, bConvert) );
- aSeq[1] = css::uno::makeAny( SvxBoxItem::SvxLineToLine( pVert, bConvert) );
+ aSeq[0] <<= SvxBoxItem::SvxLineToLine( pHori, bConvert);
+ aSeq[1] <<= SvxBoxItem::SvxLineToLine( pVert, bConvert);
if ( IsTable() )
nVal |= 0x01;
if ( IsDist() )
nVal |= 0x02;
if ( IsMinDist() )
nVal |= 0x04;
- aSeq[2] = css::uno::makeAny( nVal );
- aSeq[3] = css::uno::makeAny( static_cast<sal_Int16>(nValidFlags) );
- aSeq[4] = css::uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist()) );
- rVal = css::uno::makeAny( aSeq );
+ aSeq[2] <<= nVal;
+ aSeq[3] <<= static_cast<sal_Int16>(nValidFlags);
+ aSeq[4] <<= (sal_Int32)(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist());
+ rVal <<= aSeq;
return true;
}
@@ -3122,7 +3122,7 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
nMemId &= ~CONVERT_TWIPS;
if ( nMemId == 0 )
{
- rVal = uno::makeAny( SvxBoxItem::SvxLineToLine(pLine.get(), bConvert) );
+ rVal <<= SvxBoxItem::SvxLineToLine(pLine.get(), bConvert);
return true;
}
else if ( pLine )
@@ -3496,7 +3496,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
break;
case MID_GRAPHIC_TRANSPARENT:
- rVal = css::uno::makeAny<bool>( aColor.GetTransparency() == 0xff );
+ rVal <<= ( aColor.GetTransparency() == 0xff );
break;
case MID_GRAPHIC_URL:
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 130dfaaeebfe..8eafaf61324e 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -638,7 +638,7 @@ bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) con
switch(nMemberId)
{
case MID_IS_HYPHEN:
- rVal = css::uno::makeAny<bool>(bHyphen);
+ rVal <<= (bool)bHyphen;
break;
case MID_HYPHEN_MIN_LEAD:
rVal <<= (sal_Int16)nMinLead;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index d9dedb672807..c7c875e1a8ff 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -521,7 +521,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
switch( nMemberId )
{
case MID_ITALIC:
- rVal = css::uno::makeAny<bool>(GetBoolValue());
+ rVal <<= (bool)GetBoolValue();
break;
case MID_POSTURE:
rVal <<= (awt::FontSlant)GetValue(); // values from awt::FontSlant and FontItalic are equal
@@ -660,7 +660,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
switch( nMemberId )
{
case MID_BOLD :
- rVal = css::uno::makeAny<bool>(GetBoolValue());
+ rVal <<= (bool)GetBoolValue();
break;
case MID_WEIGHT:
{
@@ -1289,7 +1289,7 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
switch(nMemberId)
{
case MID_TEXTLINED:
- rVal = css::uno::makeAny<bool>(GetBoolValue());
+ rVal <<= (bool)GetBoolValue();
break;
case MID_TL_STYLE:
rVal <<= (sal_Int16)(GetValue());
@@ -1298,7 +1298,7 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
rVal <<= (sal_Int32)( mColor.GetColor() );
break;
case MID_TL_HASCOLOR:
- rVal = css::uno::makeAny<bool>( !mColor.GetTransparency() );
+ rVal <<= (bool) !mColor.GetTransparency();
break;
}
return true;
@@ -1490,7 +1490,7 @@ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
switch(nMemberId)
{
case MID_CROSSED_OUT:
- rVal = css::uno::makeAny<bool>(GetBoolValue());
+ rVal <<= (bool) GetBoolValue();
break;
case MID_CROSS_OUT:
rVal <<= (sal_Int16)(GetValue());
@@ -1792,7 +1792,7 @@ bool SvxBackgroundColorItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) c
{
case MID_GRAPHIC_TRANSPARENT:
{
- rVal = css::uno::makeAny<bool>(aColor.GetTransparency() == 0xff);
+ rVal <<= aColor.GetTransparency() == 0xff;
break;
}
default:
@@ -2302,7 +2302,7 @@ bool SvxEscapementItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
rVal <<= (sal_Int8)(nProp);
break;
case MID_AUTO_ESC:
- rVal = css::uno::makeAny<bool>(DFLT_ESC_AUTO_SUB == nEsc || DFLT_ESC_AUTO_SUPER == nEsc);
+ rVal <<= (DFLT_ESC_AUTO_SUB == nEsc || DFLT_ESC_AUTO_SUPER == nEsc);
break;
}
return true;
@@ -2779,7 +2779,7 @@ bool SvxTwoLinesItem::QueryValue( css::uno::Any& rVal,
switch( nMemberId )
{
case MID_TWOLINES:
- rVal = css::uno::makeAny<bool>( bOn );
+ rVal <<= (bool) bOn;
break;
case MID_START_BRACKET:
{
@@ -2942,7 +2942,7 @@ bool SvxCharRotateItem::QueryValue( css::uno::Any& rVal,
rVal <<= (sal_Int16)GetValue();
break;
case MID_FITTOLINE:
- rVal = css::uno::makeAny<bool>( IsFitToLine() );
+ rVal <<= (bool) IsFitToLine();
break;
default:
bRet = false;