[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 3 commits - configure.ac forms/source svx/source

[Thorsten Behrens (via logerrit)]

 configure.ac                                  |    2 +-
 forms/source/xforms/submission.cxx            |    3 +++
 forms/source/xforms/submission/submission.hxx |    6 ++++++
 svx/source/svdraw/svdograf.cxx                |    9 ++++++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 9ddd2a93962748498a3fa72ca9e97e59096d9c32
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Wed Jun 10 18:32:26 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jun 10 18:32:26 2020 +0200

    Release 6.3.6.3
    
    Change-Id: Idd239b69feb2b9129853d9677990fbad29be65a4

diff --git a/configure.ac b/configure.ac
index a882432e9a42..43c7b4481bcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[6.3.6.2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.6.3],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
commit 8fc63a5cd096fd88b7b09890d0ebab27611fad0a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 11 20:46:43 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jun 10 18:28:06 2020 +0200

    limit forms to http[s]
    
    Change-Id: I3ed0bc626f693ec03f610dc7361f93cad914c9d8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93993
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 3074619981c9..7da6a1e45c9a 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -252,6 +252,9 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler )
         return false;
     }
 
+    if (!xSubmission->IsWebProtocol())
+        return false;
+
     CSubmission::SubmissionResult aResult = xSubmission->submit( xHandler );
 
     if (aResult == CSubmission::SUCCESS)
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index 77d59b1f740e..a459f471ba0d 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -126,6 +126,12 @@ public:
         , m_xContext(::comphelper::getProcessComponentContext())
     {}
 
+    bool IsWebProtocol() const
+    {
+        INetProtocol eProtocol = m_aURLObj.GetProtocol();
+        return eProtocol == INetProtocol::Http || eProtocol == INetProtocol::Https;
+    }
+
     virtual ~CSubmission() {}
 
     virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& ) = 0;
commit 8f3e60009d6b8987c0092e4972f3f7ead38bd274
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 11 17:02:50 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jun 10 18:27:36 2020 +0200

    use the LinkManager persist to determine the Referer
    
    Change-Id: I4e93878972492a93af368ffa0560412132431a24
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94061
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index d7fa90ba0bd3..8cfe94a3bc4e 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -19,8 +19,10 @@
 
 #include <unotools/streamwrap.hxx>
 
+#include <sfx2/docfile.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <math.h>
+#include <sfx2/objsh.hxx>
 #include <tools/helpers.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
@@ -108,8 +110,13 @@ SdrGraphicLink::SdrGraphicLink(SdrGrafObj& rObj)
     {
         sfx2::LinkManager::GetDisplayNames( this, nullptr, &rGrafObj.aFileName, nullptr, &rGrafObj.aFilterName );
 
+        OUString sReferer(getReferer());
+        SfxObjectShell * sh = pLinkManager->GetPersist();
+        if (sh != nullptr && sh->HasName())
+            sReferer = sh->GetMedium()->GetName();
+
         Graphic aGraphic;
-        if (sfx2::LinkManager::GetGraphicFromAny(rMimeType, rValue, getReferer(), aGraphic, nullptr))
+        if (sfx2::LinkManager::GetGraphicFromAny(rMimeType, rValue, sReferer, aGraphic, nullptr))
         {
             rGrafObj.ImpSetLinkedGraphic(aGraphic);
         }