diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 10:39:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 15:50:26 +0200 |
| commit | ff6077595f6736cd6943d9f48afd2516b4d1578a (patch) | |
| tree | fb551fab038d2bc558c104f7e7de134e6c8cc5a0 /sw | |
| parent | f01f41970bd67d47161c2a2d569c883b585a273b (diff) | |
Avoid reserved identifier
Change-Id: I5f512c2519fa4305527a80ee34ea51a620dcdc2c
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/undo/untbl.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index b2f8564bb241..7f3785b93d1d 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -74,9 +74,9 @@ #endif #ifdef DBG_UTIL - #define _DEBUG_REDLINE( pDoc ) sw_DebugRedline( pDoc ); + #define DEBUG_REDLINE( pDoc ) sw_DebugRedline( pDoc ); #else - #define _DEBUG_REDLINE( pDoc ) + #define DEBUG_REDLINE( pDoc ) #endif typedef std::vector<std::shared_ptr<SfxItemSet> > SfxItemSets; @@ -2438,7 +2438,7 @@ SwUndoTableCpyTable::~SwUndoTableCpyTable() void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext) { SwDoc & rDoc = rContext.GetDoc(); - _DEBUG_REDLINE( &rDoc ) + DEBUG_REDLINE( &rDoc ) SwTableNode* pTableNd = nullptr; for (size_t n = m_pArr->size(); n; ) @@ -2579,13 +2579,13 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext) { pInsRowUndo->UndoImpl(rContext); } - _DEBUG_REDLINE( &rDoc ) + DEBUG_REDLINE( &rDoc ) } void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext) { SwDoc & rDoc = rContext.GetDoc(); - _DEBUG_REDLINE( &rDoc ) + DEBUG_REDLINE( &rDoc ) if( pInsRowUndo ) { @@ -2666,7 +2666,7 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext) pEntry->nOffset = rBox.GetSttIdx() - pEntry->nBoxIdx; } - _DEBUG_REDLINE( &rDoc ) + DEBUG_REDLINE( &rDoc ) } void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent ) @@ -2678,7 +2678,7 @@ void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent m_pArr->push_back(std::unique_ptr<_UndoTableCpyTable_Entry>(pEntry)); SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc(); - _DEBUG_REDLINE( pDoc ) + DEBUG_REDLINE( pDoc ) if( bDelContent ) { SwNodeIndex aInsIdx( *rBox.GetSttNd(), 1 ); @@ -2698,7 +2698,7 @@ void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent delete pEntry->pBoxNumAttr; pEntry->pBoxNumAttr = nullptr; } - _DEBUG_REDLINE( pDoc ) + DEBUG_REDLINE( pDoc ) } void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, bool bDelContent ) @@ -2709,7 +2709,7 @@ void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex if( bDelContent ) { SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc(); - _DEBUG_REDLINE( pDoc ) + DEBUG_REDLINE( pDoc ) if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ) { @@ -2718,7 +2718,7 @@ void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex } SwNodeIndex aDelIdx( *rBox.GetSttNd(), 1 ); rBox.GetFrameFormat()->GetDoc()->GetNodes().Delete( aDelIdx ); - _DEBUG_REDLINE( pDoc ) + DEBUG_REDLINE( pDoc ) } pEntry->nOffset = rBox.GetSttIdx() - pEntry->nBoxIdx; |