diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-10-06 09:37:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-10-06 09:37:30 +0000 |
| commit | a059ae18bc3946de63812a9f2998f1758abd3ad6 (patch) | |
| tree | 79e5842f7f4d635cc4bbb8347a3c89d6c7d158e0 /embeddedobj/source | |
| parent | 920a04b27741cba6cc586aa86d0435e01f336c0e (diff) | |
INTEGRATION: CWS fwk46 (1.24.10); FILE MERGED
2006/08/17 09:46:06 mav 1.24.10.1: #i65568# do not switch the persistance of the linked document
Diffstat (limited to 'embeddedobj/source')
| -rw-r--r-- | embeddedobj/source/commonembedding/persistence.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index b855c9cf3de3..0822bba46cb5 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -4,9 +4,9 @@ * * $RCSfile: persistence.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: obo $ $Date: 2006-09-17 00:41:06 $ + * last change: $Author: kz $ $Date: 2006-10-06 10:37:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -276,9 +276,13 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X m_aEntryName = aNewName; #ifdef USE_STORAGEBASED_DOCUMENT - uno::Reference< document::XStorageBasedDocument > xDoc( m_pDocHolder->GetComponent(), uno::UNO_QUERY ); - if ( xDoc.is() ) - xDoc->switchToStorage( m_xObjectStorage ); + // the linked document should not be switched + if ( !m_bIsLink ) + { + uno::Reference< document::XStorageBasedDocument > xDoc( m_pDocHolder->GetComponent(), uno::UNO_QUERY ); + if ( xDoc.is() ) + xDoc->switchToStorage( m_xObjectStorage ); + } #endif try { |