diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-31 23:19:54 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-02 16:49:43 +0000 |
| commit | 6523f78456c9f78fb842b7215eb84a96f4e92472 (patch) | |
| tree | 6558ac082aeab3d555d6b4c8d9f7829308d4cf42 | |
| parent | a560ee1625393faf5cd5e04c356a9101b701542b (diff) | |
fdo#59022: revert "SfxMedium::GetOutputStream(): re-use existing XStream"
Revert commit 0c2206081de38a41597aadfb2255540d6308be63, since this
apparently causes failure to open ODF files via SMB on Linux.
Instead of changing SfxMedium, adjust the ScExportTest: when saving
XLSX files interactively, the SfxFilter::lFormat is always 0, which
causes SfxObjectShell::SaveTo_Impl not to call
SfxMedium::GetOutputStorage() at all, working around the locking issue
on WNT.
Change-Id: I0ab8b4262475e4c8425eebb1413997457e5e9417
(cherry picked from commit 0799130b0ba954715d00feb93cef83dd48e29889)
Reviewed-on: https://gerrit.libreoffice.org/1952
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
| -rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 19 |
2 files changed, 10 insertions, 17 deletions
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 7b0fde81c8dc..26fe25c8bd18 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -125,7 +125,7 @@ ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const rtl: aTempFile.EnableKillingFile(); SfxMedium aStoreMedium( aTempFile.GetURL(), STREAM_STD_WRITE ); sal_uInt32 nExportFormat = 0; - if (nFormatType) + if (nFormatType == ODS_FORMAT_TYPE) nExportFormat = SFX_FILTER_EXPORT | SFX_FILTER_USESOPTIONS; SfxFilter* pExportFilter = new SfxFilter( rFilter, @@ -148,7 +148,7 @@ ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const rtl: //std::cout << "File: " << aTempFile.GetURL() << std::endl; sal_uInt32 nFormat = 0; - if (nFormatType) + if (nFormatType == ODS_FORMAT_TYPE) nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS; OUString aPass("test"); @@ -163,7 +163,7 @@ ScDocShellRef ScExportTest::saveAndReload(ScDocShell* pShell, const rtl::OUStrin aTempFile.EnableKillingFile(); SfxMedium aStoreMedium( aTempFile.GetURL(), STREAM_STD_WRITE ); sal_uInt32 nExportFormat = 0; - if (nFormatType) + if (nFormatType == ODS_FORMAT_TYPE) nExportFormat = SFX_FILTER_EXPORT | SFX_FILTER_USESOPTIONS; SfxFilter* pExportFilter = new SfxFilter( rFilter, @@ -177,7 +177,7 @@ ScDocShellRef ScExportTest::saveAndReload(ScDocShell* pShell, const rtl::OUStrin //std::cout << "File: " << aTempFile.GetURL() << std::endl; sal_uInt32 nFormat = 0; - if (nFormatType) + if (nFormatType == ODS_FORMAT_TYPE) nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS; return load(aTempFile.GetURL(), rFilter, rUserData, rTypeName, nFormat, nFormatType); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 85b7981b1e43..3ce8ab77b360 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -636,20 +636,13 @@ SvStream* SfxMedium::GetOutStream() if ( pImp->pTempFile ) { - // try to re-use XOutStream from xStream if that exists; - // opening new SvFileStream in this situation may fail on - // Windows with ERROR_SHARING_VIOLATION - if (pImp->xStream.is()) - { - assert(pImp->xStream->getOutputStream().is()); // need that... - pImp->m_pOutStream = utl::UcbStreamHelper::CreateStream( - pImp->xStream, false); - } - else - { - pImp->m_pOutStream = new SvFileStream( + // don't try to re-use XOutStream from xStream if that exists; + // it causes fdo#59022 (fails opening files via SMB on Linux) + // OTOH opening new SvFileStream in this situation may fail on + // Windows with ERROR_SHARING_VIOLATION... but that is apparently + // not a problem in practice currently + pImp->m_pOutStream = new SvFileStream( pImp->m_aName, STREAM_STD_READWRITE); - } CloseStorage(); } } |