diff options
| author | Mikhail Voitenko <mav@openoffice.org> | 2009-02-06 12:48:00 +0000 |
|---|---|---|
| committer | Mikhail Voitenko <mav@openoffice.org> | 2009-02-06 12:48:00 +0000 |
| commit | 3cb976dc662e4710d73f60f76b2c5f3600f5a8ba (patch) | |
| tree | abc0f89e8eaea8f9389563ae3736a0a882c843e4 /sfx2 | |
| parent | 06d41ee722bd5e5902a1f5fda7699db676eeefc4 (diff) | |
reverting the last commit, it was not intended for the trunk
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 53de148919..cfbcb87f75 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1188,7 +1188,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) } // TODO/LATER: This implementation does not allow to detect the system lock on saving here, actually this is no big problem - if ( bLoading && bUseSystemLock && !pImp->xStream.is() && !pOutStream ) + if ( bUseSystemLock && !pImp->xStream.is() && !pOutStream ) pImp->m_bHandleSysLocked = sal_True; // if system lock is used the writeable stream should be available do diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 4dbada3f80..8881ce5bf5 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1304,7 +1304,7 @@ sal_uInt16 SfxObjectShell::ImplGetSignatureState( sal_Bool bScriptingContent ) { *pState = SIGNATURESTATE_NOSIGNATURES; - if ( GetMedium() && GetMedium()->GetName().Len() && IsOwnStorageFormat_Impl( *GetMedium()) && GetMedium()->GetStorage().is() ) + if ( GetMedium() && GetMedium()->GetName().Len() && GetMedium()->GetStorage().is() && IsOwnStorageFormat_Impl( *GetMedium()) ) { try { diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 5ec9580185..2b6222b189 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1317,14 +1317,16 @@ sal_Bool SfxObjectShell::SaveTo_Impl else { // This is SaveAs or export action, prepare the target medium - // the alien filters still might write directly to the file, that is of course a bug, - // but for now the framework has to be ready for it - // TODO/LATER: let the medium be prepared for alien formats as well rMedium.CloseAndRelease(); if ( bStorageBasedTarget ) { rMedium.GetOutputStorage(); } + else + { + rMedium.CreateTempFileNoCopy(); + rMedium.GetOutStream(); + } } // TODO/LATER: error handling |