diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 10:26:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 12:05:23 +0200 |
| commit | e45f61a5906cb84cdd895ef00648d5b7a6468ac5 (patch) | |
| tree | c0b848bb9b21354802e8c80621d52f27167866f1 /sd/source | |
| parent | 2b825fe7f525ac017966044a1400d9095c8b7986 (diff) | |
convert SvxFileType to scoped enum
Change-Id: Iec1c67f7f0f9b2244b1d6ef52921ddd09f944fbb
Reviewed-on: https://gerrit.libreoffice.org/42314
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/app/sdpopup.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/dlg/dlgfield.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 293f7672948f..e22d875fde2c 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -187,7 +187,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) } else if( (pExtFileField = dynamic_cast< const SvxExtFileField * >(pField)) != nullptr ) { - if( pDocShell && (pExtFileField->GetType() != SVXFILETYPE_FIX) ) + if( pDocShell && (pExtFileField->GetType() != SvxFileType::Fix) ) { OUString aName; if( pDocShell->HasName() ) diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 7bb783418831..da39b3c0f688 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -126,7 +126,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) const SvxExtFileField* pFileField = static_cast<const SvxExtFileField*>(pField); //SvxExtFileField aFileField( *pFileField ); - if( pFileField->GetType() == SVXFILETYPE_FIX ) + if( pFileField->GetType() == SvxFileType::Fix ) CheckItem( 1 ); else CheckItem( 2 ); @@ -241,9 +241,9 @@ SvxFieldData* SdFieldPopup::GetField() sal_uInt16 i; if( IsItemChecked( 1 ) ) - eType = SVXFILETYPE_FIX; + eType = SvxFileType::Fix; else - eType = SVXFILETYPE_VAR; + eType = SvxFileType::Var; for( i = 3; i <= nCount; i++ ) { diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index a824ed495866..dc7be8b9312e 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -121,9 +121,9 @@ SvxFieldData* SdModifyFieldDlg::GetField() SvxFileFormat eFormat; if( m_pRbtFix->IsChecked() ) - eType = SVXFILETYPE_FIX; + eType = SvxFileType::Fix; else - eType = SVXFILETYPE_VAR; + eType = SvxFileType::Var; eFormat = (SvxFileFormat) ( m_pLbFormat->GetSelectEntryPos() ); @@ -284,7 +284,7 @@ void SdModifyFieldDlg::FillControls() const SvxExtFileField* pFileField = static_cast<const SvxExtFileField*>(pField); SvxExtFileField aFileField( *pFileField ); - if( pFileField->GetType() == SVXFILETYPE_FIX ) + if( pFileField->GetType() == SvxFileType::Fix ) m_pRbtFix->Check(); else m_pRbtVar->Check(); |