diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-11-14 09:56:50 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-14 12:02:45 +0000 |
commit | 0332e3a8e968f9f85b40405391120d2f5949fbd2 (patch) | |
tree | 5bb1c10ed24f64d1d3d2a183dd6903c7dafe8f62 /lotuswordpro/source/filter/lwppagelayout.cxx | |
parent | coverity#1242888 Unused value (diff) | |
download | core-0332e3a8e968f9f85b40405391120d2f5949fbd2.tar.gz core-0332e3a8e968f9f85b40405391120d2f5949fbd2.zip |
coverity#738972 Use after free
Change-Id: Iba60fc4ff3b10179ebc700467a3d73e7bc7b64c9
Diffstat (limited to 'lotuswordpro/source/filter/lwppagelayout.cxx')
-rw-r--r-- | lotuswordpro/source/filter/lwppagelayout.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx index 865e4d43eefb..ad75b8847814 100644 --- a/lotuswordpro/source/filter/lwppagelayout.cxx +++ b/lotuswordpro/source/filter/lwppagelayout.cxx @@ -338,14 +338,14 @@ void LwpPageLayout::RegisterStyle() //Add the page master to stylemanager XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); - m_pXFPageMaster = pm1 = static_cast<XFPageMaster*>(pXFStyleManager->AddStyle(pm1)); + m_pXFPageMaster = pm1 = static_cast<XFPageMaster*>(pXFStyleManager->AddStyle(pm1).m_pStyle); OUString pmname = pm1->GetStyleName(); //Add master page XFMasterPage* mp1 = new XFMasterPage(); mp1->SetStyleName(GetName().str()); mp1->SetPageMaster(pmname); - mp1 = static_cast<XFMasterPage*>(pXFStyleManager->AddStyle(mp1)); + mp1 = static_cast<XFMasterPage*>(pXFStyleManager->AddStyle(mp1).m_pStyle); m_StyleName = mp1->GetStyleName(); //Set footer style @@ -397,7 +397,7 @@ OUString LwpPageLayout::RegisterEndnoteStyle() //Add the page master to stylemanager XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); - m_pXFPageMaster = pm1 = static_cast<XFPageMaster*>(pXFStyleManager->AddStyle(pm1)); + m_pXFPageMaster = pm1 = static_cast<XFPageMaster*>(pXFStyleManager->AddStyle(pm1).m_pStyle); OUString pmname = pm1->GetStyleName(); //Add master page @@ -423,7 +423,7 @@ OUString LwpPageLayout::RegisterEndnoteStyle() pLayoutHeader->RegisterStyle(mp1); } - return pXFStyleManager->AddStyle(mp1)->GetStyleName(); + return pXFStyleManager->AddStyle(mp1).m_pStyle->GetStyleName(); } /** * @descr: Whether current page layout has columns |