Kaydet (Commit) 6d50c6cc authored tarafından Caolán McNamara's avatar Caolán McNamara

move ++m_nFieldsInHyperlink from StartField_Impl to callers

no logic change at all, justs makes it clear the dubiousness
of this unconditional increment

Change-Id: I32e3cb2c45b1b45826a59642c33ab850d698c206
üst 2dd0c65c
...@@ -1058,6 +1058,9 @@ void DocxAttributeOutput::EndRun() ...@@ -1058,6 +1058,9 @@ void DocxAttributeOutput::EndRun()
{ {
StartField_Impl( *pIt ); StartField_Impl( *pIt );
if (m_startedHyperlink)
++m_nFieldsInHyperlink;
// Remove the field from the stack if only the start has to be written // Remove the field from the stack if only the start has to be written
// Unknown fields should be removed too // Unknown fields should be removed too
if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) ) if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) )
...@@ -1123,6 +1126,9 @@ void DocxAttributeOutput::EndRun() ...@@ -1123,6 +1126,9 @@ void DocxAttributeOutput::EndRun()
{ {
StartField_Impl( *pIt, true ); StartField_Impl( *pIt, true );
if (m_startedHyperlink)
++m_nFieldsInHyperlink;
// Remove the field if no end needs to be written // Remove the field if no end needs to be written
if ( !pIt->bClose ) { if ( !pIt->bClose ) {
pIt = m_Fields.erase( pIt ); pIt = m_Fields.erase( pIt );
...@@ -1412,8 +1418,6 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos ) ...@@ -1412,8 +1418,6 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos& rInfos )
void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, bool bWriteRun ) void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, bool bWriteRun )
{ {
if ( m_startedHyperlink )
++m_nFieldsInHyperlink;
if ( rInfos.pField && rInfos.eType == ww::eUNKNOWN ) if ( rInfos.pField && rInfos.eType == ww::eUNKNOWN )
{ {
// Expand unsupported fields // Expand unsupported fields
......
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