mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make FillFrames a member

Browse Source 
Change-Id: I1582705ce3ae9cc7bbe33789a1626e8d7d3853cf
This commit is contained in:
Bjoern Michaelsen
2015-06-01 21:47:57 +02:00
parent 642088c5eb
commit e4891cefd3
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sw/source/core/unocore/unoobj2.cxx
View File

@@ -1610,6 +1610,7 @@ struct SwXParaFrameEnumerationImpl SAL_FINAL : public SwXParaFrameEnumeration
m_vFrames.erase(iter, m_vFrames.end()); m_vFrames.erase(iter, m_vFrames.end());
} }
} }
void FillFrame();
bool CreateNextObject(); bool CreateNextObject();
uno::Reference< text::XTextContent > m_xNextObject; uno::Reference< text::XTextContent > m_xNextObject;
FrameClientList_t m_vFrames; FrameClientList_t m_vFrames;
@@ -1617,23 +1618,6 @@ struct SwXParaFrameEnumerationImpl SAL_FINAL : public SwXParaFrameEnumeration
}; };
// Search for a FLYCNT text attribute at the cursor point and fill the frame
// into the array
static void
lcl_FillFrame(SwUnoCrsr& rUnoCrsr, FrameClientList_t & rFrames)
{
// search for objects at the cursor - anchored at/as char
SwTextAttr const*const pTextAttr = (rUnoCrsr.GetNode().IsTextNode())
? rUnoCrsr.GetNode().GetTextNode()->GetTextAttrForCharAt(
rUnoCrsr.GetPoint()->nContent.GetIndex(), RES_TXTATR_FLYCNT)
: 0;
if (pTextAttr)
{
const SwFormatFlyCnt& rFlyCnt = pTextAttr->GetFlyCnt();
SwFrameFormat * const pFrameFormat = rFlyCnt.GetFrameFormat();
rFrames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFrameFormat)));
}
}
SwXParaFrameEnumeration* SwXParaFrameEnumeration::Create(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat) SwXParaFrameEnumeration* SwXParaFrameEnumeration::Create(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat)
{ return new SwXParaFrameEnumerationImpl(rPaM, eParaFrameMode, pFormat); } { return new SwXParaFrameEnumerationImpl(rPaM, eParaFrameMode, pFormat); }
@@ -1676,18 +1660,33 @@ SwXParaFrameEnumerationImpl::SwXParaFrameEnumerationImpl(
m_vFrames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFrameFormat))); m_vFrames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFrameFormat)));
} }
} }
FillFrame();
lcl_FillFrame(*GetCursor(), m_vFrames);
} }
} }
// Search for a FLYCNT text attribute at the cursor point and fill the frame
// into the array
void SwXParaFrameEnumerationImpl::FillFrame()
{
if(!m_pUnoCursor->GetNode().IsTextNode())
return;
// search for objects at the cursor - anchored at/as char
const auto pTextAttr = m_pUnoCursor->GetNode().GetTextNode()->GetTextAttrForCharAt(
m_pUnoCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FLYCNT);
if(!pTextAttr)
return;
const SwFormatFlyCnt& rFlyCnt = pTextAttr->GetFlyCnt();
SwFrameFormat* const pFrameFormat = rFlyCnt.GetFrameFormat();
m_vFrames.push_back(std::shared_ptr<sw::FrameClient>(new sw::FrameClient(pFrameFormat)));
}
bool SwXParaFrameEnumerationImpl::CreateNextObject() bool SwXParaFrameEnumerationImpl::CreateNextObject()
{ {
if (!m_vFrames.size()) if (!m_vFrames.size())
return false; return false;
SwFrameFormat* const pFormat = static_cast<SwFrameFormat*>(const_cast<SwModify*>( SwFrameFormat* const pFormat = static_cast<SwFrameFormat*>(const_cast<SwModify*>(
m_vFrames.front()->GetRegisteredIn())); m_vFrames.front()->GetRegisteredIn()));
m_vFrames.pop_front(); m_vFrames.pop_front();
// the format should be valid here, otherwise the client // the format should be valid here, otherwise the client
// would have been removed by PurgeFrameClients // would have been removed by PurgeFrameClients
@@ -1695,11 +1694,9 @@ bool SwXParaFrameEnumerationImpl::CreateNextObject()
SwDrawContact* const pContact = SwIterator<SwDrawContact,SwFormat>( *pFormat ).First(); SwDrawContact* const pContact = SwIterator<SwDrawContact,SwFormat>( *pFormat ).First();
if (pContact) if (pContact)
{ {
SdrObject * const pSdr = pContact->GetMaster(); SdrObject* const pSdr = pContact->GetMaster();
if (pSdr) if (pSdr)
{
m_xNextObject.set(pSdr->getUnoShape(), uno::UNO_QUERY); m_xNextObject.set(pSdr->getUnoShape(), uno::UNO_QUERY);
}
} }
else else
{ {