ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#161488: allow failed image loading in repair mode

Browse Source 
Change-Id: I19a68f2f016b5ab95565c7fbcc4c435cf13c6b48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168596
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Mike Kaganski
2024-06-10 09:16:49 +02:00
parent 99ed68ac1f
commit bf02c5fa58
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmloff/source/core/xmlimp.cxx
+27 -8
View File
@@ -1303,19 +1303,38 @@ uno::Reference<graphic::XGraphic> SvXMLImport::loadGraphicByURL(OUString const &
{
uno::Reference<graphic::XGraphic> xGraphic;
if (mxGraphicStorageHandler.is())
try
{
if (IsPackageURL(rURL))
if (mxGraphicStorageHandler.is())
{
xGraphic = mxGraphicStorageHandler->loadGraphic(rURL);
if (IsPackageURL(rURL))
{
xGraphic = mxGraphicStorageHandler->loadGraphic(rURL);
}
else
{
OUString const& rAbsoluteURL = GetAbsoluteReference(rURL);
GraphicExternalLink aExternalLink(rAbsoluteURL);
Graphic aGraphic(aExternalLink);
xGraphic = aGraphic.GetXGraphic();
}
}
else
}
catch (...)
{
bool bRepairPackage = false;
if (auto const xStorProps{ GetSourceStorage().query<beans::XPropertySet>() })
{
OUString const & rAbsoluteURL = GetAbsoluteReference(rURL);
GraphicExternalLink aExternalLink(rAbsoluteURL);
Graphic aGraphic(aExternalLink);
xGraphic = aGraphic.GetXGraphic();
try
{
xStorProps->getPropertyValue(u"RepairPackage"_ustr) >>= bRepairPackage;
}
catch (uno::Exception&)
{
}
}
if (!bRepairPackage)
throw;
}
return xGraphic;