slideshow/source/engine/slide/slideimpl.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 2fe59dc6e8b5ac9c6b312d1e4a3f4c71e1d0f5bc
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Jul 10 08:58:41 2024 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Jul 11 15:12:58 2024 +0200
lok: sd: slideshow render: avoid using nullptr
Signed-off-by: Szymon Kłos <szymon.k...@collabora.com>
Change-Id: I9368a256185aa336c6cc3ed398ff1d28f6498453
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170306
Tested-by: Jenkins
diff --git a/slideshow/source/engine/slide/slideimpl.cxx
b/slideshow/source/engine/slide/slideimpl.cxx
index a03839dab1d4..1468b24bff5a 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -404,6 +404,9 @@ void LOKSlideRenderer::renderMasterPageImpl(VirtualDevice&
rDevice)
while (!mpMPShapesFunctor->isImportDone())
{
ShapeSharedPtr const& rShape(mpMPShapesFunctor->importShape());
+ if (!rShape)
+ continue;
+
uno::Reference<drawing::XShape> xShape = rShape->getXShape();
if (xShape.is())
{
@@ -449,6 +452,9 @@ void LOKSlideRenderer::renderTextFieldsImpl(VirtualDevice&
rDevice)
while( !mpTFShapesFunctor->isImportDone() )
{
ShapeSharedPtr const& rShape(mpTFShapesFunctor->importShape());
+ if (!rShape)
+ continue;
+
uno::Reference<drawing::XShape> xShape = rShape->getXShape();
if (xShape.is())
{
