diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-04-11 21:19:54 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-04-11 21:41:57 +0100 |
commit | d2a1c2d4cfa51b6ee8a7f38baa258633fae9ec6d (patch) | |
tree | ab712bc1a814bfc15def9990df0896436f346628 /lotuswordpro/source/filter/lwpframelayout.cxx | |
parent | not useful dates in source code removed (diff) | |
download | core-d2a1c2d4cfa51b6ee8a7f38baa258633fae9ec6d.tar.gz core-d2a1c2d4cfa51b6ee8a7f38baa258633fae9ec6d.zip |
fix what there is to fix
Diffstat (limited to 'lotuswordpro/source/filter/lwpframelayout.cxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpframelayout.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx index c90663abb2dd..e1f35522cd24 100644 --- a/lotuswordpro/source/filter/lwpframelayout.cxx +++ b/lotuswordpro/source/filter/lwpframelayout.cxx @@ -888,11 +888,16 @@ OUString LwpFrameLayout::GetNextLinkName() LwpObjectID* pObjectID = m_Link.GetNextLayout(); if(!pObjectID->IsNull()) { - LwpLayout* pLayout = static_cast<LwpLayout*>(pObjectID->obj()); - aName = pLayout->GetName()->str(); - //for division name confict - if(pLayout->GetStyleName().getLength() > 0) - aName = pLayout->GetStyleName(); + LwpLayout* pLayout = dynamic_cast<LwpLayout*>(pObjectID->obj()); + if (pLayout) + { + LwpAtomHolder *pHolder = pLayout->GetName(); + if (pHolder) + aName = pHolder->str(); + //for division name confict + if(pLayout->GetStyleName().getLength() > 0) + aName = pLayout->GetStyleName(); + } } return aName; } |