diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-07-23 10:58:27 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-07-23 11:25:41 +0200 |
| commit | b38d520a5f17e96909096ee7bf4d3e9d012fd27e (patch) | |
| tree | e90eba9c515f1754300cc22d7c0c0afb50dcfacb /sw/source | |
| parent | 3cb0aaa6dc987f894c0f36e9d8dc6a217b943656 (diff) | |
_SwSaveTypeCountContent dead and gone (and there was much rejoicing.)
Change-Id: I296b2c58e6d8ad67f30b027b83a442a02d5b2794
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/doc/docbm.cxx | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index b69569815c9d..a7149a22f756 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -1389,26 +1389,14 @@ namespace bool m_isMark; sal_Int32 m_nCntnt; }; - class _SwSaveTypeCountContent : public MarkEntry - { - public: - _SwSaveTypeCountContent() { m_bOther=false; m_nIdx=0; m_nCntnt = 0; } - _SwSaveTypeCountContent( const std::vector<MarkEntry> &rArr, sal_uInt16& rPos ) - { - m_nIdx = rArr[ rPos ].m_nIdx; - m_bOther = rArr[ rPos ].m_bOther; - m_nCntnt = rArr[ rPos ].m_nCntnt; - } - }; void _SaveCntntIdx(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, std::vector<MarkEntry> &rSaveArr, sal_uInt8 nSaveFly) { - // 1. Bookmarks - _SwSaveTypeCountContent aSave; - // 4. Paragraph anchored objects + // Paragraph anchored objects + MarkEntry aSave; { SwCntntNode *pNode = pDoc->GetNodes()[nNode]->GetCntntNode(); if( pNode ) @@ -1512,7 +1500,7 @@ namespace sal_uInt16 n = 0; while( n < rSaveArr.size() ) { - _SwSaveTypeCountContent aSave( rSaveArr, n ); + MarkEntry aSave = rSaveArr[n++]; SwPosition* pPos = 0; if(!aSave.m_bOther) { @@ -1563,7 +1551,7 @@ namespace sal_uInt16 n = 0; while( n < rSaveArr.size() ) { - _SwSaveTypeCountContent aSave( rSaveArr, n ); + MarkEntry aSave = rSaveArr[n]; if( aSave.m_nCntnt >= nChkLen ) rSaveArr[n].m_nCntnt -= nChkLen; else |