summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-10 21:01:19 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-12-10 21:31:15 +0000
commit4a573e67c67ddf15403a79e7ec8d984d189dc83a (patch)
tree61c8aa0de8730d16b6b4518af2bf1e6145ca7d28 /lotuswordpro
parent48c3eb3c91fd98c313bcec18f24cc949d6e788b3 (diff)
check for null content
Change-Id: I824c29b39fe1e9e631a21f09611758bea03b0ca9
Diffstat (limited to 'lotuswordpro')
-rw-r--r--lotuswordpro/source/filter/lwpframelayout.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index b26f06345b99..8d743a0cf958 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -912,10 +912,13 @@ bool LwpFrameLayout::IsForWaterMark()
{
if(m_nBuoyancy >=LAY_BUOYLAYER)
{
- if(!m_Content.IsNull() && (m_Content.obj()->GetTag()==VO_GRAPHIC) )
- {
+ if (m_Content.IsNull())
+ return false;
+ rtl::Reference<LwpObject> content = m_Content.obj();
+ if (!content.is())
+ return false;
+ if (content->GetTag() == VO_GRAPHIC)
return true;
- }
}
return false;
}