oox/source/vml/vmldrawing.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a5fd2a21b25d49ee7c60041341aefaad6c920b09
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jan 22 14:44:01 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jan 22 15:18:55 2020 +0100
avoid some unnecessary log warning messages
Change-Id: I72f839800b749bd5c90faea9f2fed25dd938bca4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87187
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 058ee5c91815..53c1e6aeed42 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -155,7 +155,9 @@ void Drawing::convertAndInsert() const
{
try
{
- Reference< XControlShape > xCtrlShape( xShapes->getByIndex(i),
UNO_QUERY_THROW );
+ Reference< XControlShape > xCtrlShape( xShapes->getByIndex(i),
UNO_QUERY );
+ if (!xCtrlShape.is())
+ continue;
Reference< XControlModel > xCtrlModel( xCtrlShape->getControl(),
UNO_SET_THROW );
Reference< XServiceInfo > xModelSI (xCtrlModel, UNO_QUERY_THROW );
Reference< XPropertySet > aProps( xCtrlModel, UNO_QUERY_THROW );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
