diff options
Diffstat (limited to 'sw')
69 files changed, 515 insertions, 518 deletions
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index 1a7d5805e8ea..757394ded765 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -26,6 +26,7 @@ #include <limits.h> #include <com/sun/star/uno/Sequence.hxx> +#include <o3tl/typed_flags_set.hxx> class SwRangeRedline; class SwTableRowRedline; @@ -37,25 +38,28 @@ struct SwPosition; class SwStartNode; class SwNode; -typedef sal_uInt16 RedlineMode_t; -namespace nsRedlineMode_t +enum class RedlineFlags { - const RedlineMode_t REDLINE_NONE = 0; ///< no RedlineMode - const RedlineMode_t REDLINE_ON = 0x01;///< RedlineMode on - const RedlineMode_t REDLINE_IGNORE = 0x02;///< ignore Redlines - const RedlineMode_t REDLINE_SHOW_INSERT = 0x10;///< show all inserts - const RedlineMode_t REDLINE_SHOW_DELETE = 0x20;///< show all deletes - const RedlineMode_t REDLINE_SHOW_MASK = REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE; + NONE = 0x000, ///< no RedlineFlags + On = 0x001, ///< RedlineFlags on + Ignore = 0x002, ///< ignore Redlines + ShowInsert = 0x010, ///< show all inserts + ShowDelete = 0x020, ///< show all deletes + ShowMask = ShowInsert | ShowDelete, // For internal management: // remove the original Redlines together with their content // (Clipboard/text modules). - const RedlineMode_t REDLINE_DELETE_REDLINES = 0x100; + DeleteRedlines = 0x100, // When deleting within a RedlineObject // ignore the DeleteRedline during Append. - const RedlineMode_t REDLINE_IGNOREDELETE_REDLINES = 0x200; + IgnoreDeleteRedlines = 0x200, // don't combine any redlines. This flag may be only used in Undo. - const RedlineMode_t REDLINE_DONTCOMBINE_REDLINES = 0x400; + DontCombineRedlines = 0x400, +}; +namespace o3tl +{ + template<> struct typed_flags<RedlineFlags> : is_typed_flags<RedlineFlags, 0x733> {}; } typedef sal_uInt16 RedlineType_t; @@ -82,17 +86,17 @@ class IDocumentRedlineAccess { // Static helper functions public: - static bool IsShowChanges(const sal_uInt16 eM) - { return (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); } + static bool IsShowChanges(const RedlineFlags eM) + { return (RedlineFlags::ShowInsert | RedlineFlags::ShowDelete) == (eM & RedlineFlags::ShowMask); } - static bool IsHideChanges(const sal_uInt16 eM) - { return nsRedlineMode_t::REDLINE_SHOW_INSERT == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); } + static bool IsHideChanges(const RedlineFlags eM) + { return RedlineFlags::ShowInsert == (eM & RedlineFlags::ShowMask); } - static bool IsShowOriginal(const sal_uInt16 eM) - { return nsRedlineMode_t::REDLINE_SHOW_DELETE == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); } + static bool IsShowOriginal(const RedlineFlags eM) + { return RedlineFlags::ShowDelete == (eM & RedlineFlags::ShowMask); } - static bool IsRedlineOn(const sal_uInt16 eM) - { return nsRedlineMode_t::REDLINE_ON == (eM & (nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE )); } + static bool IsRedlineOn(const RedlineFlags eM) + { return RedlineFlags::On == (eM & (RedlineFlags::On | RedlineFlags::Ignore )); } public: @@ -101,21 +105,21 @@ public: @returns the currently set redline mode */ - virtual RedlineMode_t GetRedlineMode() const = 0; + virtual RedlineFlags GetRedlineFlags() const = 0; /** Set a new redline mode. @param eMode [in] the new redline mode. */ - virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode) = 0; + virtual void SetRedlineFlags_intern(/*[in]*/RedlineFlags eMode) = 0; /** Set a new redline mode. @param eMode [in] the new redline mode. */ - virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode) = 0; + virtual void SetRedlineFlags(/*[in]*/RedlineFlags eMode) = 0; /** Query if redlining is on. diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index d874337d81ac..2105e224f8dc 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -101,6 +101,8 @@ class SwView; struct SwConversionArgs; enum class SvtScriptType; enum class SfxClassificationPolicyType; +enum class RedlineFlags; + namespace com { namespace sun { namespace star { namespace uno { template < class > class Sequence; }}}} @@ -885,8 +887,8 @@ public: bool GotoGlobalDocContent( const SwGlblDocContent& rPos ); /// For Redlining. - sal_uInt16 GetRedlineMode() const; - void SetRedlineMode( sal_uInt16 eMode ); + RedlineFlags GetRedlineFlags() const; + void SetRedlineFlags( RedlineFlags eMode ); bool IsRedlineOn() const; sal_uInt16 GetRedlineCount() const; const SwRangeRedline& GetRedline( sal_uInt16 nPos ) const; diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 0913cea9bbbb..5d3e0d30ae8e 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -38,6 +38,7 @@ class SwNodeIndex; class SwNodeRange; class SwRedlineData; class SwRedlineSaveDatas; +enum class RedlineFlags; namespace sw { class UndoRedoContext; @@ -48,7 +49,7 @@ class SwUndo : public SfxUndoAction { SwUndoId const m_nId; - sal_uInt16 nOrigRedlineMode; + RedlineFlags nOrigRedlineFlags; sal_Int32 m_nViewShellId; protected: @@ -112,8 +113,8 @@ public: // UndoObject remembers which mode was turned on. // In Undo/Redo/Repeat this remembered mode is switched on. - sal_uInt16 GetRedlineMode() const { return nOrigRedlineMode; } - void SetRedlineMode( sal_uInt16 eMode ) { nOrigRedlineMode = eMode; } + RedlineFlags GetRedlineFlags() const { return nOrigRedlineFlags; } + void SetRedlineFlags( RedlineFlags eMode ) { nOrigRedlineFlags = eMode; } bool IsDelBox() const; diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index e994fcbfbe27..01c67e4f5395 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -310,9 +310,9 @@ SwTextNode* getModelToViewTestDocument(SwDoc *pDoc) aPaM.DeleteMark(); //turn on red-lining and show changes - pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_DELETE|nsRedlineMode_t::REDLINE_SHOW_INSERT); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowDelete|RedlineFlags::ShowInsert); CPPUNIT_ASSERT_MESSAGE("redlining should be on", pDoc->getIDocumentRedlineAccess().IsRedlineOn()); - CPPUNIT_ASSERT_MESSAGE("redlines should be visible", IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineMode())); + CPPUNIT_ASSERT_MESSAGE("redlines should be visible", IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags())); //set start of selection to last A aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 4); @@ -743,9 +743,9 @@ void SwDocTest::testSwScanner() CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(2)); //turn on red-lining and show changes - m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_DELETE|nsRedlineMode_t::REDLINE_SHOW_INSERT); + m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowDelete|RedlineFlags::ShowInsert); CPPUNIT_ASSERT_MESSAGE("redlining should be on", m_pDoc->getIDocumentRedlineAccess().IsRedlineOn()); - CPPUNIT_ASSERT_MESSAGE("redlines should be visible", IDocumentRedlineAccess::IsShowChanges(m_pDoc->getIDocumentRedlineAccess().GetRedlineMode())); + CPPUNIT_ASSERT_MESSAGE("redlines should be visible", IDocumentRedlineAccess::IsShowChanges(m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags())); //delete everything except the first word aPaM.SetMark(); //set start of selection to current pos @@ -762,9 +762,9 @@ void SwDocTest::testSwScanner() pTextNode->SetWordCountDirty(true); //keep red-lining on but hide changes - m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON); + m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On); CPPUNIT_ASSERT_MESSAGE("redlining should be still on", m_pDoc->getIDocumentRedlineAccess().IsRedlineOn()); - CPPUNIT_ASSERT_MESSAGE("redlines should be invisible", !IDocumentRedlineAccess::IsShowChanges(m_pDoc->getIDocumentRedlineAccess().GetRedlineMode())); + CPPUNIT_ASSERT_MESSAGE("redlines should be invisible", !IDocumentRedlineAccess::IsShowChanges(m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags())); aDocStat.Reset(); pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //but word-counting the text should only count the non-deleted text @@ -794,7 +794,7 @@ void SwDocTest::testSwScanner() // https://bugs.libreoffice.org/show_bug.cgi?id=68347 we do want to count // redline *added* text though - m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_DELETE|nsRedlineMode_t::REDLINE_SHOW_INSERT); + m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowDelete|RedlineFlags::ShowInsert); aPaM.DeleteMark(); aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 0); m_pDoc->getIDocumentContentOperations().InsertString(aPaM, "redline-new-text "); @@ -1044,15 +1044,15 @@ getRandomPosition(SwDoc *pDoc, int /* nOffset */) void SwDocTest::randomTest() { CPPUNIT_ASSERT_MESSAGE("SwDoc::IsRedlineOn()", !m_pDoc->getIDocumentRedlineAccess().IsRedlineOn()); - RedlineMode_t modes[] = { - nsRedlineMode_t::REDLINE_ON, - nsRedlineMode_t::REDLINE_SHOW_MASK, - nsRedlineMode_t::REDLINE_NONE, - nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_MASK, - nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE, - nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE | nsRedlineMode_t::REDLINE_SHOW_MASK, - nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT, - nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_DELETE + RedlineFlags modes[] = { + RedlineFlags::On, + RedlineFlags::ShowMask, + RedlineFlags::NONE, + RedlineFlags::On | RedlineFlags::ShowMask, + RedlineFlags::On | RedlineFlags::Ignore, + RedlineFlags::On | RedlineFlags::Ignore | RedlineFlags::ShowMask, + RedlineFlags::On | RedlineFlags::ShowInsert, + RedlineFlags::On | RedlineFlags::ShowDelete }; static const char *authors[] = { "Jim", "Bob", "JimBobina", "Helga", "Gertrude", "Spagna", "Hurtleweed" @@ -1063,7 +1063,7 @@ void SwDocTest::randomTest() m_pDoc->ClearDoc(); // setup redlining - m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(modes[rlm]); + m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags(modes[rlm]); SW_MOD()->SetRedlineAuthor(OUString::createFromAscii(authors[0])); for( int i = 0; i < 2000; i++ ) diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx index 818fbd658567..4f91797c28ad 100644 --- a/sw/qa/extras/globalfilter/globalfilter.cxx +++ b/sw/qa/extras/globalfilter/globalfilter.cxx @@ -39,7 +39,7 @@ public: #if !defined(_WIN32) void testSkipImages(); #endif - void testRedlineMode(); + void testRedlineFlags(); CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(testSwappedOutImageExport); @@ -53,7 +53,7 @@ public: #if !defined(_WIN32) CPPUNIT_TEST(testSkipImages); #endif - CPPUNIT_TEST(testRedlineMode); + CPPUNIT_TEST(testRedlineFlags); CPPUNIT_TEST_SUITE_END(); }; @@ -821,7 +821,7 @@ void Test::testSkipImages() } #endif -void Test::testRedlineMode() +void Test::testRedlineFlags() { const char* aFilterNames[] = { "writer8", @@ -840,8 +840,8 @@ void Test::testRedlineMode() IDocumentRedlineAccess & rIDRA(pDoc->getIDocumentRedlineAccess()); // enable change tracking - rIDRA.SetRedlineMode(rIDRA.GetRedlineMode() - | nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_DELETE); + rIDRA.SetRedlineFlags(rIDRA.GetRedlineFlags() + | RedlineFlags::On | RedlineFlags::ShowDelete); // need a delete redline to trigger mode switching pam.Move(fnMoveForward, GoInDoc); @@ -850,9 +850,9 @@ void Test::testRedlineMode() pDoc->getIDocumentContentOperations().DeleteAndJoin(pam); // hide delete redlines - RedlineMode_t const nRedlineMode = - rIDRA.GetRedlineMode() & ~nsRedlineMode_t::REDLINE_SHOW_DELETE; - rIDRA.SetRedlineMode(nRedlineMode); + RedlineFlags const nRedlineFlags = + rIDRA.GetRedlineFlags() & ~RedlineFlags::ShowDelete; + rIDRA.SetRedlineFlags(nRedlineFlags); for (size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter) { @@ -869,7 +869,7 @@ void Test::testRedlineMode() // tdf#97103 check that redline mode is properly restored CPPUNIT_ASSERT_EQUAL_MESSAGE( OString(OString("redline mode not restored in ") + aFilterNames[nFilter]).getStr(), - nRedlineMode, rIDRA.GetRedlineMode()); + (int)nRedlineFlags, (int)rIDRA.GetRedlineFlags()); } } diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 8ff9436570c5..779d91c32418 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -373,16 +373,16 @@ void SwUiWriterTest::testRedlineFrame() // there is exactly one frame CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount()); - sal_uInt16 nMode = pWrtShell->GetRedlineMode(); - CPPUNIT_ASSERT(nMode & nsRedlineMode_t::REDLINE_SHOW_DELETE); + RedlineFlags nMode = pWrtShell->GetRedlineFlags(); + CPPUNIT_ASSERT(nMode & RedlineFlags::ShowDelete); // hide delete redlines - pWrtShell->SetRedlineMode(nMode & ~nsRedlineMode_t::REDLINE_SHOW_DELETE); + pWrtShell->SetRedlineFlags(nMode & ~RedlineFlags::ShowDelete); // there is still exactly one frame CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount()); - pWrtShell->SetRedlineMode(nMode); // show again + pWrtShell->SetRedlineFlags(nMode); // show again // there is still exactly one frame CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount()); diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx index 938d77975632..e59a54fc1d20 100644 --- a/sw/source/core/access/parachangetrackinginfo.cxx +++ b/sw/source/core/access/parachangetrackinginfo.cxx @@ -49,7 +49,7 @@ namespace { const IDocumentRedlineAccess& rIDocChangeTrack( rTextNode.getIDocumentRedlineAccess() ); - if ( !IDocumentRedlineAccess::IsShowChanges( rIDocChangeTrack.GetRedlineMode() ) || + if ( !IDocumentRedlineAccess::IsShowChanges( rIDocChangeTrack.GetRedlineFlags() ) || rIDocChangeTrack.GetRedlineTable().empty() ) { // nothing to do --> empty change track text markup lists. diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 1eb2c3ea48a7..3dbb7e223b26 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -1432,7 +1432,7 @@ static OUString lcl_MaskDeletedRedlines( const SwTextNode* pTextNd ) //mask deleted redlines OUString sNodeText(pTextNd->GetText()); const SwDoc& rDoc = *pTextNd->GetDoc(); - const bool bShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineMode() ); + const bool bShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineFlags() ); if ( bShowChg ) { sal_uInt16 nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( *pTextNd, USHRT_MAX ); diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 3706e096acca..c3fce7c047e4 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -373,8 +373,8 @@ namespace if( pDelPam ) { - RedlineMode_t eOld = pDestDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDestDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = pDestDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDestDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld | RedlineFlags::Ignore ); ::sw::UndoGuard const undoGuard(pDestDoc->GetIDocumentUndoRedo()); @@ -385,7 +385,7 @@ namespace delete pDelPam->GetNext(); } while( true ); - pDestDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDestDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } } } @@ -657,9 +657,9 @@ namespace if( nCurrentRedline > 0) nCurrentRedline--; - // redline mode REDLINE_IGNORE|REDLINE_ON; save old mode - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON )); + // redline mode RedlineFlags::Ignore|RedlineFlags::On; save old mode + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( (( eOld & ~RedlineFlags::Ignore) | RedlineFlags::On )); // iterate over relevant redlines and decide for each whether it should // be saved, or split + saved @@ -707,13 +707,13 @@ namespace } // restore old redline mode - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } void lcl_RestoreRedlines(SwDoc* pDoc, const SwPosition& rPos, SaveRedlines_t& rArr) { - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON )); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( ( eOld & ~RedlineFlags::Ignore) | RedlineFlags::On ); for(SaveRedline & rSvRedLine : rArr) { @@ -721,7 +721,7 @@ namespace pDoc->getIDocumentRedlineAccess().AppendRedline( rSvRedLine.pRedl, true ); } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } void lcl_SaveRedlines(const SwNodeRange& rRg, SaveRedlines_t& rArr) @@ -735,8 +735,8 @@ namespace else if( nRedlPos >= pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() ) return ; - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON )); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( ( eOld & ~RedlineFlags::Ignore) | RedlineFlags::On ); SwRedlineTable& rRedlTable = (SwRedlineTable&)pDoc->getIDocumentRedlineAccess().GetRedlineTable(); do { @@ -804,13 +804,13 @@ namespace break; } while( ++nRedlPos < pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() ); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } void lcl_RestoreRedlines(SwDoc *const pDoc, sal_uInt32 const nInsPos, SaveRedlines_t& rArr) { - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON )); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( ( eOld & ~RedlineFlags::Ignore) | RedlineFlags::On ); for(SaveRedline & rSvRedLine : rArr) { @@ -818,7 +818,7 @@ namespace pDoc->getIDocumentRedlineAccess().AppendRedline( rSvRedLine.pRedl, true ); } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } bool lcl_SaveFootnote( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd, @@ -1638,7 +1638,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) ) pRedlineRange = new SwPaM( rPos ); - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); bool bRet = false; @@ -1662,7 +1662,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons OSL_ENSURE( &m_rDoc == pDoc, " invalid copy branch!" ); OSL_FAIL("mst: i thought this could be dead code;" "please tell me what you did to get here!"); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld | RedlineFlags::Ignore); // Then copy the area to the underlying document area // (with start/end nodes clamped) and move them to @@ -1721,7 +1721,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons bRet = true; } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); if( pRedlineRange ) { if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ) @@ -3228,7 +3228,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly( lcl_CopyBookmarks((pCopiedPaM) ? pCopiedPaM->first : aRgTmp, aCpyPaM); } - if( bDelRedlines && ( nsRedlineMode_t::REDLINE_DELETE_REDLINES & pDest->getIDocumentRedlineAccess().GetRedlineMode() )) + if( bDelRedlines && ( RedlineFlags::DeleteRedlines & pDest->getIDocumentRedlineAccess().GetRedlineFlags() )) lcl_DeleteRedlines( rRg, aCpyRange ); pDest->GetNodes().DelDummyNodes( aCpyRange ); @@ -3543,7 +3543,7 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa { SwUndoRedlineDelete* pUndo = nullptr; - RedlineMode_t eOld = m_rDoc.getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags eOld = m_rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); m_rDoc.GetDocumentRedlineManager().checkRedlining( eOld ); if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { @@ -3551,8 +3551,8 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa /* please don't translate -- for cultural reasons this comment is protected until the redline implementation is finally fixed some day */ //JP 06.01.98: MUSS noch optimiert werden!!! - m_rDoc.getIDocumentRedlineAccess().SetRedlineMode( - (RedlineMode_t) ( nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE ) ); + m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags( + RedlineFlags::On | RedlineFlags::ShowInsert | RedlineFlags::ShowDelete ); m_rDoc.GetIDocumentUndoRedo().StartUndo( UNDO_DELETE, nullptr ); pUndo = new SwUndoRedlineDelete( rPam, UNDO_DELETE ); @@ -3587,7 +3587,7 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa } } //JP 06.01.98: MUSS noch optimiert werden!!! - m_rDoc.getIDocumentRedlineAccess().SetRedlineMode( eOld ); + m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags( eOld ); } return true; } @@ -3850,7 +3850,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() ) { - RedlineMode_t eOld = m_rDoc.getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags eOld = m_rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); m_rDoc.GetDocumentRedlineManager().checkRedlining(eOld); if (m_rDoc.GetIDocumentUndoRedo().DoesUndo()) { @@ -3860,8 +3860,8 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt const ::sw::mark::IMark* pBkmk = m_rDoc.getIDocumentMarkAccess()->makeMark( aDelPam, OUString(), IDocumentMarkAccess::MarkType::UNO_BOOKMARK ); //JP 06.01.98: MUSS noch optimiert werden!!! - m_rDoc.getIDocumentRedlineAccess().SetRedlineMode( - (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE )); + m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags( + RedlineFlags::On | RedlineFlags::ShowInsert | RedlineFlags::ShowDelete ); *aDelPam.GetPoint() = pBkmk->GetMarkPos(); if(pBkmk->IsExpanded()) @@ -3958,7 +3958,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt rPam.GetPoint()->nContent = rIdx; *rPam.GetMark() = *rPam.GetPoint(); //JP 06.01.98: MUSS noch optimiert werden!!! - m_rDoc.getIDocumentRedlineAccess().SetRedlineMode( eOld ); + m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags( eOld ); *rPam.GetPoint() = pBkmk->GetMarkPos(); if(pBkmk->IsExpanded()) @@ -4169,8 +4169,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, pDoc->GetIDocumentUndoRedo().AppendUndo( pUndo ); } - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld | RedlineFlags::Ignore); // Move the PaM one node back from the insert position, so that // the position doesn't get moved @@ -4514,7 +4514,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, if( bCopyBookmarks && m_rDoc.getIDocumentMarkAccess()->getAllMarksCount() ) lcl_CopyBookmarks( rPam, *pCopyPam ); - if( nsRedlineMode_t::REDLINE_DELETE_REDLINES & eOld ) + if( RedlineFlags::DeleteRedlines & eOld ) { assert(*pCopyPam->GetPoint() == rPos); // the Node rPos points to may be deleted so unregister ... @@ -4543,7 +4543,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, aListIdToPropagate, true, true ); } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); pDoc->getIDocumentState().SetModified(); return true; diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 86c1e82e9cb3..10ba31738d62 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -246,8 +246,8 @@ namespace if( bDelRedl ) delete pRedl; - RedlineMode_t eOld = rDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(eOld & ~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE))); + RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld & ~RedlineFlags(RedlineFlags::On | RedlineFlags::Ignore)); if( pCSttNd && pCEndNd ) rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam ); @@ -263,7 +263,7 @@ namespace rDoc.getIDocumentContentOperations().DelFullPara( aPam ); } } - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } else if( bDelRedl ) delete pRedl; @@ -356,8 +356,8 @@ namespace if( bDelRedl ) delete pRedl; - RedlineMode_t eOld = rDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(eOld & ~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE))); + RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld & ~RedlineFlags(RedlineFlags::On | RedlineFlags::Ignore)); if( pCSttNd && pCEndNd ) rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam ); @@ -373,7 +373,7 @@ namespace rDoc.getIDocumentContentOperations().DelFullPara( aPam ); } } - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } else if( bDelRedl ) delete pRedl; @@ -576,7 +576,7 @@ namespace sw { DocumentRedlineManager::DocumentRedlineManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ), - meRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)), + meRedlineFlags(RedlineFlags::ShowInsert | RedlineFlags::ShowDelete), mpRedlineTable( new SwRedlineTable ), mpExtraRedlineTable ( new SwExtraRedlineTable ), mpAutoFormatRedlnComment( nullptr ), @@ -586,38 +586,38 @@ DocumentRedlineManager::DocumentRedlineManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rS { } -RedlineMode_t DocumentRedlineManager::GetRedlineMode() const +RedlineFlags DocumentRedlineManager::GetRedlineFlags() const { - return meRedlineMode; + return meRedlineFlags; } -void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode ) +void DocumentRedlineManager::SetRedlineFlags( RedlineFlags eMode ) { - if( meRedlineMode != eMode ) + if( meRedlineFlags != eMode ) { - if( (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) != (nsRedlineMode_t::REDLINE_SHOW_MASK & eMode) - || 0 == (nsRedlineMode_t::REDLINE_SHOW_MASK & eMode) ) + if( (RedlineFlags::ShowMask & meRedlineFlags) != (RedlineFlags::ShowMask & eMode) + || !(RedlineFlags::ShowMask & eMode) ) { bool bSaveInXMLImportFlag = m_rDoc.IsInXMLImport(); m_rDoc.SetInXMLImport( false ); // and then hide/display everything void (SwRangeRedline::*pFnc)(sal_uInt16, size_t) = nullptr; - switch( nsRedlineMode_t::REDLINE_SHOW_MASK & eMode ) + switch( RedlineFlags::ShowMask & eMode ) { - case nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE : + case RedlineFlags::ShowInsert | RedlineFlags::ShowDelete : pFnc = &SwRangeRedline::Show; break; - case nsRedlineMode_t::REDLINE_SHOW_INSERT: + case RedlineFlags::ShowInsert: pFnc = &SwRangeRedline::Hide; break; - case nsRedlineMode_t::REDLINE_SHOW_DELETE: + case RedlineFlags::ShowDelete: pFnc = &SwRangeRedline::ShowOriginal; break; default: pFnc = &SwRangeRedline::Hide; - eMode = (RedlineMode_t)(eMode | nsRedlineMode_t::REDLINE_SHOW_INSERT); + eMode |= RedlineFlags::ShowInsert; break; } @@ -639,7 +639,7 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode ) CHECK_REDLINE( *this ) m_rDoc.SetInXMLImport( bSaveInXMLImportFlag ); } - meRedlineMode = eMode; + meRedlineFlags = eMode; m_rDoc.getIDocumentState().SetModified(); } @@ -648,17 +648,17 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode ) bool DocumentRedlineManager::IsRedlineOn() const { - return IDocumentRedlineAccess::IsRedlineOn(meRedlineMode); + return IDocumentRedlineAccess::IsRedlineOn(meRedlineFlags); } bool DocumentRedlineManager::IsIgnoreRedline() const { - return (nsRedlineMode_t::REDLINE_IGNORE & meRedlineMode); + return bool(RedlineFlags::Ignore & meRedlineFlags); } -void DocumentRedlineManager::SetRedlineMode_intern(RedlineMode_t eMode) +void DocumentRedlineManager::SetRedlineFlags_intern(RedlineFlags eMode) { - meRedlineMode = eMode; + meRedlineFlags = eMode; } const SwRedlineTable& DocumentRedlineManager::GetRedlineTable() const @@ -735,7 +735,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall bool bMerged = false; CHECK_REDLINE( *this ) - if (IsRedlineOn() && !IsShowOriginal(meRedlineMode)) + if (IsRedlineOn() && !IsShowOriginal(meRedlineFlags)) { pNewRedl->InvalidateRange(); @@ -1124,7 +1124,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall if( pRedl->IsOwnRedline( *pNewRedl ) && pRedl->CanCombine( *pNewRedl ) ) { - if( IsHideChanges( meRedlineMode )) + if( IsHideChanges( meRedlineFlags )) { // Before we can merge, we make it visible! // We insert temporarily so that pNew is @@ -1173,14 +1173,14 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall { // b62341295: Do not throw away redlines // even if they are not allowed to be combined - RedlineMode_t eOld = meRedlineMode; - if( !( eOld & nsRedlineMode_t::REDLINE_DONTCOMBINE_REDLINES ) && + RedlineFlags eOld = meRedlineFlags; + if( !( eOld & RedlineFlags::DontCombineRedlines ) && pRedl->IsOwnRedline( *pNewRedl ) ) { // Set to NONE, so that the Delete::Redo merges the Redline data correctly! // The ShowMode needs to be retained! - meRedlineMode = (RedlineMode_t)(eOld & ~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE)); + meRedlineFlags = eOld & ~RedlineFlags(RedlineFlags::On | RedlineFlags::Ignore); switch( eCmpPos ) { case POS_EQUAL: @@ -1192,7 +1192,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall case POS_INSIDE: if( bCallDelete ) { - meRedlineMode = (RedlineMode_t)(meRedlineMode | nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES); + meRedlineFlags |= RedlineFlags::IgnoreDeleteRedlines; // DeleteAndJoin does not yield the // desired result if there is no paragraph to @@ -1293,7 +1293,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall break; } - meRedlineMode = eOld; + meRedlineFlags = eOld; } else { @@ -1310,7 +1310,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall pRedl->PushData( *pNewRedl ); delete pNewRedl; pNewRedl = nullptr; - if( IsHideChanges( meRedlineMode )) + if( IsHideChanges( meRedlineFlags )) { pRedl->Hide(0, mpRedlineTable->GetPos(pRedl)); } @@ -1374,7 +1374,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall { pRedl->PushData( *pNewRedl ); pNewRedl->SetEnd( *pRStt, pEnd ); - if( IsHideChanges( meRedlineMode )) + if( IsHideChanges( meRedlineFlags )) { mpRedlineTable->Insert(pNewRedl); pRedl->Hide(0, mpRedlineTable->GetPos(pRedl)); @@ -1402,7 +1402,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall { pRedl->PushData( *pNewRedl ); pNewRedl->SetStart( *pREnd, pStt ); - if( IsHideChanges( meRedlineMode )) + if( IsHideChanges( meRedlineFlags )) { mpRedlineTable->Insert( pNewRedl ); pRedl->Hide(0, mpRedlineTable->GetPos(pRedl)); @@ -1671,12 +1671,12 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall { if( bCallDelete && nsRedlineType_t::REDLINE_DELETE == pNewRedl->GetType() ) { - RedlineMode_t eOld = meRedlineMode; + RedlineFlags eOld = meRedlineFlags; // Set to NONE, so that the Delete::Redo merges the Redline data correctly! // The ShowMode needs to be retained! - meRedlineMode = (RedlineMode_t)(eOld & ~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE)); + meRedlineFlags = eOld & ~RedlineFlags(RedlineFlags::On | RedlineFlags::Ignore); m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl ); - meRedlineMode = eOld; + meRedlineFlags = eOld; } delete pNewRedl; pNewRedl = nullptr; @@ -1696,7 +1696,7 @@ bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl, CHECK_REDLINE( this ) */ - if (IsRedlineOn() && !IsShowOriginal(meRedlineMode)) + if (IsRedlineOn() && !IsShowOriginal(meRedlineFlags)) { // #TODO - equivalent for 'SwTableRowRedline' /* @@ -1713,12 +1713,12 @@ bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl, /* if( bCallDelete && nsRedlineType_t::REDLINE_DELETE == pNewRedl->GetType() ) { - RedlineMode_t eOld = meRedlineMode; + RedlineFlags eOld = meRedlineFlags; // Set to NONE, so that the Delete::Redo merges the Redline data correctly! // The ShowMode needs to be retained! - meRedlineMode = (RedlineMode_t)(eOld & ~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE)); + meRedlineFlags = eOld & ~(RedlineFlags::On | RedlineFlags::Ignore); DeleteAndJoin( *pNewRedl ); - meRedlineMode = eOld; + meRedlineFlags = eOld; } delete pNewRedl, pNewRedl = 0; */ @@ -1741,7 +1741,7 @@ bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRed CHECK_REDLINE( this ) */ - if (IsRedlineOn() && !IsShowOriginal(meRedlineMode)) + if (IsRedlineOn() && !IsShowOriginal(meRedlineFlags)) { // #TODO - equivalent for 'SwTableCellRedline' /* @@ -1758,12 +1758,12 @@ bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRed /* if( bCallDelete && nsRedlineType_t::REDLINE_DELETE == pNewRedl->GetType() ) { - RedlineMode_t eOld = meRedlineMode; + RedlineFlags eOld = meRedlineFlags; // Set to NONE, so that the Delete::Redo merges the Redline data correctly! // The ShowMode needs to be retained! - meRedlineMode = (RedlineMode_t)(eOld & ~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE)); + meRedlineFlags = eOld & ~(RedlineFlags::On | RedlineFlags::Ignore); DeleteAndJoin( *pNewRedl ); - meRedlineMode = eOld; + meRedlineFlags = eOld; } delete pNewRedl, pNewRedl = 0; */ @@ -1781,14 +1781,15 @@ void DocumentRedlineManager::CompressRedlines() CHECK_REDLINE( *this ) void (SwRangeRedline::*pFnc)(sal_uInt16, size_t) = nullptr; - switch( nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode ) + switch( RedlineFlags::ShowMask & meRedlineFlags ) { - case nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE: + case RedlineFlags::ShowInsert | RedlineFlags::ShowDelete: pFnc = &SwRangeRedline::Show; break; - case nsRedlineMode_t::REDLINE_SHOW_INSERT: + case RedlineFlags::ShowInsert: pFnc = &SwRangeRedline::Hide; break; + default: break; } // Try to merge identical ones @@ -1889,7 +1890,7 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange ) bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo, sal_uInt16 nDelType ) { - if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & meRedlineMode || + if( RedlineFlags::IgnoreDeleteRedlines & meRedlineFlags || !rRange.HasMark() || *rRange.GetMark() == *rRange.GetPoint() ) return false; @@ -2107,9 +2108,9 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete ) bool bRet = false; // Switch to visible in any case - if( (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) != - (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) ) - SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode)); + if( (RedlineFlags::ShowInsert | RedlineFlags::ShowDelete) != + (RedlineFlags::ShowMask & meRedlineFlags) ) + SetRedlineFlags( RedlineFlags::ShowInsert | RedlineFlags::ShowDelete | meRedlineFlags ); SwRangeRedline* pTmp = (*mpRedlineTable)[ nPos ]; if( pTmp->HasMark() && pTmp->IsVisible() ) @@ -2173,9 +2174,9 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete ) bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete ) { // Switch to visible in any case - if( (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) != - (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) ) - SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode)); + if( (RedlineFlags::ShowInsert | RedlineFlags::ShowDelete) != + (RedlineFlags::ShowMask & meRedlineFlags) ) + SetRedlineFlags( RedlineFlags::ShowInsert | RedlineFlags::ShowDelete | meRedlineFlags ); // The Selection is only in the ContentSection. If there are Redlines // to Non-ContentNodes before or after that, then the Selections @@ -2221,9 +2222,9 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete ) bool bRet = false; // Switch to visible in any case - if( (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) != - (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) ) - SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode)); + if( (RedlineFlags::ShowInsert | RedlineFlags::ShowDelete) != + (RedlineFlags::ShowMask & meRedlineFlags) ) + SetRedlineFlags( RedlineFlags::ShowInsert | RedlineFlags::ShowDelete | meRedlineFlags ); SwRangeRedline* pTmp = (*mpRedlineTable)[ nPos ]; if( pTmp->HasMark() && pTmp->IsVisible() ) @@ -2287,9 +2288,9 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete ) bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete ) { // Switch to visible in any case - if( (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) != - (nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) ) - SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode)); + if( (RedlineFlags::ShowInsert | RedlineFlags::ShowDelete) != + (RedlineFlags::ShowMask & meRedlineFlags) ) + SetRedlineFlags( RedlineFlags::ShowInsert | RedlineFlags::ShowDelete | meRedlineFlags ); // The Selection is only in the ContentSection. If there are Redlines // to Non-ContentNodes before or after that, then the Selections @@ -2662,22 +2663,20 @@ void DocumentRedlineManager::SetAutoFormatRedlineComment( const OUString* pText, #define MAX_REDLINE_COUNT 250 -void DocumentRedlineManager::checkRedlining(RedlineMode_t& _rReadlineMode) +void DocumentRedlineManager::checkRedlining(RedlineFlags& _rReadlineMode) { const SwRedlineTable& rRedlineTable = GetRedlineTable(); SwEditShell* pEditShell = m_rDoc.GetEditShell(); vcl::Window* pParent = pEditShell ? pEditShell->GetWin() : nullptr; if ( pParent && !mbReadlineChecked && rRedlineTable.size() > MAX_REDLINE_COUNT - && !((_rReadlineMode & nsRedlineMode_t::REDLINE_SHOW_DELETE) == nsRedlineMode_t::REDLINE_SHOW_DELETE) ) + && !((_rReadlineMode & RedlineFlags::ShowDelete) == RedlineFlags::ShowDelete) ) { ScopedVclPtrInstance< MessageDialog > aQuery(pParent, "QueryShowChangesDialog", "modules/swriter/ui/queryshowchangesdialog.ui"); sal_uInt16 nResult = aQuery->Execute(); mbReadlineChecked = true; if ( nResult == RET_YES ) { - sal_Int32 nMode = (sal_Int32)_rReadlineMode; - nMode |= nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE; - _rReadlineMode = (RedlineMode_t)nMode; + _rReadlineMode |= RedlineFlags::ShowInsert | RedlineFlags::ShowDelete; } } } diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index dfb997717572..a598e3431866 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1841,9 +1841,9 @@ long SwDoc::CompareDoc( const SwDoc& rDoc ) SwDoc& rSrcDoc = (SwDoc&)rDoc; bool bSrcModified = rSrcDoc.getIDocumentState().IsModified(); - RedlineMode_t eSrcRedlMode = rSrcDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rSrcDoc.getIDocumentRedlineAccess().SetRedlineMode( nsRedlineMode_t::REDLINE_SHOW_INSERT ); - getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT)); + RedlineFlags eSrcRedlMode = rSrcDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rSrcDoc.getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::ShowInsert ); + getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowInsert); Comparators aComparisons(buildComparators(rSrcDoc, *this)); @@ -1857,8 +1857,8 @@ long SwDoc::CompareDoc( const SwDoc& rDoc ) if( nRet ) { - getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | - nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)); + getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | + RedlineFlags::ShowInsert | RedlineFlags::ShowDelete); for (auto& a : aComparisons) { @@ -1868,8 +1868,8 @@ long SwDoc::CompareDoc( const SwDoc& rDoc ) getIDocumentState().SetModified(); } - rSrcDoc.getIDocumentRedlineAccess().SetRedlineMode( eSrcRedlMode ); - getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)); + rSrcDoc.getIDocumentRedlineAccess().SetRedlineFlags( eSrcRedlMode ); + getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::ShowInsert | RedlineFlags::ShowDelete); if( !bSrcModified ) rSrcDoc.getIDocumentState().ResetModified(); @@ -1929,14 +1929,14 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline) SwNodeIndex aSaveNd( pDestRedl->GetPoint()->nNode, -1 ); const sal_Int32 nSaveCnt = pDestRedl->GetPoint()->nContent.GetIndex(); - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld | RedlineFlags::Ignore); pSrcRedl->GetDoc()->getIDocumentContentOperations().CopyRange( *const_cast<SwPaM*>(static_cast<const SwPaM*>(pSrcRedl)), *pDestRedl->GetPoint(), /*bCopyAll=*/false, /*bCheckPos=*/true ); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); pDestRedl->SetMark(); ++aSaveNd; @@ -2064,9 +2064,9 @@ long SwDoc::MergeDoc( const SwDoc& rDoc ) SwDoc& rSrcDoc = (SwDoc&)rDoc; bool bSrcModified = rSrcDoc.getIDocumentState().IsModified(); - RedlineMode_t eSrcRedlMode = rSrcDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rSrcDoc.getIDocumentRedlineAccess().SetRedlineMode( nsRedlineMode_t::REDLINE_SHOW_DELETE ); - getIDocumentRedlineAccess().SetRedlineMode( nsRedlineMode_t::REDLINE_SHOW_DELETE ); + RedlineFlags eSrcRedlMode = rSrcDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rSrcDoc.getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::ShowDelete ); + getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::ShowDelete ); CompareMainText aD0(rSrcDoc, false); CompareMainText aD1(*this, false); @@ -2099,12 +2099,12 @@ long SwDoc::MergeDoc( const SwDoc& rDoc ) if( !vRedlines.empty() ) { // Carry over all into DestDoc - rSrcDoc.getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)); + rSrcDoc.getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::ShowInsert | RedlineFlags::ShowDelete); - getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( - nsRedlineMode_t::REDLINE_ON | - nsRedlineMode_t::REDLINE_SHOW_INSERT | - nsRedlineMode_t::REDLINE_SHOW_DELETE)); + getIDocumentRedlineAccess().SetRedlineFlags( + RedlineFlags::On | + RedlineFlags::ShowInsert | + RedlineFlags::ShowDelete); SwPaM* pLastDestRedline(nullptr); for(SaveMergeRedline& rRedline: vRedlines) @@ -2115,11 +2115,11 @@ long SwDoc::MergeDoc( const SwDoc& rDoc ) } } - rSrcDoc.getIDocumentRedlineAccess().SetRedlineMode( eSrcRedlMode ); + rSrcDoc.getIDocumentRedlineAccess().SetRedlineFlags( eSrcRedlMode ); if( !bSrcModified ) rSrcDoc.getIDocumentState().ResetModified(); - getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)); + getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::ShowInsert | RedlineFlags::ShowDelete); GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, nullptr); diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 5d5c21d15c35..ffc932bae57f 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -1789,7 +1789,7 @@ void SwDoc::SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& rSet SwTextNode* pTNd = rPam.GetPoint()->nNode.GetNode().GetTextNode(); assert(pTNd); - RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags eOld = getIDocumentRedlineAccess().GetRedlineFlags(); if (mbIsAutoFormatRedline) { @@ -1807,7 +1807,7 @@ void SwDoc::SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& rSet //TODO: Undo is still missing! getIDocumentRedlineAccess().AppendRedline( pRedl, true ); - getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); + getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld | RedlineFlags::Ignore ); } const sal_Int32 nEnd(rPam.End()->nContent.GetIndex()); @@ -1835,7 +1835,7 @@ void SwDoc::SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& rSet endPam.SetMark(); getIDocumentContentOperations().InsertItemSet(endPam, currentSet); - getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } void SwDoc::ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet) diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index 937b8eb2a352..5cccd88b1c69 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -216,7 +216,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, // Deactivate Undo/Redline in any case GetIDocumentUndoRedo().DoUndo(false); - getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(getIDocumentRedlineAccess().GetRedlineMode() & ~nsRedlineMode_t::REDLINE_ON)); + getIDocumentRedlineAccess().SetRedlineFlags_intern( getIDocumentRedlineAccess().GetRedlineFlags() & ~RedlineFlags::On ); OUString sExt = pFilter->GetSuffixes().getToken(0, ','); if( sExt.isEmpty() ) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 71e2b82b1255..033379339b14 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1959,13 +1959,13 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv ) ++rOrigPam.GetPoint()->nNode; rOrigPam.GetPoint()->nContent.Assign( rOrigPam.GetContentNode(), 0 ); - RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags eOld = getIDocumentRedlineAccess().GetRedlineFlags(); GetDocumentRedlineManager().checkRedlining(eOld); if (GetIDocumentUndoRedo().DoesUndo()) { // Still NEEDS to be optimized (even after 14 years) - getIDocumentRedlineAccess().SetRedlineMode( - (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)); + getIDocumentRedlineAccess().SetRedlineFlags( + RedlineFlags::On | RedlineFlags::ShowInsert | RedlineFlags::ShowDelete ); SwUndo *const pUndo(new SwUndoRedlineDelete(aPam, UNDO_DELETE)); GetIDocumentUndoRedo().AppendUndo(pUndo); } @@ -1981,7 +1981,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv ) getIDocumentRedlineAccess().AppendRedline( pNewRedline, true ); // Still NEEDS to be optimized! - getIDocumentRedlineAccess().SetRedlineMode( eOld ); + getIDocumentRedlineAccess().SetRedlineFlags( eOld ); GetIDocumentUndoRedo().EndUndo( UNDO_END, nullptr ); getIDocumentState().SetModified(); diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index a293c0449eda..48bf288ac947 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -129,7 +129,7 @@ bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd ) bool SwExtraRedlineTable::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete ) { - if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & pDoc->getIDocumentRedlineAccess().GetRedlineMode() ) + if( RedlineFlags::IgnoreDeleteRedlines & pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ) return false; bool bChg = false; @@ -208,7 +208,7 @@ bool SwExtraRedlineTable::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rT bool SwExtraRedlineTable::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& rTableLine, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete ) { - if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & pDoc->getIDocumentRedlineAccess().GetRedlineMode() ) + if( RedlineFlags::IgnoreDeleteRedlines & pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ) return false; bool bChg = false; @@ -255,7 +255,7 @@ bool SwExtraRedlineTable::DeleteTableRowRedline( SwDoc* pDoc, const SwTableLine& bool SwExtraRedlineTable::DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete ) { - if( nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES & pDoc->getIDocumentRedlineAccess().GetRedlineMode() ) + if( RedlineFlags::IgnoreDeleteRedlines & pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ) return false; bool bChg = false; @@ -753,8 +753,8 @@ void SwRedlineExtraData_Format::Reject( SwPaM& rPam ) const { SwDoc* pDoc = rPam.GetDoc(); - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld & ~(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE))); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld & ~RedlineFlags(RedlineFlags::On | RedlineFlags::Ignore)); // Actually we need to reset the Attribute here! std::vector<sal_uInt16>::const_iterator it; @@ -764,7 +764,7 @@ void SwRedlineExtraData_Format::Reject( SwPaM& rPam ) const SetAttrMode::DONTEXPAND ); } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } bool SwRedlineExtraData_Format::operator == ( const SwRedlineExtraData& rCmp ) const @@ -994,17 +994,18 @@ bool SwRangeRedline::HasValidRange() const void SwRangeRedline::CallDisplayFunc(size_t nMyPos) { - switch( nsRedlineMode_t::REDLINE_SHOW_MASK & GetDoc()->getIDocumentRedlineAccess().GetRedlineMode() ) + switch( RedlineFlags::ShowMask & GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags() ) { - case nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE: + case RedlineFlags::ShowInsert | RedlineFlags::ShowDelete: Show(0, nMyPos); break; - case nsRedlineMode_t::REDLINE_SHOW_INSERT: + case RedlineFlags::ShowInsert: Hide(0, nMyPos); break; - case nsRedlineMode_t::REDLINE_SHOW_DELETE: + case RedlineFlags::ShowDelete: ShowOriginal(0, nMyPos); break; + default: break; } } @@ -1013,8 +1014,8 @@ void SwRangeRedline::Show(sal_uInt16 nLoop, size_t nMyPos) if( 1 <= nLoop ) { SwDoc* pDoc = GetDoc(); - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld | RedlineFlags::Ignore); ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); switch( GetType() ) @@ -1036,15 +1037,15 @@ void SwRangeRedline::Show(sal_uInt16 nLoop, size_t nMyPos) default: break; } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } } void SwRangeRedline::Hide(sal_uInt16 nLoop, size_t nMyPos) { SwDoc* pDoc = GetDoc(); - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld | RedlineFlags::Ignore); ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); switch( GetType() ) @@ -1073,16 +1074,16 @@ void SwRangeRedline::Hide(sal_uInt16 nLoop, size_t nMyPos) default: break; } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } void SwRangeRedline::ShowOriginal(sal_uInt16 nLoop, size_t nMyPos) { SwDoc* pDoc = GetDoc(); - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); SwRedlineData* pCur; - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld | RedlineFlags::Ignore); ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo()); // Determine the Type, it's the first on Stack @@ -1115,7 +1116,7 @@ void SwRangeRedline::ShowOriginal(sal_uInt16 nLoop, size_t nMyPos) default: break; } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } void SwRangeRedline::InvalidateRange() // trigger the Layout diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index cbf5c9abeedf..8377b14e4aa9 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -339,7 +339,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt) if( pCNd ) pRedlPam->GetMark()->nContent = pCNd->Len(); - if( getIDocumentRedlineAccess().IsRedlineOn() && !IDocumentRedlineAccess::IsShowOriginal( getIDocumentRedlineAccess().GetRedlineMode() ) ) + if( getIDocumentRedlineAccess().IsRedlineOn() && !IDocumentRedlineAccess::IsShowOriginal( getIDocumentRedlineAccess().GetRedlineFlags() ) ) { if( bUndo ) { diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 306f15e23114..774f783057a3 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -198,8 +198,8 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, SwSectionNode* pNewSectNode = nullptr; - RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode(); - getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)((eOld & ~nsRedlineMode_t::REDLINE_SHOW_MASK) | nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = getIDocumentRedlineAccess().GetRedlineFlags(); + getIDocumentRedlineAccess().SetRedlineFlags_intern( (eOld & ~RedlineFlags::ShowMask) | RedlineFlags::Ignore ); if( rRange.HasMark() ) { @@ -320,7 +320,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, pNewSectNode->CheckSectionCondColl(); //FEATURE::CONDCOLL - getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); // To-Do - add 'SwExtraRedlineTable' also ? if( getIDocumentRedlineAccess().IsRedlineOn() || (!getIDocumentRedlineAccess().IsIgnoreRedline() && !getIDocumentRedlineAccess().GetRedlineTable().empty() )) diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 6fad99458f86..1c1d2ac53b4d 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2255,8 +2255,8 @@ sal_uInt16 SwDoc::MergeTable( SwPaM& rPam ) // #i33394# GetIDocumentUndoRedo().StartUndo( UNDO_TABLE_MERGE, nullptr ); - RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode(); - getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = getIDocumentRedlineAccess().GetRedlineFlags(); + getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld | RedlineFlags::Ignore); SwUndoTableMerge *const pUndo( (GetIDocumentUndoRedo().DoesUndo()) ? new SwUndoTableMerge( rPam ) @@ -2269,7 +2269,7 @@ sal_uInt16 SwDoc::MergeTable( SwPaM& rPam ) if( !rTable.PrepareMerge( rPam, aBoxes, aMerged, &pMergeBox, pUndo ) ) { // No cells found to merge - getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); if( pUndo ) { delete pUndo; @@ -2334,7 +2334,7 @@ sal_uInt16 SwDoc::MergeTable( SwPaM& rPam ) rPam.Move(); ::ClearFEShellTabCols(); - getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } GetIDocumentUndoRedo().EndUndo( UNDO_TABLE_MERGE, nullptr ); return nRet; @@ -4333,11 +4333,11 @@ bool SwDoc::InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes, } else { - RedlineMode_t eOld = getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags eOld = getIDocumentRedlineAccess().GetRedlineFlags(); if( getIDocumentRedlineAccess().IsRedlineOn() ) - getIDocumentRedlineAccess().SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | - nsRedlineMode_t::REDLINE_SHOW_INSERT | - nsRedlineMode_t::REDLINE_SHOW_DELETE)); + getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::On | + RedlineFlags::ShowInsert | + RedlineFlags::ShowDelete ); SwUndoTableCpyTable* pUndo = nullptr; if (bUndo) @@ -4431,7 +4431,7 @@ bool SwDoc::InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes, rInsPos.nNode = *pSttNd; rInsPos.nContent.Assign( GetNodes().GoNext( &rInsPos.nNode ), 0 ); } - getIDocumentRedlineAccess().SetRedlineMode( eOld ); + getIDocumentRedlineAccess().SetRedlineFlags( eOld ); } if( bRet ) diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 5aa3b5c3c49d..b44a2636178a 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -1260,7 +1260,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) sfx2::LinkManager::GetDisplayNames( this, nullptr, &sFileName, &sRange, &sFilter ); - RedlineMode_t eOldRedlineMode = nsRedlineMode_t::REDLINE_NONE; + RedlineFlags eOldRedlineFlags = RedlineFlags::NONE; SfxObjectShellRef xDocSh; SfxObjectShellLock xLockRef; int nRet; @@ -1277,8 +1277,8 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) if( nRet ) { SwDoc* pSrcDoc = static_cast<SwDocShell*>(&xDocSh)->GetDoc(); - eOldRedlineMode = pSrcDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pSrcDoc->getIDocumentRedlineAccess().SetRedlineMode( nsRedlineMode_t::REDLINE_SHOW_INSERT ); + eOldRedlineFlags = pSrcDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pSrcDoc->getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::ShowInsert ); } } @@ -1390,8 +1390,8 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) if( 2 == nRet ) xDocSh->DoClose(); else if( static_cast<SwDocShell*>(&xDocSh)->GetDoc() ) - static_cast<SwDocShell*>(&xDocSh)->GetDoc()->getIDocumentRedlineAccess().SetRedlineMode( - eOldRedlineMode ); + static_cast<SwDocShell*>(&xDocSh)->GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags( + eOldRedlineFlags ); } } break; diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 22ba7c6e595c..08c350a5c98d 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -1976,8 +1976,8 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos ) m_aDelPam.DeleteMark(); aFInfo.SetFrame( nullptr ); } - //#125102# in case of the mode REDLINE_SHOW_DELETE the ** are still contained in pText - if(0 == (m_pDoc->getIDocumentRedlineAccess().GetRedlineMode() & nsRedlineMode_t::REDLINE_SHOW_DELETE)) + //#125102# in case of the mode RedlineFlags::ShowDelete the ** are still contained in pText + if(!(m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags() & RedlineFlags::ShowDelete)) nPos = m_aDelPam.GetPoint()->nContent.GetIndex() - 1; // Was a character deleted before starting? if (cBlank && cBlank != (*pText)[nSttPos - 1]) @@ -2148,15 +2148,15 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags& rFlags, m_nEndNdIdx = m_aEndNdIdx.GetIndex(), m_pDoc->GetDocShell() ); - RedlineMode_t eRedlMode = m_pDoc->getIDocumentRedlineAccess().GetRedlineMode(), eOldMode = eRedlMode; + RedlineFlags eRedlMode = m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(), eOldMode = eRedlMode; if( m_aFlags.bWithRedlining ) { m_pDoc->SetAutoFormatRedline( true ); - eRedlMode = (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT); + eRedlMode = RedlineFlags::On | RedlineFlags::ShowInsert; } else - eRedlMode = (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_IGNORE); - m_pDoc->getIDocumentRedlineAccess().SetRedlineMode( eRedlMode ); + eRedlMode = RedlineFlags::ShowInsert | RedlineFlags::Ignore; + m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( eRedlMode ); // save undo state (might be turned off) bool const bUndoState = m_pDoc->GetIDocumentUndoRedo().DoesUndo(); @@ -2530,7 +2530,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags& rFlags, if( m_aFlags.bWithRedlining ) m_pDoc->SetAutoFormatRedline( false ); - m_pDoc->getIDocumentRedlineAccess().SetRedlineMode( eOldMode ); + m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( eOldMode ); // restore undo (in case it has been changed) m_pDoc->GetIDocumentUndoRedo().DoUndo(bUndoState); diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index a192dc1e3f9e..e4ba47455677 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -63,9 +63,9 @@ sal_uInt16 SwEditShell::MakeGlossary( SwTextBlocks& rBlks, const OUString& rName rBlks.ClearDoc(); if( rBlks.BeginPutDoc( rShortName, rName ) ) { - rBlks.GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_DELETE_REDLINES ); + rBlks.GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::DeleteRedlines ); CopySelToDoc( pGDoc ); - rBlks.GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)0 ); + rBlks.GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::NONE ); return rBlks.PutDoc(); } diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index c73ff8bff588..4519d850001b 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -1275,7 +1275,7 @@ static SpellContentPositions lcl_CollectDeletedRedlines(SwEditShell* pSh) { SpellContentPositions aRedlines; SwDoc* pDoc = pSh->GetDoc(); - const bool bShowChg = IDocumentRedlineAccess::IsShowChanges( pDoc->getIDocumentRedlineAccess().GetRedlineMode() ); + const bool bShowChg = IDocumentRedlineAccess::IsShowChanges( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); if ( bShowChg ) { SwPaM *pCursor = pSh->GetCursor(); diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx index 79290dcad908..8df2d5f17e1f 100644 --- a/sw/source/core/edit/edredln.cxx +++ b/sw/source/core/edit/edredln.cxx @@ -26,18 +26,18 @@ #include "edimp.hxx" #include "frmtool.hxx" -sal_uInt16 SwEditShell::GetRedlineMode() const +RedlineFlags SwEditShell::GetRedlineFlags() const { - return GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); + return GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags(); } -void SwEditShell::SetRedlineMode( sal_uInt16 eMode ) +void SwEditShell::SetRedlineFlags( RedlineFlags eMode ) { - if( eMode != GetDoc()->getIDocumentRedlineAccess().GetRedlineMode() ) + if( eMode != GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags() ) { SET_CURR_SHELL( this ); StartAllAction(); - GetDoc()->getIDocumentRedlineAccess().SetRedlineMode( (RedlineMode_t)eMode ); + GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags( eMode ); EndAllAction(); } } @@ -125,8 +125,8 @@ const SwRangeRedline* SwEditShell::GetCurrRedline() const void SwEditShell::UpdateRedlineAttr() { - if( ( nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE ) == - ( nsRedlineMode_t::REDLINE_SHOW_MASK & GetDoc()->getIDocumentRedlineAccess().GetRedlineMode() )) + if( ( RedlineFlags::ShowInsert | RedlineFlags::ShowDelete ) == + ( RedlineFlags::ShowMask & GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags() )) { SET_CURR_SHELL( this ); StartAllAction(); diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index a446e73b708e..8d9d580d6543 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -123,7 +123,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount) // Destroy stored TableBoxPtr. A dection is only permitted for the new "Box"! ClearTableBoxContent(); - const RedlineMode_t eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); + const RedlineFlags eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags(); try { for (sal_uInt16 i = 0; i < nCount; ++i) @@ -142,7 +142,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount) } Pop( !bRestoreCursor ); - GetDoc()->getIDocumentRedlineAccess().SetRedlineMode( eOld ); + GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags( eOld ); GetDoc()->getIDocumentRedlineAccess().CompressRedlines(); // automatic detection of the new "Box" @@ -179,7 +179,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount) // Destroy stored TableBoxPtr. A dection is only permitted for the new "Box"! ClearTableBoxContent(); - RedlineMode_t eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags eOld = GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags(); try { for (sal_uInt16 i = 0; i < nCount; ++i) @@ -194,7 +194,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount) Pop( !bRestoreCursor ); - GetDoc()->getIDocumentRedlineAccess().SetRedlineMode( eOld ); + GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags( eOld ); GetDoc()->getIDocumentRedlineAccess().CompressRedlines(); // automatic detection of the new "Box" diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx index 3389be1b2fe9..68f82c3c7f73 100644 --- a/sw/source/core/fields/postithelper.cxx +++ b/sw/source/core/fields/postithelper.cxx @@ -79,7 +79,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos( o_rInfo.mRedlineAuthor = 0; const IDocumentRedlineAccess& rIDRA = pTextNode->getIDocumentRedlineAccess(); - if( IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineMode() ) ) + if( IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineFlags() ) ) { const SwRangeRedline* pRedline = rIDRA.GetRedline( rAnchorPos, nullptr ); if( pRedline ) diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index e24bfc357246..acb4df590ec3 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -128,7 +128,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText ) } pClpDoc->getIDocumentFieldsAccess().LockExpFields(); - pClpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_DELETE_REDLINES ); + pClpDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::DeleteRedlines ); bool bRet; // do we want to copy a FlyFrame? @@ -227,7 +227,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText ) else bRet = CopySelToDoc( pClpDoc ); // copy the selections - pClpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)0 ); + pClpDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::NONE ); pClpDoc->getIDocumentFieldsAccess().UnlockExpFields(); if( !pClpDoc->getIDocumentFieldsAccess().IsExpFieldsLocked() ) pClpDoc->getIDocumentFieldsAccess().UpdateExpFields(nullptr, true); @@ -466,8 +466,8 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, // set a flag in Doc, handled in TextNodes mpDoc->SetCopyIsMove( true ); - RedlineMode_t eOldRedlMode = pDestShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); - pDestShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(eOldRedlMode | nsRedlineMode_t::REDLINE_DELETE_REDLINES)); + RedlineFlags eOldRedlMode = pDestShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags(); + pDestShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOldRedlMode | RedlineFlags::DeleteRedlines ); // If there are table formulas in the area, then display the table first // so that the table formula can calculate a new value first @@ -648,7 +648,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, bRet = SwEditShell::Copy( pDestShell ); } - pDestShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( eOldRedlMode ); + pDestShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOldRedlMode ); mpDoc->SetCopyIsMove( bCopyIsMove ); // have new table formulas been inserted? 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. diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index bbbe0fa6478c..ef8e22fd8f23 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -295,7 +295,7 @@ void SwTextFrame::PaintExtraData( const SwRect &rRect ) const bool bLineNum = !IsInTab() && rLineInf.IsPaintLineNumbers() && ( !IsInFly() || rLineInf.IsCountInFlys() ) && rLineNum.IsCount(); sal_Int16 eHor = (sal_Int16)SW_MOD()->GetRedlineMarkPos(); - if( eHor != text::HoriOrientation::NONE && !IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineMode() ) ) + if( eHor != text::HoriOrientation::NONE && !IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineFlags() ) ) eHor = text::HoriOrientation::NONE; bool bRedLine = eHor != text::HoriOrientation::NONE; if ( bLineNum || bRedLine ) @@ -483,7 +483,7 @@ bool SwTextFrame::PaintEmpty( const SwRect &rRect, bool bCheck ) const } const IDocumentRedlineAccess& rIDRA = rTextNode.getIDocumentRedlineAccess(); - if( IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineMode() ) ) + if( IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineFlags() ) ) { const sal_uInt16 nRedlPos = rIDRA.GetRedlinePos( rTextNode, USHRT_MAX ); if( USHRT_MAX != nRedlPos ) diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 0c9ebb64a103..f4df6844bd3f 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -2090,7 +2090,7 @@ void SwScriptInfo::selectRedLineDeleted(const SwTextNode& rNode, MultiSelection || (rNode.GetText().getLength() == rHiddenMulti.GetTotalRange().Len())); const IDocumentRedlineAccess& rIDRA = rNode.getIDocumentRedlineAccess(); - if ( IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineMode() ) ) + if ( IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineFlags() ) ) { sal_uInt16 nAct = rIDRA.GetRedlinePos( rNode, USHRT_MAX ); diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index e82b69504ecb..aad0fc60b2e4 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -250,7 +250,7 @@ SwTwips SwTextFrame::EmptyHeight() const } const IDocumentRedlineAccess& rIDRA = rTextNode.getIDocumentRedlineAccess(); - if( IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineMode() ) ) + if( IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineFlags() ) ) { const sal_uInt16 nRedlPos = rIDRA.GetRedlinePos( rTextNode, USHRT_MAX ); if( USHRT_MAX != nRedlPos ) diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 83e13d221f28..64c04d3dad1f 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -131,7 +131,7 @@ void SwAttrIter::CtorInitAttrIter( SwTextNode& rTextNode, SwScriptInfo& rScrInf, const IDocumentRedlineAccess& rIDRA = rTextNode.getIDocumentRedlineAccess(); const SwExtTextInput* pExtInp = pDoc->GetExtTextInput( rTextNode ); - const bool bShow = IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineMode() ); + const bool bShow = IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineFlags() ); if( pExtInp || bShow ) { const sal_uInt16 nRedlPos = rIDRA.GetRedlinePos( rTextNode, USHRT_MAX ); diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index cff5b541b5dd..c027d2a8794f 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -151,7 +151,7 @@ lcl_MaskRedlinesAndHiddenText( const SwTextNode& rNode, OUStringBuffer& rText, sal_Int32 nHiddenCharsMasked = 0; const SwDoc& rDoc = *rNode.GetDoc(); - const bool bShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineMode() ); + const bool bShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineFlags() ); // If called from word count or from spell checking, deleted redlines // should be masked: diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index e37375cc5e55..dcab9bb0f28d 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -507,9 +507,9 @@ void UndoManager::AddUndoAction(SfxUndoAction *pAction, bool bTryMerge) SwUndo *const pUndo( dynamic_cast<SwUndo *>(pAction) ); if (pUndo) { - if (nsRedlineMode_t::REDLINE_NONE == pUndo->GetRedlineMode()) + if (RedlineFlags::NONE == pUndo->GetRedlineFlags()) { - pUndo->SetRedlineMode( m_rRedlineAccess.GetRedlineMode() ); + pUndo->SetRedlineFlags( m_rRedlineAccess.GetRedlineFlags() ); } } SdrUndoManager::AddUndoAction(pAction, bTryMerge); diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index cb3b7bffc8d6..4641aa08cd39 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -707,7 +707,7 @@ void SwUndoAttr::SaveRedlineData( const SwPaM& rPam, bool bIsContent ) m_pRedlineSaveData.reset(nullptr); } - SetRedlineMode( pDoc->getIDocumentRedlineAccess().GetRedlineMode() ); + SetRedlineFlags( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); if ( bIsContent ) { m_nNodeIndex = rPam.GetPoint()->nNode.GetIndex(); } @@ -719,7 +719,7 @@ void SwUndoAttr::UndoImpl(::sw::UndoRedoContext & rContext) RemoveIdx( *pDoc ); - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ) ) { + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() ) ) { SwPaM aPam(pDoc->GetNodes().GetEndOfContent()); if ( ULONG_MAX != m_nNodeIndex ) { aPam.DeleteMark(); @@ -770,10 +770,9 @@ void SwUndoAttr::RedoImpl(::sw::UndoRedoContext & rContext) SwPaM & rPam = AddUndoRedoPaM(rContext); if ( m_pRedlineData.get() && - IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ) ) { - RedlineMode_t eOld = rDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern(static_cast<RedlineMode_t>( - eOld & ~nsRedlineMode_t::REDLINE_IGNORE)); + IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() ) ) { + RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld & ~RedlineFlags::Ignore ); rDoc.getIDocumentContentOperations().InsertItemSet( rPam, m_AttrSet, m_nInsertFlags ); if ( ULONG_MAX != m_nNodeIndex ) { @@ -787,7 +786,7 @@ void SwUndoAttr::RedoImpl(::sw::UndoRedoContext & rContext) rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( *m_pRedlineData, rPam ), true); } - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } else { rDoc.getIDocumentContentOperations().InsertItemSet( rPam, m_AttrSet, m_nInsertFlags ); } diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index afc5d75f007a..334e75ffb48f 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -158,7 +158,7 @@ void SwUndo::RemoveIdxRel( sal_uLong nIdx, const SwPosition& rPos ) } SwUndo::SwUndo(SwUndoId const nId, const SwDoc* pDoc) - : m_nId(nId), nOrigRedlineMode(nsRedlineMode_t::REDLINE_NONE), + : m_nId(nId), nOrigRedlineFlags(RedlineFlags::NONE), m_nViewShellId(CreateViewShellId(pDoc)), bCacheComment(true), pComment(nullptr) { @@ -193,25 +193,22 @@ class UndoRedoRedlineGuard public: UndoRedoRedlineGuard(::sw::UndoRedoContext & rContext, SwUndo & rUndo) : m_rRedlineAccess(rContext.GetDoc().getIDocumentRedlineAccess()) - , m_eMode(m_rRedlineAccess.GetRedlineMode()) + , m_eMode(m_rRedlineAccess.GetRedlineFlags()) { - RedlineMode_t const eTmpMode = - static_cast<RedlineMode_t>(rUndo.GetRedlineMode()); - if ((nsRedlineMode_t::REDLINE_SHOW_MASK & eTmpMode) != - (nsRedlineMode_t::REDLINE_SHOW_MASK & m_eMode)) + RedlineFlags const eTmpMode = rUndo.GetRedlineFlags(); + if ((RedlineFlags::ShowMask & eTmpMode) != (RedlineFlags::ShowMask & m_eMode)) { - m_rRedlineAccess.SetRedlineMode( eTmpMode ); + m_rRedlineAccess.SetRedlineFlags( eTmpMode ); } - m_rRedlineAccess.SetRedlineMode_intern( static_cast<RedlineMode_t>( - eTmpMode | nsRedlineMode_t::REDLINE_IGNORE) ); + m_rRedlineAccess.SetRedlineFlags_intern( eTmpMode | RedlineFlags::Ignore ); } ~UndoRedoRedlineGuard() { - m_rRedlineAccess.SetRedlineMode(m_eMode); + m_rRedlineAccess.SetRedlineFlags(m_eMode); } private: IDocumentRedlineAccess & m_rRedlineAccess; - RedlineMode_t const m_eMode; + RedlineFlags const m_eMode; }; void SwUndo::Undo() @@ -987,8 +984,8 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam ) // content will be deleted and not the one you originally wanted. rDoc.getIDocumentRedlineAccess().DeleteRedline( *pRedl, false, USHRT_MAX ); - RedlineMode_t eOld = rDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_DONTCOMBINE_REDLINES)); + RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld | RedlineFlags::DontCombineRedlines ); //#i92154# let UI know about a new redline with comment if (rDoc.GetDocShell() && (!pRedl->GetComment().isEmpty()) ) rDoc.GetDocShell()->Broadcast(SwRedlineHint()); @@ -996,7 +993,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam ) bool const bSuccess = rDoc.getIDocumentRedlineAccess().AppendRedline( pRedl, true ); assert(bSuccess); // SwRedlineSaveData::RedlineToDoc: insert redline failed (void) bSuccess; // unused in non-debug - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } bool SwUndo::FillSaveData( @@ -1066,8 +1063,8 @@ bool SwUndo::FillSaveDataForFormat( void SwUndo::SetSaveData( SwDoc& rDoc, SwRedlineSaveDatas& rSData ) { - RedlineMode_t eOld = rDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON )); + RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( ( eOld & ~RedlineFlags::Ignore) | RedlineFlags::On ); SwPaM aPam( rDoc.GetNodes().GetEndOfContent() ); for( size_t n = rSData.size(); n; ) @@ -1080,7 +1077,7 @@ void SwUndo::SetSaveData( SwDoc& rDoc, SwRedlineSaveDatas& rSData ) // "redline count not restored properly" #endif - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } bool SwUndo::HasHiddenRedlines( const SwRedlineSaveDatas& rSData ) diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index ef84ed184b47..ec7ca8d0fafe 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -98,7 +98,7 @@ void SwUndoInsert::Init(const SwNodeIndex & rNd) { pRedlData = new SwRedlineData( nsRedlineType_t::REDLINE_INSERT, pDoc->getIDocumentRedlineAccess().GetRedlineAuthor() ); - SetRedlineMode( pDoc->getIDocumentRedlineAccess().GetRedlineMode() ); + SetRedlineFlags( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); } pUndoText = GetTextFromDoc(); @@ -157,8 +157,8 @@ bool SwUndoInsert::CanGrouping( const SwPosition& rPos ) { // consider Redline SwDoc& rDoc = *rPos.nNode.GetNode().GetDoc(); - if( ( ~nsRedlineMode_t::REDLINE_SHOW_MASK & rDoc.getIDocumentRedlineAccess().GetRedlineMode() ) == - ( ~nsRedlineMode_t::REDLINE_SHOW_MASK & GetRedlineMode() ) ) + if( ( ~RedlineFlags::ShowMask & rDoc.getIDocumentRedlineAccess().GetRedlineFlags() ) == + ( ~RedlineFlags::ShowMask & GetRedlineFlags() ) ) { bRet = true; @@ -215,7 +215,7 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext) { pPam->GetPoint()->nNode = nNode; - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) { pPam->GetPoint()->nContent.Assign( pPam->GetContentNode(), 0 ); pPam->SetMark(); @@ -243,7 +243,7 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext) if ( pTextNode ) { aPaM.GetPoint()->nContent -= nLen; - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) pTmpDoc->getIDocumentRedlineAccess().DeleteRedline( aPaM, true, USHRT_MAX ); if (m_bWithRsid) { @@ -264,7 +264,7 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext) else // otherwise Graphics/OLE/Text/... { aPaM.Move(fnMoveBackward); - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) pTmpDoc->getIDocumentRedlineAccess().DeleteRedline( aPaM, true, USHRT_MAX ); RemoveIdxFromRange( aPaM, false ); } @@ -308,14 +308,14 @@ void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext) pPam->Move( fnMoveBackward ); pPam->Exchange(); - if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) { - RedlineMode_t eOld = pTmpDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pTmpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld & ~nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = pTmpDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pTmpDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld & ~RedlineFlags::Ignore); pTmpDoc->getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( *pRedlData, *pPam ), true); - pTmpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pTmpDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } - else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) && + else if( !( RedlineFlags::Ignore & GetRedlineFlags() ) && !pTmpDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) pTmpDoc->getIDocumentRedlineAccess().SplitRedline( *pPam ); @@ -359,15 +359,15 @@ void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext) MovePtForward( *pPam, bMvBkwrd ); pPam->Exchange(); - if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) { - RedlineMode_t eOld = pTmpDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pTmpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld & ~nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = pTmpDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pTmpDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld & ~RedlineFlags::Ignore); pTmpDoc->getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( *pRedlData, *pPam ), true); - pTmpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pTmpDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } - else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) && + else if( !( RedlineFlags::Ignore & GetRedlineFlags() ) && !pTmpDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) pTmpDoc->getIDocumentRedlineAccess().SplitRedline(*pPam); } diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx index 34481305186b..c5a751a587b7 100644 --- a/sw/source/core/undo/unredln.cxx +++ b/sw/source/core/undo/unredln.cxx @@ -51,7 +51,7 @@ SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange ) default: ; } - SetRedlineMode( rDoc.getIDocumentRedlineAccess().GetRedlineMode() ); + SetRedlineFlags( rDoc.getIDocumentRedlineAccess().GetRedlineFlags() ); } sal_uLong nEndExtra = rDoc.GetNodes().GetEndOfExtras().GetIndex(); @@ -111,8 +111,8 @@ void SwUndoRedline::UndoImpl(::sw::UndoRedoContext & rContext) void SwUndoRedline::RedoImpl(::sw::UndoRedoContext & rContext) { SwDoc& rDoc = rContext.GetDoc(); - RedlineMode_t eOld = rDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON )); + RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern(( eOld & ~RedlineFlags::Ignore) | RedlineFlags::On ); SwPaM & rPam( AddUndoRedoPaM(rContext) ); if( mpRedlSaveData && mbHiddenRedlines ) @@ -128,7 +128,7 @@ void SwUndoRedline::RedoImpl(::sw::UndoRedoContext & rContext) RedoRedlineImpl(rDoc, rPam); SetPaM(rPam, true); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } void SwUndoRedline::UndoRedlineImpl(SwDoc &, SwPaM &) @@ -234,7 +234,7 @@ void SwUndoRedlineSort::UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam) SwNodeIndex aPrevIdx( pStart->nNode, -1 ); sal_uLong nOffsetTemp = pEnd->nNode.GetIndex() - pStart->nNode.GetIndex(); - if( 0 == ( nsRedlineMode_t::REDLINE_SHOW_DELETE & rDoc.getIDocumentRedlineAccess().GetRedlineMode()) ) + if( !( RedlineFlags::ShowDelete & rDoc.getIDocumentRedlineAccess().GetRedlineFlags()) ) { // Search both Redline objects and make them visible to make the nodes // consistent again. The 'delete' one is hidden, thus search for the @@ -363,7 +363,7 @@ SwUndoCompDoc::SwUndoCompDoc( const SwPaM& rRg, bool bIns ) { RedlineType_t eTyp = bInsert ? nsRedlineType_t::REDLINE_INSERT : nsRedlineType_t::REDLINE_DELETE; pRedlData = new SwRedlineData( eTyp, pDoc->getIDocumentRedlineAccess().GetRedlineAuthor() ); - SetRedlineMode( pDoc->getIDocumentRedlineAccess().GetRedlineMode() ); + SetRedlineFlags( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); } } @@ -377,7 +377,7 @@ SwUndoCompDoc::SwUndoCompDoc( const SwRangeRedline& rRedl ) if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ) { pRedlData = new SwRedlineData( rRedl.GetRedlineData() ); - SetRedlineMode( pDoc->getIDocumentRedlineAccess().GetRedlineMode() ); + SetRedlineFlags( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); } pRedlSaveData = new SwRedlineSaveDatas; @@ -404,12 +404,12 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext) if( !bInsert ) { // delete Redlines - RedlineMode_t eOld = rDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON)); + RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern(( eOld & ~RedlineFlags::Ignore) | RedlineFlags::On); rDoc.getIDocumentRedlineAccess().DeleteRedline(rPam, true, USHRT_MAX); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); // per definition Point is end (in SwUndRng!) SwContentNode* pCSttNd = rPam.GetContentNode(false); @@ -449,7 +449,7 @@ void SwUndoCompDoc::UndoImpl(::sw::UndoRedoContext & rContext) } else { - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) { rDoc.getIDocumentRedlineAccess().DeleteRedline(rPam, true, USHRT_MAX); @@ -467,13 +467,13 @@ void SwUndoCompDoc::RedoImpl(::sw::UndoRedoContext & rContext) if( bInsert ) { - if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) { SwRangeRedline* pTmp = new SwRangeRedline(*pRedlData, rPam); static_cast<SwRedlineTable&>(rDoc.getIDocumentRedlineAccess().GetRedlineTable()).Insert( pTmp ); pTmp->InvalidateRange(); } - else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) && + else if( !( RedlineFlags::Ignore & GetRedlineFlags() ) && !rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ) rDoc.getIDocumentRedlineAccess().SplitRedline(rPam); } diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index c010369a5e02..0cd4fc22edff 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -84,7 +84,7 @@ SwUndoInsSection::SwUndoInsSection( { m_pRedlData.reset(new SwRedlineData( nsRedlineType_t::REDLINE_INSERT, rDoc.getIDocumentRedlineAccess().GetRedlineAuthor() )); - SetRedlineMode( rDoc.getIDocumentRedlineAccess().GetRedlineMode() ); + SetRedlineFlags( rDoc.getIDocumentRedlineAccess().GetRedlineFlags() ); } m_pRedlineSaveData.reset( new SwRedlineSaveDatas ); if( !FillSaveData( rPam, *m_pRedlineSaveData, false )) @@ -122,7 +122,7 @@ void SwUndoInsSection::UndoImpl(::sw::UndoRedoContext & rContext) rDoc.GetNodes()[ m_nSectionNodePos ]->GetSectionNode(); OSL_ENSURE( pNd, "wo ist mein SectionNode?" ); - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) rDoc.getIDocumentRedlineAccess().DeleteRedline( *pNd, true, USHRT_MAX ); // no selection? @@ -187,16 +187,16 @@ void SwUndoInsSection::RedoImpl(::sw::UndoRedoContext & rContext) SwSectionNode *const pSectNd = rDoc.GetNodes()[ m_nSectionNodePos ]->GetSectionNode(); if (m_pRedlData.get() && - IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode())) + IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags())) { - RedlineMode_t eOld = rDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld & ~nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld & ~RedlineFlags::Ignore); SwPaM aPam( *pSectNd->EndOfSectionNode(), *pSectNd, 1 ); rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( *m_pRedlData, aPam ), true); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } - else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) && + else if( !( RedlineFlags::Ignore & GetRedlineFlags() ) && !rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ) { SwPaM aPam( *pSectNd->EndOfSectionNode(), *pSectNd, 1 ); diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx index 3cdd94158c1d..f4133fff45b8 100644 --- a/sw/source/core/undo/unspnd.cxx +++ b/sw/source/core/undo/unspnd.cxx @@ -55,7 +55,7 @@ SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ) { pRedlData = new SwRedlineData( nsRedlineType_t::REDLINE_INSERT, pDoc->getIDocumentRedlineAccess().GetRedlineAuthor() ); - SetRedlineMode( pDoc->getIDocumentRedlineAccess().GetRedlineMode() ); + SetRedlineFlags( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); } nParRsid = pTextNd->GetParRsid(); @@ -113,7 +113,7 @@ void SwUndoSplitNode::UndoImpl(::sw::UndoRedoContext & rContext) rPam.GetPoint()->nNode = *pTNd; rPam.GetPoint()->nContent.Assign(pTNd, pTNd->GetText().getLength()); - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) { rPam.SetMark(); ++rPam.GetMark()->nNode; @@ -162,19 +162,19 @@ void SwUndoSplitNode::RedoImpl(::sw::UndoRedoContext & rContext) if( pHistory ) pHistory->SetTmpEnd( pHistory->Count() ); - if( ( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) || - ( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) && + if( ( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) || + ( !( RedlineFlags::Ignore & GetRedlineFlags() ) && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )) { rPam.SetMark(); if( rPam.Move( fnMoveBackward )) { - if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) { - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld & ~nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld & ~RedlineFlags::Ignore); pDoc->getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( *pRedlData, rPam ), true); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } else pDoc->getIDocumentRedlineAccess().SplitRedline( rPam ); diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 4a942a94859e..a6b48eb3e2a0 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -246,7 +246,7 @@ SwUndoInsTable::SwUndoInsTable( const SwPosition& rPos, sal_uInt16 nCl, sal_uInt if( rDoc.getIDocumentRedlineAccess().IsRedlineOn() ) { pRedlData = new SwRedlineData( nsRedlineType_t::REDLINE_INSERT, rDoc.getIDocumentRedlineAccess().GetRedlineAuthor() ); - SetRedlineMode( rDoc.getIDocumentRedlineAccess().GetRedlineMode() ); + SetRedlineFlags( rDoc.getIDocumentRedlineAccess().GetRedlineFlags() ); } sTableNm = rName; @@ -269,7 +269,7 @@ void SwUndoInsTable::UndoImpl(::sw::UndoRedoContext & rContext) OSL_ENSURE( pTableNd, "no TableNode" ); pTableNd->DelFrames(); - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) rDoc.getIDocumentRedlineAccess().DeleteRedline( *pTableNd, true, USHRT_MAX ); RemoveIdxFromSection( rDoc, nSttNode ); @@ -324,8 +324,8 @@ void SwUndoInsTable::RedoImpl(::sw::UndoRedoContext & rContext) pDDEFieldType = nullptr; } - if( (pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) || - ( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) && + if( (pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) || + ( !( RedlineFlags::Ignore & GetRedlineFlags() ) && !rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )) { SwPaM aPam( *pTableNode->EndOfSectionNode(), *pTableNode, 1 ); @@ -333,13 +333,13 @@ void SwUndoInsTable::RedoImpl(::sw::UndoRedoContext & rContext) if( pCNd ) aPam.GetMark()->nContent.Assign( pCNd, 0 ); - if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ) ) + if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() ) ) { - RedlineMode_t eOld = rDoc.getIDocumentRedlineAccess().GetRedlineMode(); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld & ~nsRedlineMode_t::REDLINE_IGNORE)); + RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern(eOld & ~RedlineFlags::Ignore); rDoc.getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( *pRedlData, aPam ), true); - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } else rDoc.getIDocumentRedlineAccess().SplitRedline( aPam ); @@ -2296,39 +2296,39 @@ void SwUndoTableNumFormat::UndoImpl(::sw::UndoRedoContext & rContext) pPam->GetPoint()->nContent.Assign( pTextNd, 0 ); } -/** switch the RedlineMode on the given document, using - * SetRedlineMode_intern. This class set the mode in the constructor, +/** switch the RedlineFlags on the given document, using + * SetRedlineFlags_intern. This class set the mode in the constructor, * and changes it back in the destructor, i.e. it uses the * initialization-is-resource-acquisition idiom. */ -class RedlineModeInternGuard +class RedlineFlagsInternGuard { SwDoc& mrDoc; - RedlineMode_t meOldRedlineMode; + RedlineFlags meOldRedlineFlags; public: - RedlineModeInternGuard( + RedlineFlagsInternGuard( SwDoc& rDoc, // change mode of this document - RedlineMode_t eNewRedlineMode, // new redline mode - RedlineMode_t eRedlineModeMask = (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE /*change only bits set in this mask*/)); + RedlineFlags eNewRedlineFlags, // new redline mode + RedlineFlags eRedlineFlagsMask = RedlineFlags::On | RedlineFlags::Ignore /*change only bits set in this mask*/); - ~RedlineModeInternGuard(); + ~RedlineFlagsInternGuard(); }; -RedlineModeInternGuard::RedlineModeInternGuard( +RedlineFlagsInternGuard::RedlineFlagsInternGuard( SwDoc& rDoc, - RedlineMode_t eNewRedlineMode, - RedlineMode_t eRedlineModeMask ) + RedlineFlags eNewRedlineFlags, + RedlineFlags eRedlineFlagsMask ) : mrDoc( rDoc ), - meOldRedlineMode( rDoc.getIDocumentRedlineAccess().GetRedlineMode() ) + meOldRedlineFlags( rDoc.getIDocumentRedlineAccess().GetRedlineFlags() ) { - mrDoc.getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)( ( meOldRedlineMode & ~eRedlineModeMask ) | - ( eNewRedlineMode & eRedlineModeMask ) )); + mrDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( ( meOldRedlineFlags & ~eRedlineFlagsMask ) | + ( eNewRedlineFlags & eRedlineFlagsMask ) ); } -RedlineModeInternGuard::~RedlineModeInternGuard() +RedlineFlagsInternGuard::~RedlineFlagsInternGuard() { - mrDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( meOldRedlineMode ); + mrDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( meOldRedlineFlags ); } void SwUndoTableNumFormat::RedoImpl(::sw::UndoRedoContext & rContext) @@ -2376,8 +2376,8 @@ void SwUndoTableNumFormat::RedoImpl(::sw::UndoRedoContext & rContext) // dvo: When redlining is (was) enabled, setting the attribute // will also change the cell content. To allow this, the - // REDLINE_IGNORE flag must be removed during Redo. #108450# - RedlineModeInternGuard aGuard( rDoc, nsRedlineMode_t::REDLINE_NONE, nsRedlineMode_t::REDLINE_IGNORE ); + // RedlineFlags::Ignore flag must be removed during Redo. #108450# + RedlineFlagsInternGuard aGuard( rDoc, RedlineFlags::NONE, RedlineFlags::Ignore ); pBoxFormat->SetFormatAttr( aBoxSet ); } else if( css::util::NumberFormat::TEXT != static_cast<sal_Int16>(nFormatIdx) ) @@ -2396,8 +2396,8 @@ void SwUndoTableNumFormat::RedoImpl(::sw::UndoRedoContext & rContext) // dvo: When redlining is (was) enabled, setting the attribute // will also change the cell content. To allow this, the - // REDLINE_IGNORE flag must be removed during Redo. #108450# - RedlineModeInternGuard aGuard( rDoc, nsRedlineMode_t::REDLINE_NONE, nsRedlineMode_t::REDLINE_IGNORE ); + // RedlineFlags::Ignore flag must be removed during Redo. #108450# + RedlineFlagsInternGuard aGuard( rDoc, RedlineFlags::NONE, RedlineFlags::Ignore ); pBoxFormat->SetFormatAttr( aBoxSet ); } else @@ -2477,7 +2477,7 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext) SwPaM aPam( aInsIdx.GetNode(), *pEndNode ); SwUndoDelete* pUndo = nullptr; - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ) ) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() ) ) { bool bDeleteCompleteParagraph = false; bool bShiftPam = false; @@ -2626,11 +2626,11 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext) // b62341295: Redline for copying tables - Start. rDoc.GetNodes().MakeTextNode( aInsIdx, rDoc.GetDfltTextFormatColl() ); SwPaM aPam( aInsIdx.GetNode(), *rBox.GetSttNd()->EndOfSectionNode()); - SwUndo* pUndo = IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ) ? nullptr : new SwUndoDelete( aPam, true ); + SwUndo* pUndo = IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() ) ? nullptr : new SwUndoDelete( aPam, true ); if( pEntry->pUndo ) { pEntry->pUndo->UndoImpl(rContext); - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ) ) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() ) ) { // PrepareRedline has to be called with the beginning of the old content // When new and old content has been joined, the rIter.pAktPam has been set @@ -2757,9 +2757,8 @@ SwUndo* SwUndoTableCpyTable::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox // Mark the cell content before rIdx as insertion, // mark the cell content behind rIdx as deletion // merge text nodes at rIdx if possible - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)( ( eOld | nsRedlineMode_t::REDLINE_DONTCOMBINE_REDLINES ) & - ~nsRedlineMode_t::REDLINE_IGNORE )); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( ( eOld | RedlineFlags::DontCombineRedlines ) & ~RedlineFlags::Ignore ); SwPosition aInsertEnd( rPos ); SwTextNode* pText; if( !rJoin ) @@ -2816,7 +2815,7 @@ SwUndo* SwUndoTableCpyTable::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox pDoc->getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, aTmpPam ), true ); } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); return pUndo; } diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx index 26baa8ccaca3..0dd4d1127f9e 100644 --- a/sw/source/core/undo/untblk.cxx +++ b/sw/source/core/undo/untblk.cxx @@ -72,7 +72,7 @@ SwUndoInserts::SwUndoInserts( SwUndoId nUndoId, const SwPaM& rPam ) if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ) { pRedlData = new SwRedlineData( nsRedlineType_t::REDLINE_INSERT, pDoc->getIDocumentRedlineAccess().GetRedlineAuthor() ); - SetRedlineMode( pDoc->getIDocumentRedlineAccess().GetRedlineMode() ); + SetRedlineFlags( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); } } @@ -150,7 +150,7 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext) SwDoc& rDoc = rContext.GetDoc(); SwPaM& rPam = AddUndoRedoPaM(rContext); - if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) rDoc.getIDocumentRedlineAccess().DeleteRedline(rPam, true, USHRT_MAX); // if Point and Mark are different text nodes so a JoinNext has to be done @@ -292,14 +292,14 @@ void SwUndoInserts::RedoImpl(::sw::UndoRedoContext & rContext) pHistory->Rollback( pDoc, nSetPos ); - if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) + if( pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags() )) { - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)( eOld & ~nsRedlineMode_t::REDLINE_IGNORE )); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld & ~RedlineFlags::Ignore ); pDoc->getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( *pRedlData, rPam ), true); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); } - else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) && + else if( !( RedlineFlags::Ignore & GetRedlineFlags() ) && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) pDoc->getIDocumentRedlineAccess().SplitRedline(rPam); } diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 1671fe18d3cb..88dd4943496c 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1265,12 +1265,12 @@ void makeRedline( SwPaM& rPaM, } SwRangeRedline* pRedline = new SwRangeRedline( aRedlineData, rPaM ); - RedlineMode_t nPrevMode = pRedlineAccess->GetRedlineMode( ); + RedlineFlags nPrevMode = pRedlineAccess->GetRedlineFlags( ); pRedline->SetExtraData( pRedlineExtraData ); - pRedlineAccess->SetRedlineMode_intern(nsRedlineMode_t::REDLINE_ON); + pRedlineAccess->SetRedlineFlags_intern(RedlineFlags::On); bool bRet = pRedlineAccess->AppendRedline( pRedline, false ); - pRedlineAccess->SetRedlineMode_intern( nPrevMode ); + pRedlineAccess->SetRedlineFlags_intern( nPrevMode ); if( !bRet ) throw lang::IllegalArgumentException(); } @@ -1322,12 +1322,12 @@ void makeTableRowRedline( SwTableLine& rTableLine, } SwTableRowRedline* pRedline = new SwTableRowRedline( aRedlineData, rTableLine ); - RedlineMode_t nPrevMode = pRedlineAccess->GetRedlineMode( ); + RedlineFlags nPrevMode = pRedlineAccess->GetRedlineFlags( ); pRedline->SetExtraData( nullptr ); - pRedlineAccess->SetRedlineMode_intern(nsRedlineMode_t::REDLINE_ON); + pRedlineAccess->SetRedlineFlags_intern(RedlineFlags::On); bool bRet = pRedlineAccess->AppendTableRowRedline( pRedline, false ); - pRedlineAccess->SetRedlineMode_intern( nPrevMode ); + pRedlineAccess->SetRedlineFlags_intern( nPrevMode ); if( !bRet ) throw lang::IllegalArgumentException(); } @@ -1379,12 +1379,12 @@ void makeTableCellRedline( SwTableBox& rTableBox, } SwTableCellRedline* pRedline = new SwTableCellRedline( aRedlineData, rTableBox ); - RedlineMode_t nPrevMode = pRedlineAccess->GetRedlineMode( ); + RedlineFlags nPrevMode = pRedlineAccess->GetRedlineFlags( ); pRedline->SetExtraData( nullptr ); - pRedlineAccess->SetRedlineMode_intern(nsRedlineMode_t::REDLINE_ON); + pRedlineAccess->SetRedlineFlags_intern(RedlineFlags::On); bool bRet = pRedlineAccess->AppendTableCellRedline( pRedline, false ); - pRedlineAccess->SetRedlineMode_intern( nPrevMode ); + pRedlineAccess->SetRedlineFlags_intern( nPrevMode ); if( !bRet ) throw lang::IllegalArgumentException(); } diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 950ad8f02fbc..397975413223 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2211,7 +2211,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } IDocumentRedlineAccess & rIDRA(m_pImpl->m_pDoc->getIDocumentRedlineAccess()); - if (!IDocumentRedlineAccess::IsShowChanges(rIDRA.GetRedlineMode())) + if (!IDocumentRedlineAccess::IsShowChanges(rIDRA.GetRedlineFlags())) { throw uno::RuntimeException( "cannot convertToTable if tracked changes are hidden!"); diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 31823fed0c5a..4f262bd6feaf 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -697,9 +697,9 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, { if (rEntry.MakeRegion(pDoc, aRegion, true)) { - pDoc->getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( nsRedlineMode_t::REDLINE_ON - | nsRedlineMode_t::REDLINE_SHOW_INSERT - | nsRedlineMode_t::REDLINE_SHOW_DELETE )); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::On + | RedlineFlags::ShowInsert + | RedlineFlags::ShowDelete ); SwFltRedline& rFltRedline = *static_cast<SwFltRedline*>(rEntry.pAttr); if( USHRT_MAX != rFltRedline.nAutorNoPrev ) @@ -719,9 +719,9 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, nullptr ); pDoc->getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline(aData, aRegion), true ); - pDoc->getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( nsRedlineMode_t::REDLINE_NONE - | nsRedlineMode_t::REDLINE_SHOW_INSERT - | nsRedlineMode_t::REDLINE_SHOW_DELETE )); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::NONE + | RedlineFlags::ShowInsert + | RedlineFlags::ShowDelete ); } } break; diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 001151de98d2..929c0f32cc97 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -134,8 +134,8 @@ sal_uLong SwReader::Read( const Reader& rOptions ) SwNodeIndex aSplitIdx( pDoc->GetNodes() ); - RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - RedlineMode_t ePostReadRedlineMode( nsRedlineMode_t::REDLINE_IGNORE ); + RedlineFlags eOld = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + RedlineFlags ePostReadRedlineFlags( RedlineFlags::Ignore ); // Array of FlyFormats SwFrameFormatsV aFlyFrameArr; @@ -147,7 +147,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) if( bSaveUndo ) pUndo = new SwUndoInsDoc( *pPam ); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::Ignore ); SwPaM* pUndoPam = nullptr; if( bDocUndo || pCursor ) @@ -171,14 +171,14 @@ sal_uLong SwReader::Read( const Reader& rOptions ) sal_Int32 nEndContent = pCNd ? pCNd->Len() - nSttContent : 0; SwNodeIndex aEndPos( pPam->GetPoint()->nNode, 1 ); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); nError = po->Read( *pDoc, GetBaseURL(), *pPam, aFileName ); // an ODF document may contain redline mode in settings.xml; save it! - ePostReadRedlineMode = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); + ePostReadRedlineFlags = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::Ignore ); if( !IsError( nError )) // set the End position already { @@ -263,13 +263,13 @@ sal_uLong SwReader::Read( const Reader& rOptions ) { if( bSaveUndo ) { - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); // UGLY: temp. enable undo pDoc->GetIDocumentUndoRedo().DoUndo(true); pDoc->GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFormat( pFrameFormat,0,0 ) ); pDoc->GetIDocumentUndoRedo().DoUndo(false); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::Ignore ); } if( pFrameFormat->HasWriterListeners() ) { @@ -297,22 +297,22 @@ sal_uLong SwReader::Read( const Reader& rOptions ) if( !aFlyFrameArr.empty() ) aFlyFrameArr.clear(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ) pDoc->getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline( nsRedlineType_t::REDLINE_INSERT, *pUndoPam ), true); else pDoc->getIDocumentRedlineAccess().SplitRedline( *pUndoPam ); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::Ignore ); } if( bSaveUndo ) { - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); pUndo->SetInsertRange( *pUndoPam, false ); // UGLY: temp. enable undo pDoc->GetIDocumentUndoRedo().DoUndo(true); pDoc->GetIDocumentUndoRedo().AppendUndo( pUndo ); pDoc->GetIDocumentUndoRedo().DoUndo(false); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::Ignore ); } delete pUndoPam; @@ -353,9 +353,9 @@ sal_uLong SwReader::Read( const Reader& rOptions ) { if( bSaveUndo ) { - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_INSDOKUMENT, nullptr ); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::Ignore ); } } @@ -370,13 +370,12 @@ sal_uLong SwReader::Read( const Reader& rOptions ) pDoc->getIDocumentLinksAdministration().UpdateLinks(); // not insert: set the redline mode read from settings.xml - eOld = static_cast<RedlineMode_t>( - ePostReadRedlineMode & ~nsRedlineMode_t::REDLINE_IGNORE); + eOld = ePostReadRedlineFlags & ~RedlineFlags::Ignore; pDoc->getIDocumentFieldsAccess().SetFieldsDirty(false, nullptr, 0); } - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld ); pDoc->SetOle2Link( aOLELink ); if( pCursor ) // das Doc ist jetzt modifiziert diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 89deee4b1909..e19cf1990ab2 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -430,7 +430,7 @@ void DocxExport::OutputDML(uno::Reference<drawing::XShape>& xShape) void DocxExport::ExportDocument_Impl() { // Set the 'Track Revisions' flag in the settings structure - m_aSettings.trackRevisions = 0 != ( nsRedlineMode_t::REDLINE_ON & m_nOrigRedlineMode ); + m_aSettings.trackRevisions = bool( RedlineFlags::On & m_nOrigRedlineFlags ); InitStyles(); diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 9189cf7a9279..1bb06580e788 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -610,7 +610,7 @@ void RtfExport::ExportDocument_Impl() OutULong(pViewShell->GetViewOptions()->GetZoom()); } // Record changes? - if (nsRedlineMode_t::REDLINE_ON & m_nOrigRedlineMode) + if (RedlineFlags::On & m_nOrigRedlineFlags) Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_REVISIONS); // Mirror margins? if ((nsUseOnPage::PD_MIRROR & m_pDoc->GetPageDesc(0).ReadUseOn()) == nsUseOnPage::PD_MIRROR) diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 0d40c37639de..54c04acdbbce 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -126,7 +126,7 @@ namespace if (const SwPosition* pAnchor = rEntry.GetAnchor().GetContentAnchor()) { - // the anchor position will be invalidated by SetRedlineMode + // the anchor position will be invalidated by SetRedlineFlags // so set a dummy position and fix it in UpdateFramePositions SwPosition const dummy(SwNodeIndex( const_cast<SwNodes&>(pAnchor->nNode.GetNodes()))); @@ -760,8 +760,8 @@ namespace sw (*aRegion.GetPoint() != *aRegion.GetMark()) ) { - mrDoc.getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT | - nsRedlineMode_t::REDLINE_SHOW_DELETE)); + mrDoc.getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowInsert | + RedlineFlags::ShowDelete); const SwFltRedline *pFltRedline = static_cast<const SwFltRedline*> (pEntry->pAttr); @@ -783,8 +783,8 @@ namespace sw aRegion.DeleteMark(); *aRegion.GetPoint() = SwPosition(SwNodeIndex(mrDoc.GetNodes())); mrDoc.getIDocumentRedlineAccess().AppendRedline(pNewRedline, true); - mrDoc.getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_NONE | nsRedlineMode_t::REDLINE_SHOW_INSERT | - nsRedlineMode_t::REDLINE_SHOW_DELETE )); + mrDoc.getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::NONE | RedlineFlags::ShowInsert | + RedlineFlags::ShowDelete ); } delete pEntry; } diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 410a1c08be39..e1b73dfe8131 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -565,7 +565,7 @@ namespace sw */ ww8::Frames GetFrames(const SwDoc &rDoc, SwPaM *pPaM); - /** fix up frame positions, must be called after SetRedlineMode */ + /** fix up frame positions, must be called after SetRedlineFlags */ void UpdateFramePositions(ww8::Frames & rFrames); /** Get the Frames anchored to a given node diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 3b23221a07f6..56fd6e85d64a 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3116,16 +3116,16 @@ void MSWordExportBase::ExportDocument( bool bWriteAll ) // #i81405# - Collect anchored objects before changing the redline mode. m_aFrames = GetFrames( *m_pDoc, bWriteAll? nullptr : m_pOrigPam ); - m_nOrigRedlineMode = m_pDoc->getIDocumentRedlineAccess().GetRedlineMode(); + m_nOrigRedlineFlags = m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); if ( !m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) { //restored to original state by SwWriter::Write - m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(m_nOrigRedlineMode | - nsRedlineMode_t::REDLINE_SHOW_DELETE | - nsRedlineMode_t::REDLINE_SHOW_INSERT); + m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags(m_nOrigRedlineFlags | + RedlineFlags::ShowDelete | + RedlineFlags::ShowInsert); } - // fix the SwPositions in m_aFrames after SetRedlineMode + // fix the SwPositions in m_aFrames after SetRedlineFlags UpdateFramePositions(m_aFrames); m_aFontHelper.InitFontTable(*m_pDoc); @@ -3149,7 +3149,7 @@ void MSWordExportBase::ExportDocument( bool bWriteAll ) *m_pOrigPam->GetPoint() = SwPosition(m_pDoc->GetNodes().GetEndOfContent()); *m_pCurPam = *m_pOrigPam; - m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(m_nOrigRedlineMode); + m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags(m_nOrigRedlineFlags); } bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec ) @@ -3288,8 +3288,8 @@ void WW8Export::ExportDocument_Impl() m_pPiece = new WW8_WrPct( pFib->fcMin ); pDop = new WW8Dop; - pDop->fRevMarking = 0 != ( nsRedlineMode_t::REDLINE_ON & m_nOrigRedlineMode ); - pDop->fRMView = 0 != ( nsRedlineMode_t::REDLINE_SHOW_DELETE & m_nOrigRedlineMode ); + pDop->fRevMarking = bool( RedlineFlags::On & m_nOrigRedlineFlags ); + pDop->fRMView = bool( RedlineFlags::ShowDelete & m_nOrigRedlineFlags ); pDop->fRMPrint = pDop->fRMView; // set AutoHyphenation flag if found in default para style @@ -3505,7 +3505,7 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM , m_nLastFormatId(0) , m_nUniqueList(0) , m_nHdFtIndex(0) - , m_nOrigRedlineMode(0) + , m_nOrigRedlineFlags(RedlineFlags::NONE) , m_pAktPageDesc(nullptr) , m_bPrevTextNodeIsEmpty(false) , m_pPapPlc(nullptr) diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 3d568b7e5762..add0656e5a03 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -471,7 +471,7 @@ public: sal_uInt16 m_nUniqueList; ///< current number for creating unique list names unsigned int m_nHdFtIndex; - RedlineMode_t m_nOrigRedlineMode; ///< Remember the original redline mode + RedlineFlags m_nOrigRedlineFlags; ///< Remember the original redline mode public: /* implicit bookmark vector containing pairs of node indexes and bookmark names */ diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index f1b7c73ee2e8..88bcf07ab55a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4981,7 +4981,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss) SwNodeIndex aSttNdIdx( m_rDoc.GetNodes() ); SwRelNumRuleSpaces aRelNumRule(m_rDoc, m_bNewDoc); - sal_uInt16 eMode = nsRedlineMode_t::REDLINE_SHOW_INSERT; + RedlineFlags eMode = RedlineFlags::ShowInsert; m_pSprmParser = new wwSprmParser(m_pWwFib->GetFIBVersion()); @@ -5280,9 +5280,9 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss) if (m_bNewDoc) { if( m_pWDop->fRevMarking ) - eMode |= nsRedlineMode_t::REDLINE_ON; + eMode |= RedlineFlags::On; if( m_pWDop->fRMView ) - eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE; + eMode |= RedlineFlags::ShowDelete; } m_aInsertedTables.DelAndMakeTableFrames(); @@ -5410,7 +5410,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss) // delete the pam before the call for hide all redlines (Bug 73683) if (m_bNewDoc) - m_rDoc.getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( eMode )); + m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(eMode); UpdatePageDescs(m_rDoc, nPageDescOffset); diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 99b46aba24fe..e24fe060632a 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -676,9 +676,9 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo) } // set redline mode (without doing the associated book-keeping) - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern(nsRedlineMode_t::REDLINE_ON); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(RedlineFlags::On); pDoc->getIDocumentRedlineAccess().AppendRedline(pRedline, false); - pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern(nsRedlineMode_t::REDLINE_NONE); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(RedlineFlags::NONE); } } diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index d7d066d9d71a..3275e37a7a5d 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -784,14 +784,14 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c const OUString sRecordChanges("RecordChanges"); const OUString sRedlineProtectionKey("RedlineProtectionKey"); xInfoSet->setPropertyValue( sShowChanges, - makeAny(IDocumentRedlineAccess::IsShowChanges(rDoc.getIDocumentRedlineAccess().GetRedlineMode())) ); + makeAny(IDocumentRedlineAccess::IsShowChanges(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) ); xInfoSet->setPropertyValue( sRecordChanges, - makeAny(IDocumentRedlineAccess::IsRedlineOn(rDoc.getIDocumentRedlineAccess().GetRedlineMode())) ); + makeAny(IDocumentRedlineAccess::IsRedlineOn(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) ); xInfoSet->setPropertyValue( sRedlineProtectionKey, makeAny(rDoc.getIDocumentRedlineAccess().GetRedlinePassword()) ); // force redline mode to "none" - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_NONE ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::NONE ); const bool bOASIS = ( SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60 ); // #i28749# - set property <ShapePositionInHoriL2R> @@ -909,21 +909,19 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c rDoc.getIDocumentRedlineAccess().SetRedlinePassword( aKey ); // restore redline mode from import info property set - sal_Int16 nRedlineMode = nsRedlineMode_t::REDLINE_SHOW_INSERT; + RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert; aAny = xInfoSet->getPropertyValue( sShowChanges ); if ( *o3tl::doAccess<bool>(aAny) ) - nRedlineMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE; + nRedlineFlags |= RedlineFlags::ShowDelete; aAny = xInfoSet->getPropertyValue( sRecordChanges ); if ( *o3tl::doAccess<bool>(aAny) || (aKey.getLength() > 0) ) - nRedlineMode |= nsRedlineMode_t::REDLINE_ON; - else - nRedlineMode |= nsRedlineMode_t::REDLINE_NONE; + nRedlineFlags |= RedlineFlags::On; // ... restore redline mode - // (First set bogus mode to make sure the mode in getIDocumentRedlineAccess().SetRedlineMode() + // (First set bogus mode to make sure the mode in getIDocumentRedlineAccess().SetRedlineFlags() // is different from its previous mode.) - rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)( ~nRedlineMode )); - rDoc.getIDocumentRedlineAccess().SetRedlineMode( (RedlineMode_t)( nRedlineMode )); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( ~nRedlineFlags ); + rDoc.getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags ); lcl_EnsureValidPam( rPaM ); // move Pam into valid content diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 64926cfbe805..3c15cc1e4f30 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -181,13 +181,13 @@ sal_uInt32 SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& // save show redline mode ... const OUString sShowChanges("ShowChanges"); - sal_uInt16 nRedlineMode = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags nRedlineFlags = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); xInfoSet->setPropertyValue( sShowChanges, - makeAny( IDocumentRedlineAccess::IsShowChanges( nRedlineMode ) ) ); + makeAny( IDocumentRedlineAccess::IsShowChanges( nRedlineFlags ) ) ); // ... and hide redlines for export - nRedlineMode &= ~nsRedlineMode_t::REDLINE_SHOW_MASK; - nRedlineMode |= nsRedlineMode_t::REDLINE_SHOW_INSERT; - pDoc->getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( nRedlineMode )); + nRedlineFlags &= ~RedlineFlags::ShowMask; + nRedlineFlags |= RedlineFlags::ShowInsert; + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags ); // Set base URI xInfoSet->setPropertyValue( "BaseURI", makeAny( GetBaseURL() ) ); @@ -400,12 +400,12 @@ sal_uInt32 SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& // restore redline mode aAny = xInfoSet->getPropertyValue( sShowChanges ); - nRedlineMode = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - nRedlineMode &= ~nsRedlineMode_t::REDLINE_SHOW_MASK; - nRedlineMode |= nsRedlineMode_t::REDLINE_SHOW_INSERT; + nRedlineFlags = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + nRedlineFlags &= ~RedlineFlags::ShowMask; + nRedlineFlags |= RedlineFlags::ShowInsert; if ( *o3tl::doAccess<bool>(aAny) ) - nRedlineMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE; - pDoc->getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( nRedlineMode )); + nRedlineFlags |= RedlineFlags::ShowDelete; + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags ); if (xStatusIndicator.is()) { diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 55acbceee1c0..11e3de0c6cfd 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -284,14 +284,14 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) "ShowChanges" ); } } - sal_uInt16 nRedlineMode = 0; - bSavedShowChanges = IDocumentRedlineAccess::IsShowChanges( pDoc->getIDocumentRedlineAccess().GetRedlineMode() ); + RedlineFlags nRedlineFlags = RedlineFlags::NONE; + bSavedShowChanges = IDocumentRedlineAccess::IsShowChanges( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() ); if( bSaveRedline ) { // now save and switch redline mode - nRedlineMode = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - pDoc->getIDocumentRedlineAccess().SetRedlineMode( - (RedlineMode_t)(( nRedlineMode & nsRedlineMode_t::REDLINE_SHOW_MASK ) | nsRedlineType_t::REDLINE_INSERT )); + nRedlineFlags = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( + ( nRedlineFlags & RedlineFlags::ShowMask ) | RedlineFlags::ShowInsert ); } sal_uInt32 nRet = SvXMLExport::exportDoc( eClass ); @@ -299,7 +299,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) // now we can restore the redline mode (if we changed it previously) if( bSaveRedline ) { - pDoc->getIDocumentRedlineAccess().SetRedlineMode( (RedlineMode_t)(nRedlineMode )); + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags ); } if( pGraphicResolver ) diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index d0b30d969edc..b76d6788365f 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -411,7 +411,7 @@ SwXMLImport::SwXMLImport( m_bBlock( false ), m_bOrganizerMode( false ), m_bInititedXForms( false ), - m_bPreserveRedlineMode( true ), + m_bPreserveRedlineFlags( true ), m_pDoc( nullptr ) { InitItemImport(); @@ -979,7 +979,7 @@ XMLTextImportHelper* SwXMLImport::CreateTextImport() IsInsertMode(), IsStylesOnlyMode(), IsBlockMode(), IsOrganizerMode(), - m_bPreserveRedlineMode ); + m_bPreserveRedlineFlags ); } XMLShapeImportHelper* SwXMLImport::CreateShapeImport() @@ -1479,16 +1479,16 @@ void SwXMLImport::initialize( // delegate to super class SvXMLImport::initialize(aArguments); - // we are only looking for a PropertyValue "PreserveRedlineMode" + // we are only looking for a PropertyValue "PreserveRedlineFlags" sal_Int32 nLength = aArguments.getLength(); for(sal_Int32 i = 0; i < nLength; i++) { beans::PropertyValue aValue; if ( aArguments[i] >>= aValue ) { - if (aValue.Name == "PreserveRedlineMode") + if (aValue.Name == "PreserveRedlineFlags") { - OSL_VERIFY( aValue.Value >>= m_bPreserveRedlineMode ); + OSL_VERIFY( aValue.Value >>= m_bPreserveRedlineFlags ); } continue; } diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index e8a7c252db67..4d202791a9d7 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -87,7 +87,7 @@ class SwXMLImport: public SvXMLImport bool m_bBlock : 1; // Load text block bool m_bOrganizerMode : 1; bool m_bInititedXForms : 1; - bool m_bPreserveRedlineMode; + bool m_bPreserveRedlineFlags; SwDoc* m_pDoc; // cached for getDoc() diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 7b9137948c9e..1fc18b2b599e 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -149,7 +149,7 @@ SwXMLTextImportHelper::SwXMLTextImportHelper( const uno::Reference<XPropertySet> & rInfoSet, bool bInsertM, bool bStylesOnlyM, bool bBlockM, bool bOrganizerM, - bool /*bPreserveRedlineMode*/ ) : + bool /*bPreserveRedlineFlags*/ ) : XMLTextImportHelper( rModel, rImport, bInsertM, bStylesOnlyM, true/*bProgress*/, bBlockM, bOrganizerM ), pRedlineHelper( nullptr ) diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 5a8704e007d5..327bc42f4751 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -41,7 +41,7 @@ public: const css::uno::Reference<css::beans::XPropertySet>& rInfoSet, bool bInsertM, bool bStylesOnlyM, bool bBlockM, bool bOrganizerM, - bool bPreserveRedlineMode ); + bool bPreserveRedlineFlags ); virtual ~SwXMLTextImportHelper(); virtual css::uno::Reference<css::beans::XPropertySet> diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index c12ed6c5aeaa..11a48dacb545 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1283,7 +1283,7 @@ bool SwDocShell::IsChangeRecording() const { if (!m_pWrtShell) return false; - return (m_pWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0; + return bool(m_pWrtShell->GetRedlineFlags() & RedlineFlags::On); } bool SwDocShell::HasChangeRecordProtection() const @@ -1295,9 +1295,9 @@ bool SwDocShell::HasChangeRecordProtection() const void SwDocShell::SetChangeRecording( bool bActivate ) { - sal_uInt16 nOn = bActivate ? nsRedlineMode_t::REDLINE_ON : 0; - sal_uInt16 nMode = m_pWrtShell->GetRedlineMode(); - m_pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn); + RedlineFlags nOn = bActivate ? RedlineFlags::On : RedlineFlags::NONE; + RedlineFlags nMode = m_pWrtShell->GetRedlineFlags(); + m_pWrtShell->SetRedlineFlagsAndCheckInsMode( (nMode & ~RedlineFlags::On) | nOn ); } void SwDocShell::SetProtectionPassword( const OUString &rNewPassword ) diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 6e633ce13098..b276665e781c 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -149,7 +149,7 @@ public: void SetInsMode( bool bOn = true ); void ToggleInsMode() { SetInsMode( !m_bIns ); } bool IsInsMode() const { return m_bIns; } - void SetRedlineModeAndCheckInsMode( sal_uInt16 eMode ); + void SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode ); void EnterSelFrameMode(const Point *pStartDrag = nullptr); void LeaveSelFrameMode(); diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 764c76eb5a12..ac19555db35b 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -256,7 +256,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const } } -static short lcl_AskRedlineMode(vcl::Window *pWin) +static short lcl_AskRedlineFlags(vcl::Window *pWin) { ScopedVclPtrInstance<MessBox> aQBox( pWin, 0, OUString( SW_RES( STR_REDLINE_TITLE ) ), @@ -661,7 +661,7 @@ void SwTextShell::Execute(SfxRequest &rReq) std::unique_ptr<AbstractSwModalRedlineAcceptDlg> pDlg(pFact->CreateSwModalRedlineAcceptDlg(&GetView().GetEditWin())); OSL_ENSURE(pDlg, "Dialog creation failed!"); - switch (lcl_AskRedlineMode(&GetView().GetEditWin())) + switch (lcl_AskRedlineFlags(&GetView().GetEditWin())) { case RET_OK: { diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index b79c929e384f..413ec54122f4 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -596,10 +596,10 @@ void SwView::Execute(SfxRequest &rReq) } } - const sal_uInt16 nOn = static_cast<const SfxBoolItem*>(pItem)->GetValue() - ? nsRedlineMode_t::REDLINE_ON : 0; - const sal_uInt16 nMode = m_pWrtShell->GetRedlineMode(); - m_pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn); + const RedlineFlags nOn = static_cast<const SfxBoolItem*>(pItem)->GetValue() + ? RedlineFlags::On : RedlineFlags::NONE; + const RedlineFlags nMode = m_pWrtShell->GetRedlineFlags(); + m_pWrtShell->SetRedlineFlagsAndCheckInsMode( (nMode & ~RedlineFlags::On) | nOn); // Notify all view shells of this document, as the track changes mode is document-global. SwDocShell* pDocShell = GetDocShell(); @@ -628,7 +628,7 @@ void SwView::Execute(SfxRequest &rReq) aPasswdDlg->ShowExtras(SfxShowExtras::CONFIRM); if (aPasswdDlg->Execute()) { - sal_uInt16 nOn = nsRedlineMode_t::REDLINE_ON; + RedlineFlags nOn = RedlineFlags::On; OUString sNewPasswd( aPasswdDlg->GetPassword() ); Sequence <sal_Int8> aNewPasswd = rIDRA.GetRedlinePassword(); @@ -640,11 +640,11 @@ void SwView::Execute(SfxRequest &rReq) else if(SvPasswordHelper::CompareHashPassword(aPasswd, sNewPasswd)) { rIDRA.SetRedlinePassword(Sequence <sal_Int8> ()); - nOn = 0; + nOn = RedlineFlags::NONE; } - const sal_uInt16 nMode = rIDRA.GetRedlineMode(); - m_pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn); - rReq.AppendItem( SfxBoolItem( FN_REDLINE_PROTECT, ((nMode&nsRedlineMode_t::REDLINE_ON)==0) ) ); + const RedlineFlags nMode = rIDRA.GetRedlineFlags(); + m_pWrtShell->SetRedlineFlagsAndCheckInsMode( (nMode & ~RedlineFlags::On) | nOn); + rReq.AppendItem( SfxBoolItem( FN_REDLINE_PROTECT, !(nMode&RedlineFlags::On) ) ); } else bIgnore = true; @@ -655,12 +655,12 @@ void SwView::Execute(SfxRequest &rReq) if( pArgs && SfxItemState::SET == pArgs->GetItemState(nSlot, false, &pItem)) { - sal_uInt16 nMode = ( ~(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) - & m_pWrtShell->GetRedlineMode() ) | nsRedlineMode_t::REDLINE_SHOW_INSERT; + RedlineFlags nMode = ( ~RedlineFlags(RedlineFlags::ShowInsert | RedlineFlags::ShowDelete) + & m_pWrtShell->GetRedlineFlags() ) | RedlineFlags::ShowInsert; if( static_cast<const SfxBoolItem*>(pItem)->GetValue() ) - nMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE; + nMode |= RedlineFlags::ShowDelete; - m_pWrtShell->SetRedlineModeAndCheckInsMode( nMode ); + m_pWrtShell->SetRedlineFlagsAndCheckInsMode( nMode ); } break; case FN_MAILMERGE_SENDMAIL_CHILDWINDOW: diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index e468c7eaa3f9..39121e85b426 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -266,9 +266,8 @@ void SwView::GetState(SfxItemSet &rSet) break; case FN_REDLINE_SHOW: { - sal_uInt16 nMask = nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE; - rSet.Put( SfxBoolItem( nWhich, - (m_pWrtShell->GetRedlineMode() & nMask) == nMask )); + RedlineFlags nMask = RedlineFlags::ShowInsert | RedlineFlags::ShowDelete; + rSet.Put( SfxBoolItem( nWhich, bool(m_pWrtShell->GetRedlineFlags() & nMask) )); } break; case SID_AVMEDIA_PLAYER : diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 053398b8a6b3..b804f20f5e25 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -633,9 +633,9 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf mpDoc->getIDocumentRedlineAccess().SetRedlinePassword(aNew); if(aNew.getLength()) { - sal_uInt16 eMode = mpDoc->getIDocumentRedlineAccess().GetRedlineMode(); - eMode = eMode|nsRedlineMode_t::REDLINE_ON; - mpDoc->getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( eMode )); + RedlineFlags eMode = mpDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + eMode |= RedlineFlags::On; + mpDoc->getIDocumentRedlineAccess().SetRedlineFlags( eMode ); } } } diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index d2fe10f53f5b..7de2f70f6d38 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -393,9 +393,9 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const pGlosGroup->ClearDoc(); if( pGlosGroup->BeginPutDoc( sShortName, sLongName ) ) { - pGDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( nsRedlineMode_t::REDLINE_DELETE_REDLINES ); + pGDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::DeleteRedlines ); lcl_CopySelToDoc( pGDoc, pxCursor, pxRange ); - pGDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)( 0 )); + pGDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern(RedlineFlags::NONE); nRet = pGlosGroup->PutDoc(); } } diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 5bc38ae1f418..c65d4dc779fc 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1843,19 +1843,19 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& case WID_DOC_CHANGES_SHOW: { bool bSet = *o3tl::doAccess<bool>(aValue); - sal_uInt16 eMode = pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags eMode = pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags(); if(WID_DOC_CHANGES_SHOW == pEntry->nWID) { - eMode &= ~(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE); - eMode |= nsRedlineMode_t::REDLINE_SHOW_INSERT; + eMode &= ~RedlineFlags(RedlineFlags::ShowInsert | RedlineFlags::ShowDelete); + eMode |= RedlineFlags::ShowInsert; if( bSet ) - eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE; + eMode |= RedlineFlags::ShowDelete; } else if(WID_DOC_CHANGES_RECORD == pEntry->nWID) { - eMode = bSet ? eMode|nsRedlineMode_t::REDLINE_ON : eMode&~nsRedlineMode_t::REDLINE_ON; + eMode = bSet ? eMode|RedlineFlags::On : eMode&~RedlineFlags::On; } - pDocShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineMode( (RedlineMode_t)(eMode )); + pDocShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags( eMode ); } break; case WID_DOC_CHANGES_PASSWORD: @@ -1867,9 +1867,9 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& pDoc->getIDocumentRedlineAccess().SetRedlinePassword(aNew); if(aNew.getLength()) { - sal_uInt16 eMode = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - eMode = eMode|nsRedlineMode_t::REDLINE_ON; - pDoc->getIDocumentRedlineAccess().SetRedlineMode( (RedlineMode_t)(eMode )); + RedlineFlags eMode = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + eMode |= RedlineFlags::On; + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( eMode ); } } } @@ -1886,21 +1886,21 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& break; case WID_DOC_REDLINE_DISPLAY: { - sal_Int16 eRedMode = pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); - eRedMode = eRedMode & (~nsRedlineMode_t::REDLINE_SHOW_MASK); + RedlineFlags eRedMode = pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags(); + eRedMode = eRedMode & (~RedlineFlags::ShowMask); sal_Int16 nSet = 0; aValue >>= nSet; switch(nSet) { case RedlineDisplayType::NONE: break; - case RedlineDisplayType::INSERTED: eRedMode |= nsRedlineMode_t::REDLINE_SHOW_INSERT; break; - case RedlineDisplayType::REMOVED: eRedMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE; break; + case RedlineDisplayType::INSERTED: eRedMode |= RedlineFlags::ShowInsert; break; + case RedlineDisplayType::REMOVED: eRedMode |= RedlineFlags::ShowDelete; break; case RedlineDisplayType:: - INSERTED_AND_REMOVED: eRedMode |= nsRedlineMode_t::REDLINE_SHOW_INSERT|nsRedlineMode_t::REDLINE_SHOW_DELETE; + INSERTED_AND_REMOVED: eRedMode |= RedlineFlags::ShowInsert|RedlineFlags::ShowDelete; break; default: throw IllegalArgumentException(); } - pDocShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineMode(eRedMode); + pDocShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags(eRedMode); } break; case WID_DOC_TWO_DIGIT_YEAR: @@ -2027,17 +2027,16 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) case WID_DOC_CHANGES_RECORD: case WID_DOC_CHANGES_SHOW: { - const sal_uInt16 eMode = pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); + const RedlineFlags eMode = pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags(); bool bSet = false; if(WID_DOC_CHANGES_SHOW == pEntry->nWID) { - const sal_uInt16 nMask = nsRedlineMode_t::REDLINE_SHOW_INSERT | - nsRedlineMode_t::REDLINE_SHOW_DELETE; - bSet = (eMode & nMask) == nMask; + const RedlineFlags nMask = RedlineFlags::ShowInsert | RedlineFlags::ShowDelete; + bSet = bool(eMode & nMask); } else if(WID_DOC_CHANGES_RECORD == pEntry->nWID) { - bSet = (eMode& nsRedlineMode_t::REDLINE_ON) != 0; + bSet = bool(eMode & RedlineFlags::On); } aAny <<= bSet; } @@ -2056,14 +2055,14 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) break; case WID_DOC_REDLINE_DISPLAY: { - sal_Int16 eRedMode = pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineMode(); - eRedMode = eRedMode & nsRedlineMode_t::REDLINE_SHOW_MASK; + RedlineFlags eRedMode = pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags(); + eRedMode = eRedMode & RedlineFlags::ShowMask; sal_Int16 nRet = RedlineDisplayType::NONE; - if(nsRedlineMode_t::REDLINE_SHOW_INSERT == eRedMode) + if(RedlineFlags::ShowInsert == eRedMode) nRet = RedlineDisplayType::INSERTED; - else if(nsRedlineMode_t::REDLINE_SHOW_DELETE == eRedMode) + else if(RedlineFlags::ShowDelete == eRedMode) nRet = RedlineDisplayType::REMOVED; - else if(nsRedlineMode_t::REDLINE_SHOW_MASK == eRedMode) + else if(RedlineFlags::ShowMask == eRedMode) nRet = RedlineDisplayType::INSERTED_AND_REMOVED; aAny <<= nRet; } diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index c92f5287ac27..2db60238eba3 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -649,9 +649,9 @@ void SwWrtShell::SetInsMode( bool bOn ) Invalidate(); } //Overwrite mode is incompatible with red-lining -void SwWrtShell::SetRedlineModeAndCheckInsMode( sal_uInt16 eMode ) +void SwWrtShell::SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode ) { - SetRedlineMode( eMode ); + SetRedlineFlags( eMode ); if (IsRedlineOn()) SetInsMode(); } |