summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-01-08 08:48:26 +0200
committerMichael Stahl <mstahl@redhat.com>2014-01-10 13:26:24 +0000
commitb69864f3f8c9be2e1f28f4b422074d2040b084a0 (patch)
tree93d51bc91257472198beffccb92188ceee61667d /sd/source
parentde84529b55f5b295b089043a7119d6b0d8b92408 (diff)
re-write SvStream operator<< to non-overloaded methods
This is the actual re-write. Use a clang rewriter to rewrite SvStream::operator<< to methods like WriteuInt32. Note that the rewriter is not perfect, and I hand-tweaked the output. In particular, I had to adjust places doing things like (*this) << 1; Change-Id: I5923eda3f4ebaa8b452b6ef109e726e116235a2a Reviewed-on: https://gerrit.libreoffice.org/7342 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/sdiocmpt.cxx4
-rw-r--r--sd/source/filter/eppt/eppt.cxx316
-rw-r--r--sd/source/filter/eppt/epptso.cxx624
-rw-r--r--sd/source/filter/eppt/escherex.cxx68
-rw-r--r--sd/source/filter/eppt/pptexanimations.cxx124
-rw-r--r--sd/source/filter/eppt/pptexsoundcollection.cxx20
-rw-r--r--sd/source/filter/eppt/pptx-stylesheet.cxx90
-rw-r--r--sd/source/filter/eppt/pptx-text.cxx2
-rw-r--r--sd/source/filter/html/htmlex.cxx8
-rw-r--r--sd/source/filter/html/pubdlg.cxx38
-rw-r--r--sd/source/ui/dlg/morphdlg.cxx6
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx4
12 files changed, 652 insertions, 652 deletions
diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx
index 3fc5a737ff02..ce28ab43f854 100644
--- a/sd/source/core/sdiocmpt.cxx
+++ b/sd/source/core/sdiocmpt.cxx
@@ -46,7 +46,7 @@ void old_SdrDownCompat::Read()
void old_SdrDownCompat::Write()
{
- rStream << nSubRecSiz;
+ rStream.WriteUInt32( nSubRecSiz );
}
void old_SdrDownCompat::OpenSubRecord()
@@ -107,7 +107,7 @@ SdIOCompat::SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode, sal_uInt16 nVe
{
DBG_ASSERT(nVer != SDIOCOMPAT_VERSIONDONTKNOW,
"can´t write unknown version");
- rNewStream << nVersion;
+ rNewStream.WriteUInt16( nVersion );
}
else if (nNewMode == STREAM_READ)
{
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 3189a30ca3d0..3f06b1118075 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -168,12 +168,12 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Slide | nPageNum, mpStrm->Tell() );
mpPptEscherEx->OpenContainer( EPP_Slide );
mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
- *mpStrm << rLayout.nLayout;
+ mpStrm->WriteInt32( rLayout.nLayout );
mpStrm->Write( rLayout.nPlaceHolder, 8 ); // placeholderIDs (8 parts)
- *mpStrm << (sal_uInt32)(nMasterNum | 0x80000000)// master ID (equals 0x80000000 on a master page)
- << (sal_uInt32)nPageNum + 0x100 // notes ID (equals null if no notes are present)
- << nMode
- << (sal_uInt16)0; // padword
+ 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)
+ .WriteUInt16( nMode )
+ .WriteUInt16( (sal_uInt16)0 ); // padword
mnDiaMode = 0;
sal_Bool bVisible = sal_True;
@@ -262,13 +262,13 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
nSlideTime = *(sal_Int32*)aAny.getValue() << 10; // in ticks
mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom );
- *mpStrm << nSlideTime // standtime in ticks
- << nSoundRef
- << nDirection
- << nTransitionType
- << nBuildFlags
- << nSpeed
- << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0;
+ mpStrm->WriteInt32( nSlideTime ) // standtime in ticks
+ .WriteUInt32( nSoundRef )
+ .WriteUChar( nDirection )
+ .WriteUChar( nTransitionType )
+ .WriteUInt16( nBuildFlags )
+ .WriteUChar( nSpeed )
+ .WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 );
}
ImplCreateHeaderFooters( mXPagePropSet );
@@ -302,7 +302,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 << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
+ 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 );
SvMemoryStream aBinaryTagData10Atom;
ImplExportComments( mXDrawPage, aBinaryTagData10Atom );
@@ -316,12 +316,12 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
{
{
EscherExAtom aMagic2( aBinaryTagData10Atom, 0x2eeb );
- aBinaryTagData10Atom << (sal_uInt32)0x01c45df9
- << (sal_uInt32)0xe1471b30;
+ aBinaryTagData10Atom.WriteUInt32( (sal_uInt32)0x01c45df9 )
+ .WriteUInt32( (sal_uInt32)0xe1471b30 );
}
{
EscherExAtom aMagic( aBinaryTagData10Atom, 0x2b00 );
- aBinaryTagData10Atom << (sal_uInt32)0;
+ aBinaryTagData10Atom.WriteUInt32( (sal_uInt32)0 );
}
aBinaryTagData10Atom.Write( amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell() );
{
@@ -335,11 +335,11 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
{
EscherExAtom aCString( *mpStrm, EPP_CString );
- *mpStrm << (sal_uInt32)0x5f005f
- << (sal_uInt32)0x50005f
- << (sal_uInt32)0x540050
- << (sal_uInt16)0x31
- << (sal_uInt16)0x30;
+ mpStrm->WriteUInt32( (sal_uInt32)0x5f005f )
+ .WriteUInt32( (sal_uInt32)0x50005f )
+ .WriteUInt32( (sal_uInt32)0x540050 )
+ .WriteUInt16( (sal_uInt16)0x31 )
+ .WriteUInt16( (sal_uInt16)0x30 );
}
{
EscherExAtom aBinaryTagData( *mpStrm, EPP_BinaryTagData );
@@ -356,27 +356,27 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() );
mpPptEscherEx->OpenContainer( EPP_MainMaster );
mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
- *mpStrm << (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout -> title and body slide
- << (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 // placeholderID
- << (sal_uInt32)0 // master ID (equals null at a master page)
- << (sal_uInt32)0 // notes ID (equals null if no notes are present)
- << (sal_uInt16)0 // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
- << (sal_uInt16)0; // padword
+ mpStrm->WriteInt32( (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE ) // slide layout -> title and body slide
+ .WriteUChar( (sal_uInt8)1 ).WriteUChar( (sal_uInt8)2 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)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)
+ .WriteUInt16( (sal_uInt16)0 ) // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
+ .WriteUInt16( (sal_uInt16)0 ); // padword
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
+ 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 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- *mpStrm << (sal_uInt32)0xff0000 << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x00ffff << (sal_uInt32)0x0099ff << (sal_uInt32)0xffff00 << (sal_uInt32)0x0000ff << (sal_uInt32)0x969696;
+ 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 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- *mpStrm << (sal_uInt32)0xccffff << (sal_uInt32)0x000000 << (sal_uInt32)0x336666 << (sal_uInt32)0x008080 << (sal_uInt32)0x339933 << (sal_uInt32)0x000080 << (sal_uInt32)0xcc3300 << (sal_uInt32)0x66ccff;
+ 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 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x333333 << (sal_uInt32)0x000000 << (sal_uInt32)0xdddddd << (sal_uInt32)0x808080 << (sal_uInt32)0x4d4d4d << (sal_uInt32)0xeaeaea;
+ 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 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x66ccff << (sal_uInt32)0xff0000 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xc0c0c0;
+ 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 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xc0c0c0 << (sal_uInt32)0xff6600 << (sal_uInt32)0x0000ff << (sal_uInt32)0x009900;
+ 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 );
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
- *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xff9933 << (sal_uInt32)0xccff99 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xb2b2b2;
+ 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 );
for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
{
@@ -394,7 +394,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
sal_Bool bFirst = sal_True;
sal_Bool bSimpleText = sal_False;
- *mpStrm << (sal_uInt16)5; // paragraph count
+ mpStrm->WriteUInt16( (sal_uInt16)5 ); // paragraph count
for ( sal_uInt16 nLev = 0; nLev < 5; nLev++ )
{
@@ -402,7 +402,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
{
bFirst = sal_False;
bSimpleText = sal_True;
- *mpStrm << nLev;
+ mpStrm->WriteUInt16( nLev );
}
mpStyleSheet->mpParaSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
mpStyleSheet->mpCharSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
@@ -428,7 +428,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 << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
+ 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 );
if ( aBuExMasterStream.Tell() )
{
@@ -469,22 +469,22 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream()
sal_uInt32 nLenOfUserName = strlen( pUserName );
sal_uInt32 nSizeOfRecord = 0x14 + ( ( nLenOfUserName + 4 ) & ~ 3 );
- *mpCurUserStrm << (sal_uInt16)0 << (sal_uInt16)EPP_CurrentUserAtom << nSizeOfRecord;
- *mpCurUserStrm << (sal_uInt32)0x14 // Len
- << (sal_uInt32)0xe391c05f; // Magic
+ mpCurUserStrm->WriteUInt16( (sal_uInt16)0 ).WriteUInt16( (sal_uInt16)EPP_CurrentUserAtom ).WriteUInt32( nSizeOfRecord );
+ mpCurUserStrm->WriteUInt32( (sal_uInt32)0x14 ) // Len
+ .WriteUInt32( (sal_uInt32)0xe391c05f ); // Magic
sal_uInt32 nEditPos = mpCurUserStrm->Tell();
- *mpCurUserStrm << (sal_uInt32)0x0 // OffsetToCurrentEdit;
- << (sal_uInt16)nLenOfUserName //
- << (sal_uInt16)0x3f4 // DocFileVersion
- << (sal_uInt8)3 // MajorVersion
- << (sal_uInt8)0 // MinorVersion
- << (sal_uInt16)0; // Pad Word
+ mpCurUserStrm->WriteUInt32( (sal_uInt32)0x0 ) // OffsetToCurrentEdit;
+ .WriteUInt16( (sal_uInt16)nLenOfUserName ) //
+ .WriteUInt16( (sal_uInt16)0x3f4 ) // DocFileVersion
+ .WriteUChar( (sal_uInt8)3 ) // MajorVersion
+ .WriteUChar( (sal_uInt8)0 ) // MinorVersion
+ .WriteUInt16( (sal_uInt16)0 ); // Pad Word
pUserName[ nLenOfUserName ] = 8;
mpCurUserStrm->Write( pUserName, nLenOfUserName + 1 );
for ( sal_uInt32 i = 0x15 + nLenOfUserName; i < nSizeOfRecord; i++ )
{
- *mpCurUserStrm << (sal_uInt8)0; // pad bytes
+ mpCurUserStrm->WriteUChar( (sal_uInt8)0 ); // pad bytes
};
mpCurUserStrm->Seek( nEditPos );
return sal_True;
@@ -549,11 +549,11 @@ void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sa
{
if ( rSt.Tell() )
{
- aBuExOutlineStream << (sal_uInt32)( ( EPP_PST_ExtendedParagraphHeaderAtom << 16 )
- | ( nRef << 4 ) )
- << (sal_uInt32)8
- << (sal_uInt32)nSlideId
- << (sal_uInt32)nInstance;
+ aBuExOutlineStream.WriteUInt32( (sal_uInt32)( ( EPP_PST_ExtendedParagraphHeaderAtom << 16 )
+ | ( nRef << 4 ) ) )
+ .WriteUInt32( (sal_uInt32)8 )
+ .WriteUInt32( (sal_uInt32)nSlideId )
+ .WriteUInt32( (sal_uInt32)nInstance );
aBuExOutlineStream.Write( rSt.GetData(), rSt.Tell() );
}
}
@@ -662,7 +662,7 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com
mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 0 );
mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom );
- *mpStrm << nVal;
+ mpStrm->WriteUInt32( nVal );
ImplCreateHeaderFooterStrings( *mpStrm, rXPagePropSet );
mpPptEscherEx->CloseContainer();
}
@@ -690,32 +690,32 @@ sal_Bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->OpenContainer( EPP_Document );
// CREATE DOCUMENT ATOM
mpPptEscherEx->AddAtom( 40, EPP_DocumentAtom, 1 );
- *mpStrm << nWidth // Slide Size in Master coordinates X
- << nHeight // " " " " " Y
- << (sal_Int32)maNotesPageSize.Width // Notes Page Size X
- << (sal_Int32)maNotesPageSize.Height // " " " Y
- << (sal_Int32)1 << (sal_Int32)2; // the scale used when the Powerpoint document is embedded. the default is 1:2
+ mpStrm->WriteUInt32( nWidth ) // Slide Size in Master coordinates X
+ .WriteUInt32( nHeight ) // " " " " " Y
+ .WriteInt32( (sal_Int32)maNotesPageSize.Width ) // Notes Page Size X
+ .WriteInt32( (sal_Int32)maNotesPageSize.Height ) // " " " Y
+ .WriteInt32( (sal_Int32)1 ).WriteInt32( (sal_Int32)2 ); // the scale used when the Powerpoint document is embedded. the default is 1:2
mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, mpStrm->Tell() );
- *mpStrm << (sal_uInt32)0 // Reference to NotesMaster ( 0 if none );
- << (sal_uInt32)0 // Reference to HandoutMaster ( 0 if none );
- << (sal_Int16)1 // Number of the first slide;
- << nSlideType // Size of the document slides ( default: EPP_SLIDESIZETYPEONSCREEN )
- << (sal_uInt8)0 // bool1 indicates if document was saved with embedded true type fonts
- << (sal_uInt8)0 // bool1 indicates if the placeholders on the title slide are omitted
- << (sal_uInt8)0 // bool1 right to left ( flag for Bidi version )
- << (sal_uInt8)1; // bool1 visibility of comments shapes
+ mpStrm->WriteUInt32( (sal_uInt32)0 ) // Reference to NotesMaster ( 0 if none );
+ .WriteUInt32( (sal_uInt32)0 ) // Reference to HandoutMaster ( 0 if none );
+ .WriteInt16( (sal_Int16)1 ) // Number of the first slide;
+ .WriteUInt16( nSlideType ) // Size of the document slides ( default: EPP_SLIDESIZETYPEONSCREEN )
+ .WriteUChar( (sal_uInt8)0 ) // bool1 indicates if document was saved with embedded true type fonts
+ .WriteUChar( (sal_uInt8)0 ) // bool1 indicates if the placeholders on the title slide are omitted
+ .WriteUChar( (sal_uInt8)0 ) // bool1 right to left ( flag for Bidi version )
+ .WriteUChar( (sal_uInt8)1 ); // bool1 visibility of comments shapes
mpPptEscherEx->PtInsert( EPP_Persist_Document, mpStrm->Tell() );
mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 3 ); //Master footer (default)
mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom );
- *mpStrm << (sal_uInt32)0x25000d;
+ mpStrm->WriteUInt32( (sal_uInt32)0x25000d );
if ( GetPageByIndex( 0, MASTER ) )
ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet );
mpPptEscherEx->CloseContainer();
mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 4 ); //NotesMaster footer (default)
mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom );
- *mpStrm << (sal_uInt32)0x3d000d;
+ mpStrm->WriteUInt32( (sal_uInt32)0x3d000d );
if ( GetPageByIndex( 0, NOTICE ) )
ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet );
mpPptEscherEx->CloseContainer();
@@ -726,11 +726,11 @@ sal_Bool PPTWriter::ImplCreateDocument()
{
mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom );
mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() );
- *mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY )
- << (sal_uInt32)4 // flags - only bit 3 used, if set then slide contains shapes other than placeholders
- << (sal_Int32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
- << (sal_Int32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example
- << (sal_uInt32)0; // reserved, usualy 0
+ 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
+ .WriteInt32( (sal_Int32)0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
+ .WriteInt32( (sal_Int32)i + 0x100 ) // slideId - Unique slide identifier, used for OLE link monikers for example
+ .WriteUInt32( (sal_uInt32)0 ); // reserved, usualy 0
if ( !GetPageByIndex( i, NORMAL ) ) // very exciting: once again through all pages
return sal_False;
@@ -751,11 +751,11 @@ sal_Bool PPTWriter::ImplCreateDocument()
{
mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom );
mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, mpStrm->Tell() );
- *mpStrm << (sal_uInt32)0
- << (sal_uInt32)4
- << (sal_Int32)0
- << (sal_Int32)i + 0x100
- << (sal_uInt32)0;
+ mpStrm->WriteUInt32( (sal_uInt32)0 )
+ .WriteUInt32( (sal_uInt32)4 )
+ .WriteInt32( (sal_Int32)0 )
+ .WriteInt32( (sal_Int32)i + 0x100 )
+ .WriteUInt32( (sal_uInt32)0 );
}
mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText
@@ -836,7 +836,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
}
mpPptEscherEx->AddAtom( 80, EPP_SSDocInfoAtom, 1 );
- *mpStrm << nPenColor << nRestartTime << nStartSlide << nEndSlide;
+ mpStrm->WriteUInt32( nPenColor ).WriteInt32( nRestartTime ).WriteInt16( nStartSlide ).WriteInt16( nEndSlide );
sal_uInt32 nCustomShowNameLen = aCustomShow.getLength();
if ( nCustomShowNameLen > 31 )
@@ -846,12 +846,12 @@ sal_Bool PPTWriter::ImplCreateDocument()
const sal_Unicode* pCustomShow = aCustomShow.getStr();
for ( i = 0; i < nCustomShowNameLen; i++ )
{
- *mpStrm << (sal_uInt16)( pCustomShow[ i ] );
+ mpStrm->WriteUInt16( (sal_uInt16)( pCustomShow[ i ] ) );
}
}
- for ( i = nCustomShowNameLen; i < 32; i++, *mpStrm << (sal_uInt16)0 ) ;
+ for ( i = nCustomShowNameLen; i < 32; i++, mpStrm->WriteUInt16( (sal_uInt16)0 ) ) ;
- *mpStrm << nFlags;
+ mpStrm->WriteUInt32( nFlags );
::com::sun::star::uno::Reference< ::com::sun::star::presentation::XCustomPresentationSupplier >
aXCPSup( mXModel, ::com::sun::star::uno::UNO_QUERY );
if ( aXCPSup.is() )
@@ -878,7 +878,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
nNamedShowLen = 31;
mpPptEscherEx->AddAtom( nNamedShowLen << 1, EPP_CString );
const sal_Unicode* pCustomShowName = pUString[ i ].getStr();
- for ( sal_uInt32 k = 0; k < nNamedShowLen; *mpStrm << (sal_uInt16)( pCustomShowName[ k++ ] ) ) ;
+ for ( sal_uInt32 k = 0; k < nNamedShowLen; mpStrm->WriteUInt16( (sal_uInt16)( pCustomShowName[ k++ ] ) ) ) ;
mAny = aXCont->getByName( pUString[ i ] );
if ( mAny.getValue() )
{
@@ -910,7 +910,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
if (pIter != maSlideNameList.end())
{
sal_uInt32 nPageNumber = pIter - maSlideNameList.begin();
- *mpStrm << (sal_uInt32)( nPageNumber + 0x100 ); // unique slide id
+ mpStrm->WriteUInt32( (sal_uInt32)( nPageNumber + 0x100 ) ); // unique slide id
}
}
}
@@ -941,18 +941,18 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
sal_uInt32 nCurrentOfs, nParaOfs, nParaCount = 0;
nParaOfs = rStrm.Tell();
- rStrm << (sal_uInt32)0; // property size
- rStrm << (sal_uInt32)0; // property count
+ rStrm.WriteUInt32( (sal_uInt32)0 ); // property size
+ rStrm.WriteUInt32( (sal_uInt32)0 ); // property count
for ( std::vector<EPPTHyperlink>::const_iterator pIter = maHyperlink.begin(); pIter != maHyperlink.end(); ++pIter )
{
nParaCount += 6;
- rStrm << (sal_uInt32)3 // Type VT_I4
- << (sal_uInt32)7 // (VTI4 - Private1)
- << (sal_uInt32)3 // Type VT_I4
- << (sal_uInt32)6 // (VTI4 - Private2)
- << (sal_uInt32)3 // Type VT_I4
- << (sal_uInt32)0; // (VTI4 - Private3)
+ 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)
// INFO
// HIWORD: = 0 : do not change anything
@@ -973,46 +973,46 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
sal_uInt32 nInfo = 7;
- rStrm << (sal_uInt32)3 // Type VT_I4
- << nInfo; // Info
+ rStrm .WriteUInt32( (sal_uInt32)3 ) // Type VT_I4
+ .WriteUInt32( nInfo ); // Info
switch( pIter->nType & 0xff )
{
case 1 : // click action to slidenumber
{
- rStrm << (sal_uInt32)0x1f << (sal_uInt32)1 << (sal_uInt32)0; // path
- rStrm << (sal_uInt32)0x1f << (sal_uInt32)( nUrlLen + 1 );
+ rStrm.WriteUInt32( (sal_uInt32)0x1f ).WriteUInt32( (sal_uInt32)1 ).WriteUInt32( (sal_uInt32)0 ); // path
+ rStrm.WriteUInt32( (sal_uInt32)0x1f ).WriteUInt32( (sal_uInt32)( nUrlLen + 1 ) );
for ( sal_Int32 i = 0; i < nUrlLen; i++ )
{
- rStrm << rUrl[ i ];
+ rStrm.WriteUInt16( rUrl[ i ] );
}
- rStrm << (sal_uInt16)0;
+ rStrm.WriteUInt16( (sal_uInt16)0 );
}
break;
case 2 :
{
sal_Int32 i;
- rStrm << (sal_uInt32)0x1f
- << (sal_uInt32)( nUrlLen + 1 );
+ rStrm .WriteUInt32( (sal_uInt32)0x1f )
+ .WriteUInt32( (sal_uInt32)( nUrlLen + 1 ) );
for ( i = 0; i < nUrlLen; i++ )
{
- rStrm << rUrl[ i ];
+ rStrm.WriteUInt16( rUrl[ i ] );
}
if ( ! ( i & 1 ) )
- rStrm << (sal_uInt16)0;
- rStrm << (sal_uInt16)0
- << (sal_uInt32)0x1f
- << (sal_uInt32)1
- << (sal_uInt32)0;
+ rStrm.WriteUInt16( (sal_uInt16)0 );
+ rStrm .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt32( (sal_uInt32)0x1f )
+ .WriteUInt32( (sal_uInt32)1 )
+ .WriteUInt32( (sal_uInt32)0 );
}
break;
}
}
nCurrentOfs = rStrm.Tell();
rStrm.Seek( nParaOfs );
- rStrm << (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) );
- rStrm << nParaCount;
+ rStrm.WriteUInt32( (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) ) );
+ rStrm.WriteUInt32( nParaCount );
rStrm.Seek( nCurrentOfs );
return sal_True;
}
@@ -1026,8 +1026,8 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainNotes, mpStrm->Tell() );
mpPptEscherEx->OpenContainer( EPP_Notes );
mpPptEscherEx->AddAtom( 8, EPP_NotesAtom, 1 );
- *mpStrm << (sal_uInt32)0x80000001 // Number that identifies this slide
- << (sal_uInt32)0; // follow nothing
+ mpStrm->WriteUInt32( (sal_uInt32)0x80000001 ) // Number that identifies this slide
+ .WriteUInt32( (sal_uInt32)0 ); // follow nothing
mpPptEscherEx->OpenContainer( EPP_PPDrawing );
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
@@ -1054,7 +1054,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer
mpPptEscherEx->CloseContainer(); // EPP_Drawing
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
- *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
+ 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 );
mpPptEscherEx->CloseContainer(); // EPP_Notes
return sal_True;
}
@@ -1127,17 +1127,17 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr
sal_Int16 nMilliSeconds = static_cast<sal_Int16>(::rtl::math::round(static_cast<double>(aDateTime.NanoSeconds) / 1000000000.0));
EscherExAtom aCommentAtom10( rBinaryTagData10Atom, EPP_CommentAtom10 );
- rBinaryTagData10Atom << nIndex++
- << aDateTime.Year
- << aDateTime.Month
- << aDateTime.Day // todo: day of week
- << aDateTime.Day
- << aDateTime.Hours
- << aDateTime.Minutes
- << aDateTime.Seconds
- << nMilliSeconds
- << static_cast< sal_Int32 >( aPoint.X() )
- << static_cast< sal_Int32 >( aPoint.Y() );
+ rBinaryTagData10Atom.WriteInt32( nIndex++ )
+ .WriteInt16( aDateTime.Year )
+ .WriteUInt16( aDateTime.Month )
+ .WriteUInt16( aDateTime.Day ) // todo: day of week
+ .WriteUInt16( aDateTime.Day )
+ .WriteUInt16( aDateTime.Hours )
+ .WriteUInt16( aDateTime.Minutes )
+ .WriteUInt16( aDateTime.Seconds )
+ .WriteInt16( nMilliSeconds )
+ .WriteInt32( static_cast< sal_Int32 >( aPoint.X() ) )
+ .WriteInt32( static_cast< sal_Int32 >( aPoint.Y() ) );
}
}
}
@@ -1153,9 +1153,9 @@ 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 << (sal_uInt32)nPageNum + 0x100
- << (sal_uInt16)3 // follow master ....
- << (sal_uInt16)0;
+ mpStrm->WriteUInt32( (sal_uInt32)nPageNum + 0x100 )
+ .WriteUInt16( (sal_uInt16)3 ) // follow master ....
+ .WriteUInt16( (sal_uInt16)0 );
ImplCreateHeaderFooters( mXPagePropSet );
@@ -1187,7 +1187,7 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer
mpPptEscherEx->CloseContainer(); // EPP_Drawing
mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
- *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
+ 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 );
mpPptEscherEx->CloseContainer(); // EPP_Notes
};
@@ -1305,15 +1305,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 << (sal_uInt32)0 // no ClipboardId
- << (sal_uInt32)4 // no target device
- << (sal_uInt32)1 // aspect ratio
- << (sal_Int32)-1 // L-Index
- << (sal_uInt32)0 // Advanced Flags
- << (sal_uInt32)0 // compression
- << (sal_uInt32)0 // Size
- << (sal_uInt32)0 // "
- << (sal_uInt32)0;
+ xStm->WriteUInt32( (sal_uInt32)0 ) // no ClipboardId
+ .WriteUInt32( (sal_uInt32)4 ) // no target device
+ .WriteUInt32( (sal_uInt32)1 ) // aspect ratio
+ .WriteInt32( (sal_Int32)-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 );
pStrm = xCleanStorage->CreateMemoryStream();
}
}
@@ -1339,7 +1339,7 @@ void PPTWriter::ImplWriteOLE( )
mpPptEscherEx->BeginAtom();
pStrm->Seek( STREAM_SEEK_TO_END );
sal_uInt32 npStrmSize = pStrm->Tell();
- *mpStrm << npStrmSize; // uncompressed size
+ mpStrm->WriteUInt32( npStrmSize ); // uncompressed size
pStrm->Seek( 0 );
ZCodec aZCodec( 0x8000, 0x8000 );
@@ -1362,18 +1362,18 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
sal_uInt32 i, nPos, nOfs, nPersistOfs = mpStrm->Tell();
sal_uInt32 nPersistEntrys = 0;
- *mpStrm << (sal_uInt32)0 << (sal_uInt32)0 << (sal_uInt32)0; // skip record header and first entry
+ mpStrm->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ); // skip record header and first entry
// write document persist
nPersistEntrys++;
- *mpStrm << (sal_uInt32)0;
+ mpStrm->WriteUInt32( (sal_uInt32)0 );
// write MasterPages persists
for ( i = 0; i < mnMasterPages; i++ )
{
nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_MainMaster | i );
if ( nOfs )
{
- *mpStrm << nOfs;
+ mpStrm->WriteUInt32( nOfs );
mpPptEscherEx->InsertAtPersistOffset( EPP_MAINMASTER_PERSIST_KEY | i, ++nPersistEntrys );
}
}
@@ -1381,7 +1381,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_MainNotes );
if ( nOfs )
{
- *mpStrm << nOfs;
+ mpStrm->WriteUInt32( nOfs );
mpPptEscherEx->InsertAtPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, ++nPersistEntrys );
}
// write slide persists -> we have to write a valid value into EPP_SlidePersistAtome too
@@ -1390,7 +1390,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Slide | i );
if ( nOfs )
{
- *mpStrm << nOfs;
+ mpStrm->WriteUInt32( nOfs );
mpPptEscherEx->InsertAtPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, ++nPersistEntrys );
}
}
@@ -1400,7 +1400,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Notes | i );
if ( nOfs )
{
- *mpStrm << nOfs;
+ mpStrm->WriteUInt32( nOfs );
mpPptEscherEx->InsertAtPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, ++nPersistEntrys );
}
}
@@ -1412,11 +1412,11 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
if ( nOfs )
{
nPersistEntrys++;
- *mpStrm << pPtr->nOfsB;
+ mpStrm->WriteUInt32( pPtr->nOfsB );
sal_uInt32 nOldPos, nPersOfs = nOfs + pPtr->nOfsA + 16 + 8; // 8 bytes atom header, +16 to the persist entry
nOldPos = mpStrm->Tell();
mpStrm->Seek( nPersOfs );
- *mpStrm << nPersistEntrys;
+ mpStrm->WriteUInt32( nPersistEntrys );
mpStrm->Seek( nOldPos );
}
}
@@ -1433,12 +1433,12 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
*mpVBA >> n1
>> n2;
- *mpStrm << mnVBAOleOfs;
+ mpStrm->WriteUInt32( mnVBAOleOfs );
sal_uInt32 nOldPos = mpStrm->Tell();
mpStrm->Seek( nOfs ); // Fill the VBAInfoAtom with the correct index to the persisttable
- *mpStrm << nPersistEntrys
- << n1
- << sal_Int32(2);
+ mpStrm->WriteUInt32( nPersistEntrys )
+ .WriteUInt32( n1 )
+ .WriteInt32( sal_Int32(2) );
mpStrm->Seek( nOldPos );
}
@@ -1446,19 +1446,19 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
nPos = mpStrm->Tell();
mpStrm->Seek( nPersistOfs );
mpPptEscherEx->AddAtom( ( nPersistEntrys + 1 ) << 2, EPP_PersistPtrIncrementalBlock ); // insert Record Header
- *mpStrm << (sal_uInt32)( ( nPersistEntrys << 20 ) | 1 );
+ mpStrm->WriteUInt32( (sal_uInt32)( ( nPersistEntrys << 20 ) | 1 ) );
mpStrm->Seek( nPos );
- *mpCurUserStrm << (sal_uInt32)nPos; // set offset to current edit
+ mpCurUserStrm->WriteUInt32( (sal_uInt32)nPos ); // set offset to current edit
mpPptEscherEx->AddAtom( 28, EPP_UserEditAtom );
- *mpStrm << (sal_Int32)0x100 // last slide ID
- << (sal_uInt32)0x03000dbc // minor and major app version that did the save
- << (sal_uInt32)0 // offset last save, 0 after a full save
- << nPersistOfs // File offset to persist pointers for this save operation
- << (sal_uInt32)1 // Persist reference to the document persist object
- << (sal_uInt32)nPersistEntrys // max persists written, Seed value for persist object id management
- << (sal_Int16)EPP_LastViewTypeSlideView // last view type
- << (sal_Int16)0x12; // padword
+ mpStrm->WriteInt32( (sal_Int32)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( 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
+ .WriteInt16( (sal_Int16)EPP_LastViewTypeSlideView ) // last view type
+ .WriteInt16( (sal_Int16)0x12 ); // padword
return sal_True;
}
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 45bf78b10647..501fa786f102 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -160,14 +160,14 @@ sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm )
sal_uInt32 nSize = 28;
if ( pStrm )
{
- *pStrm << (sal_uInt32)( 0x1f | ( EPP_VBAInfo << 16 ) )
- << (sal_uInt32)( nSize - 8 )
- << (sal_uInt32)( 2 | ( EPP_VBAInfoAtom << 16 ) )
- << (sal_uInt32)12;
+ pStrm->WriteUInt32( (sal_uInt32)( 0x1f | ( EPP_VBAInfo << 16 ) ) )
+ .WriteUInt32( (sal_uInt32)( nSize - 8 ) )
+ .WriteUInt32( (sal_uInt32)( 2 | ( EPP_VBAInfoAtom << 16 ) ) )
+ .WriteUInt32( (sal_uInt32)12 );
mpPptEscherEx->InsertPersistOffset( EPP_Persist_VBAInfoAtom, pStrm->Tell() );
- *pStrm << (sal_uInt32)0
- << (sal_uInt32)0
- << (sal_uInt32)1;
+ pStrm->WriteUInt32( (sal_uInt32)0 )
+ .WriteUInt32( (sal_uInt32)0 )
+ .WriteUInt32( (sal_uInt32)1 );
}
return nSize;
}
@@ -201,24 +201,24 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream
nPosition1 = 0xb40;
nPosition2 = 0x870;
}
- *pStrm << (sal_uInt32)( 0xf | ( EPP_SlideViewInfo << 16 ) | ( nInstance << 4 ) )
- << (sal_uInt32)( nSize - 8 )
- << (sal_uInt32)( EPP_SlideViewInfoAtom << 16 ) << (sal_uInt32)3
- << bShowGuides << bSnapToGrid << bSnapToShape
- << (sal_uInt32)( EPP_ViewInfoAtom << 16 ) << (sal_uInt32)52
- << nScaling << (sal_Int32)100 << nScaling << (sal_Int32)100 // scaling atom - Keeps the current scale
- << nScaling << (sal_Int32)100 << nScaling << (sal_Int32)100 // scaling atom - Keeps the previous scale
- << (sal_Int32)0x17ac << nMasterCoordinate// Origin - Keeps the origin in master coordinates
- << nXOrigin << nYOrigin // Origin
- << (sal_uInt8)1 // Bool1 varScale - Set if zoom to fit is set
- << (sal_uInt8)0 // bool1 draftMode - Not used
- << (sal_uInt16)0 // padword
- << (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) << (sal_uInt32)8
- << (sal_uInt32)0 // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one.
- << nPosition1 // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal.
- << (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) << (sal_uInt32)8
- << (sal_Int32)1 // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one.
- << nPosition2; // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal.
+ 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 )
+ .WriteUChar( bShowGuides ).WriteUChar( bSnapToGrid ).WriteUChar( bSnapToShape )
+ .WriteUInt32( (sal_uInt32)( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)52 )
+ .WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ).WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ) // scaling atom - Keeps the current scale
+ .WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ).WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ) // scaling atom - Keeps the previous scale
+ .WriteInt32( (sal_Int32)0x17ac ).WriteInt32( nMasterCoordinate )// Origin - Keeps the origin in master coordinates
+ .WriteInt32( nXOrigin ).WriteInt32( nYOrigin ) // Origin
+ .WriteUChar( (sal_uInt8)1 ) // Bool1 varScale - Set if zoom to fit is set
+ .WriteUChar( (sal_uInt8)0 ) // bool1 draftMode - Not used
+ .WriteUInt16( (sal_uInt16)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.
+ .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 )
+ .WriteInt32( (sal_Int32)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.
}
return nSize;
}
@@ -230,15 +230,15 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm )
sal_uInt32 nSize = 68;
if ( pStrm )
{
- *pStrm << (sal_uInt32)( 0xf | ( EPP_OutlineViewInfo << 16 ) ) << (sal_uInt32)( nSize - 8 )
- << (sal_uInt32)( EPP_ViewInfoAtom << 16 ) << (sal_uInt32)52
- << (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 << (sal_Int32)200 // scaling atom - Keeps the current scale
- << (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 << (sal_Int32)200 // scaling atom - Keeps the previous scale
- << (sal_Int32)0x17ac << (sal_Int32)0xdda // Origin - Keeps the origin in master coordinates
- << (sal_Int32)-780 << (sal_Int32)-84 // Origin
- << (sal_uInt8)1 // bool1 varScale - Set if zoom to fit is set
- << (sal_uInt8)0 // bool1 draftMode - Not used
- << (sal_uInt16)0; // padword
+ pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_OutlineViewInfo << 16 ) ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) )
+ .WriteUInt32( (sal_uInt32)( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)52 )
+ .WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ).WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ) // scaling atom - Keeps the current scale
+ .WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ).WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ) // scaling atom - Keeps the previous scale
+ .WriteInt32( (sal_Int32)0x17ac ).WriteInt32( (sal_Int32)0xdda ) // Origin - Keeps the origin in master coordinates
+ .WriteInt32( (sal_Int32)-780 ).WriteInt32( (sal_Int32)-84 ) // Origin
+ .WriteUChar( (sal_uInt8)1 ) // bool1 varScale - Set if zoom to fit is set
+ .WriteUChar( (sal_uInt8)0 ) // bool1 draftMode - Not used
+ .WriteUInt16( (sal_uInt16)0 ); // padword
}
return nSize;
}
@@ -259,15 +259,15 @@ sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm )
if ( pStrm )
{
- *pStrm << (sal_uInt32)( EPP_BinaryTagData << 16 ) << (sal_uInt32)( nSize - 8 );
+ pStrm->WriteUInt32( (sal_uInt32)( EPP_BinaryTagData << 16 ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) );
if ( nPictureStreamSize )
{
- *pStrm << (sal_uInt32)( 0xf | ( EPP_PST_ExtendedBuGraContainer << 16 ) ) << nPictureStreamSize;
+ pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_PST_ExtendedBuGraContainer << 16 ) ) ).WriteUInt32( nPictureStreamSize );
pStrm->Write( aBuExPictureStream.GetData(), nPictureStreamSize );
}
if ( nOutlineStreamSize )
{
- *pStrm << (sal_uInt32)( 0xf | ( EPP_PST_ExtendedPresRuleContainer << 16 ) ) << nOutlineStreamSize;
+ pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_PST_ExtendedPresRuleContainer << 16 ) ) ).WriteUInt32( nOutlineStreamSize );
pStrm->Write( aBuExOutlineStream.GetData(), nOutlineStreamSize );
}
}
@@ -281,16 +281,16 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea
sal_uInt32 nSize = 8 + 8 + 14;
if ( pStrm )
{
- *pStrm << (sal_uInt32)( 0xf | ( EPP_ProgBinaryTag << 16 ) ) << (sal_uInt32)0
- << (sal_uInt32)( EPP_CString << 16 ) << (sal_uInt32)14
- << (sal_uInt32)0x5f005f << (sal_uInt32)0x50005f
- << (sal_uInt32)0x540050 << (sal_uInt16)0x39;
+ 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( (sal_uInt16)0x39 );
}
if ( pBinTagStrm )
{
sal_uInt32 nLen = pBinTagStrm->Tell();
nSize += nLen + 8;
- *pStrm << (sal_uInt32)( EPP_BinaryTagData << 16 ) << nLen;
+ pStrm->WriteUInt32( (sal_uInt32)( EPP_BinaryTagData << 16 ) ).WriteUInt32( nLen );
pStrm->Write( pBinTagStrm->GetData(), nLen );
}
else
@@ -299,7 +299,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea
if ( pStrm )
{
pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
- *pStrm << (sal_uInt32)( nSize - 8 );
+ pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) );
pStrm->SeekRel( nSize - 8 );
}
return nSize;
@@ -315,13 +315,13 @@ sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBi
nSize = 8;
if ( pStrm )
{
- *pStrm << (sal_uInt32)( 0xf | ( EPP_ProgTags << 16 ) ) << (sal_uInt32)0;
+ pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ProgTags << 16 ) ) ).WriteUInt32( (sal_uInt32)0 );
}
nSize += ImplProgBinaryTagContainer( pStrm, pBinTagStrm );
if ( pStrm )
{
pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
- *pStrm << (sal_uInt32)( nSize - 8 );
+ pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) );
pStrm->SeekRel( nSize - 8 );
}
}
@@ -335,7 +335,7 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm )
sal_uInt32 nSize = 8;
if ( pStrm )
{
- *pStrm << (sal_uInt32)( ( EPP_List << 16 ) | 0xf ) << (sal_uInt32)0;
+ pStrm->WriteUInt32( (sal_uInt32)( ( EPP_List << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)0 );
}
nSize += ImplVBAInfoContainer( pStrm );
@@ -347,7 +347,7 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm )
if ( pStrm )
{
pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
- *pStrm << (sal_uInt32)( nSize - 8 );
+ pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) );
pStrm->SeekRel( nSize - 8 );
}
return nSize;
@@ -360,17 +360,17 @@ sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm )
sal_uInt32 i, nSize = 28 * mnMasterPages + 8;
if ( pStrm )
{
- *pStrm << (sal_uInt32)( 0x1f | ( EPP_SlideListWithText << 16 ) ) << (sal_uInt32)( nSize - 8 );
+ pStrm->WriteUInt32( (sal_uInt32)( 0x1f | ( EPP_SlideListWithText << 16 ) ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) );
for ( i = 0; i < mnMasterPages; i++ )
{
- *pStrm << (sal_uInt32)( EPP_SlidePersistAtom << 16 ) << (sal_uInt32)20;
+ pStrm->WriteUInt32( (sal_uInt32)( EPP_SlidePersistAtom << 16 ) ).WriteUInt32( (sal_uInt32)20 );
mpPptEscherEx->InsertPersistOffset( EPP_MAINMASTER_PERSIST_KEY | i, pStrm->Tell() );
- *pStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINMASTER_PERSIST_KEY )
- << (sal_uInt32)0 // flags - only bit 3 used, if set then slide contains shapes other than placeholders
- << (sal_Int32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
- << (sal_Int32)( 0x80000000 | i ) // slideId - Unique slide identifier, used for OLE link monikers for example
- << (sal_uInt32)0; // reserved, usualy 0
+ 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
+ .WriteInt32( (sal_Int32)0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects
+ .WriteInt32( (sal_Int32)( 0x80000000 | i ) ) // slideId - Unique slide identifier, used for OLE link monikers for example
+ .WriteUInt32( (sal_uInt32)0 ); // reserved, usualy 0
}
}
return nSize;
@@ -395,14 +395,14 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const
}
maHyperlink.push_back( EPPTHyperlink( sBookmarkURL, nType ) );
- *mpExEmbed << (sal_uInt16)0xf
- << (sal_uInt16)EPP_ExHyperlink
- << (sal_uInt32)0;
+ mpExEmbed->WriteUInt16( (sal_uInt16)0xf )
+ .WriteUInt16( (sal_uInt16)EPP_ExHyperlink )
+ .WriteUInt32( (sal_uInt32)0 );
sal_uInt32 nHyperSize, nHyperStart = mpExEmbed->Tell();
- *mpExEmbed << (sal_uInt16)0
- << (sal_uInt16)EPP_ExHyperlinkAtom
- << (sal_uInt32)4
- << nHyperId;
+ mpExEmbed->WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)EPP_ExHyperlinkAtom )
+ .WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( nHyperId );
PPTWriter::WriteCString( *mpExEmbed, rStringVer0, 0 );
PPTWriter::WriteCString( *mpExEmbed, rStringVer1, 1 );
@@ -411,7 +411,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const
nHyperSize = mpExEmbed->Tell() - nHyperStart;
mpExEmbed->SeekRel( - ( (sal_Int32)nHyperSize + 4 ) );
- *mpExEmbed << nHyperSize;
+ mpExEmbed->WriteUInt32( nHyperSize );
mpExEmbed->SeekRel( nHyperSize );
return nHyperId;
}
@@ -430,7 +430,7 @@ sal_Bool PPTWriter::ImplCloseDocument()
SvMemoryStream aTxMasterStyleAtomStrm( 0x200, 0x200 );
{
EscherExAtom aTxMasterStyleAtom( aTxMasterStyleAtomStrm, EPP_TxMasterStyleAtom, EPP_TEXTTYPE_Other );
- aTxMasterStyleAtomStrm << (sal_uInt16)5; // paragraph count
+ aTxMasterStyleAtomStrm.WriteUInt16( (sal_uInt16)5 ); // paragraph count
sal_uInt16 nLev;
sal_Bool bFirst = sal_True;
for ( nLev = 0; nLev < 5; nLev++ )
@@ -468,27 +468,27 @@ sal_Bool PPTWriter::ImplCloseDocument()
// CREATE HYPERLINK CONTAINER
if ( nExEmbedSize )
{
- *mpStrm << (sal_uInt16)0xf
- << (sal_uInt16)EPP_ExObjList
- << (sal_uInt32)( nExEmbedSize + 12 )
- << (sal_uInt16)0
- << (sal_uInt16)EPP_ExObjListAtom
- << (sal_uInt32)4
- << (sal_uInt32)mnExEmbed;
+ mpStrm->WriteUInt16( (sal_uInt16)0xf )
+ .WriteUInt16( (sal_uInt16)EPP_ExObjList )
+ .WriteUInt32( (sal_uInt32)( nExEmbedSize + 12 ) )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)EPP_ExObjListAtom )
+ .WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( (sal_uInt32)mnExEmbed );
mpPptEscherEx->InsertPersistOffset( EPP_Persist_ExObj, mpStrm->Tell() );
mpStrm->Write( mpExEmbed->GetData(), nExEmbedSize );
}
// CREATE ENVIRONMENT
- *mpStrm << (sal_uInt16)0xf << (sal_uInt16)EPP_Environment << (sal_uInt32)nEnvironment;
+ mpStrm->WriteUInt16( (sal_uInt16)0xf ).WriteUInt16( (sal_uInt16)EPP_Environment ).WriteUInt32( (sal_uInt32)nEnvironment );
// Open Container ( EPP_SrKinsoku )
- *mpStrm << (sal_uInt16)0x2f << (sal_uInt16)EPP_SrKinsoku << (sal_uInt32)12;
+ mpStrm->WriteUInt16( (sal_uInt16)0x2f ).WriteUInt16( (sal_uInt16)EPP_SrKinsoku ).WriteUInt32( (sal_uInt32)12 );
mpPptEscherEx->AddAtom( 4, EPP_SrKinsokuAtom, 0, 3 );
- *mpStrm << (sal_Int32)0; // SrKinsoku Level 0
+ mpStrm->WriteInt32( (sal_Int32)0 ); // SrKinsoku Level 0
// Open Container ( EPP_FontCollection )
- *mpStrm << (sal_uInt16)0xf << (sal_uInt16)EPP_FontCollection << (sal_uInt32)maFontCollection.GetCount() * 76;
+ mpStrm->WriteUInt16( (sal_uInt16)0xf ).WriteUInt16( (sal_uInt16)EPP_FontCollection ).WriteUInt32( (sal_uInt32)maFontCollection.GetCount() * 76 );
for ( sal_uInt32 i = 0; i < maFontCollection.GetCount(); i++ )
{
@@ -502,7 +502,7 @@ sal_Bool PPTWriter::ImplCloseDocument()
sal_Unicode nUniCode = 0;
if ( n < nFontLen )
nUniCode = pDesc->Name[n];
- *mpStrm << nUniCode;
+ mpStrm->WriteUInt16( nUniCode );
}
sal_uInt8 lfCharSet = ANSI_CHARSET;
sal_uInt8 lfClipPrecision = 0;
@@ -548,18 +548,18 @@ sal_Bool PPTWriter::ImplCloseDocument()
lfPitchAndFamily |= DEFAULT_PITCH;
break;
}
- *mpStrm << lfCharSet
- << lfClipPrecision
- << lfQuality
- << lfPitchAndFamily;
+ mpStrm->WriteUChar( lfCharSet )
+ .WriteUChar( lfClipPrecision )
+ .WriteUChar( lfQuality )
+ .WriteUChar( lfPitchAndFamily );
}
mpStyleSheet->WriteTxCFStyleAtom( *mpStrm ); // create style that is used for new standard objects
mpPptEscherEx->AddAtom( 10, EPP_TxSIStyleAtom );
- *mpStrm << (sal_uInt32)7 // ?
- << (sal_Int16)2 // ?
- << (sal_uInt8)9 // ?
- << (sal_uInt8)8 // ?
- << (sal_Int16)0; // ?
+ mpStrm->WriteUInt32( (sal_uInt32)7 ) // ?
+ .WriteInt16( (sal_Int16)2 ) // ?
+ .WriteUChar( (sal_uInt8)9 ) // ?
+ .WriteUChar( (sal_uInt8)8 ) // ?
+ .WriteInt16( (sal_Int16)0 ); // ?
mpStrm->Write( aTxMasterStyleAtomStrm.GetData(), aTxMasterStyleAtomStrm.Tell() );
maSoundCollection.Write( *mpStrm );
@@ -774,18 +774,18 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
FontCollectionEntry aFontDescEntry( pPara->aFontDesc.Name, pPara->aFontDesc.Family, pPara->aFontDesc.Pitch, pPara->aFontDesc.CharSet );
sal_uInt16 nFontId = (sal_uInt16)maFontCollection.GetId( aFontDescEntry );
- rOut << nCharCount
- << nDepth // Level
- << (sal_uInt32)nPropertyFlags; // Paragraph Attribut Set
+ rOut.WriteUInt32( nCharCount )
+ .WriteUInt16( nDepth ) // Level
+ .WriteUInt32( (sal_uInt32)nPropertyFlags ); // Paragraph Attribut Set
if ( nPropertyFlags & 0xf )
- rOut << nBulletFlags;
+ rOut.WriteInt16( nBulletFlags );
if ( nPropertyFlags & 0x80 )
- rOut << (sal_uInt16)( pPara->cBulletId );
+ rOut.WriteUInt16( (sal_uInt16)( pPara->cBulletId ) );
if ( nPropertyFlags & 0x10 )
- rOut << nFontId;
+ rOut.WriteUInt16( nFontId );
if ( nPropertyFlags & 0x40 )
- rOut << (sal_Int16)nBuRealSize;
+ rOut.WriteInt16( (sal_Int16)nBuRealSize );
if ( nPropertyFlags & 0x20 )
{
sal_uInt32 nBulletColor = pPara->nBulletColor;
@@ -799,20 +799,20 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
}
nBulletColor &= 0xffffff;
nBulletColor |= 0xfe000000;
- rOut << nBulletColor;
+ rOut.WriteUInt32( nBulletColor );
}
if ( nPropertyFlags & 0x00000800 )
- rOut << (sal_uInt16)( pPara->mnTextAdjust );
+ rOut.WriteUInt16( (sal_uInt16)( pPara->mnTextAdjust ) );
if ( nPropertyFlags & 0x00001000 )
- rOut << (sal_uInt16)( nLineSpacing );
+ rOut.WriteUInt16( (sal_uInt16)( nLineSpacing ) );
if ( nPropertyFlags & 0x00002000 )
- rOut << (sal_uInt16)( pPara->mnLineSpacingTop );
+ rOut.WriteUInt16( (sal_uInt16)( pPara->mnLineSpacingTop ) );
if ( nPropertyFlags & 0x00004000 )
- rOut << (sal_uInt16)( pPara->mnLineSpacingBottom );
+ rOut.WriteUInt16( (sal_uInt16)( pPara->mnLineSpacingBottom ) );
if ( nPropertyFlags & 0x100 )
- rOut << (sal_uInt16)(pPara->nTextOfs);
+ rOut.WriteUInt16( (sal_uInt16)(pPara->nTextOfs) );
if ( nPropertyFlags & 0x400 )
- rOut << (sal_uInt16)(pPara->nBulletOfs);
+ rOut.WriteUInt16( (sal_uInt16)(pPara->nBulletOfs) );
if ( nPropertyFlags & 0x000e0000 )
{
sal_uInt16 nAsianSettings = 0;
@@ -820,10 +820,10 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
nAsianSettings |= 1;
if ( pPara->mbParagraphPunctation )
nAsianSettings |= 4;
- rOut << nAsianSettings;
+ rOut.WriteUInt16( nAsianSettings );
}
if ( nPropertyFlags & 0x200000 )
- rOut << pPara->mnBiDi;
+ rOut.WriteUInt16( pPara->mnBiDi );
}
}
@@ -994,21 +994,21 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
sal_uInt32 nCharCount = pPortion->Count();
- rOut << nCharCount
- << nPropertyFlags; //PropertyFlags
+ rOut.WriteUInt32( nCharCount )
+ .WriteUInt32( nPropertyFlags ); //PropertyFlags
if ( nPropertyFlags & 0xffff )
- rOut << (sal_uInt16)( nCharAttr );
+ rOut.WriteUInt16( (sal_uInt16)( nCharAttr ) );
if ( nPropertyFlags & 0x00010000 )
- rOut << pPortion->mnFont;
+ rOut.WriteUInt16( pPortion->mnFont );
if ( nPropertyFlags & 0x00200000 )
- rOut << pPortion->mnAsianOrComplexFont;
+ rOut.WriteUInt16( pPortion->mnAsianOrComplexFont );
if ( nPropertyFlags & 0x00020000 )
- rOut << (sal_uInt16)( pPortion->mnCharHeight );
+ rOut.WriteUInt16( (sal_uInt16)( pPortion->mnCharHeight ) );
if ( nPropertyFlags & 0x00040000 )
- rOut << (sal_uInt32)nCharColor;
+ rOut.WriteUInt32( (sal_uInt32)nCharColor );
if ( nPropertyFlags & 0x00080000 )
- rOut << pPortion->mnCharEscapement;
+ rOut.WriteInt16( pPortion->mnCharEscapement );
}
}
}
@@ -1111,8 +1111,8 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
{
PPTExParaSheet& rParaSheet = mpStyleSheet->GetParaSheet( nTextInstance );
- rOut << (sal_uInt32)( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4 ) ) << (sal_uInt32)4
- << sal_Int32(nTextInstance);
+ rOut.WriteUInt32( (sal_uInt32)( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4 ) ) ).WriteUInt32( (sal_uInt32)4 )
+ .WriteInt32( sal_Int32(nTextInstance) );
if ( mbEmptyPresObj )
mnTextSize = 0;
@@ -1131,12 +1131,12 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
sal_uInt32 nSize, nPos = rOut.Tell();
- rOut << (sal_uInt32)( EPP_StyleTextPropAtom << 16 ) << (sal_uInt32)0;
+ rOut.WriteUInt32( (sal_uInt32)( EPP_StyleTextPropAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 );
ImplWriteParagraphs( rOut, aTextObj );
ImplWritePortions( rOut, aTextObj );
nSize = rOut.Tell() - nPos;
rOut.SeekRel( - ( (sal_Int32)nSize - 4 ) );
- rOut << (sal_uInt32)( nSize - 8 );
+ rOut.WriteUInt32( (sal_uInt32)( nSize - 8 ) );
rOut.SeekRel( nSize - 8 );
for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount(); ++i )
@@ -1154,16 +1154,16 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
case 1 :
case 2 :
{
- rOut << (sal_uInt32)( EPP_DateTimeMCAtom << 16 ) << (sal_uInt32)8
- << (sal_uInt32)( pFieldEntry->nFieldStartPos ) // TxtOffset to TxtField;
- << (sal_uInt8)( pFieldEntry->nFieldType & 0xff ) // Type
- << (sal_uInt8)0 << (sal_uInt16)0; // PadBytes
+ rOut.WriteUInt32( (sal_uInt32)( EPP_DateTimeMCAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 )
+ .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) ) // TxtOffset to TxtField;
+ .WriteUChar( (sal_uInt8)( pFieldEntry->nFieldType & 0xff ) ) // Type
+ .WriteUChar( (sal_uInt8)0 ).WriteUInt16( (sal_uInt16)0 ); // PadBytes
}
break;
case 3 :
{
- rOut << (sal_uInt32)( EPP_SlideNumberMCAtom << 16 ) << (sal_uInt32 ) 4
- << (sal_uInt32)( pFieldEntry->nFieldStartPos );
+ rOut.WriteUInt32( (sal_uInt32)( EPP_SlideNumberMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 )
+ .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) );
}
break;
case 4 :
@@ -1206,37 +1206,37 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
else
nHyperId = ImplInsertBookmarkURL( pFieldEntry->aFieldUrl, 2 | ( nHyperId << 8 ), aFile, aTarget, "", "" );
- rOut << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)24
- << (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) << (sal_uInt32)16
- << (sal_uInt32)0 // soundref
- << nHyperId // hyperlink id
- << (sal_uInt8)4 // hyperlink action
- << (sal_uInt8)0 // ole verb
- << (sal_uInt8)0 // jump
- << (sal_uInt8)0 // flags
- << (sal_uInt8)8 // hyperlink type ?
- << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0
- << (sal_uInt32)( EPP_TxInteractiveInfoAtom << 16 ) << (sal_uInt32)8
- << (sal_uInt32)( pFieldEntry->nFieldStartPos )
- << (sal_uInt32)( pFieldEntry->nFieldEndPos );
+ 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
+ .WriteUInt32( nHyperId ) // hyperlink id
+ .WriteUChar( (sal_uInt8)4 ) // hyperlink action
+ .WriteUChar( (sal_uInt8)0 ) // ole verb
+ .WriteUChar( (sal_uInt8)0 ) // jump
+ .WriteUChar( (sal_uInt8)0 ) // flags
+ .WriteUChar( (sal_uInt8)8 ) // hyperlink type ?
+ .WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 )
+ .WriteUInt32( (sal_uInt32)( EPP_TxInteractiveInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 )
+ .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) )
+ .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldEndPos ) );
}
break;
case 5 :
{
- rOut << (sal_uInt32)( EPP_GenericDateMCAtom << 16 ) << (sal_uInt32)4
- << (sal_uInt32)( pFieldEntry->nFieldStartPos );
+ rOut.WriteUInt32( (sal_uInt32)( EPP_GenericDateMCAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) );
}
break;
case 6 :
{
- rOut << (sal_uInt32)( EPP_HeaderMCAtom << 16 ) << (sal_uInt32 ) 4
- << (sal_uInt32)( pFieldEntry->nFieldStartPos );
+ rOut.WriteUInt32( (sal_uInt32)( EPP_HeaderMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 )
+ .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) );
}
break;
case 7 :
{
- rOut << (sal_uInt32)( EPP_FooterMCAtom << 16 ) << (sal_uInt32 ) 4
- << (sal_uInt32)( pFieldEntry->nFieldStartPos );
+ rOut.WriteUInt32( (sal_uInt32)( EPP_FooterMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 )
+ .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) );
}
break;
default:
@@ -1314,11 +1314,11 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
pRuleOut = pTextRule->pOut = new SvMemoryStream( 0x100, 0x100 );
sal_uInt32 nRulePos = pRuleOut->Tell();
- *pRuleOut << (sal_uInt32)( EPP_TextRulerAtom << 16 ) << (sal_uInt32)0;
- *pRuleOut << nTextRulerAtomFlags;
+ pRuleOut->WriteUInt32( (sal_uInt32)( EPP_TextRulerAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 );
+ pRuleOut->WriteUInt32( nTextRulerAtomFlags );
if ( nTextRulerAtomFlags & 4 )
{
- *pRuleOut << (sal_uInt16)nTabCount;
+ pRuleOut->WriteUInt16( (sal_uInt16)nTabCount );
for ( i = 0; i < nTabs; i++ )
{
sal_uInt16 nPosition = (sal_uInt16)( ( pTabStop[ i ].Position / 4.40972 ) + nTextOfs );
@@ -1332,8 +1332,8 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
case ::com::sun::star::style::TabAlign_LEFT :
default: nType = 0;
};
- *pRuleOut << nPosition
- << nType;
+ pRuleOut->WriteUInt16( nPosition )
+ .WriteUInt16( nType );
}
sal_uInt32 nWidth = 1;
@@ -1341,18 +1341,18 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
nWidth += (sal_Int32)( ( ( pTabStop[ nTabs - 1 ].Position / 4.40972 + nTextOfs ) / nDefaultTabSize ) );
nWidth *= nDefaultTabSize;
for ( i = 0; i < nDefaultTabs; i++, nWidth += nDefaultTabSize )
- *pRuleOut << nWidth;
+ pRuleOut->WriteUInt32( nWidth );
}
for ( i = 0; i < 5; i++ )
{
if ( nTextRulerAtomFlags & ( 8 << i ) )
- *pRuleOut << nNumberingRule[ i << 1 ];
+ pRuleOut->WriteInt16( nNumberingRule[ i << 1 ] );
if ( nTextRulerAtomFlags & ( 256 << i ) )
- *pRuleOut << nNumberingRule[ ( i << 1 ) + 1 ];
+ pRuleOut->WriteInt16( nNumberingRule[ ( i << 1 ) + 1 ] );
}
sal_uInt32 nBufSize = pRuleOut->Tell() - nRulePos;
pRuleOut->SeekRel( - ( (sal_Int32)nBufSize - 4 ) );
- *pRuleOut << (sal_uInt32)( nBufSize - 8 );
+ pRuleOut->WriteUInt32( (sal_uInt32)( nBufSize - 8 ) );
pRuleOut->SeekRel( nBufSize - 8 );
}
}
@@ -1364,7 +1364,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
sal_uInt32 nBulletFlags = 0;
sal_uInt32 nNumberingType = 0, nPos2 = rExtBuStr.Tell();
- rExtBuStr << (sal_uInt32)( EPP_PST_ExtendedParagraphAtom << 16 ) << (sal_uInt32)0;
+ rExtBuStr.WriteUInt32( (sal_uInt32)( EPP_PST_ExtendedParagraphAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 );
for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount(); ++i )
{
@@ -1377,10 +1377,10 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
if ( pBulletPara->nNumberingType != SVX_NUM_BITMAP )
nBulletFlags = 0x3000000;
}
- rExtBuStr << (sal_uInt32)nBulletFlags;
+ rExtBuStr.WriteUInt32( (sal_uInt32)nBulletFlags );
if ( nBulletFlags & 0x800000 )
- rExtBuStr << nBulletId;
+ rExtBuStr.WriteUInt16( nBulletId );
if ( nBulletFlags & 0x1000000 )
{
switch( pBulletPara->nNumberingType )
@@ -1409,15 +1409,15 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
break;
}
- rExtBuStr << (sal_uInt32)nNumberingType;
+ rExtBuStr.WriteUInt32( (sal_uInt32)nNumberingType );
}
if ( nBulletFlags & 0x2000000 )
- rExtBuStr << (sal_uInt16)pBulletPara->nStartWith;
- rExtBuStr << (sal_uInt32)0 << (sal_uInt32)0;
+ rExtBuStr.WriteUInt16( (sal_uInt16)pBulletPara->nStartWith );
+ rExtBuStr.WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 );
}
sal_uInt32 nBulletSize = ( rExtBuStr.Tell() - nPos2 ) - 8;
rExtBuStr.SeekRel( - ( (sal_Int32)nBulletSize + 4 ) );
- rExtBuStr << nBulletSize;
+ rExtBuStr.WriteUInt32( nBulletSize );
rExtBuStr.SeekRel( nBulletSize );
}
}
@@ -1936,11 +1936,11 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
if ( ImplGetPropertyValue( OUString( "DimColor" ) ) )
nDimColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) ) | 0xfe000000;
- rSt << nDimColor << nFlags << nSoundRef << nDelayTime
- << nOrder // order of build ( 1.. )
- << nSlideCount << nBuildType << nFlyMethod << nFlyDirection
- << nAfterEffect << nSubEffect << nOleVerb
- << (sal_uInt16)0; // PadWord
+ rSt.WriteUInt32( nDimColor ).WriteUInt32( nFlags ).WriteUInt32( nSoundRef ).WriteUInt32( nDelayTime )
+ .WriteUInt16( nOrder ) // order of build ( 1.. )
+ .WriteUInt16( nSlideCount ).WriteUChar( nBuildType ).WriteUChar( nFlyMethod ).WriteUChar( nFlyDirection )
+ .WriteUChar( nAfterEffect ).WriteUChar( nSubEffect ).WriteUChar( nOleVerb )
+ .WriteUInt16( (sal_uInt16)0 ); // PadWord
}
// -----------------------------------------------------------------------
@@ -2076,27 +2076,27 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
sal_uInt32 nContainerSize = 24;
if ( nAction == 2 )
nContainerSize += ( aFile.getLength() * 2 ) + 8;
- rSt << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)nContainerSize
- << (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) << (sal_uInt32)16
- << nSoundRef
- << nHyperLinkID
- << nAction
- << nOleVerb
- << nJump
- << nFlags
- << (sal_uInt32)nHyperLinkType;
+ rSt.WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)nContainerSize )
+ .WriteUInt32( (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)16 )
+ .WriteUInt32( nSoundRef )
+ .WriteUInt32( nHyperLinkID )
+ .WriteUChar( nAction )
+ .WriteUChar( nOleVerb )
+ .WriteUChar( nJump )
+ .WriteUChar( nFlags )
+ .WriteUInt32( (sal_uInt32)nHyperLinkType );
if ( nAction == 2 ) // run program Action
{
sal_Int32 nLen = aFile.getLength();
- rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 0x20 ) << (sal_uInt32)( nLen * 2 );
+ rSt.WriteUInt32( (sal_uInt32)( ( EPP_CString << 16 ) | 0x20 ) ).WriteUInt32( (sal_uInt32)( nLen * 2 ) );
for ( sal_Int32 i = 0; i < nLen; i++ )
- rSt << aFile[i];
+ rSt.WriteUInt16( aFile[i] );
}
- rSt << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0x1f ) << (sal_uInt32)24 // Mouse Over Action
- << (sal_uInt32)( EPP_InteractiveInfo << 16 ) << (sal_uInt32)16;
- for ( int i = 0; i < 4; i++, rSt << (sal_uInt32)0 ) ;
+ 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 ) ) ;
}
// -----------------------------------------------------------------------
@@ -2159,19 +2159,19 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag
aPropOpt.CreateShapeProperties( mXShape );
aPropOpt.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
- *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // oben, links, rechts, unten ????
+ mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // oben, links, rechts, unten ????
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
- *mpStrm << (sal_uInt32)0 // PlacementID
- << (sal_uInt8)nPlaceHolderId // PlaceHolderID
- << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
- << (sal_uInt16)0; // padword
+ mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID
+ .WriteUChar( (sal_uInt8)nPlaceHolderId ) // PlaceHolderID
+ .WriteUChar( (sal_uInt8)0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
+ .WriteUInt16( (sal_uInt16)0 ); // padword
mpPptEscherEx->CloseContainer(); // ESCHER_ClientData
if ( aClientTextBox.Tell() )
{
- *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf )
- << (sal_uInt32)aClientTextBox.Tell();
+ mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
+ .WriteUInt32( (sal_uInt32)aClientTextBox.Tell() );
mpStrm->Write( aClientTextBox.GetData(), aClientTextBox.Tell() );
}
@@ -2520,8 +2520,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
catch( ::com::sun::star::uno::Exception& )
{}
- *mpExEmbed << (sal_uInt32)( 0xf | ( EPP_ExControl << 16 ) )
- << (sal_uInt32)0; // Size of this container
+ mpExEmbed->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ExControl << 16 ) ) )
+ .WriteUInt32( (sal_uInt32)0 ); // Size of this container
sal_uInt32 nSize, nOldPos = mpExEmbed->Tell();
@@ -2530,9 +2530,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
nPageId |= 0x80000000;
else
nPageId += 0x100;
- *mpExEmbed << (sal_uInt32)( EPP_ExControlAtom << 16 )
- << (sal_uInt32)4
- << nPageId;
+ mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_ExControlAtom << 16 ) )
+ .WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( nPageId );
PPTExOleObjEntry* pEntry = new PPTExOleObjEntry( OCX_CONTROL, mpExEmbed->Tell() );
pEntry->xControlModel = aXControlModel;
pEntry->xShape = mXShape;
@@ -2540,14 +2540,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mnExEmbed++;
- *mpExEmbed << (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) )
- << (sal_uInt32)24
- << (sal_uInt32)nAspect
- << (sal_uInt32)2
- << (sal_uInt32)mnExEmbed
- << (sal_uInt32)0
- << (sal_uInt32)4 // index to the persist table
- << (sal_uInt32)0x0012de00;
+ 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 );
::com::sun::star::awt::Size aSize;
OUString aControlName;
@@ -2595,7 +2595,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
nSize = mpExEmbed->Tell() - nOldPos;
mpExEmbed->Seek( nOldPos - 4 );
- *mpExEmbed << nSize;
+ mpExEmbed->WriteUInt32( nSize );
mpExEmbed->Seek( STREAM_SEEK_TO_END );
nOlePictureId = mnExEmbed;
@@ -2861,17 +2861,17 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt );
aPropertyOptions.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
- *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // top, left, right, bottom ????
+ mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // top, left, right, bottom ????
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
- *mpStrm << (sal_uInt32)0 // PlacementID
- << (sal_uInt8)EPP_PLACEHOLDER_MASTERTITLE // PlaceHolderID
- << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
- << (sal_uInt16)0; // padword
+ mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID
+ .WriteUChar( (sal_uInt8)EPP_PLACEHOLDER_MASTERTITLE ) // PlaceHolderID
+ .WriteUChar( (sal_uInt8)0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
+ .WriteUInt16( (sal_uInt16)0 ); // padword
mpPptEscherEx->CloseContainer(); // ESCHER_ClientData
mpPptEscherEx->OpenContainer( ESCHER_ClientTextbox );
mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom );
- *mpStrm << (sal_uInt32)EPP_TEXTTYPE_Title;
+ mpStrm->WriteUInt32( (sal_uInt32)EPP_TEXTTYPE_Title );
mpPptEscherEx->AddAtom( mnTextSize << 1, EPP_TextCharsAtom );
const sal_Unicode* pString = aUString.getStr();
for ( sal_uInt32 i = 0; i < mnTextSize; i++ )
@@ -2879,12 +2879,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
nChar = pString[ i ]; // 0xa -> 0xb soft newline
if ( nChar == 0xa )
nChar++; // 0xd -> 0xd hard newline
- *mpStrm << nChar;
+ mpStrm->WriteUInt16( nChar );
}
mpPptEscherEx->AddAtom( 6, EPP_BaseTextPropAtom );
- *mpStrm << (sal_uInt32)( mnTextSize + 1 ) << (sal_uInt16)0;
+ mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt16( (sal_uInt16)0 );
mpPptEscherEx->AddAtom( 10, EPP_TextSpecInfoAtom );
- *mpStrm << (sal_uInt32)( mnTextSize + 1 ) << (sal_uInt32)1 << (sal_uInt16)0;
+ mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( (sal_uInt16)0 );
mpPptEscherEx->CloseContainer(); // ESCHER_ClientTextBox
mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer
}
@@ -2953,21 +2953,21 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt2 );
aPropOpt2.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
- *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // top, left, right, bottom ????
+ mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // top, left, right, bottom ????
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
sal_uInt8 PlaceHolderID = ( mType == "presentation.Subtitle") ? EPP_PLACEHOLDER_MASTERSUBTITLE:EPP_PLACEHOLDER_MASTERBODY;
- *mpStrm << (sal_uInt32)1 // PlacementID
- << PlaceHolderID/*(sal_uInt8)EPP_PLACEHOLDER_MASTERBODY */ // PlaceHolderID
- << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
- << (sal_uInt16)0; // padword
+ mpStrm->WriteUInt32( (sal_uInt32)1 ) // PlacementID
+ .WriteUChar( PlaceHolderID )/*(sal_uInt8)EPP_PLACEHOLDER_MASTERBODY */ // PlaceHolderID
+ .WriteUChar( (sal_uInt8)0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
+ .WriteUInt16( (sal_uInt16)0 ); // padword
mpPptEscherEx->CloseContainer(); // ESCHER_ClientData
mpPptEscherEx->OpenContainer( ESCHER_ClientTextbox ); // printf
mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom );
if ( mType == "presentation.Subtitle")
- *mpStrm << (sal_uInt32)EPP_TEXTTYPE_CenterBody;
+ mpStrm->WriteUInt32( (sal_uInt32)EPP_TEXTTYPE_CenterBody );
else
- *mpStrm << (sal_uInt32)EPP_TEXTTYPE_Body;
+ mpStrm->WriteUInt32( (sal_uInt32)EPP_TEXTTYPE_Body );
mnTextSize = aTextObj.Count();
aTextObj.Write( mpStrm );
mpPptEscherEx->BeginAtom();
@@ -2979,12 +2979,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( nDepth > 4)
nDepth = 4;
- *mpStrm << nCharCount
- << nDepth;
+ mpStrm->WriteUInt32( nCharCount )
+ .WriteUInt16( nDepth );
}
mpPptEscherEx->EndAtom( EPP_BaseTextPropAtom );
mpPptEscherEx->AddAtom( 10, EPP_TextSpecInfoAtom );
- *mpStrm << (sal_uInt32)( mnTextSize ) << (sal_uInt32)1 << (sal_uInt16)0;
+ mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( (sal_uInt16)0 );
mpPptEscherEx->CloseContainer(); // ESCHER_ClientTextBox
mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer
@@ -3057,20 +3057,20 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
}
else
{
- *mpExEmbed << (sal_uInt32)( 0xf | ( EPP_ExEmbed << 16 ) )
- << (sal_uInt32)0; // Size of this container
+ mpExEmbed->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ExEmbed << 16 ) ) )
+ .WriteUInt32( (sal_uInt32)0 ); // Size of this container
sal_uInt32 nSize, nOldPos = mpExEmbed->Tell();
- *mpExEmbed << (sal_uInt32)( EPP_ExEmbedAtom << 16 )
- << (sal_uInt32)8
- << (sal_uInt32)0 // follow colorscheme : 0->do not follow
+ mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_ExEmbedAtom << 16 ) )
+ .WriteUInt32( (sal_uInt32)8 )
+ .WriteUInt32( (sal_uInt32)0 ) // follow colorscheme : 0->do not follow
// 1->follow collorscheme
// 2->follow text and background scheme
- << (sal_uInt8)1 // (bool)set if embedded server can not be locked
- << (sal_uInt8)0 // (bool)do not need to send dimension
- << (sal_uInt8)0 // (bool)is object a world table
- << (sal_uInt8)0; // pad byte
+ .WriteUChar( (sal_uInt8)1 ) // (bool)set if embedded server can not be locked
+ .WriteUChar( (sal_uInt8)0 ) // (bool)do not need to send dimension
+ .WriteUChar( (sal_uInt8)0 ) // (bool)is object a world table
+ .WriteUChar( (sal_uInt8)0 ); // pad byte
PPTExOleObjEntry* pE = new PPTExOleObjEntry( NORMAL_OLE_OBJECT, mpExEmbed->Tell() );
pE->xShape = mXShape;
@@ -3089,18 +3089,18 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
catch( ::com::sun::star::uno::Exception& )
{}
- *mpExEmbed << (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) )
- << (sal_uInt32)24
- << (sal_uInt32)nAspect // Aspect
- << (sal_uInt32)0
- << (sal_uInt32)mnExEmbed // index to the persist table
- << (sal_uInt32)0 // subtype
- << (sal_uInt32)0
- << (sal_uInt32)0x0012b600;
+ 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 );
nSize = mpExEmbed->Tell() - nOldPos;
mpExEmbed->Seek( nOldPos - 4 );
- *mpExEmbed << nSize;
+ mpExEmbed->WriteUInt32( nSize );
mpExEmbed->Seek( STREAM_SEEK_TO_END );
nOlePictureId = mnExEmbed;
@@ -3186,58 +3186,58 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
// SJ: creating the Media RefObj
sal_uInt32 nRefId = ++mnExEmbed;
- *mpExEmbed << (sal_uInt16)0xf
- << (sal_uInt16)EPP_ExMCIMovie // PPT_PST_ExAviMovie
- << (sal_uInt32)0;
+ mpExEmbed->WriteUInt16( (sal_uInt16)0xf )
+ .WriteUInt16( (sal_uInt16)EPP_ExMCIMovie ) // PPT_PST_ExAviMovie
+ .WriteUInt32( (sal_uInt32)0 );
sal_uInt32 nSize, nStart = mpExEmbed->Tell();
- *mpExEmbed << (sal_uInt16)0
- << (sal_uInt16)EPP_ExObjRefAtom
- << (sal_uInt32)4
- << nRefId;
- *mpExEmbed << (sal_uInt16)0xf
- << (sal_uInt16)EPP_ExVideo
- << (sal_uInt32)0;
-
- *mpExEmbed << (sal_uInt16)0
- << (sal_uInt16)EPP_ExMediaAtom
- << (sal_uInt32)8
- << nRefId
- << (sal_uInt16)0
- << (sal_uInt16)0x435;
+ mpExEmbed->WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)EPP_ExObjRefAtom )
+ .WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( nRefId );
+ mpExEmbed->WriteUInt16( (sal_uInt16)0xf )
+ .WriteUInt16( (sal_uInt16)EPP_ExVideo )
+ .WriteUInt32( (sal_uInt32)0 );
+
+ mpExEmbed->WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)EPP_ExMediaAtom )
+ .WriteUInt32( (sal_uInt32)8 )
+ .WriteUInt32( nRefId )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)0x435 );
sal_uInt16 i, nStringLen = (sal_uInt16)aMediaURL.getLength();
- *mpExEmbed << (sal_uInt32)( EPP_CString << 16 ) << (sal_uInt32)( nStringLen * 2 );
+ mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)( nStringLen * 2 ) );
for ( i = 0; i < nStringLen; i++ )
{
sal_Unicode nChar = aMediaURL[ i ];
- *mpExEmbed << nChar;
+ mpExEmbed->WriteUInt16( nChar );
}
nSize = mpExEmbed->Tell() - nStart;
mpExEmbed->SeekRel( - ( (sal_Int32)nSize + 4 ) );
- *mpExEmbed << nSize; // size of PPT_PST_ExMCIMovie
+ mpExEmbed->WriteUInt32( nSize ); // size of PPT_PST_ExMCIMovie
mpExEmbed->SeekRel( 0x10 );
nSize -= 20;
- *mpExEmbed << nSize; // PPT_PST_ExMediaAtom
+ mpExEmbed->WriteUInt32( nSize ); // PPT_PST_ExMediaAtom
mpExEmbed->SeekRel( nSize );
if ( !pClientData )
pClientData = new SvMemoryStream( 0x200, 0x200 );
- *pClientData << (sal_uInt16)0
- << (sal_uInt16)EPP_ExObjRefAtom
- << (sal_uInt32)4
- << nRefId;
+ pClientData->WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)EPP_ExObjRefAtom )
+ .WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( nRefId );
// write EPP_InteractiveInfo container for no_action
- *pClientData << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)24;
- *pClientData << (sal_uInt16)0
- << (sal_uInt16)EPP_InteractiveInfoAtom
- << (sal_uInt32)16
- << (sal_uInt32) 0
- << (sal_uInt32) 0
- << (sal_uInt8) 6
- << (sal_uInt8) 0
- << (sal_uInt8) 0
- << (sal_uInt8) 0
- << (sal_uInt32) 0;
+ pClientData->WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)24 );
+ pClientData->WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)EPP_InteractiveInfoAtom )
+ .WriteUInt32( (sal_uInt32)16 )
+ .WriteUInt32( (sal_uInt32) 0 )
+ .WriteUInt32( (sal_uInt32) 0 )
+ .WriteUChar( (sal_uInt8) 6 )
+ .WriteUChar( (sal_uInt8) 0 )
+ .WriteUChar( (sal_uInt8) 0 )
+ .WriteUChar( (sal_uInt8) 0 )
+ .WriteUInt32( (sal_uInt32) 0 );
}
}
}
@@ -3299,19 +3299,19 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( !pClientData )
pClientData = new SvMemoryStream( 0x200, 0x200 );
- *pClientData << (sal_uInt32)( EPP_OEPlaceholderAtom << 16 ) << (sal_uInt32)8
- << nPlacementID // PlacementID
- << (sal_uInt8)nPlaceHolderAtom // PlaceHolderID
- << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
- << (sal_uInt16)0; // padword
+ pClientData->WriteUInt32( (sal_uInt32)( EPP_OEPlaceholderAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 )
+ .WriteInt32( nPlacementID ) // PlacementID
+ .WriteUChar( (sal_uInt8)nPlaceHolderAtom ) // PlaceHolderID
+ .WriteUChar( (sal_uInt8)0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
+ .WriteUInt16( (sal_uInt16)0 ); // padword
}
if ( nOlePictureId )
{
if ( !pClientData )
pClientData = new SvMemoryStream( 0x200, 0x200 );
- *pClientData << (sal_uInt32)( EPP_ExObjRefAtom << 16 ) << (sal_uInt32)4
- << nOlePictureId;
+ pClientData->WriteUInt32( (sal_uInt32)( EPP_ExObjRefAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( nOlePictureId );
nOlePictureId = 0;
}
if ( bEffect )
@@ -3418,8 +3418,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( !pClientTextBox )
pClientTextBox = new SvMemoryStream( 12 );
- *pClientTextBox << (sal_uInt32)( EPP_TextHeaderAtom << 16 ) << (sal_uInt32)4
- << (sal_uInt32)7;
+ pClientTextBox->WriteUInt32( (sal_uInt32)( EPP_TextHeaderAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 )
+ .WriteUInt32( (sal_uInt32)7 );
}
}
}
@@ -3437,16 +3437,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( pClientData )
{
- *mpStrm << (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf )
- << (sal_uInt32)pClientData->Tell();
+ mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) )
+ .WriteUInt32( (sal_uInt32)pClientData->Tell() );
mpStrm->Write( pClientData->GetData(), pClientData->Tell() );
delete pClientData, pClientData = NULL;
}
if ( pClientTextBox )
{
- *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf )
- << (sal_uInt32)pClientTextBox->Tell();
+ mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
+ .WriteUInt32( (sal_uInt32)pClientTextBox->Tell() );
mpStrm->Write( pClientTextBox->GetData(), pClientTextBox->Tell() );
delete pClientTextBox, pClientTextBox = NULL;
@@ -3510,8 +3510,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
else
mpPptEscherEx->AddClientAnchor( maRect );
- *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf )
- << (sal_uInt32)pClientTextBox->Tell();
+ mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
+ .WriteUInt32( (sal_uInt32)pClientTextBox->Tell() );
mpStrm->Write( pClientTextBox->GetData(), pClientTextBox->Tell() );
delete pClientTextBox, pClientTextBox = NULL;
@@ -3564,10 +3564,10 @@ sal_Bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int
aPropOptSp.AddOpt( ESCHER_Prop_fc3DLightFace, 0x80000 );
aPropOptSp.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 16, ESCHER_ChildAnchor );
- *mpStrm << nX1
- << nY1
- << nX2
- << nY2;
+ mpStrm ->WriteInt32( nX1 )
+ .WriteInt32( nY1 )
+ .WriteInt32( nX2 )
+ .WriteInt32( nY2 );
mpPptEscherEx->CloseContainer();
return sal_True;
}
@@ -3614,10 +3614,10 @@ void PPTWriter::WriteCString( SvStream& rSt, const OUString& rString, sal_uInt32
sal_Int32 nLen = rString.getLength();
if ( nLen )
{
- rSt << (sal_uInt32)( ( nInstance << 4 ) | ( EPP_CString << 16 ) )
- << (sal_uInt32)( nLen << 1 );
+ rSt.WriteUInt32( (sal_uInt32)( ( nInstance << 4 ) | ( EPP_CString << 16 ) ) )
+ .WriteUInt32( (sal_uInt32)( nLen << 1 ) );
for ( sal_Int32 i = 0; i < nLen; i++ )
- rSt << rString[i];
+ rSt.WriteUInt16( rString[i] );
}
}
@@ -3671,10 +3671,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer );
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 );
- *mpStrm << (sal_Int32)maRect.Left() // Bounding box for the grouped shapes to which they are attached
- << (sal_Int32)maRect.Top()
- << (sal_Int32)maRect.Right()
- << (sal_Int32)maRect.Bottom();
+ mpStrm ->WriteInt32( (sal_Int32)maRect.Left() ) // Bounding box for the grouped shapes to which they are attached
+ .WriteInt32( (sal_Int32)maRect.Top() )
+ .WriteInt32( (sal_Int32)maRect.Right() )
+ .WriteInt32( (sal_Int32)maRect.Bottom() );
sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId();
mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch
@@ -3685,13 +3685,13 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
{
SvMemoryStream aMemStrm;
aMemStrm.ObjectOwnsMemory( sal_False );
- aMemStrm << nRowCount
- << nRowCount
- << (sal_uInt16)4;
+ aMemStrm.WriteUInt16( nRowCount )
+ .WriteUInt16( nRowCount )
+ .WriteUInt16( (sal_uInt16)4 );
std::vector< std::pair< sal_Int32, sal_Int32 > >::const_iterator aIter( aRows.begin() );
while( aIter != aRows.end() )
- aMemStrm << (*aIter++).second;
+ aMemStrm.WriteInt32( (*aIter++).second );
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x1000100 );
aPropOpt2.AddOpt( ESCHER_Prop_tableProperties, 1 );
@@ -3745,8 +3745,8 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
{
SvMemoryStream* pClientData = new SvMemoryStream( 0x200, 0x200 );
ImplProgTagContainer( pClientData, &aExtBu );
- *mpStrm << (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf )
- << (sal_uInt32)pClientData->Tell();
+ mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) )
+ .WriteUInt32( (sal_uInt32)pClientData->Tell() );
mpStrm->Write( pClientData->GetData(), pClientData->Tell() );
delete pClientData, pClientData = NULL;
@@ -3754,13 +3754,13 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
aPropOptSp.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 16, ESCHER_ChildAnchor );
- *mpStrm << nLeft
- << nTop
- << nRight
- << nBottom;
+ mpStrm ->WriteInt32( nLeft )
+ .WriteInt32( nTop )
+ .WriteInt32( nRight )
+ .WriteInt32( nBottom );
- *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf )
- << (sal_uInt32)aClientTextBox.Tell();
+ mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) )
+ .WriteUInt32( (sal_uInt32)aClientTextBox.Tell() );
mpStrm->Write( aClientTextBox.GetData(), aClientTextBox.Tell() );
mpPptEscherEx->CloseContainer();
@@ -3896,12 +3896,12 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
void TextObjBinary::Write( SvStream* pStrm )
{
sal_uInt32 nSize, nPos = pStrm->Tell();
- *pStrm << (sal_uInt32)( EPP_TextCharsAtom << 16 ) << (sal_uInt32)0;
+ pStrm->WriteUInt32( (sal_uInt32)( EPP_TextCharsAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 );
for ( sal_uInt32 i = 0; i < ParagraphCount(); ++i )
GetParagraph(i)->Write( pStrm );
nSize = pStrm->Tell() - nPos;
pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
- *pStrm << (sal_uInt32)( nSize - 8 );
+ pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) );
pStrm->SeekRel( nSize - 8 );
}
@@ -3920,15 +3920,15 @@ void TextObjBinary::WriteTextSpecInfo( SvStream* pStrm )
sal_Int32 nPortionSize = pPortion->mnTextSize >= nCharactersLeft ? nCharactersLeft : pPortion->mnTextSize;
sal_Int32 nFlags = 7;
nCharactersLeft -= nPortionSize;
- *pStrm << static_cast< sal_uInt32 >( nPortionSize )
- << nFlags
- << static_cast< sal_Int16 >( 1 ) // spellinfo -> needs rechecking
- << static_cast< sal_Int16 >( LanguageTag( pPortion->meCharLocale ).makeFallback().getLanguageType() )
- << static_cast< sal_Int16 >( 0 ); // alt language
+ pStrm ->WriteUInt32( static_cast< sal_uInt32 >( nPortionSize ) )
+ .WriteInt32( nFlags )
+ .WriteInt16( static_cast< sal_Int16 >( 1 ) ) // spellinfo -> needs rechecking
+ .WriteInt16( static_cast< sal_Int16 >( LanguageTag( pPortion->meCharLocale ).makeFallback().getLanguageType() ) )
+ .WriteInt16( static_cast< sal_Int16 >( 0 ) ); // alt language
}
}
if ( nCharactersLeft )
- *pStrm << nCharactersLeft << static_cast< sal_Int32 >( 1 ) << static_cast< sal_Int16 >( 1 );
+ pStrm->WriteUInt32( nCharactersLeft ).WriteInt32( static_cast< sal_Int32 >( 1 ) ).WriteInt16( static_cast< sal_Int16 >( 1 ) );
}
}
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index e8df344b228e..d2c78b64374b 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -40,8 +40,8 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize()
void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
{
sal_uInt32 nSize = DrawingGroupContainerSize();
- rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup
- << (sal_uInt32)( nSize - 8 );
+ rSt.WriteUInt32( (sal_uInt32)( 0xf | ( 1035 << 16 ) ) ) // EPP_PPDrawingGroup
+ .WriteUInt32( (sal_uInt32)( nSize - 8 ) );
ImplWriteDggContainer( rSt );
}
@@ -65,8 +65,8 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt )
sal_uInt32 nSize = ImplDggContainerSize();
if ( nSize )
{
- rSt << (sal_uInt32)( 0xf | ( ESCHER_DggContainer << 16 ) )
- << (sal_uInt32)( nSize - 8 );
+ rSt.WriteUInt32( (sal_uInt32)( 0xf | ( ESCHER_DggContainer << 16 ) ) )
+ .WriteUInt32( (sal_uInt32)( nSize - 8 ) );
mxGlobal->SetDggContainer();
mxGlobal->WriteDggAtom( rSt );
@@ -93,14 +93,14 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt )
sal_uInt32 nSize = ImplOptAtomSize();
if ( nSize )
{
- rSt << (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 )
- << (sal_uInt32)( nSize - 8 )
- << (sal_uInt16)ESCHER_Prop_fillColor << (sal_uInt32)0xffb800
- << (sal_uInt16)ESCHER_Prop_fillBackColor << (sal_uInt32)0
- << (sal_uInt16)ESCHER_Prop_fNoFillHitTest << (sal_uInt32)0x00100010
- << (sal_uInt16)ESCHER_Prop_lineColor << (sal_uInt32)0x8000001
- << (sal_uInt16)ESCHER_Prop_fNoLineDrawDash << (sal_uInt32)0x00080008
- << (sal_uInt16)ESCHER_Prop_shadowColor << (sal_uInt32)0x8000002;
+ rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) )
+ .WriteUInt32( (sal_uInt32)( nSize - 8 ) )
+ .WriteUInt16( (sal_uInt16)ESCHER_Prop_fillColor ) .WriteUInt32( (sal_uInt32)0xffb800 )
+ .WriteUInt16( (sal_uInt16)ESCHER_Prop_fillBackColor ) .WriteUInt32( (sal_uInt32)0 )
+ .WriteUInt16( (sal_uInt16)ESCHER_Prop_fNoFillHitTest ) .WriteUInt32( (sal_uInt32)0x00100010 )
+ .WriteUInt16( (sal_uInt16)ESCHER_Prop_lineColor ) .WriteUInt32( (sal_uInt32)0x8000001 )
+ .WriteUInt16( (sal_uInt16)ESCHER_Prop_fNoLineDrawDash ) .WriteUInt32( (sal_uInt32)0x00080008 )
+ .WriteUInt16( (sal_uInt16)ESCHER_Prop_shadowColor ) .WriteUInt32( (sal_uInt32)0x8000002 );
}
}
@@ -121,12 +121,12 @@ void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt )
sal_uInt32 nSize = ImplSplitMenuColorsAtomSize();
if ( nSize )
{
- rSt << (sal_uInt32)( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) )
- << (sal_uInt32)( nSize - 8 )
- << (sal_uInt32)0x08000004
- << (sal_uInt32)0x08000001
- << (sal_uInt32)0x08000002
- << (sal_uInt32)0x100000f7;
+ 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 );
}
}
@@ -141,7 +141,7 @@ PptEscherEx::~PptEscherEx()
void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance )
{
- *mpOutStrm << (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) << n_EscherContainer << (sal_uInt32)0;
+ mpOutStrm->WriteUInt16( (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) ).WriteUInt16( n_EscherContainer ).WriteUInt32( (sal_uInt32)0 );
mOffsets.push_back( mpOutStrm->Tell() - 4 );
mRecTypes.push_back( n_EscherContainer );
@@ -155,8 +155,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 << (sal_uInt32)0 // The number of shapes in this drawing
- << (sal_uInt32)0; // The last MSOSPID given to an SP in this DG
+ 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
}
}
break;
@@ -188,7 +188,7 @@ void PptEscherEx::CloseContainer()
sal_uInt32 nSize, nPos = mpOutStrm->Tell();
nSize = ( nPos - mOffsets.back() ) - 4;
mpOutStrm->Seek( mOffsets.back() );
- *mpOutStrm << nSize;
+ mpOutStrm->WriteUInt32( nSize );
switch( mRecTypes.back() )
{
@@ -198,7 +198,7 @@ void PptEscherEx::CloseContainer()
{
mbEscherDg = sal_False;
if ( DoSeek( ESCHER_Persist_Dg | mnCurrentDg ) )
- *mpOutStrm << mxGlobal->GetDrawingShapeCount( mnCurrentDg ) << mxGlobal->GetLastShapeId( mnCurrentDg );
+ mpOutStrm->WriteUInt32( mxGlobal->GetDrawingShapeCount( mnCurrentDg ) ).WriteUInt32( mxGlobal->GetLastShapeId( mnCurrentDg ) );
}
}
break;
@@ -241,10 +241,10 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
OpenContainer( ESCHER_SpContainer );
AddAtom( 16, ESCHER_Spgr, 1 );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() );
- *mpOutStrm << (sal_Int32)aRect.Left() // bounding box for the grouped shapes to which they are attached
- << (sal_Int32)aRect.Top()
- << (sal_Int32)aRect.Right()
- << (sal_Int32)aRect.Bottom();
+ mpOutStrm ->WriteInt32( (sal_Int32)aRect.Left() ) // bounding box for the grouped shapes to which they are attached
+ .WriteInt32( (sal_Int32)aRect.Top() )
+ .WriteInt32( (sal_Int32)aRect.Right() )
+ .WriteInt32( (sal_Int32)aRect.Bottom() );
nShapeId = GenerateShapeId();
if ( !mnGroupLevel )
@@ -256,16 +256,16 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
{
AddAtom( 8, ESCHER_ClientAnchor );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() );
- *mpOutStrm << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left() << (sal_Int16)aRect.Right() << (sal_Int16)aRect.Bottom();
+ mpOutStrm->WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ).WriteInt16( (sal_Int16)aRect.Right() ).WriteInt16( (sal_Int16)aRect.Bottom() );
}
else
{
AddAtom( 16, ESCHER_ChildAnchor );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() );
- *mpOutStrm << (sal_Int32)aRect.Left()
- << (sal_Int32)aRect.Top()
- << (sal_Int32)aRect.Right()
- << (sal_Int32)aRect.Bottom();
+ mpOutStrm ->WriteInt32( (sal_Int32)aRect.Left() )
+ .WriteInt32( (sal_Int32)aRect.Top() )
+ .WriteInt32( (sal_Int32)aRect.Right() )
+ .WriteInt32( (sal_Int32)aRect.Bottom() );
}
}
if ( pClientData )
@@ -274,8 +274,8 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
sal_uInt32 nSize = pClientData->Tell();
if ( nSize )
{
- *mpOutStrm << (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf )
- << nSize;
+ mpOutStrm->WriteUInt32( (sal_uInt32)( ( 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 6ad06d633759..3a9d5d0ee136 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -254,14 +254,14 @@ const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, co
SvStream& operator<<(SvStream& rOut, AnimationNode& rNode )
{
- rOut << rNode.mnU1;
- rOut << rNode.mnRestart;
- rOut << rNode.mnGroupType;
- rOut << rNode.mnFill;
- rOut << rNode.mnU3;
- rOut << rNode.mnU4;
- rOut << rNode.mnDuration;
- rOut << rNode.mnNodeType;
+ rOut.WriteInt32( rNode.mnU1 );
+ rOut.WriteInt32( rNode.mnRestart );
+ rOut.WriteInt32( rNode.mnGroupType );
+ rOut.WriteInt32( rNode.mnFill );
+ rOut.WriteInt32( rNode.mnU3 );
+ rOut.WriteInt32( rNode.mnU4 );
+ rOut.WriteInt32( rNode.mnDuration );
+ rOut.WriteInt32( rNode.mnNodeType );
return rOut;
}
@@ -679,7 +679,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode >
EscherExContainer aAnimEvent( rStrm, DFF_msofbtAnimEvent, 1 );
{
EscherExAtom aAnimTrigger( rStrm, DFF_msofbtAnimTrigger );
- rStrm << nU1 << nTrigger << nU3 << nBegin;
+ rStrm.WriteInt32( nU1 ).WriteInt32( nTrigger ).WriteInt32( nU3 ).WriteInt32( nBegin );
}
}
nU1 = 1;
@@ -689,7 +689,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode >
EscherExContainer aAnimEvent( rStrm, DFF_msofbtAnimEvent, 2 );
{
EscherExAtom aAnimTrigger( rStrm, DFF_msofbtAnimTrigger );
- rStrm << nU1 << nTrigger << nU3 << nBegin;
+ rStrm.WriteInt32( nU1 ).WriteInt32( nTrigger ).WriteInt32( nU3 ).WriteInt32( nBegin );
}
}
EscherExContainer aAnimateTargetElement( rStrm, DFF_msofbtAnimateTargetElement );
@@ -701,7 +701,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode >
sal_Int32 end = -1;
EscherExAtom aAnimReference( rStrm, DFF_msofbtAnimReference );
- rStrm << nRefMode << nRefType << nRefId << begin << end;
+ rStrm.WriteUInt32( nRefMode ).WriteUInt32( nRefType ).WriteUInt32( nRefId ).WriteInt32( begin ).WriteInt32( end );
}
}
}
@@ -1195,7 +1195,7 @@ void AnimationExporter::exportAnimPropertyString( SvStream& rStrm, const sal_uIn
{
EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId );
sal_uInt8 nType = DFF_ANIM_PROP_TYPE_UNISTRING;
- rStrm << nType;
+ rStrm.WriteUChar( nType );
OUString aStr( rVal );
if ( eTranslateMode != TRANSLATE_NONE )
ImplTranslateAttribute( aStr, eTranslateMode );
@@ -1207,32 +1207,32 @@ void AnimationExporter::exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt
EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId );
sal_uInt8 nType = DFF_ANIM_PROP_TYPE_FLOAT;
float fFloat = (float)rVal;
- rStrm << nType
- << fFloat;
+ rStrm.WriteUChar( nType )
+ .WriteFloat( fFloat );
}
void AnimationExporter::exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode )
{
EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId );
sal_uInt8 nType = DFF_ANIM_PROP_TYPE_INT32 ;
- rStrm << nType
- << nVal;
+ rStrm.WriteUChar( nType )
+ .WriteUInt32( nVal );
}
void AnimationExporter::exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal, const TranslateMode )
{
EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId );
sal_uInt8 nType = DFF_ANIM_PROP_TYPE_BYTE;
- rStrm << nType
- << nVal;
+ rStrm.WriteUChar( nType )
+ .WriteUChar( nVal );
}
void AnimationExporter::writeZString( SvStream& rStrm, const OUString& rVal )
{
sal_Int32 i;
for ( i = 0; i < rVal.getLength(); i++ )
- rStrm << rVal[ i ];
- rStrm << (sal_Unicode)0;
+ rStrm.WriteUInt16( rVal[ i ] );
+ rStrm.WriteUInt16( (sal_Unicode)0 );
}
void AnimationExporter::exportAnimAction( SvStream& rStrm, const Reference< XAnimationNode >& xNode )
@@ -1251,11 +1251,11 @@ void AnimationExporter::exportAnimAction( SvStream& rStrm, const Reference< XAni
if ( nAnimationEndSync == AnimationEndSync::ALL )
nEndSync = 1;
}
- rStrm << nConcurrent
- << nNextAction
- << nEndSync
- << nU4
- << nU5;
+ rStrm.WriteInt32( nConcurrent )
+ .WriteInt32( nNextAction )
+ .WriteInt32( nEndSync )
+ .WriteInt32( nU4 )
+ .WriteInt32( nU5 );
}
@@ -1389,10 +1389,10 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim
EscherExContainer aAnimEvent( rStrm, DFF_msofbtAnimEvent, i + 1 );
{
EscherExAtom aAnimTrigger( rStrm, DFF_msofbtAnimTrigger );
- rStrm << nU1
- << nTrigger
- << nU3
- << nBegin;
+ rStrm.WriteInt32( nU1 )
+ .WriteInt32( nTrigger )
+ .WriteInt32( nU3 )
+ .WriteInt32( nBegin );
}
exportAnimateTargetElement( rStrm, aSource, ( nFlags & ( 1 << i ) ) != 0 );
}
@@ -1539,7 +1539,7 @@ void AnimationExporter::exportAnimateSet( SvStream& rStrm, const Reference< XAni
EscherExAtom aAnimateSetData( rStrm, DFF_msofbtAnimateSetData );
sal_uInt32 nId1 = 1; // ??
sal_uInt32 nId2 = 1; // ??
- rStrm << nId1 << nId2;
+ rStrm.WriteUInt32( nId1 ).WriteUInt32( nId2 );
}
Any aConvertedValue( convertAnimateValue( xSet->getTo(), xSet->getAttributeName() ) );
if ( aConvertedValue.hasValue() )
@@ -1624,9 +1624,9 @@ void AnimationExporter::exportAnimate( SvStream& rStrm, const Reference< XAnimat
if ( aTo.hasValue() )
nBits |= 4;
- rStrm << nCalcMode
- << nBits
- << nValueType;
+ rStrm.WriteUInt32( nCalcMode )
+ .WriteUInt32( nBits )
+ .WriteUInt32( nValueType );
}
if ( aBy.hasValue() )
exportAnimProperty( rStrm, 1, aBy, TRANSLATE_NUMBER_TO_STRING | TRANSLATE_MEASURE );
@@ -1678,10 +1678,10 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
nAccumulate = 1;
}
}
- rStrm << nBits
- << nAdditive
- << nAccumulate
- << nTransformType;
+ rStrm.WriteUInt32( nBits )
+ .WriteUInt32( nAdditive )
+ .WriteUInt32( nAccumulate )
+ .WriteUInt32( nTransformType );
}
if ( !xAnimate->getAttributeName().isEmpty() || nForceAttributeNames )
{
@@ -1790,16 +1790,16 @@ void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any a
sal_uInt32 nRefType = 1; // TODO: nRefType == 2 -> Sound;
sal_uInt32 nRefId = ((EscherSolverContainer&)mrSolverContainer).GetShapeId( xShape );
- rStrm << nRefMode
- << nRefType
- << nRefId
- << begin
- << end;
+ rStrm.WriteUInt32( nRefMode )
+ .WriteUInt32( nRefType )
+ .WriteUInt32( nRefId )
+ .WriteInt32( begin )
+ .WriteInt32( end );
}
if ( bCreate2b01Atom )
{
EscherExAtom a2b01Atom( rStrm, 0x2b01 );
- rStrm << (sal_uInt32)1; // ?
+ rStrm.WriteUInt32( (sal_uInt32)1 ); // ?
}
}
}
@@ -1818,7 +1818,7 @@ void AnimationExporter::exportAnimateKeyPoints( SvStream& rStrm, const Reference
{
EscherExAtom aAnimKeyTime( rStrm, DFF_msofbtAnimKeyTime );
sal_Int32 nKeyTime = (sal_Int32)( aKeyTimes[ i ] * 1000.0 );
- rStrm << nKeyTime;
+ rStrm.WriteInt32( nKeyTime );
}
Any aAny[ 2 ];
if ( aValues[ i ].hasValue() )
@@ -1864,8 +1864,8 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim
{
EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue );
sal_uInt32 nType = 0;
- rStrm << nType
- << fRepeatCount;
+ rStrm.WriteUInt32( nType )
+ .WriteFloat( fRepeatCount );
}
// accelerate (3)
float fAccelerate = (float)xNode->getAcceleration();
@@ -1873,8 +1873,8 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim
{
EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue );
sal_uInt32 nType = 3;
- rStrm << nType
- << fAccelerate;
+ rStrm.WriteUInt32( nType )
+ .WriteFloat( fAccelerate );
}
// decelerate (4)
@@ -1883,8 +1883,8 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim
{
EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue );
sal_uInt32 nType = 4;
- rStrm << nType
- << fDecelerate;
+ rStrm.WriteUInt32( nType )
+ .WriteFloat( fDecelerate );
}
// autoreverse (5)
@@ -1894,8 +1894,8 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim
EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue );
sal_uInt32 nType = 5;
sal_uInt32 nVal = bAutoReverse ? 1 : 0;
- rStrm << nType
- << nVal;
+ rStrm.WriteUInt32( nType )
+ .WriteUInt32( nVal );
}
}
@@ -1911,8 +1911,8 @@ void AnimationExporter::exportTransitionFilter( SvStream& rStrm, const Reference
// bit 1 -> use nTransition
sal_uInt32 nTransition = xFilter->getMode() ? 0 : 1;
- rStrm << nBits
- << nTransition;
+ rStrm.WriteUInt32( nBits )
+ .WriteUInt32( nTransition );
}
const sal_Char* pFilter = FindTransitionName( xFilter->getTransition(), xFilter->getSubtype(), xFilter->getDirection() );
if ( pFilter )
@@ -1941,7 +1941,7 @@ void AnimationExporter::exportAnimateMotion( SvStream& rStrm, const Reference< X
float fFromY = 0.0; // nBits&2
float fToX = 100.0; // nBits&4
float fToY = 100.0; // nBits&4
- rStrm << nBits << fByX << fByY << fFromX << fFromY << fToX << fToY << nOrigin;
+ rStrm.WriteUInt32( nBits ).WriteFloat( fByX ).WriteFloat( fByY ).WriteFloat( fFromX ).WriteFloat( fFromY ).WriteFloat( fToX ).WriteFloat( fToY ).WriteUInt32( nOrigin );
}
OUString aStr;
@@ -2008,7 +2008,7 @@ void AnimationExporter::exportAnimateTransform( SvStream& rStrm, const Reference
//if( nBits & 8 )
//( fprintf( mpFile, " zoomContents=\"%s\"", nZoomContents ? "true" : "false" );
- rStrm << nBits << fByX << fByY << fFromX << fFromY << fToX << fToY << nZoomContents;
+ rStrm.WriteUInt32( nBits ).WriteFloat( fByX ).WriteFloat( fByY ).WriteFloat( fFromX ).WriteFloat( fFromY ).WriteFloat( fToX ).WriteFloat( fToY ).WriteUInt32( nZoomContents );
}
exportAnimateTarget( rStrm, xNode );
}
@@ -2039,7 +2039,7 @@ void AnimationExporter::exportAnimateTransform( SvStream& rStrm, const Reference
nBits |= 4;
fTo = (float)fVal;
}
- rStrm << nBits << fBy << fFrom << fTo << nU1;
+ rStrm.WriteUInt32( nBits ).WriteFloat( fBy ).WriteFloat( fFrom ).WriteFloat( fTo ).WriteUInt32( nU1 );
}
exportAnimateTarget( rStrm, xNode, 1 );
}
@@ -2112,10 +2112,10 @@ void AnimationExporter::exportAnimateColor( SvStream& rStrm, const Reference< XA
if ( getColorAny( aAny, nColorSpace, nToMode, nToA, nToB, nToC ) )
nBits |= 0x14;
}
- rStrm << nBits
- << nByMode << nByA << nByB << nByC
- << nFromMode << nFromA << nFromB << nFromC
- << nToMode << nToA << nToB << nToC;
+ rStrm .WriteUInt32( nBits )
+ .WriteInt32( nByMode ).WriteInt32( nByA ).WriteInt32( nByB ).WriteInt32( nByC )
+ .WriteInt32( nFromMode ).WriteInt32( nFromA ).WriteInt32( nFromB ).WriteInt32( nFromC )
+ .WriteInt32( nToMode ).WriteInt32( nToA ).WriteInt32( nToB ).WriteInt32( nToC );
}
exportAnimateTarget( rStrm, xNode, 0, nAfterEffectType );
}
@@ -2173,7 +2173,7 @@ void AnimationExporter::exportIterate( SvStream& rStrm, const Reference< XAnimat
if( fDuration )
fInterval = (float)(100.0 * fInterval / fDuration);
- rStrm << fInterval << nTextUnitEffect << nU1 << nU2 << nU3;
+ rStrm.WriteFloat( fInterval ).WriteInt32( nTextUnitEffect ).WriteInt32( nU1 ).WriteInt32( nU2 ).WriteInt32( nU3 );
aTarget = xIterate->getTarget();
}
}
diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx
index 5978dc8f23dc..dea8b243d456 100644
--- a/sd/source/filter/eppt/pptexsoundcollection.cxx
+++ b/sd/source/filter/eppt/pptexsoundcollection.cxx
@@ -97,34 +97,34 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const
comphelper::getProcessComponentContext() );
// create SoundContainer
- rSt << (sal_uInt32)( ( EPP_Sound << 16 ) | 0xf ) << (sal_uInt32)( GetSize( nId ) - 8 );
+ rSt.WriteUInt32( (sal_uInt32)( ( EPP_Sound << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)( GetSize( nId ) - 8 ) );
OUString aSoundName( ImplGetName() );
sal_Int32 i, nSoundNameLen = aSoundName.getLength();
if ( nSoundNameLen )
{
// name of sound ( instance 0 )
- rSt << (sal_uInt32)( EPP_CString << 16 ) << (sal_uInt32)( nSoundNameLen * 2 );
+ rSt.WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)( nSoundNameLen * 2 ) );
for ( i = 0; i < nSoundNameLen; ++i )
- rSt << aSoundName[i];
+ rSt.WriteUInt16( aSoundName[i] );
}
OUString aExtension( ImplGetExtension() );
sal_Int32 nExtensionLen = aExtension.getLength();
if ( nExtensionLen )
{
// extension of sound ( instance 1 )
- rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 16 ) << (sal_uInt32)( nExtensionLen * 2 );
+ rSt.WriteUInt32( (sal_uInt32)( ( EPP_CString << 16 ) | 16 ) ).WriteUInt32( (sal_uInt32)( nExtensionLen * 2 ) );
for ( i = 0; i < nExtensionLen; ++i )
- rSt << aExtension[i];
+ rSt.WriteUInt16( aExtension[i] );
}
// id of sound ( instance 2 )
OUString aId( OUString::number(nId ) );
sal_Int32 nIdLen = aId.getLength();
- rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 32 ) << (sal_uInt32)( nIdLen * 2 );
+ rSt.WriteUInt32( (sal_uInt32)( ( EPP_CString << 16 ) | 32 ) ).WriteUInt32( (sal_uInt32)( nIdLen * 2 ) );
for ( i = 0; i < nIdLen; ++i )
- rSt << aId[i];
+ rSt.WriteUInt16( aId[i] );
- rSt << (sal_uInt32)( EPP_SoundData << 16 ) << (sal_uInt32)( nFileSize );
+ rSt.WriteUInt32( (sal_uInt32)( EPP_SoundData << 16 ) ).WriteUInt32( (sal_uInt32)( 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 << (sal_uInt16)0xf << (sal_uInt16)EPP_SoundCollection << (sal_uInt32)( GetSize() - 8 );
+ rSt.WriteUInt16( (sal_uInt16)0xf ).WriteUInt16( (sal_uInt16)EPP_SoundCollection ).WriteUInt32( (sal_uInt32)( GetSize() - 8 ) );
// create SoundCollAtom ( reference to the next free SoundId );
- rSt << (sal_uInt32)( EPP_SoundCollAtom << 16 ) << (sal_uInt32)4 << nSoundCount;
+ rSt.WriteUInt32( (sal_uInt32)( EPP_SoundCollAtom << 16 ) ).WriteUInt32( (sal_uInt32)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 f35762cbae5f..b99755e9ab8e 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -99,9 +99,9 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
if ( bSimpleText )
nCharFlags = 0x7ffff;
- rSt << nCharFlags
- << rLev.mnFlags
- << rLev.mnFont;
+ rSt.WriteUInt32( nCharFlags )
+ .WriteUInt16( rLev.mnFlags )
+ .WriteUInt16( rLev.mnFont );
sal_uInt32 nFontColor = rLev.mnFontColor;
if ( nFontColor == COL_AUTO )
@@ -116,17 +116,17 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
nFontColor |= 0xfe000000;
if ( bSimpleText )
{
- rSt << rLev.mnFontHeight
- << nFontColor;
+ rSt.WriteUInt16( rLev.mnFontHeight )
+ .WriteUInt32( nFontColor );
}
else
{
- rSt << rLev.mnAsianOrComplexFont
- << (sal_uInt16)0xffff // unknown
- << (sal_uInt16)0xffff // unknown
- << rLev.mnFontHeight
- << nFontColor
- << rLev.mnEscapement;
+ rSt.WriteUInt16( rLev.mnAsianOrComplexFont )
+ .WriteUInt16( (sal_uInt16)0xffff ) // unknown
+ .WriteUInt16( (sal_uInt16)0xffff ) // unknown
+ .WriteUInt16( rLev.mnFontHeight )
+ .WriteUInt32( nFontColor )
+ .WriteUInt16( rLev.mnEscapement );
}
}
@@ -325,18 +325,18 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
SvStream& rOut = rBuProv.aBuExMasterStream;
if ( !nLev )
{
- rOut << (sal_uInt32)( ( EPP_PST_ExtendedParagraphMasterAtom << 16 ) | ( mnInstance << 4 ) )
- << (sal_uInt32)( 5 * 16 + 2 )
- << (sal_uInt16)5; // depth
+ rOut.WriteUInt32( (sal_uInt32)( ( EPP_PST_ExtendedParagraphMasterAtom << 16 ) | ( mnInstance << 4 ) ) )
+ .WriteUInt32( (sal_uInt32)( 5 * 16 + 2 ) )
+ .WriteUInt16( (sal_uInt16)5 ); // depth
}
sal_uInt16 nBulletId = rLev.mnBulletId;
if ( rLev.mnNumberingType != SVX_NUM_BITMAP )
nBulletId = 0xffff;
- rOut << (sal_uInt32)0x03800000
- << (sal_uInt16)nBulletId
- << (sal_uInt32)rLev.mnMappedNumType
- << (sal_uInt16)rLev.mnBulletStart
- << (sal_uInt32)0;
+ rOut.WriteUInt32( (sal_uInt32)0x03800000 )
+ .WriteUInt16( (sal_uInt16)nBulletId )
+ .WriteUInt32( (sal_uInt32)rLev.mnMappedNumType )
+ .WriteUInt16( (sal_uInt16)rLev.mnBulletStart )
+ .WriteUInt32( (sal_uInt32)0 );
}
sal_uInt32 nParaFlags = 0x3ffdff;
@@ -357,31 +357,31 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
}
nBulletColor &= 0xffffff;
nBulletColor |= 0xfe000000;
- rSt << nParaFlags
- << nBulletFlags
- << rLev.mnBulletChar
- << rLev.mnBulletFont
- << rLev.mnBulletHeight
- << nBulletColor
- << rLev.mnAdjust
- << rLev.mnLineFeed
- << rLev.mnUpperDist
- << rLev.mnLowerDist
- << rLev.mnTextOfs
- << rLev.mnBulletOfs;
+ rSt.WriteUInt32( nParaFlags )
+ .WriteUInt16( nBulletFlags )
+ .WriteUInt16( rLev.mnBulletChar )
+ .WriteUInt16( rLev.mnBulletFont )
+ .WriteUInt16( rLev.mnBulletHeight )
+ .WriteUInt32( nBulletColor )
+ .WriteUInt16( rLev.mnAdjust )
+ .WriteUInt16( rLev.mnLineFeed )
+ .WriteUInt16( rLev.mnUpperDist )
+ .WriteUInt16( rLev.mnLowerDist )
+ .WriteUInt16( rLev.mnTextOfs )
+ .WriteUInt16( rLev.mnBulletOfs );
if ( bSimpleText || nLev )
{
if ( nParaFlags & 0x200000 )
- rSt << rLev.mnBiDi;
+ rSt.WriteUInt16( rLev.mnBiDi );
}
else
{
- rSt << rLev.mnDefaultTab
- << (sal_uInt16)0
- << (sal_uInt16)0
- << rLev.mnAsianSettings
- << rLev.mnBiDi;
+ rSt.WriteUInt16( rLev.mnDefaultTab )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( rLev.mnAsianSettings )
+ .WriteUInt16( rLev.mnBiDi );
}
}
@@ -485,14 +485,14 @@ void PPTExStyleSheet::WriteTxCFStyleAtom( SvStream& rSt )
sal_uInt32 nCharFlags = rCharStyle.mnFlags;
nCharFlags &= CharAttr_Italic | CharAttr_Bold | CharAttr_Underline | CharAttr_Shadow;
- rSt << (sal_uInt32)( EPP_TxCFStyleAtom << 16 ) // recordheader
- << SizeOfTxCFStyleAtom() - 8
- << (sal_uInt16)( 0x80 | nCharFlags )
- << (sal_uInt16)nFlags
- << (sal_uInt16)nCharFlags
- << (sal_Int32)-1 // ?
- << rCharStyle.mnFontHeight
- << rCharStyle.mnFontColor;
+ rSt.WriteUInt32( (sal_uInt32)( EPP_TxCFStyleAtom << 16 ) ) // recordheader
+ .WriteUInt32( SizeOfTxCFStyleAtom() - 8 )
+ .WriteUInt16( (sal_uInt16)( 0x80 | nCharFlags ) )
+ .WriteUInt16( (sal_uInt16)nFlags )
+ .WriteUInt16( (sal_uInt16)nCharFlags )
+ .WriteInt32( (sal_Int32)-1 ) // ?
+ .WriteUInt16( rCharStyle.mnFontHeight )
+ .WriteUInt32( rCharStyle.mnFontColor );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 0a45ad0358b2..7759f980090f 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -214,7 +214,7 @@ void PortionObj::Write( SvStream* pStrm, sal_Bool bLast )
if ( bLast && mbLastPortion )
nCount--;
for ( sal_uInt32 i = 0; i < nCount; i++ )
- *pStrm << (sal_uInt16)mpText[ i ];
+ pStrm->WriteUInt16( (sal_uInt16)mpText[ i ] );
}
void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue )
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index eb166b21ac1f..193b50997c6d 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1109,7 +1109,7 @@ bool HtmlExport::WriteHtml( const OUString& rFileName, bool bAddExtension, const
{
OString aStr(OUStringToOString(rHtmlData,
RTL_TEXTENCODING_UTF8));
- *pStr << aStr.getStr();
+ pStr->WriteCharPtr( aStr.getStr() );
nErr = aFile.close();
}
@@ -2754,7 +2754,7 @@ OUString HtmlExport::StringToHTMLString( const OUString& rString )
{
SvMemoryStream aMemStm;
HTMLOutFuncs::Out_String( aMemStm, rString, RTL_TEXTENCODING_UTF8 );
- aMemStm << (char) 0;
+ aMemStm.WriteChar( (char) 0 );
sal_Int32 nLength = strlen((char*)aMemStm.GetData());
return OUString( (char*)aMemStm.GetData(), nLength, RTL_TEXTENCODING_UTF8 );
}
@@ -2832,7 +2832,7 @@ bool HtmlExport::CopyScript( const OUString& rPath, const OUString& rSource, con
{
OString aStr(OUStringToOString(aScript,
RTL_TEXTENCODING_UTF8));
- *pStr << aStr.getStr();
+ pStr->WriteCharPtr( aStr.getStr() );
nErr = aFile.close();
}
@@ -2922,7 +2922,7 @@ bool HtmlExport::CreateImageNumberFile()
sal_uLong nErr = aFile.createStream(aFull, pStr);
if(nErr == 0)
{
- *pStr << (const char *)"1";
+ pStr->WriteCharPtr( (const char *)"1" );
nErr = aFile.close();
}
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 31076f6bda70..0b0dede074c3 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -304,13 +304,13 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aDesignName,
RTL_TEXTENCODING_UTF8);
- rOut << (sal_uInt16)rDesign.m_eMode;
- rOut << rDesign.m_bContentPage;
- rOut << rDesign.m_bNotes;
- rOut << rDesign.m_nResolution;
+ rOut.WriteUInt16( (sal_uInt16)rDesign.m_eMode );
+ rOut.WriteUChar( rDesign.m_bContentPage );
+ rOut.WriteUChar( rDesign.m_bNotes );
+ rOut.WriteUInt16( rDesign.m_nResolution );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCompression,
RTL_TEXTENCODING_UTF8);
- rOut << (sal_uInt16)rDesign.m_eFormat;
+ rOut.WriteUInt16( (sal_uInt16)rDesign.m_eFormat );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aAuthor,
RTL_TEXTENCODING_UTF8);
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aEMail,
@@ -319,29 +319,29 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign)
RTL_TEXTENCODING_UTF8);
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aMisc,
RTL_TEXTENCODING_UTF8);
- rOut << rDesign.m_bDownload;
- rOut << rDesign.m_bCreated; // not used
- rOut << rDesign.m_nButtonThema;
- rOut << rDesign.m_bUserAttr;
+ rOut.WriteUChar( rDesign.m_bDownload );
+ rOut.WriteUChar( rDesign.m_bCreated ); // not used
+ rOut.WriteInt16( rDesign.m_nButtonThema );
+ rOut.WriteUChar( rDesign.m_bUserAttr );
rOut << rDesign.m_aBackColor;
rOut << rDesign.m_aTextColor;
rOut << rDesign.m_aLinkColor;
rOut << rDesign.m_aVLinkColor;
rOut << rDesign.m_aALinkColor;
- rOut << rDesign.m_bUseAttribs;
- rOut << rDesign.m_bUseColor;
+ rOut.WriteUChar( rDesign.m_bUseAttribs );
+ rOut.WriteUChar( rDesign.m_bUseColor );
- rOut << (sal_uInt16)rDesign.m_eScript;
+ rOut.WriteUInt16( (sal_uInt16)rDesign.m_eScript );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aURL,
RTL_TEXTENCODING_UTF8);
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCGI,
RTL_TEXTENCODING_UTF8);
- rOut << rDesign.m_bAutoSlide;
- rOut << rDesign.m_nSlideDuration;
- rOut << rDesign.m_bEndless;
- rOut << rDesign.m_bSlideSound;
- rOut << rDesign.m_bHiddenSlides;
+ rOut.WriteUChar( rDesign.m_bAutoSlide );
+ rOut.WriteUInt32( rDesign.m_nSlideDuration );
+ rOut.WriteUChar( rDesign.m_bEndless );
+ rOut.WriteUChar( rDesign.m_bSlideSound );
+ rOut.WriteUChar( rDesign.m_bHiddenSlides );
return rOut;
}
@@ -1558,14 +1558,14 @@ sal_Bool SdPublishingDlg::Save()
return( sal_False );
sal_uInt16 aCheck = nMagic;
- *pStream << aCheck;
+ pStream->WriteUInt16( aCheck );
// Destroys the SdIOCompat before the Stream is being destributed
{
SdIOCompat aIO(*pStream, STREAM_WRITE, 0);
sal_uInt16 nDesigns = (sal_uInt16) m_aDesignList.size();
- *pStream << nDesigns;
+ pStream->WriteUInt16( nDesigns );
for( sal_uInt16 nIndex = 0;
pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns;
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index af95d5904ebf..0559dda21ba4 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -100,9 +100,9 @@ void MorphDlg::SaveSettings() const
{
SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 );
- *xOStm << (sal_uInt16) m_pMtfSteps->GetValue()
- << m_pCbxOrientation->IsChecked()
- << m_pCbxAttributes->IsChecked();
+ xOStm->WriteUInt16( (sal_uInt16) m_pMtfSteps->GetValue() )
+ .WriteUChar( m_pCbxOrientation->IsChecked() )
+ .WriteUChar( m_pCbxAttributes->IsChecked() );
}
}
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 5abbec90594d..85fac7688b9b 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -335,8 +335,8 @@ void SdVectorizeDlg::SaveSettings() const
if( xOStm.Is() )
{
SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 );
- *xOStm << (sal_uInt16) m_pNmLayers->GetValue() << (sal_uInt16) m_pMtReduce->GetValue();
- *xOStm << (sal_uInt16) m_pMtFillHoles->GetValue() << m_pCbFillHoles->IsChecked();
+ xOStm->WriteUInt16( (sal_uInt16) m_pNmLayers->GetValue() ).WriteUInt16( (sal_uInt16) m_pMtReduce->GetValue() );
+ xOStm->WriteUInt16( (sal_uInt16) m_pMtFillHoles->GetValue() ).WriteUChar( m_pCbFillHoles->IsChecked() );
}
}
generated by cgit (git 2.34.1) at 2025-01-30 11:45:24 +0000