Kaydet (Commit) eba9ff46 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

remove obsolete SetCount/DecCount/GetCount functions

Change-Id: Ieee429bb96d53d5825ef39b849f757401a1f3e32
üst 4e579add
...@@ -1404,9 +1404,6 @@ namespace ...@@ -1404,9 +1404,6 @@ namespace
rArr.push_back( *this ); rArr.push_back( *this );
} }
void SetCount( sal_uInt16 n ) { m_nIdx = n; }
sal_uInt16 GetCount() const { return m_nIdx; }
sal_uInt16 DecCount() { return --m_nIdx; }
void SetContent( sal_Int32 n ) { m_nCntnt = n; } void SetContent( sal_Int32 n ) { m_nCntnt = n; }
sal_Int32 GetContent() const { return m_nCntnt; } sal_Int32 GetContent() const { return m_nCntnt; }
...@@ -1462,13 +1459,13 @@ namespace ...@@ -1462,13 +1459,13 @@ namespace
continue; continue;
} }
} }
aSave.SetCount( pDoc->GetSpzFrmFmts()->size() ); aSave.m_nIdx = pDoc->GetSpzFrmFmts()->size();
while( aSave.GetCount() && while( aSave.m_nIdx &&
&rFmt != (*pDoc->GetSpzFrmFmts())[ &rFmt != (*pDoc->GetSpzFrmFmts())[
aSave.DecCount() ] ) --aSave.m_nIdx ] )
; // nothing ; // nothing
OSL_ENSURE( &rFmt == (*pDoc->GetSpzFrmFmts())[ OSL_ENSURE( &rFmt == (*pDoc->GetSpzFrmFmts())[
aSave.GetCount() ], aSave.m_nIdx ],
"_SaveCntntIdx: Lost FrameFormat" ); "_SaveCntntIdx: Lost FrameFormat" );
aSave.Add( rSaveArr ); aSave.Add( rSaveArr );
} }
...@@ -1477,11 +1474,11 @@ namespace ...@@ -1477,11 +1474,11 @@ namespace
} }
else // No layout, so it's a bit more expensive ... else // No layout, so it's a bit more expensive ...
{ {
for( aSave.SetCount( pDoc->GetSpzFrmFmts()->size() ); for( aSave.m_nIdx = pDoc->GetSpzFrmFmts()->size();
aSave.GetCount() ; ) aSave.m_nIdx ; )
{ {
SwFrmFmt* pFrmFmt = (*pDoc->GetSpzFrmFmts())[ SwFrmFmt* pFrmFmt = (*pDoc->GetSpzFrmFmts())[
aSave.DecCount() ]; --aSave.m_nIdx ];
if ( RES_FLYFRMFMT != pFrmFmt->Which() && if ( RES_FLYFRMFMT != pFrmFmt->Which() &&
RES_DRAWFRMFMT != pFrmFmt->Which() ) RES_DRAWFRMFMT != pFrmFmt->Which() )
continue; continue;
...@@ -1527,7 +1524,7 @@ namespace ...@@ -1527,7 +1524,7 @@ namespace
SwPosition* pPos = 0; SwPosition* pPos = 0;
if(!aSave.m_bOther) if(!aSave.m_bOther)
{ {
SwFrmFmt *pFrmFmt = (*pSpz)[ aSave.GetCount() ]; SwFrmFmt *pFrmFmt = (*pSpz)[ aSave.m_nIdx ];
const SwFmtAnchor& rFlyAnchor = pFrmFmt->GetAnchor(); const SwFmtAnchor& rFlyAnchor = pFrmFmt->GetAnchor();
if( rFlyAnchor.GetCntntAnchor() ) if( rFlyAnchor.GetCntntAnchor() )
{ {
...@@ -1549,13 +1546,13 @@ namespace ...@@ -1549,13 +1546,13 @@ namespace
} }
else if( bAuto ) else if( bAuto )
{ {
SwFrmFmt *pFrmFmt = (*pSpz)[ aSave.GetCount() ]; SwFrmFmt *pFrmFmt = (*pSpz)[ aSave.m_nIdx ];
SfxPoolItem *pAnchor = (SfxPoolItem*)&pFrmFmt->GetAnchor(); SfxPoolItem *pAnchor = (SfxPoolItem*)&pFrmFmt->GetAnchor();
pFrmFmt->NotifyClients( pAnchor, pAnchor ); pFrmFmt->NotifyClients( pAnchor, pAnchor );
} }
if( pPos ) if( pPos )
{ {
SAL_INFO("sw.core", "setting " << pPos << " for Index " << aSave.GetCount() << " on Node " << nNode << " from " << pPos->nContent.GetIndex() << " to " << (aSave.GetContent() + nOffset)); SAL_INFO("sw.core", "setting " << pPos << " for Index " << aSave.m_nIdx << " on Node " << nNode << " from " << pPos->nContent.GetIndex() << " to " << (aSave.GetContent() + nOffset));
pPos->nNode = *pCNd; pPos->nNode = *pCNd;
pPos->nContent.Assign( pCNd, aSave.GetContent() + nOffset ); pPos->nContent.Assign( pCNd, aSave.GetContent() + nOffset );
} }
...@@ -1581,7 +1578,7 @@ namespace ...@@ -1581,7 +1578,7 @@ namespace
{ {
SwPosition* pPos = 0; SwPosition* pPos = 0;
{ {
SwFrmFmt *pFrmFmt = (*pSpz)[ aSave.GetCount() ]; SwFrmFmt *pFrmFmt = (*pSpz)[ aSave.m_nIdx ];
const SwFmtAnchor& rFlyAnchor = pFrmFmt->GetAnchor(); const SwFmtAnchor& rFlyAnchor = pFrmFmt->GetAnchor();
if( rFlyAnchor.GetCntntAnchor() ) if( rFlyAnchor.GetCntntAnchor() )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment