diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-10 21:01:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-10 21:32:21 +0000 |
| commit | b0c826638ee55b10749f58ca9efaf7e5c4f3a25f (patch) | |
| tree | 65a64eaf7ab3a5e613167124a209352d4163704e | |
| parent | dca46b983000472ee6d1f74507b8421e8c817312 (diff) | |
check for null content
Change-Id: I824c29b39fe1e9e631a21f09611758bea03b0ca9
(cherry picked from commit 4a573e67c67ddf15403a79e7ec8d984d189dc83a)
| -rw-r--r-- | lotuswordpro/source/filter/lwpframelayout.cxx | 9 |
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; } |