Kaydet (Commit) 12679b37 authored tarafından Katarina Behrens's avatar Katarina Behrens

tdf#83722: Restrict the condition only to File > New

referrer =~ private:user

Change-Id: Ic67b0285ab7f49546499e4a9d90d9061c9d1274c
Reviewed-on: https://gerrit.libreoffice.org/72346
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst fb978737
...@@ -1519,8 +1519,8 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() ...@@ -1519,8 +1519,8 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
OUString sReferrer = lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString()); OUString sReferrer = lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString());
// tdf#83722: valid but unmodified document, either from template // tdf#83722: valid but unmodified document, either from template
// or opened by the user (File > New) // or opened by the user (via File > New, referrer is set to private:user)
if (bFromTemplate || !sReferrer.isEmpty()) if (bFromTemplate || (sReferrer == "private:user"))
return css::uno::Reference< css::frame::XFrame >(); return css::uno::Reference< css::frame::XFrame >();
bReactivateOldControllerOnError = xOldDoc->suspend(true); bReactivateOldControllerOnError = xOldDoc->suspend(true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment