From 1f2d0f87e85375a86289b79dad7ed7d1b9014dc8 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 29 Jul 2014 10:33:04 -0400 Subject: [PATCH 069/137] bnc#885548: Reset the default user to the document owner at the end. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Matúš Kukan --- sc/source/filter/oox/revisionfragment.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx index dd8cc4b..463b663 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 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. -- 1.9.3