From a34b33d2b900d3d1ea1ac806bc584846dc9d3fbe Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 29 Mar 2017 14:07:22 +0200
Subject: 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>
---
 editeng/source/accessibility/AccessibleEditableTextPara.cxx | 4 ++--
 editeng/source/items/flditem.cxx                            | 8 ++++----
 editeng/source/uno/unofield.cxx                             | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'editeng')

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index c1b6f30202ef..11a212b02f41 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -865,9 +865,9 @@ namespace
                 const SvxDateField* pDateField = static_cast< const SvxDateField* >(ree.pFieldItem->GetField());
                 if (pDateField)
                 {
-                    if (pDateField->GetType() == SVXDATETYPE_FIX)
+                    if (pDateField->GetType() == SvxDateType::Fix)
                         strFldType = "date (fixed)";
-                    else if (pDateField->GetType() == SVXDATETYPE_VAR)
+                    else if (pDateField->GetType() == SvxDateType::Var)
                         strFldType = "date (variable)";
                 }
                 break;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 690425594227..cb2c69f3abb1 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -68,7 +68,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
                         bool bIsFixed = false;
                         xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed;
 
-                        SvxDateField* pData = new SvxDateField(aDate, bIsFixed ? SVXDATETYPE_FIX : SVXDATETYPE_VAR);
+                        SvxDateField* pData = new SvxDateField(aDate, bIsFixed ? SvxDateType::Fix : SvxDateType::Var);
                         sal_Int32 nNumFmt = -1;
                         xPropSet->getPropertyValue(UNO_TC_PROP_NUMFORMAT) >>= nNumFmt;
                         if (nNumFmt >= SVXDATEFORMAT_APPDEFAULT && nNumFmt <= SVXDATEFORMAT_F)
@@ -363,7 +363,7 @@ SV_IMPL_PERSIST1( SvxDateField, SvxFieldData );
 SvxDateField::SvxDateField()
 {
     nFixDate = Date( Date::SYSTEM ).GetDate();
-    eType = SVXDATETYPE_VAR;
+    eType = SvxDateType::Var;
     eFormat = SVXDATEFORMAT_STDSMALL;
 }
 
@@ -410,7 +410,7 @@ void SvxDateField::Load( SvPersistStream & rStm )
 void SvxDateField::Save( SvPersistStream & rStm )
 {
     rStm.WriteInt32( nFixDate );
-    rStm.WriteUInt16( eType );
+    rStm.WriteUInt16( (sal_uInt16)eType );
     rStm.WriteUInt16( eFormat );
 }
 
@@ -418,7 +418,7 @@ void SvxDateField::Save( SvPersistStream & rStm )
 OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
 {
     Date aDate( Date::EMPTY );
-    if ( eType == SVXDATETYPE_FIX )
+    if ( eType == SvxDateType::Fix )
         aDate.SetDate( nFixDate );
     else
         aDate = Date( Date::SYSTEM ); // current date
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index b6d6b626dec4..26aaff95392b 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -316,7 +316,7 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > const & xAn
                     mpImpl->mbBoolean2 = true;
                     // #i35416# for variable date field, don't use invalid "0000-00-00" date,
                     // use current date instead
-                    bool bFixed = static_cast<const SvxDateField*>(pData)->GetType() == SVXDATETYPE_FIX;
+                    bool bFixed = static_cast<const SvxDateField*>(pData)->GetType() == SvxDateType::Fix;
                     mpImpl->maDateTime = getDate( bFixed ?
                                             static_cast<const SvxDateField*>(pData)->GetFixDate() :
                                             Date( Date::SYSTEM ).GetDate() );
@@ -392,7 +392,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
         if( mpImpl->mbBoolean2 ) // IsDate?
         {
             Date aDate( setDate( mpImpl->maDateTime ) );
-            pData = new SvxDateField( aDate, mpImpl->mbBoolean1?SVXDATETYPE_FIX:SVXDATETYPE_VAR );
+            pData = new SvxDateField( aDate, mpImpl->mbBoolean1?SvxDateType::Fix:SvxDateType::Var );
             if( mpImpl->mnInt32 >= SVXDATEFORMAT_APPDEFAULT && mpImpl->mnInt32 <= SVXDATEFORMAT_F )
                 static_cast<SvxDateField*>(pData)->SetFormat( (SvxDateFormat)mpImpl->mnInt32 );
         }
-- 
cgit