diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-22 14:35:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-22 14:35:20 +0000 |
| commit | a08c70cae7c418a4dd86a5a278c1b6f0117a1b7a (patch) | |
| tree | 650c9580930a37b700234af21dd92b88747e8357 /goodies | |
| parent | efe00baffd529188760d2cfc91c3c2e83b590083 (diff) | |
INTEGRATION: CWS impress112 (1.33.24); FILE MERGED
2006/12/01 10:16:27 sj 1.33.24.1: #i69521# fixed problem with missing eps graphic that is always creating a new unique ID when being loaded
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/graphic/grfmgr.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/goodies/source/graphic/grfmgr.cxx b/goodies/source/graphic/grfmgr.cxx index a6dbb4640e56..7653933170f9 100644 --- a/goodies/source/graphic/grfmgr.cxx +++ b/goodies/source/graphic/grfmgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: grfmgr.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: obo $ $Date: 2007-01-22 11:47:47 $ + * last change: $Author: obo $ $Date: 2007-01-22 15:35:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -200,7 +200,7 @@ void GraphicObject::ImplAssignGraphicData() if( maGraphic.GetType() == GRAPHIC_GDIMETAFILE ) { const GDIMetaFile& rMtf = GetGraphic().GetGDIMetaFile(); - mbEPS = ( rMtf.GetActionCount() == 1 ) && ( META_EPS_ACTION == rMtf.GetAction( 0 )->GetType() ); + mbEPS = ( rMtf.GetActionCount() >= 1 ) && ( META_EPS_ACTION == rMtf.GetAction( 0 )->GetType() ); } else mbEPS = FALSE; @@ -452,6 +452,9 @@ void GraphicObject::Assign( const SvDataCopyStream& rCopyStream ) ByteString GraphicObject::GetUniqueID() const { + if ( !IsInSwapIn() && IsEPS() ) + const_cast<GraphicObject*>(this)->FireSwapInRequest(); + ByteString aRet; if( mpMgr ) |