diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-09-07 17:11:48 +0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-27 23:20:32 +0200 |
| commit | 4f28521bf96d4a5fedad3c85171baba412abbb0e (patch) | |
| tree | a5e16b6ef56288ca3e130306e35304cd782374b4 /sfx2/source | |
| parent | 3ab472e718ea590a5c0dba572cf91e79ab916562 (diff) | |
tdf#119238: keep replaced file's identity when renaming docfile
Regression from 2157a3536f97ff5ae7c82611a801fef7e3708983
sfx2 store: try rename before copying
Rename is cheaper then copying the content over manually, so try that
first.
On Windows, we need to keep the file's dentity, including metadata (e.g.,
creation time, which is kept in FS). WinAPI has ReplaceFileW specifically
for this, and it keeps ACLs of the original file, and otherwise makes the
changed file not a separate entry, but updated old file from system's PoV.
Eventually, we could try to restructure creating backup copies (e.g., for
documents when configured so) to take advantage of this function being able
to do that.
Change-Id: I6001a2a3af5e10bc010f5ef129f4bb6f83ee1581
Reviewed-on: https://gerrit.libreoffice.org/60163
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
(cherry picked from commit c9343988204ee3e9889f3cc833adbbaca83e53e6)
Reviewed-on: https://gerrit.libreoffice.org/61041
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index a852a01e644e..e101aa2e815d 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1860,7 +1860,8 @@ void SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, OUString aDestMainURL = aDest.GetMainURL(INetURLObject::DecodeMechanism::NONE); sal_uInt64 nAttributes = GetDefaultFileAttributes(aDestMainURL); - if (IsFileMovable(aDestMainURL) && osl::File::move(aSourceMainURL, aDestMainURL) == osl::FileBase::E_None) + if (IsFileMovable(aDestMainURL) + && osl::File::replace(aSourceMainURL, aDestMainURL) == osl::FileBase::E_None) { if (nAttributes) // Adjust attributes, source might be created with |