diff options
author | Adam Co <rattles2013@gmail.com> | 2014-02-03 18:25:57 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-12 08:47:13 +0000 |
commit | 198733f7efbd552e6c0b7fde480474cd1020c250 (patch) | |
tree | e6f752415eb5d27a9d1b8614040e87d80da13f0b /sw/source | |
parent | 50eb0490e328e6d0ceb9b0550d97d5fc4220a82f (diff) |
Added some 'To-Do' notes regarding the new 'SwExtraRedlineTbl'
These notes are to make sure if logic needs to be added for the
'SwExtraRedlineTbl' in these functions, in addition to the
'SwRedlineTbl' that is already there.
Change-Id: I7778b4e20f5323a925d05a7df0c727f443566662
Reviewed-on: https://gerrit.libreoffice.org/7823
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/doc/doc.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/doc/doccorr.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/docredln.cxx | 28 | ||||
-rw-r--r-- | sw/source/core/doc/docsort.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/docnode/ndsect.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 1 |
6 files changed, 38 insertions, 0 deletions
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 5155eeb06d85..97c06db3fbde 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -868,6 +868,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart ) if( !aBkmkArr.empty() ) _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, true ); + // To-Do - add 'SwExtraRedlineTbl' also ? if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() )) { SwPaM aPam( rPos ); @@ -906,6 +907,7 @@ bool SwDoc::AppendTxtNode( SwPosition& rPos ) GetIDocumentUndoRedo().AppendUndo( new SwUndoInsert( rPos.nNode ) ); } + // To-Do - add 'SwExtraRedlineTbl' also ? if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() )) { SwPaM aPam( rPos ); @@ -997,6 +999,7 @@ bool SwDoc::InsertString( const SwPaM &rRg, const OUString &rStr, } } + // To-Do - add 'SwExtraRedlineTbl' also ? if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() )) { SwPaM aPam( rPos.nNode, aTmp.GetCntnt(), diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx index c40205d0176f..997aad907d04 100644 --- a/sw/source/core/doc/doccorr.cxx +++ b/sw/source/core/doc/doccorr.cxx @@ -206,6 +206,8 @@ void SwDoc::CorrAbs(const SwNodeIndex& rOldNode, ++n; } } + + // To-Do - need to add here 'SwExtraRedlineTbl' also ? } if(bMoveCrsr) @@ -311,6 +313,8 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode, // lies on the position ?? lcl_PaMCorrRel1( rTbl[ n ], &rOldNode.GetNode(), aNewPos, aNewPos.nContent.GetIndex() + nOffset ); } + + // To-Do - need to add here 'SwExtraRedlineTbl' also ? } if(bMoveCrsr) diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 7bfef2cdc7da..ca12ab23398d 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -188,6 +188,8 @@ void SwDoc::SetRedlineMode( RedlineMode_t eMode ) meRedlineMode = eMode; SetModified(); } + + // To-Do - add 'SwExtraRedlineTbl' also ? } bool SwDoc::IsRedlineOn() const @@ -1277,6 +1279,8 @@ void SwDoc::CompressRedlines() } } _CHECK_REDLINE( this ) + + // To-Do - add 'SwExtraRedlineTbl' also ? } bool SwDoc::SplitRedline( const SwPaM& rRange ) @@ -1339,6 +1343,8 @@ bool SwDoc::SplitRedline( const SwPaM& rRange ) break; } return bChg; + + // To-Do - add 'SwExtraRedlineTbl' also ? } bool SwDoc::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo, @@ -1454,6 +1460,8 @@ bool SwDoc::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo, SetModified(); return bChg; + + // To-Do - add 'SwExtraRedlineTbl' also ? } bool SwDoc::DeleteRedline( const SwStartNode& rNode, bool bSaveInUndo, @@ -1481,6 +1489,8 @@ sal_uInt16 SwDoc::GetRedlinePos( const SwNode& rNd, sal_uInt16 nType ) const break; } return USHRT_MAX; + + // To-Do - add 'SwExtraRedlineTbl' also ? } const SwRangeRedline* SwDoc::GetRedline( const SwPosition& rPos, @@ -1549,6 +1559,8 @@ const SwRangeRedline* SwDoc::GetRedline( const SwPosition& rPos, if( pFndPos ) *pFndPos = nU; return 0; + + // To-Do - add 'SwExtraRedlineTbl' also ? } typedef sal_Bool (*Fn_AcceptReject)( SwRedlineTbl& rArr, sal_uInt16& rPos, @@ -2093,6 +2105,8 @@ bool SwDoc::AcceptRedline( sal_uInt16 nPos, bool bCallDelete ) } } return bRet; + + // To-Do - add 'SwExtraRedlineTbl' also ? } bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete ) @@ -2137,6 +2151,8 @@ bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete ) GetIDocumentUndoRedo().EndUndo( UNDO_ACCEPT_REDLINE, &aRewriter ); } return nRet != 0; + + // To-Do - add 'SwExtraRedlineTbl' also ? } bool SwDoc::RejectRedline( sal_uInt16 nPos, bool bCallDelete ) @@ -2203,6 +2219,8 @@ bool SwDoc::RejectRedline( sal_uInt16 nPos, bool bCallDelete ) } } return bRet; + + // To-Do - add 'SwExtraRedlineTbl' also ? } bool SwDoc::RejectRedline( const SwPaM& rPam, bool bCallDelete ) @@ -2248,6 +2266,8 @@ bool SwDoc::RejectRedline( const SwPaM& rPam, bool bCallDelete ) } return nRet != 0; + + // To-Do - add 'SwExtraRedlineTbl' also ? } const SwRangeRedline* SwDoc::SelNextRedline( SwPaM& rPam ) const @@ -2365,6 +2385,8 @@ const SwRangeRedline* SwDoc::SelNextRedline( SwPaM& rPam ) const } while( bRestart ); return pFnd; + + // To-Do - add 'SwExtraRedlineTbl' also ? } const SwRangeRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const @@ -2484,6 +2506,8 @@ const SwRangeRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const } while( bRestart ); return pFnd; + + // To-Do - add 'SwExtraRedlineTbl' also ? } // Set comment at the Redline @@ -2512,6 +2536,8 @@ bool SwDoc::SetRedlineComment( const SwPaM& rPaM, const OUString& rS ) SetModified(); return bRet; + + // To-Do - add 'SwExtraRedlineTbl' also ? } // Create a new author if necessary @@ -2535,6 +2561,8 @@ void SwDoc::UpdateRedlineAttr() if( pRedl->IsVisible() ) pRedl->InvalidateRange(); } + + // To-Do - add 'SwExtraRedlineTbl' also ? } /// Set comment text for the Redline, which is inserted later on via diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 13f83a8862b5..7caaed06472d 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -326,6 +326,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt) SwUndoRedlineSort* pRedlUndo = 0; SwUndoSort* pUndoSort = 0; + // To-Do - add 'SwExtraRedlineTbl' also ? if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() )) { pRedlPam = new SwPaM( pStart->nNode, pEnd->nNode, -1, 1 ); diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 5dec44a56397..bfd738f19bcd 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -316,6 +316,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, SetRedlineMode_intern( eOld ); + // To-Do - add 'SwExtraRedlineTbl' also ? if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() )) { SwPaM aPam( *pNewSectNode->EndOfSectionNode(), *pNewSectNode, 1 ); diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 406e368c8894..a4d1d66bc66d 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -538,6 +538,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts, GetNodes().GoNext( &aNdIdx ); // Go to the next ContentNode pTblNd->MakeFrms( &aNdIdx ); + // To-Do - add 'SwExtraRedlineTbl' also ? if( IsRedlineOn() || (!IsIgnoreRedline() && !mpRedlineTbl->empty() )) { SwPaM aPam( *pTblNd->EndOfSectionNode(), *pTblNd, 1 ); |