Avoid reserved identifier

Change-Id: Ie3e28611003ae51ba4d0278cec41744f2ca08223

sw/inc/ftnidx.hxx

@@ -30,7 +30,7 @@ class SwSectionNode;
 // Everywhere where NodeIndex is used, the header files missing here
 // are already included. Therefore put here as defines only and
 // not as inline methods (saves compile time).
-#define _SwTextFootnote_GetIndex( pFIdx ) (pFIdx->GetTextNode().GetIndex())
+#define SwTextFootnote_GetIndex( pFIdx ) (pFIdx->GetTextNode().GetIndex())
 
 struct CompareSwFootnoteIdxs
 {

sw/source/core/doc/docftn.cxx

@@ -417,7 +417,7 @@ bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
     bool bTypeChgd = false;
     const size_t nPosSave = nPos;
     while( nPos < rFootnoteArr.size() &&
-            (( nIdx = _SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ nPos++ ] )))
+            (( nIdx = SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ nPos++ ] )))
                 < nEndNd || ( nIdx == nEndNd &&
                 nEndCnt >= pTextFootnote->GetStart() )) )
         if( nIdx > nSttNd || ( nIdx == nSttNd &&
@@ -447,7 +447,7 @@ bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
 
     nPos = nPosSave;       // There are more in the front!
     while( nPos &&
-            (( nIdx = _SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ --nPos ] )))
+            (( nIdx = SwTextFootnote_GetIndex((pTextFootnote = rFootnoteArr[ --nPos ] )))
                 > nSttNd || ( nIdx == nSttNd &&
                 nSttCnt <= pTextFootnote->GetStart() )) )
         if( nIdx < nEndNd || ( nIdx == nEndNd &&

sw/source/core/doc/ftnidx.cxx

@@ -31,8 +31,8 @@
 
 bool CompareSwFootnoteIdxs::operator()(SwTextFootnote* const& lhs, SwTextFootnote* const& rhs) const
 {
-    sal_uLong nIdxLHS = _SwTextFootnote_GetIndex( lhs );
-    sal_uLong nIdxRHS = _SwTextFootnote_GetIndex( rhs );
+    sal_uLong nIdxLHS = SwTextFootnote_GetIndex( lhs );
+    sal_uLong nIdxRHS = SwTextFootnote_GetIndex( rhs );
     return ( nIdxLHS == nIdxRHS && lhs->GetStart() < rhs->GetStart() ) || nIdxLHS < nIdxRHS;
 }
 
@@ -256,7 +256,7 @@ SwTextFootnote* SwFootnoteIdxs::SeekEntry( const SwNodeIndex& rPos, size_t* pFnd
         while( nU <= nO )
         {
             const size_t nM = nU + ( nO - nU ) / 2;
-            sal_uLong nNdIdx = _SwTextFootnote_GetIndex( (*this)[ nM ] );
+            sal_uLong nNdIdx = SwTextFootnote_GetIndex( (*this)[ nM ] );
             if( nNdIdx == nIdx )
             {
                 if( pFndPos )

sw/source/core/docnode/ndsect.cxx

@@ -758,7 +758,7 @@ void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
 
         // Delete all succeeding Footnotes
         while( nPos < rFootnoteArr.size() &&
-            _SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) <= nEnd )
+            SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) <= nEnd )
         {
             // If the Nodes are not deleted, they need to deregister at the Pages
             // (delete Frames) or else they will remain there (Undo does not delete them!)
@@ -767,7 +767,7 @@ void sw_DeleteFootnote( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd )
         }
 
         while( nPos-- &&
-            _SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) >= nStt )
+            SwTextFootnote_GetIndex( (pSrch = rFootnoteArr[ nPos ]) ) >= nStt )
         {
             // If the Nodes are not deleted, they need to deregister at the Pages
             // (delete Frames) or else they will remain there (Undo does not delete them!)

sw/source/core/undo/rolbck.cxx

@@ -439,7 +439,7 @@ SwHistorySetFootnote::SwHistorySetFootnote( SwTextFootnote* pTextFootnote, sal_u
 SwHistorySetFootnote::SwHistorySetFootnote( const SwTextFootnote &rTextFootnote )
     : SwHistoryHint( HSTRY_SETFTNHNT )
     , m_FootnoteNumber( rTextFootnote.GetFootnote().GetNumStr() )
-    , m_nNodeIndex( _SwTextFootnote_GetIndex( (&rTextFootnote) ) )
+    , m_nNodeIndex( SwTextFootnote_GetIndex( (&rTextFootnote) ) )
     , m_nStart( rTextFootnote.GetStart() )
     , m_bEndNote( rTextFootnote.GetFootnote().IsEndNote() )
 {