[Libreoffice-commits] core.git: sw/source
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Sun Sep 12 23:56:30 UTC 2021
sw/source/filter/indexing/IndexingExport.cxx | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
New commits:
commit 2f755ae4bf69951c29ec64c5df500687051e4ee3
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Sep 12 23:25:12 2021 +0900
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Sep 13 01:55:56 2021 +0200
indexing: prevent crash when creting the indexing XML
The pOutlinerParagraphObject can be null, so need to check for
that or the applciation can crash.
Change-Id: Icf771bb9ae2c344ed04e8ec27a22390a272ad725
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121998
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/sw/source/filter/indexing/IndexingExport.cxx b/sw/source/filter/indexing/IndexingExport.cxx
index 8b60c3d1a88a..e4532aaf6f34 100644
--- a/sw/source/filter/indexing/IndexingExport.cxx
+++ b/sw/source/filter/indexing/IndexingExport.cxx
@@ -123,17 +123,20 @@ public:
if (pTextObject)
{
OutlinerParaObject* pOutlinerParagraphObject = pTextObject->GetOutlinerParaObject();
- const EditTextObject& aEdit = pOutlinerParagraphObject->GetTextObject();
- for (sal_Int32 nParagraph = 0; nParagraph < aEdit.GetParagraphCount(); ++nParagraph)
+ if (pOutlinerParagraphObject)
{
- OUString sText = aEdit.GetText(nParagraph);
-
- m_rXmlWriter.startElement("paragraph");
- m_rXmlWriter.attribute("index", nParagraph);
- m_rXmlWriter.attribute("node_type", "common");
- m_rXmlWriter.attribute("object_name", pObject->GetName());
- m_rXmlWriter.content(sText);
- m_rXmlWriter.endElement();
+ const EditTextObject& aEdit = pOutlinerParagraphObject->GetTextObject();
+ for (sal_Int32 nParagraph = 0; nParagraph < aEdit.GetParagraphCount(); ++nParagraph)
+ {
+ OUString sText = aEdit.GetText(nParagraph);
+
+ m_rXmlWriter.startElement("paragraph");
+ m_rXmlWriter.attribute("index", nParagraph);
+ m_rXmlWriter.attribute("node_type", "common");
+ m_rXmlWriter.attribute("object_name", pObject->GetName());
+ m_rXmlWriter.content(sText);
+ m_rXmlWriter.endElement();
+ }
}
}
}
More information about the Libreoffice-commits
mailing list