diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-19 11:41:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-19 11:41:30 +0000 |
| commit | 590dd7e343bcbd32031f9021bd83e99ffa1852a4 (patch) | |
| tree | 4b9bf6cf7fe850a20932e410910a1c787e8b60e3 | |
| parent | ff94845a735aba6061709ee0ec0f308d12966c2b (diff) | |
INTEGRATION: CWS cov2src (1.9.8); FILE MERGED
2005/10/18 08:43:09 rt 1.9.8.1: #126234# Join MWS COV680 m4 into SRC680
| -rw-r--r-- | embeddedobj/source/msole/olevisual.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 331ce4df9065..fd2ca909d061 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -4,9 +4,9 @@ * * $RCSfile: olevisual.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-08 18:43:55 $ + * last change: $Author: rt $ $Date: 2005-10-19 12:41:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -303,8 +303,11 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres embed::VisualRepresentation aVisualRepr; // TODO: in case of different aspects they must be applied to the mediatype and XTransferable must be used - if ( !m_xCachedVisualRepresentation.is() && m_bVisReplInStream ) + if ( !m_xCachedVisualRepresentation.is() && ( !m_bVisReplInitialized || m_bVisReplInStream ) ) + { m_xCachedVisualRepresentation = TryToRetrieveCachedVisualRepresentation_Impl( m_xObjectStream ); + SetVisReplInStream( m_xCachedVisualRepresentation.is() ); + } if ( m_xCachedVisualRepresentation.is() ) { |