strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

EnterGroup now has additional parameter that makes it possible to write ClientData

Browse source
This commit is contained in:
Sven Jacobi 2000-11-20 13:52:35 +00:00
parent bd027941c4
commit 50d028997b
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sd/source/filter/eppt/escherex.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: escherex.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: sj $ $Date: 2000-11-03 18:01:54 $
* last change: $Author: sj $ $Date: 2000-11-20 14:52:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -939,7 +939,7 @@ void _EscherEx::AddClientAnchor( const Rectangle& rRect )
// ---------------------------------------------------------------------------------------------
void _EscherEx::EnterGroup( Rectangle* pBoundRect )
void _EscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData )
{
Rectangle aRect;
if ( pBoundRect )
@ -955,18 +955,26 @@ void _EscherEx::EnterGroup( Rectangle* pBoundRect )
<< (INT32)aRect.Bottom();
if ( !mnGroupLevel )
{
AddShape( _Escher_ShpInst_Min, 5 ); // Flags: Group | Patriarch
CloseContainer(); // _Escher_SpContainer
}
else
{
AddShape( _Escher_ShpInst_Min, 0x201 ); // Flags: Group | HaveAnchor
AddAtom( 8, _Escher_ClientAnchor );
PtReplaceOrInsert( _Escher_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() );
*mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom();
CloseContainer(); // _Escher_SpContainer
}
if ( pClientData )
{
pClientData->Seek( STREAM_SEEK_TO_END );
sal_uInt32 nSize = pClientData->Tell();
if ( nSize )
{
*mpOutStrm << (sal_uInt32)( ( _Escher_ClientData << 16 ) | 0xf )
<< nSize;
mpOutStrm->Write( pClientData->GetData(), nSize );
}
}
CloseContainer(); // _Escher_SpContainer
mnGroupLevel++;
}

6
sd/source/filter/eppt/escherex.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: escherex.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: sj $ $Date: 2000-11-03 18:02:16 $
* last change: $Author: sj $ $Date: 2000-11-20 14:52:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1186,7 +1186,7 @@ class _EscherEx : public _EscherPersistTable
void AddAtom( UINT32 nAtomSitze, UINT16 nRecType, int nRecVersion = 0, int nRecInstance = 0 );
void AddClientAnchor( const Rectangle& rRectangle );
void EnterGroup( Rectangle* pBoundRect = NULL );
void EnterGroup( Rectangle* pBoundRect = NULL, SvMemoryStream* pClientData = NULL );
UINT32 GetGroupLevel() const { return mnGroupLevel; };
BOOL SetGroupSnapRect( UINT32 nGroupLevel, const Rectangle& rRect );
BOOL SetGroupLogicRect( UINT32 nGroupLevel, const Rectangle& rRect );