#91594#: watch for LateInit flag in ::AddSupportedFormats
This commit is contained in:
parent
9365a77eb8
commit
d30786d84c
2 changed files with 14 additions and 9 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: sdxfer.cxx,v $
|
||||
*
|
||||
* $Revision: 1.13 $
|
||||
* $Revision: 1.14 $
|
||||
*
|
||||
* last change: $Author: ka $ $Date: 2001-08-23 10:54:33 $
|
||||
* last change: $Author: ka $ $Date: 2001-08-29 08:27:08 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -179,9 +179,10 @@ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, SdView* pWorkView, BOOL
|
|||
pOLEDataHelper( NULL ),
|
||||
pBookmark( NULL ),
|
||||
pGraphic( NULL ),
|
||||
pImageMap( NULL )
|
||||
pImageMap( NULL ),
|
||||
bLateInit( bInitOnGetData )
|
||||
{
|
||||
if( !bInitOnGetData )
|
||||
if( !bLateInit )
|
||||
CreateData();
|
||||
}
|
||||
|
||||
|
@ -388,6 +389,9 @@ void SdTransferable::CreateData()
|
|||
|
||||
void SdTransferable::AddSupportedFormats()
|
||||
{
|
||||
if( !bLateInit )
|
||||
CreateData();
|
||||
|
||||
if( pOLEDataHelper )
|
||||
{
|
||||
AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: sdxfer.hxx,v $
|
||||
*
|
||||
* $Revision: 1.6 $
|
||||
* $Revision: 1.7 $
|
||||
*
|
||||
* last change: $Author: ka $ $Date: 2001-08-21 15:24:11 $
|
||||
* last change: $Author: ka $ $Date: 2001-08-29 08:25:36 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -100,9 +100,10 @@ private:
|
|||
ImageMap* pImageMap;
|
||||
Rectangle aVisArea;
|
||||
Point aStartPos;
|
||||
BOOL bInternalMove;
|
||||
BOOL bOwnDocument;
|
||||
BOOL bOwnView;
|
||||
BOOL bInternalMove : 1;
|
||||
BOOL bOwnDocument : 1;
|
||||
BOOL bOwnView : 1;
|
||||
BOOL bLateInit : 1;
|
||||
|
||||
// not available
|
||||
SdTransferable();
|
||||
|
|
Loading…
Reference in a new issue