diff options
| -rw-r--r-- | cui/source/options/optmemory.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/vclenum.hxx | 9 | ||||
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/field2.cxx | 12 |
4 files changed, 14 insertions, 11 deletions
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 2f8e2fce7fd6..31cc66dce7b9 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -134,7 +134,7 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSe m_pQuickStarterFrame->Hide(); #endif - m_pTfGraphicObjectTime->SetExtFormat( EXTTIMEF_24H_SHORT ); + m_pTfGraphicObjectTime->SetExtFormat( ExtTimeFieldFormat::Short24H ); SetExchangeSupport(); diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 3441ba627244..3324b3d120ce 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -24,9 +24,12 @@ #include <sal/types.h> #include <tools/fontenum.hxx> -enum ExtTimeFieldFormat { EXTTIMEF_24H_SHORT, EXTTIMEF_24H_LONG, - EXTTIMEF_12H_SHORT, EXTTIMEF_12H_LONG, - EXTTIMEF_DURATION_SHORT, EXTTIMEF_DURATION_LONG }; +enum class ExtTimeFieldFormat +{ + Short24H, Long24H, + Short12H, Long12H, + ShortDuration, LongDuration +}; enum class ExtDateFieldFormat { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index ab8c00cdad61..828e957f5ec7 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1415,7 +1415,7 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_bTypeLostFocus( false ) { - m_aTimeField->SetExtFormat( EXTTIMEF_24H_LONG ); + m_aTimeField->SetExtFormat( ExtTimeFieldFormat::Long24H ); m_aDateField->SetExtDateFormat( ExtDateFieldFormat::SystemShortYYYY ); m_aRemoveButton->SetModeImage(Image(SfxResId(SFX_IMG_PROPERTY_REMOVE))); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 2a00d3faae97..80861d6cc575 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2606,41 +2606,41 @@ void TimeField::SetExtFormat( ExtTimeFieldFormat eFormat ) { switch ( eFormat ) { - case EXTTIMEF_24H_SHORT: + case ExtTimeFieldFormat::Short24H: { SetTimeFormat( TimeFormat::Hour24 ); SetDuration( false ); SetFormat( TimeFieldFormat::F_NONE ); } break; - case EXTTIMEF_24H_LONG: + case ExtTimeFieldFormat::Long24H: { SetTimeFormat( TimeFormat::Hour24 ); SetDuration( false ); SetFormat( TimeFieldFormat::F_SEC ); } break; - case EXTTIMEF_12H_SHORT: + case ExtTimeFieldFormat::Short12H: { SetTimeFormat( TimeFormat::Hour12 ); SetDuration( false ); SetFormat( TimeFieldFormat::F_NONE ); } break; - case EXTTIMEF_12H_LONG: + case ExtTimeFieldFormat::Long12H: { SetTimeFormat( TimeFormat::Hour12 ); SetDuration( false ); SetFormat( TimeFieldFormat::F_SEC ); } break; - case EXTTIMEF_DURATION_SHORT: + case ExtTimeFieldFormat::ShortDuration: { SetDuration( true ); SetFormat( TimeFieldFormat::F_NONE ); } break; - case EXTTIMEF_DURATION_LONG: + case ExtTimeFieldFormat::LongDuration: { SetDuration( true ); SetFormat( TimeFieldFormat::F_SEC ); |