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>

3 files changed, 49 insertions, 46 deletions

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 1678fbf0efec..f39a726413e0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6409,34 +6409,34 @@ PPTFieldEntry::~PPTFieldEntry()
 
 void PPTFieldEntry::GetDateTime( const sal_uInt32 nVal, SvxDateFormat& eDateFormat, SvxTimeFormat& eTimeFormat )
 {
-    eDateFormat = SVXDATEFORMAT_APPDEFAULT;
+    eDateFormat = SvxDateFormat::AppDefault;
     eTimeFormat = SvxTimeFormat::AppDefault;
     // evaluate ID
     switch( nVal )
     {
         case 0:
         case 6:
-            eDateFormat = SVXDATEFORMAT_A;
+            eDateFormat = SvxDateFormat::A;
         break;
         case 1:
-            eDateFormat = SVXDATEFORMAT_F;
+            eDateFormat = SvxDateFormat::F;
         break;
         case 2:
         case 3:
-            eDateFormat = SVXDATEFORMAT_D;
+            eDateFormat = SvxDateFormat::D;
         break;
         case 4:
         case 5:
-            eDateFormat = SVXDATEFORMAT_C;
+            eDateFormat = SvxDateFormat::C;
         break;
         case 7:
-            eDateFormat = SVXDATEFORMAT_A;
+            eDateFormat = SvxDateFormat::A;
             SAL_FALLTHROUGH;
         case 9:
             eTimeFormat = SvxTimeFormat::HH24_MM;
         break;
         case 8:
-            eDateFormat = SVXDATEFORMAT_A;
+            eDateFormat = SvxDateFormat::A;
             SAL_FALLTHROUGH;
         case 11:
             eTimeFormat = SvxTimeFormat::HH12_MM;
@@ -6455,7 +6455,7 @@ void PPTFieldEntry::SetDateTime( sal_uInt32 nVal )
     SvxDateFormat eDateFormat;
     SvxTimeFormat eTimeFormat;
     GetDateTime( nVal, eDateFormat, eTimeFormat );
-    if ( eDateFormat != SVXDATEFORMAT_APPDEFAULT )
+    if ( eDateFormat != SvxDateFormat::AppDefault )
         xField1.reset(new SvxFieldItem(SvxDateField( Date( Date::SYSTEM ), SvxDateType::Var, eDateFormat ), EE_FEATURE_FIELD));
     if ( eTimeFormat != SvxTimeFormat::AppDefault )
     {
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index c50cddde7d16..d2b42b94719a 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -221,29 +221,29 @@ public:
         VariableTextField::elementExport( pSVGExport );
         OUString sDateFormat, sTimeFormat;
         SvxDateFormat eDateFormat = (SvxDateFormat)( format & 0x0f );
-        if( eDateFormat )
+        if( eDateFormat != SvxDateFormat::AppDefault )
         {
             switch( eDateFormat )
             {
-                case SVXDATEFORMAT_STDSMALL:
-                case SVXDATEFORMAT_A:       // 13.02.96
+                case SvxDateFormat::StdSmall:
+                case SvxDateFormat::A:       // 13.02.96
                     sDateFormat.clear();
                     break;
-                case SVXDATEFORMAT_C:       // 13.Feb 1996
+                case SvxDateFormat::C:       // 13.Feb 1996
                     sDateFormat.clear();
                     break;
-                case SVXDATEFORMAT_D:       // 13.February 1996
+                case SvxDateFormat::D:       // 13.February 1996
                     sDateFormat.clear();
                     break;
-                case SVXDATEFORMAT_E:       // Tue, 13.February 1996
+                case SvxDateFormat::E:       // Tue, 13.February 1996
                     sDateFormat.clear();
                     break;
-                case SVXDATEFORMAT_STDBIG:
-                case SVXDATEFORMAT_F:       // Tuesday, 13.February 1996
+                case SvxDateFormat::StdBig:
+                case SvxDateFormat::F:       // Tuesday, 13.February 1996
                     sDateFormat.clear();
                     break;
                 // default case
-                case SVXDATEFORMAT_B:      // 13.02.1996
+                case SvxDateFormat::B:      // 13.02.1996
                 default:
                     sDateFormat.clear();
                     break;
@@ -1359,7 +1359,7 @@ void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
     mVisiblePagePropSet.bIsFooterFieldVisible               = true;
     mVisiblePagePropSet.bIsDateTimeFieldVisible             = true;
     mVisiblePagePropSet.bIsDateTimeFieldFixed               = true;
-    mVisiblePagePropSet.nDateTimeFormat                     = SVXDATEFORMAT_B;
+    mVisiblePagePropSet.nDateTimeFormat                     = SvxDateFormat::B;
     mVisiblePagePropSet.nPageNumberingType                  = css::style::NumberingType::ARABIC;
 
     //  We collect info on master page elements visibility, and placeholder text shape content.
@@ -1377,7 +1377,9 @@ void SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
             implSafeGetPagePropSet( "IsDateTimeVisible", xPropSet, xPropSetInfo )            >>= mVisiblePagePropSet.bIsDateTimeFieldVisible;
 
             implSafeGetPagePropSet( "IsDateTimeFixed", xPropSet, xPropSetInfo )              >>= mVisiblePagePropSet.bIsDateTimeFieldFixed;
-            implSafeGetPagePropSet( "DateTimeFormat", xPropSet, xPropSetInfo )               >>= mVisiblePagePropSet.nDateTimeFormat;
+            sal_Int32 nTmp;
+            if (implSafeGetPagePropSet( "DateTimeFormat", xPropSet, xPropSetInfo ) >>= nTmp)
+                mVisiblePagePropSet.nDateTimeFormat = static_cast<SvxDateFormat>(nTmp);
 
             if( mVisiblePagePropSet.bIsPageNumberFieldVisible )
             {
@@ -2161,7 +2163,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
                 }
                 if( bHasCharSetMap && ( pCharSetMap->find( aVariableDateTimeId ) != pCharSetMap->end() ) && !(*pCharSetMap)[ aVariableDateTimeId ].empty() )
                 {
-                    SvxDateFormat eDateFormat = SVXDATEFORMAT_B, eCurDateFormat;
+                    SvxDateFormat eDateFormat = SvxDateFormat::B, eCurDateFormat;
                     const UCharSet & aCharSet = (*pCharSetMap)[ aVariableDateTimeId ];
                     UCharSet::const_iterator aChar = aCharSet.begin();
                     // we look for the most verbose date format
@@ -2170,29 +2172,29 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
                         eCurDateFormat = (SvxDateFormat)( (int)( *aChar ) & 0x0f );
                         switch( eDateFormat )
                         {
-                            case SVXDATEFORMAT_STDSMALL:
-                            case SVXDATEFORMAT_A:       // 13.02.96
-                            case SVXDATEFORMAT_B:       // 13.02.1996
+                            case SvxDateFormat::StdSmall:
+                            case SvxDateFormat::A:       // 13.02.96
+                            case SvxDateFormat::B:       // 13.02.1996
                                 switch( eCurDateFormat )
                                 {
-                                    case SVXDATEFORMAT_C:       // 13.Feb 1996
-                                    case SVXDATEFORMAT_D:       // 13.February 1996
-                                    case SVXDATEFORMAT_E:       // Tue, 13.February 1996
-                                    case SVXDATEFORMAT_STDBIG:
-                                    case SVXDATEFORMAT_F:       // Tuesday, 13.February 1996
+                                    case SvxDateFormat::C:       // 13.Feb 1996
+                                    case SvxDateFormat::D:       // 13.February 1996
+                                    case SvxDateFormat::E:       // Tue, 13.February 1996
+                                    case SvxDateFormat::StdBig:
+                                    case SvxDateFormat::F:       // Tuesday, 13.February 1996
                                         eDateFormat = eCurDateFormat;
                                         break;
                                     default:
                                         break;
                                 }
                                 break;
-                            case SVXDATEFORMAT_C:       // 13.Feb 1996
-                            case SVXDATEFORMAT_D:       // 13.February 1996
+                            case SvxDateFormat::C:       // 13.Feb 1996
+                            case SvxDateFormat::D:       // 13.February 1996
                                 switch( eCurDateFormat )
                                 {
-                                    case SVXDATEFORMAT_E:       // Tue, 13.February 1996
-                                    case SVXDATEFORMAT_STDBIG:
-                                    case SVXDATEFORMAT_F:       // Tuesday, 13.February 1996
+                                    case SvxDateFormat::E:       // Tue, 13.February 1996
+                                    case SvxDateFormat::StdBig:
+                                    case SvxDateFormat::F:       // Tuesday, 13.February 1996
                                         eDateFormat = eCurDateFormat;
                                         break;
                                     default:
@@ -2207,28 +2209,28 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
                     // They should be enough to cover every time format.
                     aRepresentation += "0123456789.:/-APM";
 
-                    if( eDateFormat )
+                    if( eDateFormat != SvxDateFormat::AppDefault )
                     {
                         OUString sDate;
                         LanguageType eLang = pInfo->GetOutliner()->GetLanguage( pInfo->GetPara(), pInfo->GetPos() );
                         SvNumberFormatter * pNumberFormatter = new SvNumberFormatter( ::comphelper::getProcessComponentContext(), LANGUAGE_SYSTEM );
-                        // We always collect the characters obtained by using the SVXDATEFORMAT_B (as: 13.02.1996)
+                        // We always collect the characters obtained by using the SvxDateFormat::B (as: 13.02.1996)
                         // so we are sure to include any unusual day|month|year separator.
                         Date aDate( 1, 1, 1996 );
-                        sDate += SvxDateField::GetFormatted( aDate, SVXDATEFORMAT_B, *pNumberFormatter, eLang );
+                        sDate += SvxDateField::GetFormatted( aDate, SvxDateFormat::B, *pNumberFormatter, eLang );
                         switch( eDateFormat )
                         {
-                            case SVXDATEFORMAT_E:       // Tue, 13.February 1996
-                            case SVXDATEFORMAT_STDBIG:
-                            case SVXDATEFORMAT_F:       // Tuesday, 13.February 1996
+                            case SvxDateFormat::E:       // Tue, 13.February 1996
+                            case SvxDateFormat::StdBig:
+                            case SvxDateFormat::F:       // Tuesday, 13.February 1996
                                 for( sal_uInt16 i = 1; i <= 7; ++i )  // we get all days in a week
                                 {
                                     aDate.SetDay( i );
                                     sDate += SvxDateField::GetFormatted( aDate, eDateFormat, *pNumberFormatter, eLang );
                                 }
                                 SAL_FALLTHROUGH; // We need months too!
-                            case SVXDATEFORMAT_C:       // 13.Feb 1996
-                            case SVXDATEFORMAT_D:       // 13.February 1996
+                            case SvxDateFormat::C:       // 13.Feb 1996
+                            case SvxDateFormat::D:       // 13.February 1996
                                 for( sal_uInt16 i = 1; i <= 12; ++i ) // we get all months in a year
                                 {
                                     aDate.SetMonth( i );
@@ -2236,9 +2238,9 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
                                 }
                                 break;
                             // coverity[dead_error_begin] - following conditions exist to avoid compiler warning
-                            case SVXDATEFORMAT_STDSMALL:
-                            case SVXDATEFORMAT_A:       // 13.02.96
-                            case SVXDATEFORMAT_B:       // 13.02.1996
+                            case SvxDateFormat::StdSmall:
+                            case SvxDateFormat::A:       // 13.02.96
+                            case SvxDateFormat::B:       // 13.02.1996
                             default:
                                 // nothing to do here, we always collect the characters needed for these cases.
                                 break;
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 1920d063f103..34b7b20a47c1 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -38,6 +38,7 @@
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <comphelper/processfactory.hxx>
+#include <editeng/flditem.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
@@ -132,7 +133,7 @@ struct PagePropertySet
     bool               bIsHeaderFieldVisible;
     sal_Int32          nPageNumberingType;
     bool               bIsDateTimeFieldFixed;
-    sal_Int32          nDateTimeFormat;
+    SvxDateFormat      nDateTimeFormat;
     PagePropertySet()
         : bIsBackgroundVisible(false)
         , bAreBackgroundObjectsVisible(false)
@@ -142,7 +143,7 @@ struct PagePropertySet
         , bIsHeaderFieldVisible(false)
         , nPageNumberingType(0)
         , bIsDateTimeFieldFixed(false)
-        , nDateTimeFormat(0)
+        , nDateTimeFormat(SvxDateFormat::AppDefault)
     {
     }
 };