[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 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 d73b46346a76d26047f80b28af874e6af34abd1d
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Wed Jun 3 00:44:35 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jun 3 00:44:35 2020 +0200

    Bump version to 6.1.7.15
    
    Change-Id: I75725ca4812e1afe5bf3264e93fdb963fdadcab2

diff --git a/configure.ac b/configure.ac
index 08f362fdac6f..3e3ea6cb6fe0 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 powered by CIB],[6.1.7.14],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by CIB],[6.1.7.15],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
commit 665258448af655f4b9da434ec29d380597b901e6
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 3 00:43:01 2020 +0200

    use the LinkManager persist to determine the Referer
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94061
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 3ee652e1c18186a5de47797aa4b02defcb29c210)
    
    Conflicts:
            svx/source/svdraw/svdograf.cxx
    
    Change-Id: I4e93878972492a93af368ffa0560412132431a24

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 6b0b2bc7b44e..0b1f788cd8bf 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/formats.hxx>
 #include <sot/storage.hxx>
@@ -228,8 +230,13 @@ void SdrGraphicLink::RemoveGraphicUpdater()
     {
         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))
+        if (sfx2::LinkManager::GetGraphicFromAny(rMimeType, rValue, sReferer, aGraphic))
         {
             rGrafObj.ImpSetLinkedGraphic(aGraphic);
         }
commit ddd7a2f43634bb3e2b2a1978bcf09d8f3fd27bab
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 3 00:39:44 2020 +0200

    limit forms to http[s]
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93993
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 5d101a65c31e6c2f8dd0edffe05f69055cbd481c)
    
    Conflicts:
            forms/source/xforms/submission.cxx
    
    Change-Id: I3ed0bc626f693ec03f610dc7361f93cad914c9d8

diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 3757378c663d..81cc0563d390 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -255,6 +255,9 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler )
     }
 
     xSubmission->setEncoding(getEncoding());
+    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 7d726392c736..f93146d5923e 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -127,6 +127,12 @@ public:
         , m_xContext(::comphelper::getProcessComponentContext())
     {}
 
+    bool IsWebProtocol() const
+    {
+        INetProtocol eProtocol = m_aURLObj.GetProtocol();
+        return eProtocol == INetProtocol::Http || eProtocol == INetProtocol::Https;
+    }
+
     virtual ~CSubmission() {}
 
     void setEncoding(const OUString& aEncoding)