include/xmloff/xmlictxt.hxx | 3 +++
sd/source/ui/unoidl/DrawController.cxx | 2 +-
xmloff/source/draw/ximpstyl.cxx | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d27aac755a58f1c7cd32cb0a0a2a4a5cffd63b4c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jun 16 20:30:07 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jun 17 09:07:09 2023 +0200
improve exception message
the colon here made me think a piece had been chopped off.
Change-Id: I1e0f0ef9c16e0fd8f7619a3d8e58e8e0886fda9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153192
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/unoidl/DrawController.cxx
b/sd/source/ui/unoidl/DrawController.cxx
index 3dd4c4c65478..8eb4422251b6 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -780,7 +780,7 @@ void DrawController::ThrowIfDisposed() const
{
if (rBHelper.bDisposed || rBHelper.bInDispose || mbDisposing)
{
- SAL_WARN("sd", "Calling disposed DrawController object. Throwing
exception:");
+ SAL_WARN("sd", "Calling disposed DrawController object. Throwing
exception.");
throw lang::DisposedException (
"DrawController object has already been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
commit c2d290fa917fec68050a930c6297e794b5785244
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jun 16 20:28:29 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jun 17 09:06:58 2023 +0200
SAL_WARN->SAL_INFO in SdXMLStylesContext::CreateStyleChildContext
This is not an error - this method handles elements if it knows about
them, and otherwise leaves the elements for other code to handle
Change-Id: I531a2d9aff84ef4a2762923737a6b827e88cd920
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153191
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 7ff91aa84d7e..ea10bd002b83 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -120,6 +120,9 @@ public:
#define XMLOFF_WARN_UNKNOWN_ELEMENT(area, token) \
SAL_WARN(area, "unknown element " <<
SvXMLImport::getPrefixAndNameFromToken(token));
+#define XMLOFF_INFO_UNKNOWN_ELEMENT(area, token) \
+ SAL_INFO(area, "unknown element " <<
SvXMLImport::getPrefixAndNameFromToken(token));
+
#endif // INCLUDED_XMLOFF_XMLICTXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 196aeb136a1e..0d98bce54151 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -905,7 +905,7 @@ SvXMLStyleContext*
SdXMLStylesContext::CreateStyleChildContext(
case XML_ELEMENT(STYLE, XML_STYLE):
break; // ignore
default:
- XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
+ XMLOFF_INFO_UNKNOWN_ELEMENT("xmloff", nElement);
}
// call base class
