Skip to content

C
core
Kaydet (Commit) aa0301e6 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen
Dosyalara gözat
Seçenekler

RAII for ParagraphFrameEnumeration 

Change-Id: I23d9beabe38587eca2b0620b5c431835ce70d37b
üst e1323281
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
sw/source/core/unocore/unoobj2.cxx
Dosyayı görüntüle @ aa0301e6
...@@ -1676,8 +1676,7 @@ lcl_FillFrame(SwUnoCrsr& rUnoCrsr, FrameClientList_t & rFrames) ...@@ -1676,8 +1676,7 @@ lcl_FillFrame(SwUnoCrsr& rUnoCrsr, FrameClientList_t & rFrames)
{ {
const SwFormatFlyCnt& rFlyCnt = pTextAttr->GetFlyCnt(); const SwFormatFlyCnt& rFlyCnt = pTextAttr->GetFlyCnt();
SwFrameFormat * const pFrameFormat = rFlyCnt.GetFrameFormat(); SwFrameFormat * const pFrameFormat = rFlyCnt.GetFrameFormat();
sw::FrameClient* const pNewClient = new sw::FrameClient(pFrameFormat); rFrames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFrameFormat)));
rFrames.push_back( std::shared_ptr<sw::FrameClient>(pNewClient) );
} }
} }
...@@ -1697,9 +1696,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration( ...@@ -1697,9 +1696,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
} }
else if (pFormat) else if (pFormat)
{ {
// create SwDepend for frame and insert into array m_pImpl->m_Frames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFormat)));
sw::FrameClient* const pNewClient = new sw::FrameClient(pFormat);
m_pImpl->m_Frames.push_back(std::shared_ptr<sw::FrameClient>(pNewClient));
} }
else if ((PARAFRAME_PORTION_CHAR == eParaFrameMode) || else if ((PARAFRAME_PORTION_CHAR == eParaFrameMode) ||
(PARAFRAME_PORTION_TEXTRANGE == eParaFrameMode)) (PARAFRAME_PORTION_TEXTRANGE == eParaFrameMode))
...@@ -1713,9 +1710,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration( ...@@ -1713,9 +1710,7 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(
{ {
SwFrameFormat *const pFrameFormat = const_cast<SwFrameFormat*>(&((*aIter)->GetFormat())); SwFrameFormat *const pFrameFormat = const_cast<SwFrameFormat*>(&((*aIter)->GetFormat()));
// create SwDepend for frame and insert into array m_pImpl->m_Frames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFrameFormat)));
sw::FrameClient* const pNewClient = new sw::FrameClient(pFrameFormat);
m_pImpl->m_Frames.push_back(std::shared_ptr<sw::FrameClient>(pNewClient));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment