diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-07 13:10:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-08 09:23:40 +0200 |
| commit | 847e004e65ec3c35acff607588d15cd75a84f121 (patch) | |
| tree | 1b2ac62948c9ad15d2f231b56eb45ff341f572f7 /sw/source/core/inc/DocumentRedlineManager.hxx | |
| parent | 3cac15856ade9fce161a49212c9d1861741122a5 (diff) | |
convert nsRedlineMode_t to typed_flags
including fixing a bug in SwXMLExport::exportDoc where it was ORing with
a constant from a different type: nsRedlineType_t::REDLINE_INSERT
Change-Id: I2bb154c9a35d106e64fd1a8b6e928d0384c9fafe
Diffstat (limited to 'sw/source/core/inc/DocumentRedlineManager.hxx')
| -rw-r--r-- | sw/source/core/inc/DocumentRedlineManager.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx index dfd3edadd171..2cc61c9868d2 100644 --- a/sw/source/core/inc/DocumentRedlineManager.hxx +++ b/sw/source/core/inc/DocumentRedlineManager.hxx @@ -32,11 +32,11 @@ class DocumentRedlineManager : public IDocumentRedlineAccess public: DocumentRedlineManager( SwDoc& i_rSwdoc ); - virtual RedlineMode_t GetRedlineMode() const override; + virtual RedlineFlags GetRedlineFlags() const override; - virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode) override; + virtual void SetRedlineFlags_intern(/*[in]*/RedlineFlags eMode) override; - virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode) override; + virtual void SetRedlineFlags(/*[in]*/RedlineFlags eMode) override; virtual bool IsRedlineOn() const override; @@ -116,7 +116,7 @@ public: Sequence number is for conjoining of Redlines by the UI. */ void SetAutoFormatRedlineComment( const OUString* pText, sal_uInt16 nSeqNo = 0 ); - void checkRedlining(RedlineMode_t& _rReadlineMode); + void checkRedlining(RedlineFlags& _rReadlineMode); virtual ~DocumentRedlineManager(); @@ -128,7 +128,7 @@ private: SwDoc& m_rDoc; - RedlineMode_t meRedlineMode; //< Current Redline Mode. + RedlineFlags meRedlineFlags; //< Current Redline Mode. SwRedlineTable *mpRedlineTable; //< List of all Ranged Redlines. SwExtraRedlineTable *mpExtraRedlineTable; //< List of all Extra Redlines. OUString *mpAutoFormatRedlnComment; //< Comment for Redlines inserted via AutoFormat. |