[Libreoffice-commits] core.git: editeng/source include/editeng

[Noel Grandin]

 editeng/source/items/flditem.cxx |   13 +++++++------
 editeng/source/uno/unofield.cxx  |    9 +++++----
 include/editeng/flditem.hxx      |   13 +++++++------
 3 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit 4da85bf822dcce7da6c2243b408652af8eb55b71
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Sep 15 09:50:54 2017 +0200

    convert SvxAuthorFormat to scoped enum
    
    Change-Id: I5553ea640a4483c98ec5f5240594e30a72c968f8
    Reviewed-on: https://gerrit.libreoffice.org/42311
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index b16c0da747b6..05146abce0e4 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -185,9 +185,10 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
                     {
                         if (!bFullName)
                         {
-                            pData->SetFormat(SVXAUTHORFORMAT_SHORTNAME);
+                            pData->SetFormat(SvxAuthorFormat::ShortName);
                         }
-                        else if (nFmt >= SVXAUTHORFORMAT_FULLNAME && nFmt <= SVXAUTHORFORMAT_SHORTNAME)
+                        else if (static_cast<SvxAuthorFormat>(nFmt) >= SvxAuthorFormat::FullName &&
+                                 static_cast<SvxAuthorFormat>(nFmt) <= SvxAuthorFormat::ShortName)
                         {
                             pData->SetFormat(static_cast<SvxAuthorFormat>(nFmt));
                         }
@@ -860,18 +861,18 @@ OUString SvxAuthorField::GetFormatted() const
 
     switch( eFormat )
     {
-        case SVXAUTHORFORMAT_FULLNAME:
+        case SvxAuthorFormat::FullName:
             aString = aFirstName + " " + aName;
         break;
-        case SVXAUTHORFORMAT_NAME:
+        case SvxAuthorFormat::LastName:
             aString = aName;
         break;
 
-        case SVXAUTHORFORMAT_FIRSTNAME:
+        case SvxAuthorFormat::FirstName:
             aString = aFirstName;
         break;
 
-        case SVXAUTHORFORMAT_SHORTNAME:
+        case SvxAuthorFormat::ShortName:
             aString = aShortName;
         break;
     }
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index e6357f0e4969..985dbddb3306 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -272,7 +272,7 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw()
         break;
 
     case text::textfield::Type::AUTHOR:
-        mpImpl->mnInt16 = SVXAUTHORFORMAT_FULLNAME;
+        mpImpl->mnInt16 = static_cast<sal_uInt16>(SvxAuthorFormat::FullName);
         mpImpl->mbBoolean1 = false;
         mpImpl->mbBoolean2 = true;
         break;
@@ -357,7 +357,7 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > const & xAn
                 mpImpl->mnInt16    = sal::static_int_cast< sal_Int16 >(
                     static_cast<const SvxAuthorField*>(pData)->GetFormat());
                 mpImpl->mbBoolean1 = static_cast<const SvxAuthorField*>(pData)->GetType() == SVXAUTHORTYPE_FIX;
-                mpImpl->mbBoolean2 = static_cast<const SvxAuthorField*>(pData)->GetFormat() != SVXAUTHORFORMAT_SHORTNAME;
+                mpImpl->mbBoolean2 = static_cast<const SvxAuthorField*>(pData)->GetFormat() != SvxAuthorFormat::ShortName;
                 break;
 
             case text::textfield::Type::MEASURE:
@@ -478,9 +478,10 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
 
         if( !mpImpl->mbBoolean2 )
         {
-            static_cast<SvxAuthorField*>(pData)->SetFormat( SVXAUTHORFORMAT_SHORTNAME );
+            static_cast<SvxAuthorField*>(pData)->SetFormat( SvxAuthorFormat::ShortName );
         }
-        else if( mpImpl->mnInt16 >= SVXAUTHORFORMAT_FULLNAME && mpImpl->mnInt16 <= SVXAUTHORFORMAT_SHORTNAME )
+        else if( static_cast<SvxAuthorFormat>(mpImpl->mnInt16) >= SvxAuthorFormat::FullName &&
+                 static_cast<SvxAuthorFormat>(mpImpl->mnInt16) <= SvxAuthorFormat::ShortName )
         {
             static_cast<SvxAuthorField*>(pData)->SetFormat( (SvxAuthorFormat) mpImpl->mnInt16 );
         }
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index d4962fb2ff9c..b86916aa59f2 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -328,11 +328,12 @@ public:
 
 
 enum SvxAuthorType { SVXAUTHORTYPE_FIX, SVXAUTHORTYPE_VAR };
-enum SvxAuthorFormat {  SVXAUTHORFORMAT_FULLNAME = 0, // full name
-                        SVXAUTHORFORMAT_NAME,       // Only Last name
-                        SVXAUTHORFORMAT_FIRSTNAME,  // Only first name
-                        SVXAUTHORFORMAT_SHORTNAME   // Initials
-                    };
+enum class SvxAuthorFormat {
+    FullName,   // full name
+    LastName,   // Only Last name
+    FirstName,  // Only first name
+    ShortName   // Initials
+};
 
 class EDITENG_DLLPUBLIC SvxAuthorField : public SvxFieldData
 {
@@ -350,7 +351,7 @@ public:
                                 const OUString& rLastName,
                                 const OUString& rShortName,
                                 SvxAuthorType eType = SVXAUTHORTYPE_VAR,
-                                SvxAuthorFormat eFormat = SVXAUTHORFORMAT_FULLNAME );
+                                SvxAuthorFormat eFormat = SvxAuthorFormat::FullName );
 
     SvxAuthorType           GetType() const { return eType; }
     void                    SetType( SvxAuthorType eTp ) { eType = eTp; }