[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 2 commits - configure.ac xmlscript/source

[Samuel Mehrbrodt (via logerrit)]

 configure.ac                                    |    2 +-
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx |    4 +++-
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx |   11 +++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit d67bcc90d98b2268f2434e1077c09b0f08c11aeb
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Feb 25 15:06:22 2020 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Feb 25 15:06:22 2020 +0100

    Release 6.3.5.3
    
    Change-Id: I25e2df1d163eefe4a442b0cd7176b4e10ad6c38a

diff --git a/configure.ac b/configure.ac
index bb17f3ef95a9..9eca69a31a9a 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.5.2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.5.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 636d659d86c078300b595a8ed45d0e2fdc2f569f
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon Feb 24 23:38:40 2020 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Feb 25 15:04:35 2020 +0100

    tdf#130793 Fix import/export of image URLs
    
    Change-Id: I329af3b0d5a81d9f31def9c2ad861d0e83e3714c

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index eca2feb26fa0..e3141cf60b57 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -742,7 +742,9 @@ void ElementDescriptor::readImageOrGraphicAttr(OUString const & rAttrName)
             }
         }
     }
-    else if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState("ImageURL"))
+    // tdf#130793 Above fails if the dialog is not part of a document. Export the ImageURL then.
+    if (sURL.isEmpty()
+        && beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState("ImageURL"))
     {
         _xProps->getPropertyValue("ImageURL") >>= sURL;
     }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 50b86b5f601e..c52c23f05210 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -882,6 +882,17 @@ bool ImportContext::importGraphicOrImageProperty(
                 return true;
             }
         }
+        else if (!sURL.isEmpty())
+        {
+            // tdf#130793 Above fails if the dialog is not part of a document.
+            // In this case we need to set the ImageURL.
+            Reference<beans::XPropertySet> xProps = getControlModel();
+            if (xProps.is())
+            {
+                xProps->setPropertyValue("ImageURL", makeAny(sURL));
+                return true;
+            }
+        }
     }
     return false;
 }