diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-29 14:07:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-30 06:26:12 +0000 |
| commit | a34b33d2b900d3d1ea1ac806bc584846dc9d3fbe (patch) | |
| tree | 5deb2d3be849dc2eae3d032c64588b11a0db8420 /sd | |
| parent | 1cd7edadfedc8bf55b979449cbb084082a888e89 (diff) | |
convert SvxDateType to scoped enum
Change-Id: I5ce04f252642cb3a6c1b08ee22255f6c7b97f0f8
Reviewed-on: https://gerrit.libreoffice.org/35842
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/sdpopup.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/dlg/dlgfield.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvs2.cxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 9cd822ff21b5..02c7ff23c0c6 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -60,7 +60,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) const SvxDateField* pDateField = static_cast<const SvxDateField*>( pField ); SvxDateField aDateField( *pDateField ); - if( pDateField->GetType() == SVXDATETYPE_FIX ) + if( pDateField->GetType() == SvxDateType::Fix ) CheckItem( 1 ); else CheckItem( 2 ); @@ -174,9 +174,9 @@ SvxFieldData* SdFieldPopup::GetField() sal_uInt16 i; if( IsItemChecked( 1 ) ) - eType = SVXDATETYPE_FIX; + eType = SvxDateType::Fix; else - eType = SVXDATETYPE_VAR; + eType = SvxDateType::Var; for( i = 3; i <= nCount; i++ ) { @@ -192,7 +192,7 @@ SvxFieldData* SdFieldPopup::GetField() static_cast<SvxDateField*>( pNewField )->SetType( eType ); static_cast<SvxDateField*>( pNewField )->SetFormat( eFormat ); - if( (pDateField->GetType() == SVXDATETYPE_VAR) && (eType == SVXDATETYPE_FIX) ) + if( (pDateField->GetType() == SvxDateType::Var) && (eType == SvxDateType::Fix) ) { Date aDate( Date::SYSTEM ); static_cast<SvxDateField*>( pNewField )->SetFixDate( aDate ); diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 57ccd00d0f81..0ff1eddb3c82 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -87,9 +87,9 @@ SvxFieldData* SdModifyFieldDlg::GetField() SvxDateFormat eFormat; if( m_pRbtFix->IsChecked() ) - eType = SVXDATETYPE_FIX; + eType = SvxDateType::Fix; else - eType = SVXDATETYPE_VAR; + eType = SvxDateType::Var; eFormat = (SvxDateFormat) ( m_pLbFormat->GetSelectEntryPos() + 2 ); @@ -264,7 +264,7 @@ void SdModifyFieldDlg::FillControls() const SvxDateField* pDateField = static_cast<const SvxDateField*>(pField); SvxDateField aDateField( *pDateField ); - if( pDateField->GetType() == SVXDATETYPE_FIX ) + if( pDateField->GetType() == SvxDateType::Fix ) m_pRbtFix->Check(); else m_pRbtVar->Check(); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index ea41c4d0aacf..292067501d6b 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1841,7 +1841,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { case SID_INSERT_FLD_DATE_FIX: pFieldItem.reset(new SvxFieldItem( - SvxDateField( Date( Date::SYSTEM ), SVXDATETYPE_FIX ), EE_FEATURE_FIELD )); + SvxDateField( Date( Date::SYSTEM ), SvxDateType::Fix ), EE_FEATURE_FIELD )); break; case SID_INSERT_FLD_DATE_VAR: diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index c4adefd0164f..5e7ee9db9493 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -490,7 +490,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) { case SID_INSERT_FLD_DATE_FIX: pFieldItem.reset(new SvxFieldItem( - SvxDateField( Date( Date::SYSTEM ), SVXDATETYPE_FIX ), EE_FEATURE_FIELD )); + SvxDateField( Date( Date::SYSTEM ), SvxDateType::Fix ), EE_FEATURE_FIELD )); break; case SID_INSERT_FLD_DATE_VAR: |