diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-27 09:08:16 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-27 09:32:46 +0200 |
| commit | d2aa5fc49a5c7669aac5afa05ac99bb29c78971f (patch) | |
| tree | ef9d60d3c463d958a4b5f79f684a506e7a8ab55c /sw | |
| parent | b12bb0fb2e8db6e0f2092163d9fe46dc990132dd (diff) | |
SwXFrameEnumeration: ignore textboxes
Change-Id: I6b37e904898c8b57e619443035ca271b411f5f00
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unocoll.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 3ecae22f1e1a..a6e283147efe 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -49,6 +49,7 @@ #include <unofield.hxx> #include <unoidx.hxx> #include <unoframe.hxx> +#include <textboxhelper.hxx> #include <unofootnote.hxx> #include <vcl/svapp.hxx> #include <fmtcntnt.hxx> @@ -1087,12 +1088,15 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc) ::std::insert_iterator<frmcontainer_t> pInserter = ::std::insert_iterator<frmcontainer_t>(m_aFrames, m_aFrames.begin()); // #i104937# SwFrmFmt* pFmt( 0 ); + + std::list<SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc); + for( sal_uInt16 i = 0; i < nSize; ++i ) // for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt < pFmtsEnd; ++pFmt) { // #i104937# pFmt = (*pFmts)[i]; - if(pFmt->Which() != RES_FLYFRMFMT) + if(pFmt->Which() != RES_FLYFRMFMT || std::find(aTextBoxes.begin(), aTextBoxes.end(), pFmt) != aTextBoxes.end()) continue; const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx(); if(!pIdx || !pIdx->GetNodes().IsDocNodes()) |