summaryrefslogtreecommitdiff
path: root/sw/source/core/docnode/nodes.cxx
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2020-12-22 18:59:43 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2020-12-23 11:44:47 +0100
commit2e0b757e62536281f61b8d37987378646a246fcb (patch)
tree3ddd351e9080919820c17215d08834e5ec1a69cf /sw/source/core/docnode/nodes.cxx
parent86f3fa919a6de6767177193d5b7714f8f6dbd5c4 (diff)
Rename sorted_vector::erase(size_t) to erase_at
emscripten clang fails with: sc/source/core/data/attarray.cxx:378:44: \ error: call to member function 'erase' is ambiguous aNewCondFormatData.erase(nIndex); ~~~~~~~~~~~~~~~~~~~^~~~~ include/o3tl/sorted_vector.hxx:86:15: note: candidate function size_type erase( const Value& x ) ^ include/o3tl/sorted_vector.hxx:97:10: note: candidate function void erase( size_t index ) This looks like a compiler error, but if the vector contained size_t values, this would also be ambiguous to begin with. So this just renames erase(size_t) to erase_at. And instead of a 2nd find in the failing code, after copying the vector, it mow uses std::distance to remove the item. Change-Id: I7d03ff32352a1890cc01ca241452c0f00d6a9302 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108212 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sw/source/core/docnode/nodes.cxx')
-rw-r--r--sw/source/core/docnode/nodes.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index a7a2078b2091..7a1d2bd07491 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1131,7 +1131,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
m_pOutlineNodes->Seek_Entry( pNd, &nIdxPos ))
{
// remove outline indices
- m_pOutlineNodes->erase(nIdxPos);
+ m_pOutlineNodes->erase_at(nIdxPos);
bUpdateOutline = true;
}
pTextNode->InvalidateNumRule();
@@ -1359,7 +1359,7 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, sal_uLong nCnt )
SwOutlineNodes::size_type nIdxPos;
if( m_pOutlineNodes->Seek_Entry( pNd, &nIdxPos ))
{
- m_pOutlineNodes->erase(nIdxPos);
+ m_pOutlineNodes->erase_at(nIdxPos);
bUpdateNum = 1;
}
}