summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorekuiitr <jhaekansh80@gmail.com>2017-12-27 18:55:49 +0800
committerMichael Stahl <mstahl@redhat.com>2018-01-10 15:20:44 +0100
commit728104b31c89c93c8211fcd78a2c7a38192268eb (patch)
treeefa65f4d3c233d696e7abbe2fbf0dbbf28e74c37 /editeng
parentc2bc2c4633e92349cac390c05d245d1a812986c4 (diff)
tdf#96099 Removed some trivial typedefs related to UnOrderedMap and size_t.
Change-Id: I59d3d0b2c1097b5ca96505dc99a4a104b4f8ab48 Reviewed-on: https://gerrit.libreoffice.org/47082 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editobj.cxx16
1 files changed, 7 insertions, 9 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 59f1c17fcd0a..b9a8fd82baff 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -878,15 +878,13 @@ public:
void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs ) const
{
- typedef std::vector<size_t> SectionBordersType;
- typedef std::vector<SectionBordersType> ParagraphsType;
- ParagraphsType aParaBorders(aContents.size());
+ std::vector<std::vector<size_t>> aParaBorders(aContents.size());
// First pass: determine section borders for each paragraph.
for (size_t nPara = 0; nPara < aContents.size(); ++nPara)
{
const ContentInfo& rC = *aContents[nPara].get();
- SectionBordersType& rBorders = aParaBorders[nPara];
+ std::vector<size_t>& rBorders = aParaBorders[nPara];
rBorders.push_back(0);
rBorders.push_back(rC.GetText().getLength());
for (const auto & aAttrib : rC.maCharAttribs)
@@ -902,12 +900,12 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs )
}
// Sort and remove duplicates for each paragraph.
- ParagraphsType::iterator it = aParaBorders.begin(), itEnd = aParaBorders.end();
+ std::vector<std::vector<size_t>>::iterator it = aParaBorders.begin(), itEnd = aParaBorders.end();
for (; it != itEnd; ++it)
{
- SectionBordersType& rBorders = *it;
+ std::vector<size_t>& rBorders = *it;
std::sort(rBorders.begin(), rBorders.end());
- SectionBordersType::iterator itUniqueEnd = std::unique(rBorders.begin(), rBorders.end());
+ auto itUniqueEnd = std::unique(rBorders.begin(), rBorders.end());
rBorders.erase(itUniqueEnd, rBorders.end());
}
@@ -920,7 +918,7 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs )
for (; it != itEnd; ++it)
{
size_t nPara = distance(aParaBorders.begin(), it);
- const SectionBordersType& rBorders = *it;
+ const std::vector<size_t>& rBorders = *it;
if (rBorders.size() == 1 && rBorders[0] == 0)
{
// Empty paragraph. Push an empty section.
@@ -928,7 +926,7 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs )
continue;
}
- SectionBordersType::const_iterator itBorder = rBorders.begin(), itBorderEnd = rBorders.end();
+ auto itBorder = rBorders.begin(), itBorderEnd = rBorders.end();
size_t nPrev = *itBorder;
size_t nCur;
for (++itBorder; itBorder != itBorderEnd; ++itBorder, nPrev = nCur)