summaryrefslogtreecommitdiff
path: root/sd/source/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-25 20:19:30 +0200
committerNoel Grandin <noel@peralex.com>2014-09-26 15:27:17 +0200
commit5cefde06ea9f4347b5d2747e0d2825c3c710aa83 (patch)
tree7f24ac5f1fe1749ea8c0135c73de80745b1c7508 /sd/source/filter
parent04fd62096fca2c0b917ac6172104399e65933585 (diff)
remove unnecessary casts in calls to SvStream.WriteUInt32
left over from our conversion of the SvStream output operators to more specific methods Change-Id: I1d848f19f82783e6eabf2da37dbde78fe36ea1e0
Diffstat (limited to 'sd/source/filter')
-rw-r--r--sd/source/filter/eppt/eppt.cxx150
-rw-r--r--sd/source/filter/eppt/epptso.cxx284
-rw-r--r--sd/source/filter/eppt/escherex.cxx44
-rw-r--r--sd/source/filter/eppt/pptexanimations.cxx2
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.cxx14
-rw-r--r--sd/source/filter/eppt/pptx-stylesheet.cxx12
6 files changed, 253 insertions, 253 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 9fbf5a37a257..082b67a89655 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -177,8 +177,8 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
mpStrm->WriteInt32( rLayout.nLayout );
mpStrm->Write( rLayout.nPlaceHolder, 8 ); // placeholderIDs (8 parts)
- mpStrm->WriteUInt32( (sal_uInt32)(nMasterNum | 0x80000000) )// master ID (equals 0x80000000 on a master page)
- .WriteUInt32( (sal_uInt32)nPageNum + 0x100 ) // notes ID (equals null if no notes are present)
+ mpStrm->WriteUInt32( (nMasterNum | 0x80000000) )// master ID (equals 0x80000000 on a master page)
+ .WriteUInt32( nPageNum + 0x100 ) // notes ID (equals null if no notes are present)
.WriteUInt16( nMode )
.WriteUInt16( 0 ); // padword
@@ -310,7 +310,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer
mpPptEscherEx->CloseContainer(); // EPP_Drawing
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
- mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 );
+ mpStrm->WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x808080 ).WriteUInt32( 0x000000 ).WriteUInt32( 0x99cc00 ).WriteUInt32( 0xcc3333 ).WriteUInt32( 0xffcccc ).WriteUInt32( 0xb2b2b2 );
SvMemoryStream aBinaryTagData10Atom;
ImplExportComments( mXDrawPage, aBinaryTagData10Atom );
@@ -324,12 +324,12 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
{
{
EscherExAtom aMagic2( aBinaryTagData10Atom, 0x2eeb );
- aBinaryTagData10Atom.WriteUInt32( (sal_uInt32)0x01c45df9 )
- .WriteUInt32( (sal_uInt32)0xe1471b30 );
+ aBinaryTagData10Atom.WriteUInt32( 0x01c45df9 )
+ .WriteUInt32( 0xe1471b30 );
}
{
EscherExAtom aMagic( aBinaryTagData10Atom, 0x2b00 );
- aBinaryTagData10Atom.WriteUInt32( (sal_uInt32)0 );
+ aBinaryTagData10Atom.WriteUInt32( 0 );
}
aBinaryTagData10Atom.Write( amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell() );
{
@@ -343,9 +343,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
{
EscherExAtom aCString( *mpStrm, EPP_CString );
- mpStrm->WriteUInt32( (sal_uInt32)0x5f005f )
- .WriteUInt32( (sal_uInt32)0x50005f )
- .WriteUInt32( (sal_uInt32)0x540050 )
+ mpStrm->WriteUInt32( 0x5f005f )
+ .WriteUInt32( 0x50005f )
+ .WriteUInt32( 0x540050 )
.WriteUInt16( 0x31 )
.WriteUInt16( 0x30 );
}
@@ -364,25 +364,25 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
mpStrm->WriteInt32( EPP_LAYOUT_TITLEANDBODYSLIDE ) // slide layout -> title and body slide
.WriteUChar( 1 ).WriteUChar( 2 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ) // placeholderID
- .WriteUInt32( (sal_uInt32)0 ) // master ID (equals null at a master page)
- .WriteUInt32( (sal_uInt32)0 ) // notes ID (equals null if no notes are present)
+ .WriteUInt32( 0 ) // master ID (equals null at a master page)
+ .WriteUInt32( 0 ) // notes ID (equals null if no notes are present)
.WriteUInt16( 0 ) // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
.WriteUInt16( 0 ); // padword
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 );
+ mpStrm->WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x808080 ).WriteUInt32( 0x000000 ).WriteUInt32( 0x99cc00 ).WriteUInt32( 0xcc3333 ).WriteUInt32( 0xffcccc ).WriteUInt32( 0xb2b2b2 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- mpStrm->WriteUInt32( (sal_uInt32)0xff0000 ).WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x00ffff ).WriteUInt32( (sal_uInt32)0x0099ff ).WriteUInt32( (sal_uInt32)0xffff00 ).WriteUInt32( (sal_uInt32)0x0000ff ).WriteUInt32( (sal_uInt32)0x969696 );
+ mpStrm->WriteUInt32( 0xff0000 ).WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x00ffff ).WriteUInt32( 0x0099ff ).WriteUInt32( 0xffff00 ).WriteUInt32( 0x0000ff ).WriteUInt32( 0x969696 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- mpStrm->WriteUInt32( (sal_uInt32)0xccffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x336666 ).WriteUInt32( (sal_uInt32)0x008080 ).WriteUInt32( (sal_uInt32)0x339933 ).WriteUInt32( (sal_uInt32)0x000080 ).WriteUInt32( (sal_uInt32)0xcc3300 ).WriteUInt32( (sal_uInt32)0x66ccff );
+ mpStrm->WriteUInt32( 0xccffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x336666 ).WriteUInt32( 0x008080 ).WriteUInt32( 0x339933 ).WriteUInt32( 0x000080 ).WriteUInt32( 0xcc3300 ).WriteUInt32( 0x66ccff );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x333333 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0xdddddd ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x4d4d4d ).WriteUInt32( (sal_uInt32)0xeaeaea );
+ mpStrm->WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x333333 ).WriteUInt32( 0x000000 ).WriteUInt32( 0xdddddd ).WriteUInt32( 0x808080 ).WriteUInt32( 0x4d4d4d ).WriteUInt32( 0xeaeaea );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x66ccff ).WriteUInt32( (sal_uInt32)0xff0000 ).WriteUInt32( (sal_uInt32)0xcc00cc ).WriteUInt32( (sal_uInt32)0xc0c0c0 );
+ mpStrm->WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x808080 ).WriteUInt32( 0x000000 ).WriteUInt32( 0x66ccff ).WriteUInt32( 0xff0000 ).WriteUInt32( 0xcc00cc ).WriteUInt32( 0xc0c0c0 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0xc0c0c0 ).WriteUInt32( (sal_uInt32)0xff6600 ).WriteUInt32( (sal_uInt32)0x0000ff ).WriteUInt32( (sal_uInt32)0x009900 );
+ mpStrm->WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x808080 ).WriteUInt32( 0x000000 ).WriteUInt32( 0xc0c0c0 ).WriteUInt32( 0xff6600 ).WriteUInt32( 0x0000ff ).WriteUInt32( 0x009900 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0xff9933 ).WriteUInt32( (sal_uInt32)0xccff99 ).WriteUInt32( (sal_uInt32)0xcc00cc ).WriteUInt32( (sal_uInt32)0xb2b2b2 );
+ mpStrm->WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x808080 ).WriteUInt32( 0x000000 ).WriteUInt32( 0xff9933 ).WriteUInt32( 0xccff99 ).WriteUInt32( 0xcc00cc ).WriteUInt32( 0xb2b2b2 );
for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
{
@@ -434,7 +434,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer
mpPptEscherEx->CloseContainer(); // EPP_Drawing
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
- mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 );
+ mpStrm->WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x808080 ).WriteUInt32( 0x000000 ).WriteUInt32( 0x99cc00 ).WriteUInt32( 0xcc3333 ).WriteUInt32( 0xffcccc ).WriteUInt32( 0xb2b2b2 );
if ( aBuExMasterStream.Tell() )
{
@@ -472,11 +472,11 @@ bool PPTWriter::ImplCreateCurrentUserStream()
sal_uInt32 nSizeOfRecord = 0x14 + ( ( nLenOfUserName + 4 ) & ~ 3 );
mpCurUserStrm->WriteUInt16( 0 ).WriteUInt16( EPP_CurrentUserAtom ).WriteUInt32( nSizeOfRecord );
- mpCurUserStrm->WriteUInt32( (sal_uInt32)0x14 ) // Len
- .WriteUInt32( (sal_uInt32)0xe391c05f ); // Magic
+ mpCurUserStrm->WriteUInt32( 0x14 ) // Len
+ .WriteUInt32( 0xe391c05f ); // Magic
sal_uInt32 nEditPos = mpCurUserStrm->Tell();
- mpCurUserStrm->WriteUInt32( (sal_uInt32)0x0 ) // OffsetToCurrentEdit;
+ mpCurUserStrm->WriteUInt32( 0x0 ) // OffsetToCurrentEdit;
.WriteUInt16( nLenOfUserName )
.WriteUInt16( 0x3f4 ) // DocFileVersion
.WriteUChar( 3 ) // MajorVersion
@@ -547,11 +547,11 @@ void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sa
{
if ( rSt.Tell() )
{
- aBuExOutlineStream.WriteUInt32( (sal_uInt32)( ( EPP_PST_ExtendedParagraphHeaderAtom << 16 )
+ aBuExOutlineStream.WriteUInt32( ( ( EPP_PST_ExtendedParagraphHeaderAtom << 16 )
| ( nRef << 4 ) ) )
- .WriteUInt32( (sal_uInt32)8 )
- .WriteUInt32( (sal_uInt32)nSlideId )
- .WriteUInt32( (sal_uInt32)nInstance );
+ .WriteUInt32( 8 )
+ .WriteUInt32( nSlideId )
+ .WriteUInt32( nInstance );
aBuExOutlineStream.Write( rSt.GetData(), rSt.Tell() );
}
}
@@ -688,8 +688,8 @@ bool PPTWriter::ImplCreateDocument()
.WriteInt32( maNotesPageSize.Height ) // " " " Y
.WriteInt32( 1 ).WriteInt32( 2 ); // the scale used when the Powerpoint document is embedded. the default is 1:2
mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, mpStrm->Tell() );
- mpStrm->WriteUInt32( (sal_uInt32)0 ) // Reference to NotesMaster ( 0 if none );
- .WriteUInt32( (sal_uInt32)0 ) // Reference to HandoutMaster ( 0 if none );
+ mpStrm->WriteUInt32( 0 ) // Reference to NotesMaster ( 0 if none );
+ .WriteUInt32( 0 ) // Reference to HandoutMaster ( 0 if none );
.WriteInt16( 1 ) // Number of the first slide;
.WriteUInt16( nSlideType ) // Size of the document slides ( default: EPP_SLIDESIZETYPEONSCREEN )
.WriteUChar( 0 ) // bool1 indicates if document was saved with embedded true type fonts
@@ -701,13 +701,13 @@ bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 3 ); //Master footer (default)
mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom );
- mpStrm->WriteUInt32( (sal_uInt32)0x25000d );
+ mpStrm->WriteUInt32( 0x25000d );
if ( GetPageByIndex( 0, MASTER ) )
ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet );
mpPptEscherEx->CloseContainer();
mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 4 ); //NotesMaster footer (default)
mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom );
- mpStrm->WriteUInt32( (sal_uInt32)0x3d000d );
+ mpStrm->WriteUInt32( 0x3d000d );
if ( GetPageByIndex( 0, NOTICE ) )
ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet );
mpPptEscherEx->CloseContainer();
@@ -718,11 +718,11 @@ bool PPTWriter::ImplCreateDocument()
{
mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom );
mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() );
- mpStrm->WriteUInt32( (sal_uInt32)0 ) // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY )
- .WriteUInt32( (sal_uInt32)4 ) // flags - only bit 3 used, if set then slide contains shapes other than placeholders
+ mpStrm->WriteUInt32( 0 ) // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY )
+ .WriteUInt32( 4 ) // flags - only bit 3 used, if set then slide contains shapes other than placeholders
.WriteInt32( 0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
.WriteInt32( i + 0x100 ) // slideId - Unique slide identifier, used for OLE link monikers for example
- .WriteUInt32( (sal_uInt32)0 ); // reserved, usually 0
+ .WriteUInt32( 0 ); // reserved, usually 0
if ( !GetPageByIndex( i, NORMAL ) ) // very exciting: once again through all pages
return false;
@@ -743,11 +743,11 @@ bool PPTWriter::ImplCreateDocument()
{
mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom );
mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, mpStrm->Tell() );
- mpStrm->WriteUInt32( (sal_uInt32)0 )
- .WriteUInt32( (sal_uInt32)4 )
+ mpStrm->WriteUInt32( 0 )
+ .WriteUInt32( 4 )
.WriteInt32( 0 )
.WriteInt32( i + 0x100 )
- .WriteUInt32( (sal_uInt32)0 );
+ .WriteUInt32( 0 );
}
mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText
@@ -902,7 +902,7 @@ bool PPTWriter::ImplCreateDocument()
if (pIter != maSlideNameList.end())
{
sal_uInt32 nPageNumber = pIter - maSlideNameList.begin();
- mpStrm->WriteUInt32( (sal_uInt32)( nPageNumber + 0x100 ) ); // unique slide id
+ mpStrm->WriteUInt32( ( nPageNumber + 0x100 ) ); // unique slide id
}
}
}
@@ -931,18 +931,18 @@ bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
sal_uInt32 nCurrentOfs, nParaOfs, nParaCount = 0;
nParaOfs = rStrm.Tell();
- rStrm.WriteUInt32( (sal_uInt32)0 ); // property size
- rStrm.WriteUInt32( (sal_uInt32)0 ); // property count
+ rStrm.WriteUInt32( 0 ); // property size
+ rStrm.WriteUInt32( 0 ); // property count
for ( std::vector<EPPTHyperlink>::const_iterator pIter = maHyperlink.begin(); pIter != maHyperlink.end(); ++pIter )
{
nParaCount += 6;
- rStrm .WriteUInt32( (sal_uInt32)3 ) // Type VT_I4
- .WriteUInt32( (sal_uInt32)7 ) // (VTI4 - Private1)
- .WriteUInt32( (sal_uInt32)3 ) // Type VT_I4
- .WriteUInt32( (sal_uInt32)6 ) // (VTI4 - Private2)
- .WriteUInt32( (sal_uInt32)3 ) // Type VT_I4
- .WriteUInt32( (sal_uInt32)0 ); // (VTI4 - Private3)
+ rStrm .WriteUInt32( 3 ) // Type VT_I4
+ .WriteUInt32( 7 ) // (VTI4 - Private1)
+ .WriteUInt32( 3 ) // Type VT_I4
+ .WriteUInt32( 6 ) // (VTI4 - Private2)
+ .WriteUInt32( 3 ) // Type VT_I4
+ .WriteUInt32( 0 ); // (VTI4 - Private3)
// INFO
// HIWORD: = 0 : do not change anything
@@ -963,15 +963,15 @@ bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
sal_uInt32 nInfo = 7;
- rStrm .WriteUInt32( (sal_uInt32)3 ) // Type VT_I4
+ rStrm .WriteUInt32( 3 ) // Type VT_I4
.WriteUInt32( nInfo ); // Info
switch( pIter->nType & 0xff )
{
case 1 : // click action to slidenumber
{
- rStrm.WriteUInt32( (sal_uInt32)0x1f ).WriteUInt32( (sal_uInt32)1 ).WriteUInt32( (sal_uInt32)0 ); // path
- rStrm.WriteUInt32( (sal_uInt32)0x1f ).WriteUInt32( (sal_uInt32)( nUrlLen + 1 ) );
+ rStrm.WriteUInt32( 0x1f ).WriteUInt32( 1 ).WriteUInt32( 0 ); // path
+ rStrm.WriteUInt32( 0x1f ).WriteUInt32( ( nUrlLen + 1 ) );
for ( sal_Int32 i = 0; i < nUrlLen; i++ )
{
rStrm.WriteUInt16( rUrl[ i ] );
@@ -983,8 +983,8 @@ bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
{
sal_Int32 i;
- rStrm .WriteUInt32( (sal_uInt32)0x1f )
- .WriteUInt32( (sal_uInt32)( nUrlLen + 1 ) );
+ rStrm .WriteUInt32( 0x1f )
+ .WriteUInt32( ( nUrlLen + 1 ) );
for ( i = 0; i < nUrlLen; i++ )
{
rStrm.WriteUInt16( rUrl[ i ] );
@@ -992,16 +992,16 @@ bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
if ( ! ( i & 1 ) )
rStrm.WriteUInt16( 0 );
rStrm .WriteUInt16( 0 )
- .WriteUInt32( (sal_uInt32)0x1f )
- .WriteUInt32( (sal_uInt32)1 )
- .WriteUInt32( (sal_uInt32)0 );
+ .WriteUInt32( 0x1f )
+ .WriteUInt32( 1 )
+ .WriteUInt32( 0 );
}
break;
}
}
nCurrentOfs = rStrm.Tell();
rStrm.Seek( nParaOfs );
- rStrm.WriteUInt32( (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) ) );
+ rStrm.WriteUInt32( ( nCurrentOfs - ( nParaOfs + 4 ) ) );
rStrm.WriteUInt32( nParaCount );
rStrm.Seek( nCurrentOfs );
return true;
@@ -1014,8 +1014,8 @@ bool PPTWriter::ImplCreateMainNotes()
mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainNotes, mpStrm->Tell() );
mpPptEscherEx->OpenContainer( EPP_Notes );
mpPptEscherEx->AddAtom( 8, EPP_NotesAtom, 1 );
- mpStrm->WriteUInt32( (sal_uInt32)0x80000001 ) // Number that identifies this slide
- .WriteUInt32( (sal_uInt32)0 ); // follow nothing
+ mpStrm->WriteUInt32( 0x80000001 ) // Number that identifies this slide
+ .WriteUInt32( 0 ); // follow nothing
mpPptEscherEx->OpenContainer( EPP_PPDrawing );
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
@@ -1042,7 +1042,7 @@ bool PPTWriter::ImplCreateMainNotes()
mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer
mpPptEscherEx->CloseContainer(); // EPP_Drawing
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
- mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 );
+ mpStrm->WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x808080 ).WriteUInt32( 0x000000 ).WriteUInt32( 0x99cc00 ).WriteUInt32( 0xcc3333 ).WriteUInt32( 0xffcccc ).WriteUInt32( 0xb2b2b2 );
mpPptEscherEx->CloseContainer(); // EPP_Notes
return true;
}
@@ -1137,7 +1137,7 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Notes | nPageNum, mpStrm->Tell() );
mpPptEscherEx->OpenContainer( EPP_Notes );
mpPptEscherEx->AddAtom( 8, EPP_NotesAtom, 1 );
- mpStrm->WriteUInt32( (sal_uInt32)nPageNum + 0x100 )
+ mpStrm->WriteUInt32( nPageNum + 0x100 )
.WriteUInt16( 3 ) // follow master ....
.WriteUInt16( 0 );
@@ -1171,7 +1171,7 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer
mpPptEscherEx->CloseContainer(); // EPP_Drawing
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
- mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 );
+ mpStrm->WriteUInt32( 0xffffff ).WriteUInt32( 0x000000 ).WriteUInt32( 0x808080 ).WriteUInt32( 0x000000 ).WriteUInt32( 0x99cc00 ).WriteUInt32( 0xcc3333 ).WriteUInt32( 0xffcccc ).WriteUInt32( 0xb2b2b2 );
mpPptEscherEx->CloseContainer(); // EPP_Notes
};
@@ -1286,15 +1286,15 @@ void PPTWriter::ImplWriteOLE( )
// create a dummy content stream, the dummy content is necessary for ppt, but not for
// doc files, so we can't share code.
SotStorageStreamRef xStm = xCleanStorage->OpenSotStream( aPersistStream, STREAM_STD_READWRITE );
- xStm->WriteUInt32( (sal_uInt32)0 ) // no ClipboardId
- .WriteUInt32( (sal_uInt32)4 ) // no target device
- .WriteUInt32( (sal_uInt32)1 ) // aspect ratio
+ xStm->WriteUInt32( 0 ) // no ClipboardId
+ .WriteUInt32( 4 ) // no target device
+ .WriteUInt32( 1 ) // aspect ratio
.WriteInt32( -1 ) // L-Index
- .WriteUInt32( (sal_uInt32)0 ) // Advanced Flags
- .WriteUInt32( (sal_uInt32)0 ) // compression
- .WriteUInt32( (sal_uInt32)0 ) // Size
- .WriteUInt32( (sal_uInt32)0 ) // "
- .WriteUInt32( (sal_uInt32)0 );
+ .WriteUInt32( 0 ) // Advanced Flags
+ .WriteUInt32( 0 ) // compression
+ .WriteUInt32( 0 ) // Size
+ .WriteUInt32( 0 ) // "
+ .WriteUInt32( 0 );
pStrm = xCleanStorage->CreateMemoryStream();
}
}
@@ -1342,11 +1342,11 @@ bool PPTWriter::ImplWriteAtomEnding()
sal_uInt32 i, nPos, nOfs, nPersistOfs = mpStrm->Tell();
sal_uInt32 nPersistEntrys = 0;
- mpStrm->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ); // skip record header and first entry
+ mpStrm->WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 ); // skip record header and first entry
// write document persist
nPersistEntrys++;
- mpStrm->WriteUInt32( (sal_uInt32)0 );
+ mpStrm->WriteUInt32( 0 );
// write MasterPages persists
for ( i = 0; i < mnMasterPages; i++ )
{
@@ -1426,17 +1426,17 @@ bool PPTWriter::ImplWriteAtomEnding()
nPos = mpStrm->Tell();
mpStrm->Seek( nPersistOfs );
mpPptEscherEx->AddAtom( ( nPersistEntrys + 1 ) << 2, EPP_PersistPtrIncrementalBlock ); // insert Record Header
- mpStrm->WriteUInt32( (sal_uInt32)( ( nPersistEntrys << 20 ) | 1 ) );
+ mpStrm->WriteUInt32( ( ( nPersistEntrys << 20 ) | 1 ) );
mpStrm->Seek( nPos );
- mpCurUserStrm->WriteUInt32( (sal_uInt32)nPos ); // set offset to current edit
+ mpCurUserStrm->WriteUInt32( nPos ); // set offset to current edit
mpPptEscherEx->AddAtom( 28, EPP_UserEditAtom );
mpStrm->WriteInt32( 0x100 ) // last slide ID
- .WriteUInt32( (sal_uInt32)0x03000dbc ) // minor and major app version that did the save
- .WriteUInt32( (sal_uInt32)0 ) // offset last save, 0 after a full save
+ .WriteUInt32( 0x03000dbc ) // minor and major app version that did the save
+ .WriteUInt32( 0 ) // offset last save, 0 after a full save
.WriteUInt32( nPersistOfs ) // File offset to persist pointers for this save operation
- .WriteUInt32( (sal_uInt32)1 ) // Persist reference to the document persist object
- .WriteUInt32( (sal_uInt32)nPersistEntrys ) // max persists written, Seed value for persist object id management
+ .WriteUInt32( 1 ) // Persist reference to the document persist object
+ .WriteUInt32( nPersistEntrys ) // max persists written, Seed value for persist object id management
.WriteInt16( EPP_LastViewTypeSlideView ) // last view type
.WriteInt16( 0x12 ); // padword
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 7ee29aa384c4..bca9fc82b774 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -154,14 +154,14 @@ sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm )
sal_uInt32 nSize = 28;
if ( pStrm )
{
- pStrm->WriteUInt32( (sal_uInt32)( 0x1f | ( EPP_VBAInfo << 16 ) ) )
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) )
- .WriteUInt32( (sal_uInt32)( 2 | ( EPP_VBAInfoAtom << 16 ) ) )
- .WriteUInt32( (sal_uInt32)12 );
+ pStrm->WriteUInt32( ( 0x1f | ( EPP_VBAInfo << 16 ) ) )
+ .WriteUInt32( ( nSize - 8 ) )
+ .WriteUInt32( ( 2 | ( EPP_VBAInfoAtom << 16 ) ) )
+ .WriteUInt32( 12 );
mpPptEscherEx->InsertPersistOffset( EPP_Persist_VBAInfoAtom, pStrm->Tell() );
- pStrm->WriteUInt32( (sal_uInt32)0 )
- .WriteUInt32( (sal_uInt32)0 )
- .WriteUInt32( (sal_uInt32)1 );
+ pStrm->WriteUInt32( 0 )
+ .WriteUInt32( 0 )
+ .WriteUInt32( 1 );
}
return nSize;
}
@@ -193,11 +193,11 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream
nPosition1 = 0xb40;
nPosition2 = 0x870;
}
- pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_SlideViewInfo << 16 ) | ( nInstance << 4 ) ) )
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) )
- .WriteUInt32( (sal_uInt32)( EPP_SlideViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)3 )
+ pStrm->WriteUInt32( ( 0xf | ( EPP_SlideViewInfo << 16 ) | ( nInstance << 4 ) ) )
+ .WriteUInt32( ( nSize - 8 ) )
+ .WriteUInt32( ( EPP_SlideViewInfoAtom << 16 ) ).WriteUInt32( 3 )
.WriteUChar( bShowGuides ).WriteUChar( bSnapToGrid ).WriteUChar( bSnapToShape )
- .WriteUInt32( (sal_uInt32)( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)52 )
+ .WriteUInt32( ( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( 52 )
.WriteInt32( nScaling ).WriteInt32( 100 ).WriteInt32( nScaling ).WriteInt32( 100 ) // scaling atom - Keeps the current scale
.WriteInt32( nScaling ).WriteInt32( 100 ).WriteInt32( nScaling ).WriteInt32( 100 ) // scaling atom - Keeps the previous scale
.WriteInt32( 0x17ac ).WriteInt32( nMasterCoordinate )// Origin - Keeps the origin in master coordinates
@@ -205,10 +205,10 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream
.WriteUChar( 1 ) // Bool1 varScale - Set if zoom to fit is set
.WriteUChar( 0 ) // bool1 draftMode - Not used
.WriteUInt16( 0 ) // padword
- .WriteUInt32( (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) ).WriteUInt32( (sal_uInt32)8 )
- .WriteUInt32( (sal_uInt32)0 ) // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one.
+ .WriteUInt32( ( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) ).WriteUInt32( 8 )
+ .WriteUInt32( 0 ) // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one.
.WriteInt32( nPosition1 ) // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal.
- .WriteUInt32( (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) ).WriteUInt32( (sal_uInt32)8 )
+ .WriteUInt32( ( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) ).WriteUInt32( 8 )
.WriteInt32( 1 ) // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one.
.WriteInt32( nPosition2 ); // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal.
}
@@ -220,8 +220,8 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm )
sal_uInt32 nSize = 68;
if ( pStrm )
{
- pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_OutlineViewInfo << 16 ) ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) )
- .WriteUInt32( (sal_uInt32)( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)52 )
+ pStrm->WriteUInt32( ( 0xf | ( EPP_OutlineViewInfo << 16 ) ) ).WriteUInt32( ( nSize - 8 ) )
+ .WriteUInt32( ( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( 52 )
.WriteInt32( 170 ).WriteInt32( 200 ).WriteInt32( 170 ).WriteInt32( 200 ) // scaling atom - Keeps the current scale
.WriteInt32( 170 ).WriteInt32( 200 ).WriteInt32( 170 ).WriteInt32( 200 ) // scaling atom - Keeps the previous scale
.WriteInt32( 0x17ac ).WriteInt32( 0xdda ) // Origin - Keeps the origin in master coordinates
@@ -247,15 +247,15 @@ sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm )
if ( pStrm )
{
- pStrm->WriteUInt32( (sal_uInt32)( EPP_BinaryTagData << 16 ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ pStrm->WriteUInt32( ( EPP_BinaryTagData << 16 ) ).WriteUInt32( ( nSize - 8 ) );
if ( nPictureStreamSize )
{
- pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_PST_ExtendedBuGraContainer << 16 ) ) ).WriteUInt32( nPictureStreamSize );
+ pStrm->WriteUInt32( ( 0xf | ( EPP_PST_ExtendedBuGraContainer << 16 ) ) ).WriteUInt32( nPictureStreamSize );
pStrm->Write( aBuExPictureStream.GetData(), nPictureStreamSize );
}
if ( nOutlineStreamSize )
{
- pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_PST_ExtendedPresRuleContainer << 16 ) ) ).WriteUInt32( nOutlineStreamSize );
+ pStrm->WriteUInt32( ( 0xf | ( EPP_PST_ExtendedPresRuleContainer << 16 ) ) ).WriteUInt32( nOutlineStreamSize );
pStrm->Write( aBuExOutlineStream.GetData(), nOutlineStreamSize );
}
}
@@ -267,16 +267,16 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea
sal_uInt32 nSize = 8 + 8 + 14;
if ( pStrm )
{
- pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ProgBinaryTag << 16 ) ) ).WriteUInt32( (sal_uInt32)0 )
- .WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)14 )
- .WriteUInt32( (sal_uInt32)0x5f005f ).WriteUInt32( (sal_uInt32)0x50005f )
- .WriteUInt32( (sal_uInt32)0x540050 ).WriteUInt16( 0x39 );
+ pStrm->WriteUInt32( ( 0xf | ( EPP_ProgBinaryTag << 16 ) ) ).WriteUInt32( 0 )
+ .WriteUInt32( ( EPP_CString << 16 ) ).WriteUInt32( 14 )
+ .WriteUInt32( 0x5f005f ).WriteUInt32( 0x50005f )
+ .WriteUInt32( 0x540050 ).WriteUInt16( 0x39 );
}
if ( pStrm && pBinTagStrm )
{
sal_uInt32 nLen = pBinTagStrm->Tell();
nSize += nLen + 8;
- pStrm->WriteUInt32( (sal_uInt32)( EPP_BinaryTagData << 16 ) ).WriteUInt32( nLen );
+ pStrm->WriteUInt32( ( EPP_BinaryTagData << 16 ) ).WriteUInt32( nLen );
pStrm->Write( pBinTagStrm->GetData(), nLen );
}
else
@@ -285,7 +285,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea
if ( pStrm )
{
pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
- pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ pStrm->WriteUInt32( ( nSize - 8 ) );
pStrm->SeekRel( nSize - 8 );
}
return nSize;
@@ -299,13 +299,13 @@ sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBi
nSize = 8;
if ( pStrm )
{
- pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ProgTags << 16 ) ) ).WriteUInt32( (sal_uInt32)0 );
+ pStrm->WriteUInt32( ( 0xf | ( EPP_ProgTags << 16 ) ) ).WriteUInt32( 0 );
}
nSize += ImplProgBinaryTagContainer( pStrm, pBinTagStrm );
if ( pStrm )
{
pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
- pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ pStrm->WriteUInt32( ( nSize - 8 ) );
pStrm->SeekRel( nSize - 8 );
}
}
@@ -317,7 +317,7 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm )
sal_uInt32 nSize = 8;
if ( pStrm )
{
- pStrm->WriteUInt32( (sal_uInt32)( ( EPP_List << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)0 );
+ pStrm->WriteUInt32( ( ( EPP_List << 16 ) | 0xf ) ).WriteUInt32( 0 );
}
nSize += ImplVBAInfoContainer( pStrm );
@@ -329,7 +329,7 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm )
if ( pStrm )
{
pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
- pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ pStrm->WriteUInt32( ( nSize - 8 ) );
pStrm->SeekRel( nSize - 8 );
}
return nSize;
@@ -340,17 +340,17 @@ sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm )
sal_uInt32 i, nSize = 28 * mnMasterPages + 8;
if ( pStrm )
{
- pStrm->WriteUInt32( (sal_uInt32)( 0x1f | ( EPP_SlideListWithText << 16 ) ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ pStrm->WriteUInt32( ( 0x1f | ( EPP_SlideListWithText << 16 ) ) ).WriteUInt32( ( nSize - 8 ) );
for ( i = 0; i < mnMasterPages; i++ )
{
- pStrm->WriteUInt32( (sal_uInt32)( EPP_SlidePersistAtom << 16 ) ).WriteUInt32( (sal_uInt32)20 );
+ pStrm->WriteUInt32( ( EPP_SlidePersistAtom << 16 ) ).WriteUInt32( 20 );
mpPptEscherEx->InsertPersistOffset( EPP_MAINMASTER_PERSIST_KEY | i, pStrm->Tell() );
- pStrm->WriteUInt32( (sal_uInt32)0 ) // psrReference - logical reference to the slide persist object ( EPP_MAINMASTER_PERSIST_KEY )
- .WriteUInt32( (sal_uInt32)0 ) // flags - only bit 3 used, if set then slide contains shapes other than placeholders
+ pStrm->WriteUInt32( 0 ) // psrReference - logical reference to the slide persist object ( EPP_MAINMASTER_PERSIST_KEY )
+ .WriteUInt32( 0 ) // flags - only bit 3 used, if set then slide contains shapes other than placeholders
.WriteInt32( 0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
.WriteInt32( ( 0x80000000 | i ) ) // slideId - Unique slide identifier, used for OLE link monikers for example
- .WriteUInt32( (sal_uInt32)0 ); // reserved, usually 0
+ .WriteUInt32( 0 ); // reserved, usually 0
}
}
return nSize;
@@ -375,11 +375,11 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const
mpExEmbed->WriteUInt16( 0xf )
.WriteUInt16( EPP_ExHyperlink )
- .WriteUInt32( (sal_uInt32)0 );
+ .WriteUInt32( 0 );
sal_uInt32 nHyperSize, nHyperStart = mpExEmbed->Tell();
mpExEmbed->WriteUInt16( 0 )
.WriteUInt16( EPP_ExHyperlinkAtom )
- .WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( 4 )
.WriteUInt32( nHyperId );
PPTWriter::WriteCString( *mpExEmbed, rStringVer0, 0 );
@@ -446,25 +446,25 @@ bool PPTWriter::ImplCloseDocument()
{
mpStrm->WriteUInt16( 0xf )
.WriteUInt16( EPP_ExObjList )
- .WriteUInt32( (sal_uInt32)( nExEmbedSize + 12 ) )
+ .WriteUInt32( ( nExEmbedSize + 12 ) )
.WriteUInt16( 0 )
.WriteUInt16( EPP_ExObjListAtom )
- .WriteUInt32( (sal_uInt32)4 )
- .WriteUInt32( (sal_uInt32)mnExEmbed );
+ .WriteUInt32( 4 )
+ .WriteUInt32( mnExEmbed );
mpPptEscherEx->InsertPersistOffset( EPP_Persist_ExObj, mpStrm->Tell() );
mpStrm->Write( mpExEmbed->GetData(), nExEmbedSize );
}
// CREATE ENVIRONMENT
- mpStrm->WriteUInt16( 0xf ).WriteUInt16( EPP_Environment ).WriteUInt32( (sal_uInt32)nEnvironment );
+ mpStrm->WriteUInt16( 0xf ).WriteUInt16( EPP_Environment ).WriteUInt32( nEnvironment );
// Open Container ( EPP_SrKinsoku )
- mpStrm->WriteUInt16( 0x2f ).WriteUInt16( EPP_SrKinsoku ).WriteUInt32( (sal_uInt32)12 );
+ mpStrm->WriteUInt16( 0x2f ).WriteUInt16( EPP_SrKinsoku ).WriteUInt32( 12 );
mpPptEscherEx->AddAtom( 4, EPP_SrKinsokuAtom, 0, 3 );
mpStrm->WriteInt32( 0 ); // SrKinsoku Level 0
// Open Container ( EPP_FontCollection )
- mpStrm->WriteUInt16( 0xf ).WriteUInt16( EPP_FontCollection ).WriteUInt32( (sal_uInt32)maFontCollection.GetCount() * 76 );
+ mpStrm->WriteUInt16( 0xf ).WriteUInt16( EPP_FontCollection ).WriteUInt32( maFontCollection.GetCount() * 76 );
for ( sal_uInt32 i = 0; i < maFontCollection.GetCount(); i++ )
{
@@ -531,7 +531,7 @@ bool PPTWriter::ImplCloseDocument()
}
mpStyleSheet->WriteTxCFStyleAtom( *mpStrm ); // create style that is used for new standard objects
mpPptEscherEx->AddAtom( 10, EPP_TxSIStyleAtom );
- mpStrm->WriteUInt32( (sal_uInt32)7 ) // ?
+ mpStrm->WriteUInt32( 7 ) // ?
.WriteInt16( 2 ) // ?
.WriteUChar( 9 ) // ?
.WriteUChar( 8 ) // ?
@@ -740,7 +740,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
rOut.WriteUInt32( nCharCount )
.WriteUInt16( nDepth ) // Level
- .WriteUInt32( (sal_uInt32)nPropertyFlags ); // Paragraph Attribut Set
+ .WriteUInt32( nPropertyFlags ); // Paragraph Attribut Set
if ( nPropertyFlags & 0xf )
rOut.WriteInt16( nBulletFlags );
@@ -968,7 +968,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
if ( nPropertyFlags & 0x00020000 )
rOut.WriteUInt16( ( rPortion.mnCharHeight ) );
if ( nPropertyFlags & 0x00040000 )
- rOut.WriteUInt32( (sal_uInt32)nCharColor );
+ rOut.WriteUInt32( nCharColor );
if ( nPropertyFlags & 0x00080000 )
rOut.WriteInt16( rPortion.mnCharEscapement );
}
@@ -1067,7 +1067,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
{
PPTExParaSheet& rParaSheet = mpStyleSheet->GetParaSheet( nTextInstance );
- rOut.WriteUInt32( (sal_uInt32)( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4 ) ) ).WriteUInt32( (sal_uInt32)4 )
+ rOut.WriteUInt32( ( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4 ) ) ).WriteUInt32( 4 )
.WriteInt32( nTextInstance );
if ( mbEmptyPresObj )
@@ -1087,12 +1087,12 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
sal_uInt32 nSize, nPos = rOut.Tell();
- rOut.WriteUInt32( (sal_uInt32)( EPP_StyleTextPropAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 );
+ rOut.WriteUInt32( ( EPP_StyleTextPropAtom << 16 ) ).WriteUInt32( 0 );
ImplWriteParagraphs( rOut, aTextObj );
ImplWritePortions( rOut, aTextObj );
nSize = rOut.Tell() - nPos;
rOut.SeekRel( - ( (sal_Int32)nSize - 4 ) );
- rOut.WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ rOut.WriteUInt32( ( nSize - 8 ) );
rOut.SeekRel( nSize - 8 );
for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount(); ++i )
@@ -1110,16 +1110,16 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
case 1 :
case 2 :
{
- rOut.WriteUInt32( (sal_uInt32)( EPP_DateTimeMCAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 )
- .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) ) // TxtOffset to TxtField;
+ rOut.WriteUInt32( ( EPP_DateTimeMCAtom << 16 ) ).WriteUInt32( 8 )
+ .WriteUInt32( ( pFieldEntry->nFieldStartPos ) ) // TxtOffset to TxtField;
.WriteUChar( ( pFieldEntry->nFieldType & 0xff ) ) // Type
.WriteUChar( 0 ).WriteUInt16( 0 ); // PadBytes
}
break;
case 3 :
{
- rOut.WriteUInt32( (sal_uInt32)( EPP_SlideNumberMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 )
- .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) );
+ rOut.WriteUInt32( ( EPP_SlideNumberMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 )
+ .WriteUInt32( ( pFieldEntry->nFieldStartPos ) );
}
break;
case 4 :
@@ -1162,9 +1162,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
else
nHyperId = ImplInsertBookmarkURL( pFieldEntry->aFieldUrl, 2 | ( nHyperId << 8 ), aFile, aTarget, "", "" );
- rOut.WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)24 )
- .WriteUInt32( (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)16 )
- .WriteUInt32( (sal_uInt32)0 ) // soundref
+ rOut.WriteUInt32( ( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( 24 )
+ .WriteUInt32( ( EPP_InteractiveInfoAtom << 16 ) ).WriteUInt32( 16 )
+ .WriteUInt32( 0 ) // soundref
.WriteUInt32( nHyperId ) // hyperlink id
.WriteUChar( 4 ) // hyperlink action
.WriteUChar( 0 ) // ole verb
@@ -1172,27 +1172,27 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
.WriteUChar( 0 ) // flags
.WriteUChar( 8 ) // hyperlink type ?
.WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 )
- .WriteUInt32( (sal_uInt32)( EPP_TxInteractiveInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 )
- .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) )
- .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldEndPos ) );
+ .WriteUInt32( ( EPP_TxInteractiveInfoAtom << 16 ) ).WriteUInt32( 8 )
+ .WriteUInt32( ( pFieldEntry->nFieldStartPos ) )
+ .WriteUInt32( ( pFieldEntry->nFieldEndPos ) );
}
break;
case 5 :
{
- rOut.WriteUInt32( (sal_uInt32)( EPP_GenericDateMCAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 )
- .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) );
+ rOut.WriteUInt32( ( EPP_GenericDateMCAtom << 16 ) ).WriteUInt32( 4 )
+ .WriteUInt32( ( pFieldEntry->nFieldStartPos ) );
}
break;
case 6 :
{
- rOut.WriteUInt32( (sal_uInt32)( EPP_HeaderMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 )
- .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) );
+ rOut.WriteUInt32( ( EPP_HeaderMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 )
+ .WriteUInt32( ( pFieldEntry->nFieldStartPos ) );
}
break;
case 7 :
{
- rOut.WriteUInt32( (sal_uInt32)( EPP_FooterMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 )
- .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) );
+ rOut.WriteUInt32( ( EPP_FooterMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 )
+ .WriteUInt32( ( pFieldEntry->nFieldStartPos ) );
}
break;
default:
@@ -1272,7 +1272,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
pRuleOut = pTextRule->pOut = new SvMemoryStream( 0x100, 0x100 );
sal_uInt32 nRulePos = pRuleOut->Tell();
- pRuleOut->WriteUInt32( (sal_uInt32)( EPP_TextRulerAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 );
+ pRuleOut->WriteUInt32( ( EPP_TextRulerAtom << 16 ) ).WriteUInt32( 0 );
pRuleOut->WriteUInt32( nTextRulerAtomFlags );
if ( nTextRulerAtomFlags & 4 )
{
@@ -1310,7 +1310,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
}
sal_uInt32 nBufSize = pRuleOut->Tell() - nRulePos;
pRuleOut->SeekRel( - ( (sal_Int32)nBufSize - 4 ) );
- pRuleOut->WriteUInt32( (sal_uInt32)( nBufSize - 8 ) );
+ pRuleOut->WriteUInt32( ( nBufSize - 8 ) );
pRuleOut->SeekRel( nBufSize - 8 );
}
}
@@ -1320,7 +1320,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
{
sal_uInt32 nNumberingType = 0, nPos2 = rExtBuStr.Tell();
- rExtBuStr.WriteUInt32( (sal_uInt32)( EPP_PST_ExtendedParagraphAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 );
+ rExtBuStr.WriteUInt32( ( EPP_PST_ExtendedParagraphAtom << 16 ) ).WriteUInt32( 0 );
for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount(); ++i )
{
@@ -1334,7 +1334,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
if ( pBulletPara->nNumberingType != SVX_NUM_BITMAP )
nBulletFlags = 0x3000000;
}
- rExtBuStr.WriteUInt32( (sal_uInt32)nBulletFlags );
+ rExtBuStr.WriteUInt32( nBulletFlags );
if ( nBulletFlags & 0x800000 )
rExtBuStr.WriteUInt16( nBulletId );
@@ -1366,11 +1366,11 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
break;
}
- rExtBuStr.WriteUInt32( (sal_uInt32)nNumberingType );
+ rExtBuStr.WriteUInt32( nNumberingType );
}
if ( nBulletFlags & 0x2000000 )
rExtBuStr.WriteUInt16( pBulletPara->nStartWith );
- rExtBuStr.WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 );
+ rExtBuStr.WriteUInt32( 0 ).WriteUInt32( 0 );
}
sal_uInt32 nBulletSize = ( rExtBuStr.Tell() - nPos2 ) - 8;
rExtBuStr.SeekRel( - ( (sal_Int32)nBulletSize + 4 ) );
@@ -2033,27 +2033,27 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
sal_uInt32 nContainerSize = 24;
if ( nAction == 2 )
nContainerSize += ( aFile.getLength() * 2 ) + 8;
- rSt.WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)nContainerSize )
- .WriteUInt32( (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)16 )
+ rSt.WriteUInt32( ( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( nContainerSize )
+ .WriteUInt32( ( EPP_InteractiveInfoAtom << 16 ) ).WriteUInt32( 16 )
.WriteUInt32( nSoundRef )
.WriteUInt32( nHyperLinkID )
.WriteUChar( nAction )
.WriteUChar( nOleVerb )
.WriteUChar( nJump )
.WriteUChar( nFlags )
- .WriteUInt32( (sal_uInt32)nHyperLinkType );
+ .WriteUInt32( nHyperLinkType );
if ( nAction == 2 ) // run program Action
{
sal_Int32 nLen = aFile.getLength();
- rSt.WriteUInt32( (sal_uInt32)( ( EPP_CString << 16 ) | 0x20 ) ).WriteUInt32( (sal_uInt32)( nLen * 2 ) );
+ rSt.WriteUInt32( ( ( EPP_CString << 16 ) | 0x20 ) ).WriteUInt32( ( nLen * 2 ) );
for ( sal_Int32 i = 0; i < nLen; i++ )
rSt.WriteUInt16( aFile[i] );
}
- rSt.WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0x1f ) ).WriteUInt32( (sal_uInt32)24 ) // Mouse Over Action
- .WriteUInt32( (sal_uInt32)( EPP_InteractiveInfo << 16 ) ).WriteUInt32( (sal_uInt32)16 );
- for ( int i = 0; i < 4; i++, rSt.WriteUInt32( (sal_uInt32)0 ) ) ;
+ rSt.WriteUInt32( ( ( EPP_InteractiveInfo << 16 ) | 0x1f ) ).WriteUInt32( 24 ) // Mouse Over Action
+ .WriteUInt32( ( EPP_InteractiveInfo << 16 ) ).WriteUInt32( 16 );
+ for ( int i = 0; i < 4; i++, rSt.WriteUInt32( 0 ) ) ;
}
bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet,
@@ -2115,7 +2115,7 @@ bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, const
mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // oben, links, rechts, unten ????
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
- mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID
+ mpStrm->WriteUInt32( 0 ) // PlacementID
.WriteUChar( nPlaceHolderId ) // PlaceHolderID
.WriteUChar( 0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
.WriteUInt16( 0 ); // padword
@@ -2123,8 +2123,8 @@ bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, const
if ( aClientTextBox.Tell() )
{
- mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
- .WriteUInt32( (sal_uInt32)aClientTextBox.Tell() );
+ mpStrm->WriteUInt32( ( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
+ .WriteUInt32( aClientTextBox.Tell() );
mpStrm->Write( aClientTextBox.GetData(), aClientTextBox.Tell() );
}
@@ -2471,8 +2471,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
catch( ::com::sun::star::uno::Exception& )
{}
- mpExEmbed->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ExControl << 16 ) ) )
- .WriteUInt32( (sal_uInt32)0 ); // Size of this container
+ mpExEmbed->WriteUInt32( ( 0xf | ( EPP_ExControl << 16 ) ) )
+ .WriteUInt32( 0 ); // Size of this container
sal_uInt32 nSize, nOldPos = mpExEmbed->Tell();
@@ -2481,8 +2481,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
nPageId |= 0x80000000;
else
nPageId += 0x100;
- mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_ExControlAtom << 16 ) )
- .WriteUInt32( (sal_uInt32)4 )
+ mpExEmbed->WriteUInt32( ( EPP_ExControlAtom << 16 ) )
+ .WriteUInt32( 4 )
.WriteUInt32( nPageId );
PPTExOleObjEntry* pEntry = new PPTExOleObjEntry( OCX_CONTROL, mpExEmbed->Tell() );
pEntry->xControlModel = aXControlModel;
@@ -2491,14 +2491,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mnExEmbed++;
- mpExEmbed->WriteUInt32( (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) ) )
- .WriteUInt32( (sal_uInt32)24 )
- .WriteUInt32( (sal_uInt32)nAspect )
- .WriteUInt32( (sal_uInt32)2 )
- .WriteUInt32( (sal_uInt32)mnExEmbed )
- .WriteUInt32( (sal_uInt32)0 )
- .WriteUInt32( (sal_uInt32)4 ) // index to the persist table
- .WriteUInt32( (sal_uInt32)0x0012de00 );
+ mpExEmbed->WriteUInt32( ( 1 | ( EPP_ExOleObjAtom << 16 ) ) )
+ .WriteUInt32( 24 )
+ .WriteUInt32( nAspect )
+ .WriteUInt32( 2 )
+ .WriteUInt32( mnExEmbed )
+ .WriteUInt32( 0 )
+ .WriteUInt32( 4 ) // index to the persist table
+ .WriteUInt32( 0x0012de00 );
::com::sun::star::awt::Size aSize;
OUString aControlName;
@@ -2813,14 +2813,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mpStrm->WriteInt16( maRect.Top() ).WriteInt16( maRect.Left() ).WriteInt16( maRect.Right() ).WriteInt16( maRect.Bottom() ); // top, left, right, bottom ????
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
- mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID
+ mpStrm->WriteUInt32( 0 ) // PlacementID
.WriteUChar( EPP_PLACEHOLDER_MASTERTITLE ) // PlaceHolderID
.WriteUChar( 0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
.WriteUInt16( 0 ); // padword
mpPptEscherEx->CloseContainer(); // ESCHER_ClientData
mpPptEscherEx->OpenContainer( ESCHER_ClientTextbox );
mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom );
- mpStrm->WriteUInt32( (sal_uInt32)EPP_TEXTTYPE_Title );
+ mpStrm->WriteUInt32( EPP_TEXTTYPE_Title );
mpPptEscherEx->AddAtom( mnTextSize << 1, EPP_TextCharsAtom );
const sal_Unicode* pString = aUString.getStr();
for ( sal_uInt32 i = 0; i < mnTextSize; i++ )
@@ -2831,9 +2831,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mpStrm->WriteUInt16( nChar );
}
mpPptEscherEx->AddAtom( 6, EPP_BaseTextPropAtom );
- mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt16( 0 );
+ mpStrm->WriteUInt32( ( mnTextSize + 1 ) ).WriteUInt16( 0 );
mpPptEscherEx->AddAtom( 10, EPP_TextSpecInfoAtom );
- mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( 0 );
+ mpStrm->WriteUInt32( ( mnTextSize + 1 ) ).WriteUInt32( 1 ).WriteUInt16( 0 );
mpPptEscherEx->CloseContainer(); // ESCHER_ClientTextBox
mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer
}
@@ -2906,7 +2906,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
sal_uInt8 PlaceHolderID = ( mType == "presentation.Subtitle") ? EPP_PLACEHOLDER_MASTERSUBTITLE:EPP_PLACEHOLDER_MASTERBODY;
- mpStrm->WriteUInt32( (sal_uInt32)1 ) // PlacementID
+ mpStrm->WriteUInt32( 1 ) // PlacementID
.WriteUChar( PlaceHolderID )/*(sal_uInt8)EPP_PLACEHOLDER_MASTERBODY */ // PlaceHolderID
.WriteUChar( 0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
.WriteUInt16( 0 ); // padword
@@ -2914,9 +2914,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mpPptEscherEx->OpenContainer( ESCHER_ClientTextbox ); // printf
mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom );
if ( mType == "presentation.Subtitle")
- mpStrm->WriteUInt32( (sal_uInt32)EPP_TEXTTYPE_CenterBody );
+ mpStrm->WriteUInt32( EPP_TEXTTYPE_CenterBody );
else
- mpStrm->WriteUInt32( (sal_uInt32)EPP_TEXTTYPE_Body );
+ mpStrm->WriteUInt32( EPP_TEXTTYPE_Body );
mnTextSize = aTextObj.Count();
aTextObj.Write( mpStrm );
mpPptEscherEx->BeginAtom();
@@ -2933,7 +2933,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
mpPptEscherEx->EndAtom( EPP_BaseTextPropAtom );
mpPptEscherEx->AddAtom( 10, EPP_TextSpecInfoAtom );
- mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( 0 );
+ mpStrm->WriteUInt32( ( mnTextSize ) ).WriteUInt32( 1 ).WriteUInt16( 0 );
mpPptEscherEx->CloseContainer(); // ESCHER_ClientTextBox
mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer
@@ -3006,14 +3006,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
else
{
- mpExEmbed->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ExEmbed << 16 ) ) )
- .WriteUInt32( (sal_uInt32)0 ); // Size of this container
+ mpExEmbed->WriteUInt32( ( 0xf | ( EPP_ExEmbed << 16 ) ) )
+ .WriteUInt32( 0 ); // Size of this container
sal_uInt32 nSize, nOldPos = mpExEmbed->Tell();
- mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_ExEmbedAtom << 16 ) )
- .WriteUInt32( (sal_uInt32)8 )
- .WriteUInt32( (sal_uInt32)0 ) // follow colorscheme : 0->do not follow
+ mpExEmbed->WriteUInt32( ( EPP_ExEmbedAtom << 16 ) )
+ .WriteUInt32( 8 )
+ .WriteUInt32( 0 ) // follow colorscheme : 0->do not follow
// 1->follow collorscheme
// 2->follow text and background scheme
.WriteUChar( 1 ) // (bool)set if embedded server can not be locked
@@ -3038,14 +3038,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
catch( ::com::sun::star::uno::Exception& )
{}
- mpExEmbed->WriteUInt32( (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) ) )
- .WriteUInt32( (sal_uInt32)24 )
- .WriteUInt32( (sal_uInt32)nAspect ) // Aspect
- .WriteUInt32( (sal_uInt32)0 )
- .WriteUInt32( (sal_uInt32)mnExEmbed ) // index to the persist table
- .WriteUInt32( (sal_uInt32)0 ) // subtype
- .WriteUInt32( (sal_uInt32)0 )
- .WriteUInt32( (sal_uInt32)0x0012b600 );
+ mpExEmbed->WriteUInt32( ( 1 | ( EPP_ExOleObjAtom << 16 ) ) )
+ .WriteUInt32( 24 )
+ .WriteUInt32( nAspect ) // Aspect
+ .WriteUInt32( 0 )
+ .WriteUInt32( mnExEmbed ) // index to the persist table
+ .WriteUInt32( 0 ) // subtype
+ .WriteUInt32( 0 )
+ .WriteUInt32( 0x0012b600 );
nSize = mpExEmbed->Tell() - nOldPos;
mpExEmbed->Seek( nOldPos - 4 );
@@ -3137,25 +3137,25 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mpExEmbed->WriteUInt16( 0xf )
.WriteUInt16( EPP_ExMCIMovie ) // PPT_PST_ExAviMovie
- .WriteUInt32( (sal_uInt32)0 );
+ .WriteUInt32( 0 );
sal_uInt32 nSize, nStart = mpExEmbed->Tell();
mpExEmbed->WriteUInt16( 0 )
.WriteUInt16( EPP_ExObjRefAtom )
- .WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( 4 )
.WriteUInt32( nRefId );
mpExEmbed->WriteUInt16( 0xf )
.WriteUInt16( EPP_ExVideo )
- .WriteUInt32( (sal_uInt32)0 );
+ .WriteUInt32( 0 );
mpExEmbed->WriteUInt16( 0 )
.WriteUInt16( EPP_ExMediaAtom )
- .WriteUInt32( (sal_uInt32)8 )
+ .WriteUInt32( 8 )
.WriteUInt32( nRefId )
.WriteUInt16( 0 )
.WriteUInt16( 0x435 );
sal_uInt16 i, nStringLen = (sal_uInt16)aMediaURL.getLength();
- mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)( nStringLen * 2 ) );
+ mpExEmbed->WriteUInt32( ( EPP_CString << 16 ) ).WriteUInt32( ( nStringLen * 2 ) );
for ( i = 0; i < nStringLen; i++ )
{
sal_Unicode nChar = aMediaURL[ i ];
@@ -3173,20 +3173,20 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
pClientData = new SvMemoryStream( 0x200, 0x200 );
pClientData->WriteUInt16( 0 )
.WriteUInt16( EPP_ExObjRefAtom )
- .WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( 4 )
.WriteUInt32( nRefId );
// write EPP_InteractiveInfo container for no_action
- pClientData->WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)24 );
+ pClientData->WriteUInt32( ( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( 24 );
pClientData->WriteUInt16( 0 )
.WriteUInt16( EPP_InteractiveInfoAtom )
- .WriteUInt32( (sal_uInt32)16 )
- .WriteUInt32( (sal_uInt32) 0 )
- .WriteUInt32( (sal_uInt32) 0 )
+ .WriteUInt32( 16 )
+ .WriteUInt32( 0 )
+ .WriteUInt32( 0 )
.WriteUChar( 6 )
.WriteUChar( 0 )
.WriteUChar( 0 )
.WriteUChar( 0 )
- .WriteUInt32( (sal_uInt32) 0 );
+ .WriteUInt32( 0 );
}
}
}
@@ -3248,7 +3248,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( !pClientData )
pClientData = new SvMemoryStream( 0x200, 0x200 );
- pClientData->WriteUInt32( (sal_uInt32)( EPP_OEPlaceholderAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 )
+ pClientData->WriteUInt32( ( EPP_OEPlaceholderAtom << 16 ) ).WriteUInt32( 8 )
.WriteInt32( nPlacementID ) // PlacementID
.WriteUChar( nPlaceHolderAtom ) // PlaceHolderID
.WriteUChar( 0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
@@ -3259,7 +3259,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( !pClientData )
pClientData = new SvMemoryStream( 0x200, 0x200 );
- pClientData->WriteUInt32( (sal_uInt32)( EPP_ExObjRefAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 )
+ pClientData->WriteUInt32( ( EPP_ExObjRefAtom << 16 ) ).WriteUInt32( 4 )
.WriteUInt32( nOlePictureId );
nOlePictureId = 0;
}
@@ -3367,8 +3367,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( !pClientTextBox )
pClientTextBox = new SvMemoryStream( 12 );
- pClientTextBox->WriteUInt32( (sal_uInt32)( EPP_TextHeaderAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 )
- .WriteUInt32( (sal_uInt32)7 );
+ pClientTextBox->WriteUInt32( ( EPP_TextHeaderAtom << 16 ) ).WriteUInt32( 4 )
+ .WriteUInt32( 7 );
}
}
}
@@ -3386,16 +3386,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( pClientData )
{
- mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) )
- .WriteUInt32( (sal_uInt32)pClientData->Tell() );
+ mpStrm->WriteUInt32( ( ( ESCHER_ClientData << 16 ) | 0xf ) )
+ .WriteUInt32( pClientData->Tell() );
mpStrm->Write( pClientData->GetData(), pClientData->Tell() );
delete pClientData, pClientData = NULL;
}
if ( pClientTextBox )
{
- mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
- .WriteUInt32( (sal_uInt32)pClientTextBox->Tell() );
+ mpStrm->WriteUInt32( ( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
+ .WriteUInt32( pClientTextBox->Tell() );
mpStrm->Write( pClientTextBox->GetData(), pClientTextBox->Tell() );
delete pClientTextBox, pClientTextBox = NULL;
@@ -3459,8 +3459,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
mpPptEscherEx->AddClientAnchor( maRect );
- mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
- .WriteUInt32( (sal_uInt32)pClientTextBox->Tell() );
+ mpStrm->WriteUInt32( ( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
+ .WriteUInt32( pClientTextBox->Tell() );
mpStrm->Write( pClientTextBox->GetData(), pClientTextBox->Tell() );
delete pClientTextBox, pClientTextBox = NULL;
@@ -3561,8 +3561,8 @@ void PPTWriter::WriteCString( SvStream& rSt, const OUString& rString, sal_uInt32
sal_Int32 nLen = rString.getLength();
if ( nLen )
{
- rSt.WriteUInt32( (sal_uInt32)( ( nInstance << 4 ) | ( EPP_CString << 16 ) ) )
- .WriteUInt32( (sal_uInt32)( nLen << 1 ) );
+ rSt.WriteUInt32( ( ( nInstance << 4 ) | ( EPP_CString << 16 ) ) )
+ .WriteUInt32( ( nLen << 1 ) );
for ( sal_Int32 i = 0; i < nLen; i++ )
rSt.WriteUInt16( rString[i] );
}
@@ -3692,8 +3692,8 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
{
SvMemoryStream* pClientData = new SvMemoryStream( 0x200, 0x200 );
ImplProgTagContainer( pClientData, &aExtBu );
- mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) )
- .WriteUInt32( (sal_uInt32)pClientData->Tell() );
+ mpStrm->WriteUInt32( ( ( ESCHER_ClientData << 16 ) | 0xf ) )
+ .WriteUInt32( pClientData->Tell() );
mpStrm->Write( pClientData->GetData(), pClientData->Tell() );
delete pClientData, pClientData = NULL;
@@ -3706,8 +3706,8 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
.WriteInt32( nRight )
.WriteInt32( nBottom );
- mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
- .WriteUInt32( (sal_uInt32)aClientTextBox.Tell() );
+ mpStrm->WriteUInt32( ( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
+ .WriteUInt32( aClientTextBox.Tell() );
mpStrm->Write( aClientTextBox.GetData(), aClientTextBox.Tell() );
mpPptEscherEx->CloseContainer();
@@ -3841,12 +3841,12 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
void TextObjBinary::Write( SvStream* pStrm )
{
sal_uInt32 nSize, nPos = pStrm->Tell();
- pStrm->WriteUInt32( (sal_uInt32)( EPP_TextCharsAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 );
+ pStrm->WriteUInt32( ( EPP_TextCharsAtom << 16 ) ).WriteUInt32( 0 );
for ( sal_uInt32 i = 0; i < ParagraphCount(); ++i )
GetParagraph(i)->Write( pStrm );
nSize = pStrm->Tell() - nPos;
pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
- pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ pStrm->WriteUInt32( ( nSize - 8 ) );
pStrm->SeekRel( nSize - 8 );
}
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index a796dd688daf..b2c36388eb94 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -34,8 +34,8 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize()
void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
{
sal_uInt32 nSize = DrawingGroupContainerSize();
- rSt.WriteUInt32( (sal_uInt32)( 0xf | ( 1035 << 16 ) ) ) // EPP_PPDrawingGroup
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ rSt.WriteUInt32( ( 0xf | ( 1035 << 16 ) ) ) // EPP_PPDrawingGroup
+ .WriteUInt32( ( nSize - 8 ) );
ImplWriteDggContainer( rSt );
}
@@ -57,8 +57,8 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt )
sal_uInt32 nSize = ImplDggContainerSize();
if ( nSize )
{
- rSt.WriteUInt32( (sal_uInt32)( 0xf | ( ESCHER_DggContainer << 16 ) ) )
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) );
+ rSt.WriteUInt32( ( 0xf | ( ESCHER_DggContainer << 16 ) ) )
+ .WriteUInt32( ( nSize - 8 ) );
mxGlobal->SetDggContainer();
mxGlobal->WriteDggAtom( rSt );
@@ -83,14 +83,14 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt )
sal_uInt32 nSize = ImplOptAtomSize();
if ( nSize )
{
- rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) )
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) )
- .WriteUInt16( ESCHER_Prop_fillColor ) .WriteUInt32( (sal_uInt32)0xffb800 )
- .WriteUInt16( ESCHER_Prop_fillBackColor ) .WriteUInt32( (sal_uInt32)0 )
- .WriteUInt16( ESCHER_Prop_fNoFillHitTest ) .WriteUInt32( (sal_uInt32)0x00100010 )
- .WriteUInt16( ESCHER_Prop_lineColor ) .WriteUInt32( (sal_uInt32)0x8000001 )
- .WriteUInt16( ESCHER_Prop_fNoLineDrawDash ) .WriteUInt32( (sal_uInt32)0x00080008 )
- .WriteUInt16( ESCHER_Prop_shadowColor ) .WriteUInt32( (sal_uInt32)0x8000002 );
+ rSt.WriteUInt32( ( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) )
+ .WriteUInt32( ( nSize - 8 ) )
+ .WriteUInt16( ESCHER_Prop_fillColor ) .WriteUInt32( 0xffb800 )
+ .WriteUInt16( ESCHER_Prop_fillBackColor ) .WriteUInt32( 0 )
+ .WriteUInt16( ESCHER_Prop_fNoFillHitTest ) .WriteUInt32( 0x00100010 )
+ .WriteUInt16( ESCHER_Prop_lineColor ) .WriteUInt32( 0x8000001 )
+ .WriteUInt16( ESCHER_Prop_fNoLineDrawDash ) .WriteUInt32( 0x00080008 )
+ .WriteUInt16( ESCHER_Prop_shadowColor ) .WriteUInt32( 0x8000002 );
}
}
@@ -109,12 +109,12 @@ void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt )
sal_uInt32 nSize = ImplSplitMenuColorsAtomSize();
if ( nSize )
{
- rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) ) )
- .WriteUInt32( (sal_uInt32)( nSize - 8 ) )
- .WriteUInt32( (sal_uInt32)0x08000004 )
- .WriteUInt32( (sal_uInt32)0x08000001 )
- .WriteUInt32( (sal_uInt32)0x08000002 )
- .WriteUInt32( (sal_uInt32)0x100000f7 );
+ rSt.WriteUInt32( ( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) ) )
+ .WriteUInt32( ( nSize - 8 ) )
+ .WriteUInt32( 0x08000004 )
+ .WriteUInt32( 0x08000001 )
+ .WriteUInt32( 0x08000002 )
+ .WriteUInt32( 0x100000f7 );
}
}
@@ -125,7 +125,7 @@ PptEscherEx::~PptEscherEx()
void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance )
{
- mpOutStrm->WriteUInt16( ( ( nRecInstance << 4 ) | 0xf ) ).WriteUInt16( n_EscherContainer ).WriteUInt32( (sal_uInt32)0 );
+ mpOutStrm->WriteUInt16( ( ( nRecInstance << 4 ) | 0xf ) ).WriteUInt16( n_EscherContainer ).WriteUInt32( 0 );
mOffsets.push_back( mpOutStrm->Tell() - 4 );
mRecTypes.push_back( n_EscherContainer );
@@ -139,8 +139,8 @@ void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance
mnCurrentDg = mxGlobal->GenerateDrawingId();
AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg );
PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() );
- mpOutStrm->WriteUInt32( (sal_uInt32)0 ) // The number of shapes in this drawing
- .WriteUInt32( (sal_uInt32)0 ); // The last MSOSPID given to an SP in this DG
+ mpOutStrm->WriteUInt32( 0 ) // The number of shapes in this drawing
+ .WriteUInt32( 0 ); // The last MSOSPID given to an SP in this DG
}
}
break;
@@ -253,7 +253,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
sal_uInt32 nSize = pClientData->Tell();
if ( nSize )
{
- mpOutStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) )
+ mpOutStrm->WriteUInt32( ( ( ESCHER_ClientData << 16 ) | 0xf ) )
.WriteUInt32( nSize );
mpOutStrm->Write( pClientData->GetData(), nSize );
}
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index f9ed8b433d48..995a7566b905 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1798,7 +1798,7 @@ void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any a
if ( bCreate2b01Atom )
{
EscherExAtom a2b01Atom( rStrm, 0x2b01 );
- rStrm.WriteUInt32( (sal_uInt32)1 ); // ?
+ rStrm.WriteUInt32( 1 ); // ?
}
}
}
diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx
index 25b39a914eaa..74a81f3cff11 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.cxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.cxx
@@ -97,14 +97,14 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const
comphelper::getProcessComponentContext() );
// create SoundContainer
- rSt.WriteUInt32( (sal_uInt32)( ( EPP_Sound << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)( GetSize( nId ) - 8 ) );
+ rSt.WriteUInt32( ( ( EPP_Sound << 16 ) | 0xf ) ).WriteUInt32( ( GetSize( nId ) - 8 ) );
OUString aSoundName( ImplGetName() );
sal_Int32 i, nSoundNameLen = aSoundName.getLength();
if ( nSoundNameLen )
{
// name of sound ( instance 0 )
- rSt.WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)( nSoundNameLen * 2 ) );
+ rSt.WriteUInt32( ( EPP_CString << 16 ) ).WriteUInt32( ( nSoundNameLen * 2 ) );
for ( i = 0; i < nSoundNameLen; ++i )
rSt.WriteUInt16( aSoundName[i] );
}
@@ -113,18 +113,18 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const
if ( nExtensionLen )
{
// extension of sound ( instance 1 )
- rSt.WriteUInt32( (sal_uInt32)( ( EPP_CString << 16 ) | 16 ) ).WriteUInt32( (sal_uInt32)( nExtensionLen * 2 ) );
+ rSt.WriteUInt32( ( ( EPP_CString << 16 ) | 16 ) ).WriteUInt32( ( nExtensionLen * 2 ) );
for ( i = 0; i < nExtensionLen; ++i )
rSt.WriteUInt16( aExtension[i] );
}
// id of sound ( instance 2 )
OUString aId( OUString::number(nId ) );
sal_Int32 nIdLen = aId.getLength();
- rSt.WriteUInt32( (sal_uInt32)( ( EPP_CString << 16 ) | 32 ) ).WriteUInt32( (sal_uInt32)( nIdLen * 2 ) );
+ rSt.WriteUInt32( ( ( EPP_CString << 16 ) | 32 ) ).WriteUInt32( ( nIdLen * 2 ) );
for ( i = 0; i < nIdLen; ++i )
rSt.WriteUInt16( aId[i] );
- rSt.WriteUInt32( (sal_uInt32)( EPP_SoundData << 16 ) ).WriteUInt32( (sal_uInt32)( nFileSize ) );
+ rSt.WriteUInt32( ( EPP_SoundData << 16 ) ).WriteUInt32( ( nFileSize ) );
sal_uInt32 nBytesLeft = nFileSize;
SvStream* pSourceFile = ::utl::UcbStreamHelper::CreateStream( aSoundURL, STREAM_READ );
if ( pSourceFile )
@@ -198,10 +198,10 @@ void ExSoundCollection::Write( SvStream& rSt ) const
sal_uInt32 nSoundCount = maEntries.size();
// create SoundCollection Container
- rSt.WriteUInt16( 0xf ).WriteUInt16( EPP_SoundCollection ).WriteUInt32( (sal_uInt32)( GetSize() - 8 ) );
+ rSt.WriteUInt16( 0xf ).WriteUInt16( EPP_SoundCollection ).WriteUInt32( ( GetSize() - 8 ) );
// create SoundCollAtom ( reference to the next free SoundId );
- rSt.WriteUInt32( (sal_uInt32)( EPP_SoundCollAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 ).WriteUInt32( nSoundCount );
+ rSt.WriteUInt32( ( EPP_SoundCollAtom << 16 ) ).WriteUInt32( 4 ).WriteUInt32( nSoundCount );
boost::ptr_vector<ExSoundEntry>::const_iterator iter;
for ( iter = maEntries.begin(); iter != maEntries.end(); ++iter, ++i)
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 9152d9e99a0c..1961326007b4 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -324,18 +324,18 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, bool,
SvStream& rOut = rBuProv.aBuExMasterStream;
if ( !nLev )
{
- rOut.WriteUInt32( (sal_uInt32)( ( EPP_PST_ExtendedParagraphMasterAtom << 16 ) | ( mnInstance << 4 ) ) )
- .WriteUInt32( (sal_uInt32)( 5 * 16 + 2 ) )
+ rOut.WriteUInt32( ( ( EPP_PST_ExtendedParagraphMasterAtom << 16 ) | ( mnInstance << 4 ) ) )
+ .WriteUInt32( ( 5 * 16 + 2 ) )
.WriteUInt16( 5 ); // depth
}
sal_uInt16 nBulletId = rLev.mnBulletId;
if ( rLev.mnNumberingType != SVX_NUM_BITMAP )
nBulletId = 0xffff;
- rOut.WriteUInt32( (sal_uInt32)0x03800000 )
+ rOut.WriteUInt32( 0x03800000 )
.WriteUInt16( nBulletId )
- .WriteUInt32( (sal_uInt32)rLev.mnMappedNumType )
+ .WriteUInt32( rLev.mnMappedNumType )
.WriteUInt16( rLev.mnBulletStart )
- .WriteUInt32( (sal_uInt32)0 );
+ .WriteUInt32( 0 );
}
sal_uInt32 nParaFlags = 0x3ffdff;
@@ -483,7 +483,7 @@ void PPTExStyleSheet::WriteTxCFStyleAtom( SvStream& rSt )
sal_uInt32 nCharFlags = rCharStyle.mnFlags;
nCharFlags &= CharAttr_Italic | CharAttr_Bold | CharAttr_Underline | CharAttr_Shadow;
- rSt.WriteUInt32( (sal_uInt32)( EPP_TxCFStyleAtom << 16 ) ) // recordheader
+ rSt.WriteUInt32( ( EPP_TxCFStyleAtom << 16 ) ) // recordheader
.WriteUInt32( SizeOfTxCFStyleAtom() - 8 )
.WriteUInt16( ( 0x80 | nCharFlags ) )
.WriteUInt16( nFlags )
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-04 12:18:42 +0000