Kaydet (Commit) 238ce4af authored tarafından Noel Grandin's avatar Noel Grandin

remove unnecessary casts

leftovers from conversion of SvStream operator>> to Write methods

Change-Id: Id1d1e60ae42afb689910845a3c6ec75e3388fb56
üst 897c8af7
...@@ -298,10 +298,10 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC ...@@ -298,10 +298,10 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
nTempColor = COL_BLACK; nTempColor = COL_BLACK;
WriteColor( rStream, nTempColor ); WriteColor( rStream, nTempColor );
rStream.WriteUInt16( nBulletRelSize ); rStream.WriteUInt16( nBulletRelSize );
rStream.WriteUInt16( (sal_uInt16)IsShowSymbol() ); rStream.WriteUInt16( IsShowSymbol() );
rStream.WriteUInt16( mePositionAndSpaceMode ); rStream.WriteUInt16( mePositionAndSpaceMode );
rStream.WriteUInt16( meLabelFollowedBy ); rStream.WriteUInt16( meLabelFollowedBy );
rStream.WriteInt32( mnListtabPos ); rStream.WriteInt32( mnListtabPos );
rStream.WriteInt32( mnFirstLineIndent ); rStream.WriteInt32( mnFirstLineIndent );
rStream.WriteInt32( mnIndentAt ); rStream.WriteInt32( mnIndentAt );
...@@ -681,7 +681,7 @@ SvStream& SvxNumRule::Store( SvStream &rStream ) ...@@ -681,7 +681,7 @@ SvStream& SvxNumRule::Store( SvStream &rStream )
rStream.WriteUInt16( nLevelCount ); rStream.WriteUInt16( nLevelCount );
//first save of nFeatureFlags for old versions //first save of nFeatureFlags for old versions
rStream.WriteUInt16( nFeatureFlags ); rStream.WriteUInt16( nFeatureFlags );
rStream.WriteUInt16( (sal_uInt16)bContinuousNumbering ); rStream.WriteUInt16( bContinuousNumbering );
rStream.WriteUInt16( eNumberingType ); rStream.WriteUInt16( eNumberingType );
FontToSubsFontConverter pConverter = 0; FontToSubsFontConverter pConverter = 0;
......
...@@ -142,13 +142,13 @@ void ZipOutputStream::writeEND(sal_uInt32 nOffset, sal_uInt32 nLength) ...@@ -142,13 +142,13 @@ void ZipOutputStream::writeEND(sal_uInt32 nOffset, sal_uInt32 nLength)
throw(IOException, RuntimeException) throw(IOException, RuntimeException)
{ {
m_aChucker.WriteInt32( ENDSIG ); m_aChucker.WriteInt32( ENDSIG );
m_aChucker.WriteInt16( static_cast < sal_Int16 > ( 0 ) ); m_aChucker.WriteInt16( 0 );
m_aChucker.WriteInt16( static_cast < sal_Int16 > ( 0 ) ); m_aChucker.WriteInt16( 0 );
m_aChucker.WriteInt16( static_cast < sal_Int16 > ( m_aZipList.size() ) ); m_aChucker.WriteInt16( m_aZipList.size() );
m_aChucker.WriteInt16( static_cast < sal_Int16 > ( m_aZipList.size() ) ); m_aChucker.WriteInt16( m_aZipList.size() );
m_aChucker.WriteUInt32( nLength ); m_aChucker.WriteUInt32( nLength );
m_aChucker.WriteUInt32( nOffset ); m_aChucker.WriteUInt32( nOffset );
m_aChucker.WriteInt16( static_cast < sal_Int16 > ( 0 ) ); m_aChucker.WriteInt16( 0 );
} }
static sal_uInt32 getTruncated( sal_Int64 nNum, bool *pIsTruncated ) static sal_uInt32 getTruncated( sal_Int64 nNum, bool *pIsTruncated )
...@@ -178,16 +178,16 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry ) ...@@ -178,16 +178,16 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry )
m_aChucker.WriteInt16( rEntry.nMethod ); m_aChucker.WriteInt16( rEntry.nMethod );
bool bWrite64Header = false; bool bWrite64Header = false;
m_aChucker.WriteUInt32( static_cast < sal_uInt32> ( rEntry.nTime ) ); m_aChucker.WriteUInt32( rEntry.nTime );
m_aChucker.WriteUInt32( static_cast < sal_uInt32> ( rEntry.nCrc ) ); m_aChucker.WriteUInt32( rEntry.nCrc );
m_aChucker.WriteUInt32( getTruncated( rEntry.nCompressedSize, &bWrite64Header ) ); m_aChucker.WriteUInt32( getTruncated( rEntry.nCompressedSize, &bWrite64Header ) );
m_aChucker.WriteUInt32( getTruncated( rEntry.nSize, &bWrite64Header ) ); m_aChucker.WriteUInt32( getTruncated( rEntry.nSize, &bWrite64Header ) );
m_aChucker.WriteInt16( nNameLength ); m_aChucker.WriteInt16( nNameLength );
m_aChucker.WriteInt16( static_cast < sal_Int16> (0) ); m_aChucker.WriteInt16( 0 );
m_aChucker.WriteInt16( static_cast < sal_Int16> (0) ); m_aChucker.WriteInt16( 0 );
m_aChucker.WriteInt16( static_cast < sal_Int16> (0) ); m_aChucker.WriteInt16( 0 );
m_aChucker.WriteInt16( static_cast < sal_Int16> (0) ); m_aChucker.WriteInt16( 0 );
m_aChucker.WriteInt32( static_cast < sal_Int32> (0) ); m_aChucker.WriteInt32( 0 );
m_aChucker.WriteUInt32( getTruncated( rEntry.nOffset, &bWrite64Header ) ); m_aChucker.WriteUInt32( getTruncated( rEntry.nOffset, &bWrite64Header ) );
if( bWrite64Header ) if( bWrite64Header )
...@@ -208,7 +208,7 @@ void ZipOutputStream::writeEXT( const ZipEntry &rEntry ) ...@@ -208,7 +208,7 @@ void ZipOutputStream::writeEXT( const ZipEntry &rEntry )
bool bWrite64Header = false; bool bWrite64Header = false;
m_aChucker.WriteInt32( EXTSIG ); m_aChucker.WriteInt32( EXTSIG );
m_aChucker.WriteUInt32( static_cast < sal_uInt32> ( rEntry.nCrc ) ); m_aChucker.WriteUInt32( rEntry.nCrc );
m_aChucker.WriteUInt32( getTruncated( rEntry.nCompressedSize, &bWrite64Header ) ); m_aChucker.WriteUInt32( getTruncated( rEntry.nCompressedSize, &bWrite64Header ) );
m_aChucker.WriteUInt32( getTruncated( rEntry.nSize, &bWrite64Header ) ); m_aChucker.WriteUInt32( getTruncated( rEntry.nSize, &bWrite64Header ) );
...@@ -241,27 +241,27 @@ void ZipOutputStream::writeLOC( ZipEntry *pEntry, bool bEncrypt ) ...@@ -241,27 +241,27 @@ void ZipOutputStream::writeLOC( ZipEntry *pEntry, bool bEncrypt )
m_aChucker.WriteInt16( rEntry.nFlag ); m_aChucker.WriteInt16( rEntry.nFlag );
// If it's an encrypted entry, we pretend its stored plain text // If it's an encrypted entry, we pretend its stored plain text
if (bEncrypt) if (bEncrypt)
m_aChucker.WriteInt16( static_cast < sal_Int16 > ( STORED ) ); m_aChucker.WriteInt16( STORED );
else else
m_aChucker.WriteInt16( rEntry.nMethod ); m_aChucker.WriteInt16( rEntry.nMethod );
bool bWrite64Header = false; bool bWrite64Header = false;
m_aChucker.WriteUInt32( static_cast < sal_uInt32 > (rEntry.nTime) ); m_aChucker.WriteUInt32( rEntry.nTime );
if ((rEntry.nFlag & 8) == 8 ) if ((rEntry.nFlag & 8) == 8 )
{ {
m_aChucker.WriteInt32( static_cast < sal_Int32 > (0) ); m_aChucker.WriteInt32( 0 );
m_aChucker.WriteInt32( static_cast < sal_Int32 > (0) ); m_aChucker.WriteInt32( 0 );
m_aChucker.WriteInt32( static_cast < sal_Int32 > (0) ); m_aChucker.WriteInt32( 0 );
} }
else else
{ {
m_aChucker.WriteUInt32( static_cast < sal_uInt32 > (rEntry.nCrc) ); m_aChucker.WriteUInt32( rEntry.nCrc );
m_aChucker.WriteUInt32( getTruncated( rEntry.nCompressedSize, &bWrite64Header ) ); m_aChucker.WriteUInt32( getTruncated( rEntry.nCompressedSize, &bWrite64Header ) );
m_aChucker.WriteUInt32( getTruncated( rEntry.nSize, &bWrite64Header ) ); m_aChucker.WriteUInt32( getTruncated( rEntry.nSize, &bWrite64Header ) );
} }
m_aChucker.WriteInt16( nNameLength ); m_aChucker.WriteInt16( nNameLength );
m_aChucker.WriteInt16( static_cast < sal_Int16 > (0) ); m_aChucker.WriteInt16( 0 );
if( bWrite64Header ) if( bWrite64Header )
{ {
......
This diff is collapsed.
...@@ -3864,7 +3864,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) ...@@ -3864,7 +3864,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
if ( !type ) if ( !type )
SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true ); SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true );
if ( type ) if ( type )
pDataStrm->WriteUInt16( sal_uInt16(0) ); pDataStrm->WriteUInt16( 0 );
SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffformat ), true ); SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffformat ), true );
SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffhelptext ), true ); SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffhelptext ), true );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment