diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:16:09 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 10:16:09 +0000 |
| commit | ab3c6f6e93b130dcceafcca85b21e5bd19e16805 (patch) | |
| tree | 4ea21fc5f014b8f27e782f0c27760c1c639c2a21 /embeddedobj | |
| parent | e1718b5b49b97ce9f59036696aa59cb3bb28640b (diff) | |
INTEGRATION: CWS fwk40 (1.28.10); FILE MERGED
2006/06/30 13:56:45 mav 1.28.10.2: RESYNC: (1.28-1.29); FILE MERGED
2006/06/08 11:41:36 mav 1.28.10.1: #i66067# integrate the patch
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/olepersist.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 35f7f72a1f7a..2c0ae5222f90 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -4,9 +4,9 @@ * * $RCSfile: olepersist.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: hr $ $Date: 2006-06-20 00:30:41 $ + * last change: $Author: ihi $ $Date: 2006-08-01 11:16:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -785,14 +785,20 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres { RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObject::TryToRetrieveCachedVisualRepresentation, retrieving" ); + uno::Reference< container::XNameContainer > xNameContainer; uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= xStream; aArgs[1] <<= (sal_Bool)sal_True; // do not create copy - uno::Reference< container::XNameContainer > xNameContainer( + try + { + xNameContainer = uno::Reference< container::XNameContainer >( m_xFactory->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), uno::UNO_QUERY ); + } + catch( uno::Exception& ) + {} if ( xNameContainer.is() ) { |