diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-06 13:33:15 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-07 08:42:04 +0000 |
| commit | 08f5355dee375503167989e21271a4601449a257 (patch) | |
| tree | 051ae7e50b005417f77ee0fd909fc3c27cbb3bbf /sw/source/filter/ww8/docxattributeoutput.cxx | |
| parent | 14f982775cdff2e3779f9a9bcbc0341247ed90aa (diff) | |
convert RES_FIELDS to scoped enum
and rename to SwFieldIds
Change-Id: I50d2b7550f68b4b020ffc1603f931c671c8e1de6
Reviewed-on: https://gerrit.libreoffice.org/34924
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 7b9da4c41b0e..875caf9d1a4e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1699,7 +1699,7 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos ) if ( rInfos.pField ) { sal_uInt16 nSubType = rInfos.pField->GetSubType( ); - bool bIsSetField = rInfos.pField->GetTyp( )->Which( ) == RES_SETEXPFLD; + bool bIsSetField = rInfos.pField->GetTyp( )->Which( ) == SwFieldIds::SetExp; bool bShowRef = bIsSetField && ( nSubType & nsSwExtendedSubType::SUB_INVISIBLE ) == 0; if ( ( !m_sFieldBkm.isEmpty() ) && bShowRef ) @@ -6653,8 +6653,8 @@ void DocxAttributeOutput::TextCharFormat( const SwFormatCharFormat& rCharFormat void DocxAttributeOutput::RefField( const SwField& rField, const OUString& rRef ) { - sal_uInt16 nType = rField.GetTyp( )->Which( ); - if ( nType == RES_GETEXPFLD ) + SwFieldIds nType = rField.GetTyp( )->Which( ); + if ( nType == SwFieldIds::GetExp ) { OUString sCmd = FieldString( ww::eREF ); sCmd += "\"" + rRef + "\" "; @@ -6788,16 +6788,16 @@ void DocxAttributeOutput::WriteField_Impl( const SwField* pField, ww::eField eTy if ( pField ) { - sal_uInt16 nType = pField->GetTyp( )->Which( ); + SwFieldIds nType = pField->GetTyp( )->Which( ); sal_uInt16 nSubType = pField->GetSubType(); // TODO Any other field types here ? - if ( ( nType == RES_SETEXPFLD ) && ( nSubType & nsSwGetSetExpType::GSE_STRING ) ) + if ( ( nType == SwFieldIds::SetExp ) && ( nSubType & nsSwGetSetExpType::GSE_STRING ) ) { const SwSetExpField *pSet = static_cast<const SwSetExpField*>( pField ); m_sFieldBkm = pSet->GetPar1( ); } - else if ( nType == RES_DROPDOWN ) + else if ( nType == SwFieldIds::Dropdown ) { const SwDropDownField* pDropDown = static_cast<const SwDropDownField*>( pField ); m_sFieldBkm = pDropDown->GetName( ); |