summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-04-14 13:58:14 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-04-14 14:14:36 +0200
commit0869895063bd528893707cb74c6cf4c461fef066 (patch)
treebf47ccc71145f3ee387a5dafbaab9bc86b47a008 /sdext
parent4acae16f9252ada89fd530f1ca86edafc046bc07 (diff)
tdf#120703 PVS: Silence V522 warnings
V522 There might be dereferencing of a potential null pointer. Change-Id: Ie4bc74a734a6d5a73838a27e0d80cc8e51595839 Reviewed-on: https://gerrit.libreoffice.org/70730 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.cxx17
1 files changed, 10 insertions, 7 deletions
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 2e092503d757..dec4fd7b6f4c 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -111,23 +111,26 @@ void WriterXmlEmitter::fillFrameProps( DrawElement& rElem,
double rel_x = rElem.x, rel_y = rElem.y;
// find anchor type by recursing though parents
- Element* pAnchor = rElem.Parent;
- while( pAnchor &&
- ! dynamic_cast<ParagraphElement*>(pAnchor) &&
- ! dynamic_cast<PageElement*>(pAnchor) )
+ Element* pAnchor = &rElem;
+ ParagraphElement* pParaElt = nullptr;
+ PageElement* pPage = nullptr;
+ while ((pAnchor = pAnchor->Parent))
{
- pAnchor = pAnchor->Parent;
+ if ((pParaElt = dynamic_cast<ParagraphElement*>(pAnchor)))
+ break;
+ if ((pPage = dynamic_cast<PageElement*>(pAnchor)))
+ break;
}
if( pAnchor )
{
- if( dynamic_cast<ParagraphElement*>(pAnchor) )
+ if (pParaElt)
{
rProps[ "text:anchor-type" ] = rElem.isCharacter
? OUString("character") : OUString("paragraph");
}
else
{
- PageElement* pPage = dynamic_cast<PageElement*>(pAnchor);
+ assert(pPage); // guaranteed by the while loop above
rProps[ "text:anchor-type" ] = "page";
rProps[ "text:anchor-page-number" ] = OUString::number(pPage->PageNumber);
}