sw/source/uibase/utlui/content.cxx | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
New commits:
commit f48c82cc5c2fcff4c8b6848daf66be61fd04d374
Author: Jim Raykowski <rayk...@gmail.com>
AuthorDate: Fri Dec 31 18:30:45 2021 -0900
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Jan 5 15:56:06 2022 +0100
tdf#134960 SwNavigator: Improve table content member list ordering
by sorting by table node index in the document model
This has advantage over sorting by frame layout top position because it
always shows the tables in the order they appear from start to end in
the document independent of single-view, muliple-page, or book view.
Change-Id: I9103c32bbb32afd44e0528b1c7744812075b2339
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127828
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <rayk...@gmail.com>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127932
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 88fcf00fad85..5cfa0b7bcadc 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -307,9 +307,8 @@ namespace
return false;
}
-
-// Gets "YPos" for SwRegionContent or SwOutlineContent, i.e. a number used to
sort sections in Navigator's list
-sal_Int32 getYPosForSectionOrOutline(const SwNodeIndex& rNodeIndex)
+// Gets "YPos" for content, i.e. a number used to sort content members in
Navigator's list
+sal_Int32 getYPos(const SwNodeIndex& rNodeIndex)
{
SwNodeOffset nIndex = rNodeIndex.GetIndex();
if (rNodeIndex.GetNodes().GetEndOfExtras().GetIndex() >= nIndex)
@@ -321,7 +320,7 @@ sal_Int32 getYPosForSectionOrOutline(const SwNodeIndex&
rNodeIndex)
// Get node index of anchor
if (auto pSwPosition = pFlyFormat->GetAnchor().GetContentAnchor())
{
- return getYPosForSectionOrOutline(pSwPosition->nNode);
+ return getYPos(pSwPosition->nNode);
}
}
}
@@ -475,7 +474,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
}
std::unique_ptr<SwContent> pCnt(new SwRegionContent(this,
rSectionName,
- nLevel, getYPosForSectionOrOutline(*pNodeIndex)));
+ nLevel, getYPos(*pNodeIndex)));
SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, nullptr );
if( !pFormat->GetInfo( aAskItem ) &&
@@ -654,7 +653,7 @@ void SwContentType::FillMemberList(bool*
pbLevelOrVisibilityChanged)
--m_nMemberCount;
continue; // don't hide it, just skip it
}
- tools::Long nYPos = getYPosForSectionOrOutline(
+ tools::Long nYPos = getYPos(
*m_pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNode(i));
OUString aEntry(comphelper::string::stripStart(
m_pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(
@@ -678,7 +677,6 @@ void SwContentType::FillMemberList(bool*
pbLevelOrVisibilityChanged)
{
const size_t nCount = m_pWrtShell->GetTableFrameFormatCount(true);
OSL_ENSURE(m_nMemberCount == nCount, "MemberCount differs");
- Point aNullPt;
m_nMemberCount = nCount;
const SwFrameFormats* pFrameFormats =
m_pWrtShell->GetDoc()->GetTableFrameFormats();
SwAutoFormatGetDocNode aGetHt(&m_pWrtShell->GetNodes());
@@ -691,15 +689,14 @@ void SwContentType::FillMemberList(bool*
pbLevelOrVisibilityChanged)
n++;
continue;
}
- const OUString& sTableName( rTableFormat.GetName() );
-
- SwContent* pCnt = new SwContent(this, sTableName,
- rTableFormat.FindLayoutRect(false, &aNullPt).Top() );
+ tools::Long nYPos = 0;
+ if (SwTable* pTable = SwTable::FindTable(&rTableFormat))
+ nYPos = getYPos(*pTable->GetTableNode());
+ auto pCnt = make_unique<SwContent>(this,
rTableFormat.GetName(), nYPos);
if( !rTableFormat.GetInfo( aAskItem ) &&
- !aAskItem.pObject ) // not visible
+ !aAskItem.pObject ) // not visible
pCnt->SetInvisible();
-
- m_pMember->insert(std::unique_ptr<SwContent>(pCnt));
+ m_pMember->insert(std::move(pCnt));
}
if (nullptr != pbLevelOrVisibilityChanged)
@@ -931,7 +928,7 @@ void SwContentType::FillMemberList(bool*
pbLevelOrVisibilityChanged)
}
std::unique_ptr<SwContent> pCnt(new SwRegionContent(this,
sSectionName,
- nLevel, getYPosForSectionOrOutline(*pNodeIndex)));
+ nLevel, getYPos(*pNodeIndex)));
if( !pFormat->GetInfo( aAskItem ) &&
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
