diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-03 09:07:49 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-03 17:58:26 +0200 |
| commit | 3d4e41009c42b26d318af20ac1e2da301212c1cf (patch) | |
| tree | fca33c49c6db839f7f82f98f87a66c54b9a43ef0 | |
| parent | bf1e097c16f9dd672ea43234cbe0eb64c82fd37e (diff) | |
tdf#117757 sfx2 save-as: fix leftover temporary files for embedded objects
This is really similar to c1676204447df942e766c0780c1580e1f0427b73
(tdf#117225 sfx2: fix leftover temp file when saving doc with embedded
objects, 2018-05-14), just this is save as, not save.
(cherry picked from commit b8fd1a814ffc80f2802c5b980febabcffe9606cb)
Change-Id: If78d91262bfbe97846287deb0794e4101ef7b4af
Reviewed-on: https://gerrit.libreoffice.org/56869
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 | ||||
| -rwxr-xr-x | sw/qa/extras/uiwriter/uiwriter.cxx | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 244de5869a34..7f34e6a9ca96 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1294,7 +1294,9 @@ bool SfxObjectShell::SaveTo_Impl rMedium.CloseAndRelease(); if ( bStorageBasedTarget ) { + rMedium.SetHasEmbeddedObjects(GetEmbeddedObjectContainer().HasEmbeddedObjects()); rMedium.GetOutputStorage(); + rMedium.SetHasEmbeddedObjects(false); } } diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index a02bb95e923e..619ba37ab9bb 100755 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -6300,6 +6300,13 @@ void SwUiWriterTest::testTdf117225() int nActual = CountFilesInDirectory(aTargetDirectory); // nActual was nExpected + 1, i.e. we leaked a tempfile. CPPUNIT_ASSERT_EQUAL(nExpected, nActual); + + OUString aTargetFileSaveAs = aTargetDirectory + "tdf117225-save-as.odt"; + xStorable->storeAsURL(aTargetFileSaveAs, {}); + ++nExpected; + nActual = CountFilesInDirectory(aTargetDirectory); + // nActual was nExpected + 1, i.e. we leaked a tempfile. + CPPUNIT_ASSERT_EQUAL(nExpected, nActual); } void SwUiWriterTest::testTdf91801() |