diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-23 06:39:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-23 06:39:52 +0000 |
| commit | fc425d4cf6a1b8c83993e493ac68ecf8b5e3a407 (patch) | |
| tree | a60bb3dd9bc1dd265ec18c9fffea0a66d315095e | |
| parent | 10a1f583d3863dcb5bbd1e709a75c45b8d388042 (diff) | |
INTEGRATION: CWS fwk59 (1.32.32); FILE MERGED
2006/12/18 09:15:34 mav 1.32.32.1: #i72693# avoid user interactions
| -rw-r--r-- | sfx2/source/doc/objuno.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx index a77334e49cdc..43e90cd5a0f4 100644 --- a/sfx2/source/doc/objuno.cxx +++ b/sfx2/source/doc/objuno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: objuno.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: vg $ $Date: 2006-11-22 12:20:54 $ + * last change: $Author: obo $ $Date: 2007-01-23 07:39:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1336,6 +1336,8 @@ void SAL_CALL SfxStandaloneDocumentInfoObject::loadFromURL(const ::rtl::OUStrin else { _pMedium = new SfxMedium( aURL, SFX_STREAM_READONLY, sal_True ); + _pMedium->UseInteractionHandler( sal_False ); + SvStream* pStream = _pMedium->GetInStream(); if ( pStream ) { @@ -1343,7 +1345,7 @@ void SAL_CALL SfxStandaloneDocumentInfoObject::loadFromURL(const ::rtl::OUStrin if ( !rStorage->GetName().Len() ) rStorage->SetName( aURL ); - if ( !rStorage->GetError() && !SFX_APP()->GetFilterMatcher().GuessFilter( *_pMedium, &_pFilter ) && _pFilter ) + if ( !rStorage->GetError() && !SFX_APP()->GetFilterMatcher().GuessFilterControlDefaultUI( *_pMedium, &_pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED, sal_False ) && _pFilter ) { rStorage->SetVersion( _pFilter->GetVersion() ); bOK = _pInfo->LoadFromBinaryFormat( rStorage ); |