xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 4 +++-
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 11 +++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit bb1d0511ff4f6a3f1c5019472eb04550e0745557
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Mon Feb 24 23:38:40 2020 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Wed Feb 26 11:57:07 2020 +0100
tdf#130793 Fix import/export of image URLs
Change-Id: I329af3b0d5a81d9f31def9c2ad861d0e83e3714c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89440
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
