[Libreoffice-commits] core.git: Branch 'feature/cib_contract57c' - framework/source

[Katarina Behrens (via logerrit)]

 framework/source/loadenv/loadenv.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f2d963236d7f44e935ba30e5ac2f26564f03e10d
Author:     Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Wed May 15 10:58:30 2019 +0200
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Wed May 15 11:40:33 2019 +0200

    tdf#83722: Restrict the condition only to File > New
    
    referrer =~ private:user
    
    Change-Id: Ic67b0285ab7f49546499e4a9d90d9061c9d1274c

diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 4f9cfe71d567..f05eb8de1112 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1517,8 +1517,8 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
         OUString sReferrer = lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString());
 
         // tdf#83722: valid but unmodified document, either from template
-        // or opened by the user (File > New)
-        if (bFromTemplate || !sReferrer.isEmpty())
+        // or opened by the user (via File > New, referrer is set to private:user)
+        if (bFromTemplate || (sReferrer == "private:user"))
             return css::uno::Reference< css::frame::XFrame >();
 
         bReactivateOldControllerOnError = xOldDoc->suspend(true);