diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-31 23:19:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-31 23:47:37 +0100 |
| commit | 0799130b0ba954715d00feb93cef83dd48e29889 (patch) | |
| tree | e154a693675f824ae6d532b7ea1c70f39823ffd6 /sc | |
| parent | f6f5bde055f299e18a369714469dd39d6917e09d (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
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 220877dc2c3e..f43560e47647 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -127,7 +127,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, @@ -150,7 +150,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"); @@ -165,7 +165,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, @@ -179,7 +179,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); |