diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/edit/edglss.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoobj.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 20 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index c95b8f48460f..e1220c683fde 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -535,7 +535,7 @@ bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const // --- from 680/dr25 on: store strings as UTF-8 write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString, RTL_TEXTENCODING_UTF8); - rStream.WriteUInt16( (sal_uInt16)eSysLanguage ).WriteUInt16( (sal_uInt16)eNumFmtLanguage ); + rStream.WriteUInt16( eSysLanguage ).WriteUInt16( eNumFmtLanguage ); return 0 == rStream.GetError(); } @@ -574,7 +574,7 @@ bool SwBoxAutoFmt::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) co rStream.WriteUInt16( aRotateAngle.GetVersion( fileVersion ) ); rStream.WriteUInt16( aRotateMode.GetVersion( fileVersion ) ); - rStream.WriteUInt16( (sal_uInt16)0 ); // NumberFormat + rStream.WriteUInt16( 0 ); // NumberFormat return 0 == rStream.GetError(); } diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 755a4892562c..15203f4dfec3 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -322,7 +322,7 @@ bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk ) if (!IsError(aWriter.Write(xWrt))) { - aStream.WriteUInt16( (sal_Unicode)'\0' ); + aStream.WriteUInt16( '\0' ); const sal_Unicode *p = (sal_Unicode*)aStream.GetBuffer(); if (p) diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 892d430474b8..9a26b852cba6 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -191,7 +191,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) 0x7ffffff > (( lLen = aStream.GetSize() ) / sizeof( sal_Unicode )) + 1 ) { - aStream.WriteUInt16( (sal_Unicode)'\0' ); + aStream.WriteUInt16( '\0' ); aStream.Seek( 0 ); aStream.ResetError(); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index c636ed517944..0121587b9c20 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1415,19 +1415,19 @@ 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( 3 ); - rSt.WriteUInt16( (sal_uInt16)0x0392 ).WriteUInt32( 3 ); + rSt.WriteUInt16( 0x0390 ).WriteUInt32( 3 ); + rSt.WriteUInt16( 0x0392 ).WriteUInt32( 3 ); //This sub property is required to be in the dummy inline frame as //well - rSt.WriteUInt16( (sal_uInt16)0x053F ).WriteUInt32( nInlineHack ); + rSt.WriteUInt16( 0x053F ).WriteUInt32( nInlineHack ); } else { rEx.AddAtom(24, DFF_msofbtUDefProp, 3, 4 ); //Prop id is 0xF122 - rSt.WriteUInt16( (sal_uInt16)0x038F ).WriteUInt32( mnXAlign ); - rSt.WriteUInt16( (sal_uInt16)0x0390 ).WriteUInt32( mnXRelTo ); - rSt.WriteUInt16( (sal_uInt16)0x0391 ).WriteUInt32( mnYAlign ); - rSt.WriteUInt16( (sal_uInt16)0x0392 ).WriteUInt32( mnYRelTo ); + rSt.WriteUInt16( 0x038F ).WriteUInt32( mnXAlign ); + rSt.WriteUInt16( 0x0390 ).WriteUInt32( mnXRelTo ); + rSt.WriteUInt16( 0x0391 ).WriteUInt32( mnYAlign ); + rSt.WriteUInt16( 0x0392 ).WriteUInt32( mnYRelTo ); } } } @@ -1516,7 +1516,7 @@ void SwBasicEscherEx::WriteEmptyFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShape WriteFrmExtraData(rFmt); AddAtom(6, DFF_msofbtUDefProp, 3, 1); //Prop id is 0xF122 - GetStream().WriteUInt16( (sal_uInt16)0x053F ).WriteUInt32( nInlineHack ); + GetStream().WriteUInt16( 0x053F ).WriteUInt32( nInlineHack ); CloseContainer(); // ESCHER_SpContainer } @@ -2204,8 +2204,8 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) OpenContainer( ESCHER_DggContainer ); sal_uInt16 nColorCount = 4; - pStrm ->WriteUInt16( (sal_uInt16)( nColorCount << 4 ) ) // instance - .WriteUInt16( (sal_uInt16)ESCHER_SplitMenuColors ) // record type + pStrm ->WriteUInt16( ( nColorCount << 4 ) ) // instance + .WriteUInt16( ESCHER_SplitMenuColors ) // record type .WriteUInt32( (sal_uInt32)( nColorCount * 4 ) ) // size .WriteUInt32( (sal_uInt32)0x08000004 ) .WriteUInt32( (sal_uInt32)0x08000001 ) diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 6997c553ebdd..ef495739fd33 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3852,7 +3852,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffentrymcr ), true ); SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffexitmcr ), true ); if (type==2) { - pDataStrm->WriteUInt16( (sal_uInt16)0xFFFF ); + pDataStrm->WriteUInt16( 0xFFFF ); const int items=aListItems.size(); pDataStrm->WriteUInt32( (sal_uInt32)items ); for(int i=0;i<items;i++) { |