summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-06-16 22:04:26 +0200
committerMichael Stahl <mstahl@redhat.com>2016-06-17 14:07:15 +0200
commit5593d9e1422cbf8a122fa612713a832274d30559 (patch)
tree4ccf935c74bd519190e942353c8098d2d1e03f66 /sw/source
parent793fd7e54856216bd58e1d402f63cec208291019 (diff)
sw: speed up the navigator
The call to SwTextBoxHelper::findTextBoxes() in SwDoc::GetFlyNum() made this so unbelievably slow that in a dbgutil build opening the navigator on the bugdoc of tdf#94212 the UI freezes because getting all the fly frames takes longer than the 1 second timeout. Lets's not retrieve the flys one by one but instead all at once, which makes it usable again. Change-Id: Ic41c1648a82dcc3f758ae1b08bac6058f541f25e
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/docfly.cxx54
-rw-r--r--sw/source/core/frmedt/feshview.cxx6
-rw-r--r--sw/source/uibase/utlui/content.cxx9
3 files changed, 65 insertions, 4 deletions
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index e749759f6286..e1291b6673ba 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -171,6 +171,60 @@ SwFrameFormat* SwDoc::GetFlyNum( size_t nIdx, FlyCntType eType, bool bIgnoreText
return pRetFormat;
}
+std::vector<SwFrameFormat const*> SwDoc::GetFlyFrameFormats(
+ FlyCntType const eType, bool const bIgnoreTextBoxes)
+{
+ SwFrameFormats& rFormats = *GetSpzFrameFormats();
+ const size_t nSize = rFormats.size();
+
+ std::set<const SwFrameFormat*> aTextBoxes;
+ if (bIgnoreTextBoxes)
+ aTextBoxes = SwTextBoxHelper::findTextBoxes(this);
+
+ std::vector<SwFrameFormat const*> ret;
+ ret.reserve(nSize);
+
+ for (size_t i = 0; i < nSize; ++i)
+ {
+ SwFrameFormat const*const pFlyFormat = rFormats[ i ];
+
+ if (bIgnoreTextBoxes && aTextBoxes.find(pFlyFormat) != aTextBoxes.end())
+ {
+ continue;
+ }
+
+ if (RES_FLYFRMFMT != pFlyFormat->Which())
+ {
+ continue;
+ }
+
+ SwNodeIndex const*const pIdx(pFlyFormat->GetContent().GetContentIdx());
+ if (pIdx && pIdx->GetNodes().IsDocNodes())
+ {
+ SwNode const*const pNd = GetNodes()[ pIdx->GetIndex() + 1 ];
+ switch (eType)
+ {
+ case FLYCNTTYPE_FRM:
+ if (!pNd->IsNoTextNode())
+ ret.push_back(pFlyFormat);
+ break;
+ case FLYCNTTYPE_GRF:
+ if (pNd->IsGrfNode())
+ ret.push_back(pFlyFormat);
+ break;
+ case FLYCNTTYPE_OLE:
+ if (pNd->IsOLENode())
+ ret.push_back(pFlyFormat);
+ break;
+ default:
+ ret.push_back(pFlyFormat);
+ }
+ }
+ }
+
+ return ret;
+}
+
static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFormatAnchor& rAnch,
const SwFrameFormat* pFlyFormat )
{
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 35f3421b4e3d..dd7fc5fe02e2 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2332,6 +2332,12 @@ const SwFrameFormat* SwFEShell::GetFlyNum(size_t nIdx, FlyCntType eType, bool b
return GetDoc()->GetFlyNum(nIdx, eType, bIgnoreTextBoxes);
}
+std::vector<SwFrameFormat const*> SwFEShell::GetFlyFrameFormats(
+ FlyCntType const eType, bool const bIgnoreTextBoxes)
+{
+ return GetDoc()->GetFlyFrameFormats(eType, bIgnoreTextBoxes);
+}
+
// show the current selected object
void SwFEShell::MakeSelVisible()
{
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index c6ea2751fddb..85a65f4fcece 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -556,13 +556,14 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
eType = FLYCNTTYPE_OLE;
else if(nContentType == ContentTypeId::GRAPHIC)
eType = FLYCNTTYPE_GRF;
- OSL_ENSURE(nMemberCount == pWrtShell->GetFlyCount(eType, /*bIgnoreTextBoxes=*/true),
- "MemberCount differs");
Point aNullPt;
nMemberCount = pWrtShell->GetFlyCount(eType, /*bIgnoreTextBoxes=*/true);
- for(size_t i = 0; i < nMemberCount; ++i)
+ std::vector<SwFrameFormat const*> formats(pWrtShell->GetFlyFrameFormats(eType, /*bIgnoreTextBoxes=*/true));
+ SAL_WARN_IF(nMemberCount != formats.size(), "sw.ui", "MemberCount differs");
+ nMemberCount = formats.size();
+ for (size_t i = 0; i < nMemberCount; ++i)
{
- const SwFrameFormat* pFrameFormat = pWrtShell->GetFlyNum(i,eType,/*bIgnoreTextBoxes=*/true);
+ SwFrameFormat const*const pFrameFormat = formats[i];
const OUString sFrameName = pFrameFormat->GetName();
SwContent* pCnt;