[Libreoffice-commits] core.git: writerfilter/source
Mike Kaganski
mike.kaganski at collabora.com
Thu Dec 7 05:01:36 UTC 2017
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e5a3f12588e8e8eb80cc5af4e412fa2c83f0895e
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Dec 6 15:14:43 2017 +0200
Check if we have status indicator
In other methods it's always checked, so presumably it might be absent.
In caller sites (like OOXMLFastContextHandler::endOfParagraph), it can't
(and shouldn't) be checked.
Change-Id: Ia2edf8b121cac15e6454bc6321d76517fcdf110f
Reviewed-on: https://gerrit.libreoffice.org/45951
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 44552eee5e5f..2223b2a6c61c 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -529,7 +529,8 @@ void OOXMLDocumentImpl::incrementProgress()
if (mnProgressEndPos && mnProgressCurrentPos > (mnProgressLastPos + mnPercentSize) && mnProgressLastPos < mnProgressEndPos)
{
mnProgressLastPos = mnProgressCurrentPos;
- mxStatusIndicator->setValue(mnProgressLastPos);
+ if (mxStatusIndicator.is())
+ mxStatusIndicator->setValue(mnProgressLastPos);
}
}
More information about the Libreoffice-commits
mailing list