oox/source/drawingml/table/tablecell.cxx | 3 ++- sfx2/source/doc/objstor.cxx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit e64e4e373e43e9490dda4b778424dbef6d6f1299 Author: Noel Grandin <[email protected]> AuthorDate: Thu Jun 30 11:45:11 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Jun 30 19:12:52 2022 +0200 tdf#149785 Read Error importing document after commit 04073c5fedd33654f242fecb7e39afb07cf0e273 Author: Noel Grandin <[email protected]> Date: Tue Jun 21 13:17:09 2022 +0200 replace oox::OptValue with std::optional and add a SAL_WARN to make this easier to diagnose in the future Change-Id: Ia5be0b82e3a5df34f50bc8a2decb1de98e0c5556 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136665 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 8cff610763fc..d979fb54e63f 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -502,7 +502,8 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesInsideV, PROP_RightBorder ); } - if (rProperties.getBgColor().isUsed() && !maFillProperties.maFillColor.isUsed() && maFillProperties.moFillType.value() == XML_noFill) + if (rProperties.getBgColor().isUsed() && !maFillProperties.maFillColor.isUsed() && + maFillProperties.moFillType.value_or(0) == XML_noFill) { maFillProperties.moFillType = XML_solidFill; maFillProperties.maFillColor = rProperties.getBgColor(); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 288b6a7ae6a9..6e406d332f9a 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2333,6 +2333,7 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, { const char *msg = e.what(); const OUString sError(msg, strlen(msg), RTL_TEXTENCODING_ASCII_US); + SAL_WARN("sfx.doc", "exception importing " << sError); SetError(*new StringErrorInfo(ERRCODE_SFX_DOLOADFAILED, sError, DialogMask::ButtonsOk | DialogMask::MessageError)); }
