diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-29 10:33:04 -0400 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-08-21 21:24:23 +0200 |
| commit | 4a051ba9928ffd05351330b74316034d23cb443e (patch) | |
| tree | d31cfff1aaf50e03133d07ba6f760ad5a20140ca /sc | |
| parent | 716f31fe668080cc482928239662a9c6b287de70 (diff) | |
bnc#885548: Reset the default user to the document owner at the end.
Otherwise the user name is set to the name of the user in the last revision
record, which will be used when recording new revisions.
Change-Id: I9b5e39c3b3a85614af67f86db9ed2bb3509a9e2b
(cherry picked from commit 227d3e72b0b29b73440157b64d6fb56fa151e05e)
Reviewed-on: https://gerrit.libreoffice.org/10610
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/oox/revisionfragment.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx index dd8cc4bb248d..463b66347564 100644 --- a/sc/source/filter/oox/revisionfragment.cxx +++ b/sc/source/filter/oox/revisionfragment.cxx @@ -249,6 +249,7 @@ void RevisionHeadersFragment::finalizeImport() { ScDocument& rDoc = getScDocument(); o3tl::heap_ptr<ScChangeTrack> pCT(new ScChangeTrack(&rDoc)); + OUString aSelfUser = pCT->GetUser(); // owner of this document. pCT->SetUseFixDateTime(true); const oox::core::Relations& rRels = getRelations(); @@ -268,6 +269,7 @@ void RevisionHeadersFragment::finalizeImport() importOoxFragment(xFragment, *xParser); } + pCT->SetUser(aSelfUser); // set the default user to the document owner. rDoc.SetChangeTrack(pCT.release()); // Turn on visibility of tracked changes. |