diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-22 14:54:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-24 13:23:01 +0100 |
| commit | 969d96b3a844a00181a07b07f7c6dc6db7700876 (patch) | |
| tree | 073759477dd6cc3fddcef9c1f3bf1562203162b2 /sw | |
| parent | 511ef1fc8a0c0d604067a23dc1879cea28626f4c (diff) | |
remove unused RedlineFlags::IgnoreDeleteRedlines
Change-Id: Ic7c1b752c4511a0f55aa8be6b835763715c7738a
Reviewed-on: https://gerrit.libreoffice.org/63930
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/IDocumentRedlineAccess.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/doc/DocumentRedlineManager.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/doc/docredln.cxx | 9 |
3 files changed, 2 insertions, 15 deletions
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index f8b1ee6b1a81..df2091ce6009 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -52,15 +52,12 @@ enum class RedlineFlags // remove the original Redlines together with their content // (Clipboard/text modules). DeleteRedlines = 0x100, - // When deleting within a RedlineObject - // ignore the DeleteRedline during Append. - IgnoreDeleteRedlines = 0x200, // don't combine any redlines. This flag may be only used in Undo. DontCombineRedlines = 0x400, }; namespace o3tl { - template<> struct typed_flags<RedlineFlags> : is_typed_flags<RedlineFlags, 0x733> {}; + template<> struct typed_flags<RedlineFlags> : is_typed_flags<RedlineFlags, 0x533> {}; } typedef sal_uInt16 RedlineType_t; diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 4ce414043270..7b7880bafecd 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -2083,8 +2083,7 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange ) bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo, sal_uInt16 nDelType ) { - if( RedlineFlags::IgnoreDeleteRedlines & meRedlineFlags || - !rRange.HasMark() || *rRange.GetMark() == *rRange.GetPoint() ) + if( !rRange.HasMark() || *rRange.GetMark() == *rRange.GetPoint() ) return false; bool bChg = false; diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index f9fe20b8953a..02774b88002e 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -136,9 +136,6 @@ static bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd ) bool SwExtraRedlineTable::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete ) { - if( RedlineFlags::IgnoreDeleteRedlines & pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ) - return false; - bool bChg = false; if (bSaveInUndo && pDoc->GetIDocumentUndoRedo().DoesUndo()) @@ -215,9 +212,6 @@ bool SwExtraRedlineTable::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rT bool SwExtraRedlineTable::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& rTableLine, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete ) { - if( RedlineFlags::IgnoreDeleteRedlines & pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ) - return false; - bool bChg = false; if (bSaveInUndo && pDoc->GetIDocumentUndoRedo().DoesUndo()) @@ -262,9 +256,6 @@ bool SwExtraRedlineTable::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& bool SwExtraRedlineTable::DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete ) { - if( RedlineFlags::IgnoreDeleteRedlines & pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ) - return false; - bool bChg = false; if (bSaveInUndo && pDoc->GetIDocumentUndoRedo().DoesUndo()) |