diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-22 14:36:02 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-23 11:11:11 +0200 |
commit | 28bff4bd3947f442c0aebb92217cd0c7b6a53bda (patch) | |
tree | cfa5cf6199774bc9decd07e286d4e4182f1590d3 /sw/source/filter/ww8/writerhelper.cxx | |
parent | be6227b6c8d6ffacb7168e76856c7e059c08bf77 (diff) |
convert nsRedlineType_t to scoped enum
and move the auto-format embedded flag to a separate field
Change-Id: I02155702389178fbfdf874f592d47a29f8759974
Reviewed-on: https://gerrit.libreoffice.org/72771
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8/writerhelper.cxx')
-rw-r--r-- | sw/source/filter/ww8/writerhelper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 4bb3a1e370d5..eb46cfb1463c 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -689,9 +689,9 @@ namespace sw class SameOpenRedlineType { private: - RedlineType_t const meType; + RedlineType const meType; public: - explicit SameOpenRedlineType(RedlineType_t eType) : meType(eType) {} + explicit SameOpenRedlineType(RedlineType eType) : meType(eType) {} bool operator()(const std::unique_ptr<SwFltStackEntry> & pEntry) const { const SwFltRedline *pTest = static_cast<const SwFltRedline *> @@ -700,7 +700,7 @@ namespace sw } }; - bool RedlineStack::close(const SwPosition& rPos, RedlineType_t eType) + bool RedlineStack::close(const SwPosition& rPos, RedlineType eType) { //Search from end for same type auto aResult = std::find_if(maStack.rbegin(), maStack.rend(), @@ -820,7 +820,7 @@ namespace sw //Return the earlier time, if two have the same time, prioritize //inserts over deletes if (pOne->aStamp == pTwo->aStamp) - return (pOne->eType == nsRedlineType_t::REDLINE_INSERT && pTwo->eType != nsRedlineType_t::REDLINE_INSERT); + return (pOne->eType == RedlineType::Insert && pTwo->eType != RedlineType::Insert); else return (pOne->aStamp < pTwo->aStamp); } |