Kaydet (Commit) 969d96b3 authored tarafından Noel Grandin's avatar Noel Grandin

remove unused RedlineFlags::IgnoreDeleteRedlines

Change-Id: Ic7c1b752c4511a0f55aa8be6b835763715c7738a
Reviewed-on: https://gerrit.libreoffice.org/63930
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 511ef1fc
......@@ -1324,8 +1324,6 @@ sw/inc/docufld.hxx:113
enum SwExtUserSubType EU_FATHERSNAME
sw/inc/docufld.hxx:114
enum SwExtUserSubType EU_APARTMENT
sw/inc/IDocumentRedlineAccess.hxx:57
enum RedlineFlags IgnoreDeleteRedlines
sw/inc/ndtyp.hxx:42
enum SwNodeType ContentMask
sw/inc/poolfmt.hxx:116
......
......@@ -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;
......
......@@ -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;
......
......@@ -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())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment