diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-06-30 11:45:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-06-30 19:12:52 +0200 |
| commit | e64e4e373e43e9490dda4b778424dbef6d6f1299 (patch) | |
| tree | 355862e058c986bc7b31f96244f38cf0c4d75225 | |
| parent | 5cbbbe559ea37b10f276b5a6231c9cc26f8bee12 (diff) | |
tdf#149785 Read Error importing document
after
commit 04073c5fedd33654f242fecb7e39afb07cf0e273
Author: Noel Grandin <noel.grandin@collabora.co.uk>
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 <noel.grandin@collabora.co.uk>
| -rw-r--r-- | oox/source/drawingml/table/tablecell.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 1 |
2 files changed, 3 insertions, 1 deletions
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)); } |