summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-25 05:27:36 +0200
committerNoel Grandin <noel@peralex.com>2014-09-26 15:25:40 +0200
commitd46b16e1e495c153f70633d2da5c2bb0aba85cc9 (patch)
tree79134004da6c8e06ef5d1a007c4d35340c463794 /sw
parent8f684e21de081350f0ce1f0bd0420f4775c5388d (diff)
remove unnecessary casts's
left over from our conversion of the SvStream output operators to more specific methods Change-Id: I63f18be8e940098c2acbbc73ee49ede3a949fcb2
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx6
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx16
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/uibase/config/uinums.cxx4
5 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 1ade412b5c74..015a156c8b6b 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -154,14 +154,14 @@ sal_uLong SwASCWriter::WriteStream()
switch(GetAsciiOptions().GetCharSet())
{
case RTL_TEXTENCODING_UTF8:
- Strm().WriteUChar( sal_uInt8(0xEF) ).WriteUChar( sal_uInt8(0xBB) ). WriteUChar( sal_uInt8(0xBF) );
+ Strm().WriteUChar( 0xEF ).WriteUChar( 0xBB ).WriteUChar( 0xBF );
break;
case RTL_TEXTENCODING_UCS2:
Strm().SetEndianSwap(false);
#ifdef OSL_LITENDIAN
- Strm().WriteUChar( sal_uInt8(0xFF) ).WriteUChar( sal_uInt8(0xFE) );
+ Strm().WriteUChar( 0xFF ).WriteUChar( 0xFE );
#else
- Strm().WriteUChar( sal_uInt8(0xFE) ).WriteUChar( sal_uInt8(0xFF) );
+ Strm().WriteUChar( 0xFE ).WriteUChar( 0xFF );
#endif
break;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index aa47fed5baaa..ba6aae0547b1 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -769,7 +769,7 @@ bool RtfExport::DisallowInheritingOutlineNumbering(const SwFmt& rFmt)
if (((const SwTxtFmtColl*)pParent)->IsAssignedToListLevelOfOutlineStyle())
{
// Level 9 disables the outline
- Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVEL).WriteInt32(sal_Int32(9));
+ Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVEL).WriteInt32(9);
bRet = true;
}
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 4afbf238620e..c636ed517944 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -212,7 +212,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm
SwWW8Writer::WriteLong(tmpStrm, rTarFrm.getLength()+1);
SwWW8Writer::WriteString16(tmpStrm, rTarFrm, false);
- tmpStrm.WriteUInt16( sal_uInt16( 0 ) );
+ tmpStrm.WriteUInt16( 0 );
mnFlags |= WW8_HLINK_FRAME;
}
@@ -238,7 +238,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm
//For UNICODE
SwWW8Writer::WriteLong(tmpStrm, 2*aFileName.getLength()+6);
SwWW8Writer::WriteLong(tmpStrm, 2*aFileName.getLength());
- tmpStrm.WriteUInt16( sal_uInt16(0x0003) );
+ tmpStrm.WriteUInt16( 0x0003 );
SwWW8Writer::WriteString16(tmpStrm, aFileName, false);
}
else if( eProtocol != INET_PROT_NOT_VALID )
@@ -270,7 +270,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm
}
rStrm.Write( maGuidStdLink,16 );
- rStrm .WriteUInt32( sal_uInt32( 2 ) )
+ rStrm .WriteUInt32( 2 )
.WriteUInt32( mnFlags );
tmpStrm.Seek( STREAM_SEEK_TO_BEGIN );
sal_uInt32 const nLen = tmpStrm.remainingSize();
@@ -1415,8 +1415,8 @@ void WinwordAnchoring::WriteData( EscherEx& rEx ) const
if (mbInline)
{
rEx.AddAtom(18, DFF_msofbtUDefProp, 3, 3); //Prop id is 0xF122
- rSt.WriteUInt16( (sal_uInt16)0x0390 ).WriteUInt32( sal_uInt32(3) );
- rSt.WriteUInt16( (sal_uInt16)0x0392 ).WriteUInt32( sal_uInt32(3) );
+ rSt.WriteUInt16( (sal_uInt16)0x0390 ).WriteUInt32( 3 );
+ rSt.WriteUInt16( (sal_uInt16)0x0392 ).WriteUInt32( 3 );
//This sub property is required to be in the dummy inline frame as
//well
rSt.WriteUInt16( (sal_uInt16)0x053F ).WriteUInt32( nInlineHack );
@@ -2113,11 +2113,11 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType
sal_uInt16 nLen = aPoly.GetSize();
aPolyDump.WriteUInt16( nLen );
aPolyDump.WriteUInt16( nLen );
- aPolyDump.WriteUInt16( sal_uInt16(8) );
+ aPolyDump.WriteUInt16( 8 );
for (sal_uInt16 nI = 0; nI < nLen; ++nI)
{
- aPolyDump.WriteUInt32( sal_uInt32(aPoly[nI].X()) );
- aPolyDump.WriteUInt32( sal_uInt32(aPoly[nI].Y()) );
+ aPolyDump.WriteUInt32( aPoly[nI].X() );
+ aPolyDump.WriteUInt32( aPoly[nI].Y() );
}
sal_uInt16 nArrLen = msword_cast<sal_uInt16>(aPolyDump.Tell());
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index afa6c6ab2ded..7c1331e1fd94 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1120,7 +1120,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
SvMemoryStream aMemStream;
struct HyperLinksTable hlStr;
sal_uInt16 mnRawRecId,mnRawRecSize;
- aMemStream.WriteUInt16( sal_uInt16( 0 ) ).WriteUInt16( nBufferSize );
+ aMemStream.WriteUInt16( 0 ).WriteUInt16( nBufferSize );
// copy from DFF stream to memory stream
::std::vector< sal_uInt8 > aBuffer( nBufferSize );
diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
index 57aefd9d47d5..cf8b25b60454 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -462,13 +462,13 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
nPitch = (sal_uInt16)pFnt->GetPitch();
}
- rStream.WriteUInt16( sal_uInt16(aFmt.GetNumberingType()) )
+ rStream.WriteUInt16( aFmt.GetNumberingType() )
.WriteUInt16( aFmt.GetBulletChar() )
.WriteUChar( aFmt.GetIncludeUpperLevels() > 0 )
.WriteUInt16( aFmt.GetStart() );
rStream.WriteUniOrByteString( aFmt.GetPrefix(), eEncoding );
rStream.WriteUniOrByteString( aFmt.GetSuffix(), eEncoding );
- rStream.WriteUInt16( sal_uInt16( aFmt.GetNumAdjust() ) )
+ rStream.WriteUInt16( aFmt.GetNumAdjust() )
.WriteInt16( aFmt.GetAbsLSpace() )
.WriteInt16( aFmt.GetFirstLineOffset() )
.WriteInt16( aFmt.GetCharTextDistance() )