diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-15 13:55:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-18 13:16:23 +0200 |
| commit | 7d14555ef7e867c5b1a0e195e3ef056885697c59 (patch) | |
| tree | af39963caf1328d41756e4463a2a39019448026d /sd/source/ui/dlg/dlgfield.cxx | |
| parent | 0083b33650c2f584ceff6eeaf9ef6993bfe0ae9b (diff) | |
convert SvxDateFormat to scoped enum
And simplify the code in sd/headerfooterdlg, no
need for the complex encoding of date and time when we
can just index into a static array.
Change-Id: I677400bf1f956c81eba665b71dbda9183b63f55c
Reviewed-on: https://gerrit.libreoffice.org/42346
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/dlg/dlgfield.cxx')
| -rw-r--r-- | sd/source/ui/dlg/dlgfield.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 188dfbded6e9..726a852f1305 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -177,26 +177,26 @@ void SdModifyFieldDlg::FillFormatList() const SvxDateField* pDateField = static_cast<const SvxDateField*>( pField ); SvxDateField aDateField( *pDateField ); - //SVXDATEFORMAT_APPDEFAULT, // not used - //SVXDATEFORMAT_SYSTEM, // not used + //SvxDateFormat::AppDefault, // not used + //SvxDateFormat::System, // not used m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_SMALL ) ); m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_BIG ) ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); - aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 + aDateField.SetFormat( SvxDateFormat::A ); // 13.02.96 m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 + aDateField.SetFormat( SvxDateFormat::B ); // 13.02.1996 m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 + aDateField.SetFormat( SvxDateFormat::C ); // 13.Feb 1996 m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 + aDateField.SetFormat( SvxDateFormat::D ); // 13.Februar 1996 m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 + aDateField.SetFormat( SvxDateFormat::E ); // Die, 13.Februar 1996 m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 + aDateField.SetFormat( SvxDateFormat::F ); // Dienstag, 13.Februar 1996 m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pDateField->GetFormat() - 2 ) ); + m_pLbFormat->SelectEntryPos( static_cast<sal_uInt16>(pDateField->GetFormat()) - 2 ); } else if( dynamic_cast< const SvxExtTimeField *>( pField ) != nullptr ) { |