diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-22 12:47:37 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-22 12:47:37 +0000 |
| commit | e40ad0ce63390bbefbb990c7066e69a052421dbe (patch) | |
| tree | 392a55408d23e5b166cf794ee1686cb9ddb1d5bd /sfx2/source/doc | |
| parent | 89146dc6ecbee742bc8916fa8fcae3475ff018df (diff) | |
INTEGRATION: CWS loadenv01 (1.123.56); FILE MERGED
2004/03/22 08:58:20 as 1.123.56.2: RESYNC: (1.123-1.124); FILE MERGED
2004/03/12 14:43:02 mba 1.123.56.1: #115936#: remove SfxLoadEnvironment, move MacroCheck to ViewFrame
Diffstat (limited to 'sfx2/source/doc')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index ba91b0b0dc9e..e45bda5ee65c 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objstor.cxx,v $ * - * $Revision: 1.125 $ + * $Revision: 1.126 $ * - * last change: $Author: svesik $ $Date: 2004-04-19 23:17:37 $ + * last change: $Author: svesik $ $Date: 2004-04-22 13:47:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -734,10 +734,8 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) // Falls nicht asynchron geladen wird selbst FinishedLoading aufrufen if ( !( pImp->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) && - ( !pMedium->GetFilter() || - pMedium->GetFilter()->UsesStorage() || - !( pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_ASYNC ) || - !pMedium->GetLoadEnvironment() ) ) + ( !pMedium->GetFilter() || pMedium->GetFilter()->UsesStorage() ) + ) FinishedLoading( SFX_LOADED_MAINDOCUMENT ); if ( pSalvageItem ) |