convert SvxFileFormat to scoped enum

Change-Id: Ia75c86a89c89bb22759e1d588ce603701cb7fad5
Reviewed-on: https://gerrit.libreoffice.org/42313
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 21 insertions, 21 deletions

diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index bf9baf91d4ce..b4cf848c0ef2 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -135,12 +135,12 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
                     xPropSet->getPropertyValue(UNO_TC_PROP_CURRENT_PRESENTATION) >>= aPresentation;
                     xPropSet->getPropertyValue(UNO_TC_PROP_FILE_FORMAT) >>= nFmt;
 
-                    SvxFileFormat eFmt = SVXFILEFORMAT_NAME_EXT;
+                    SvxFileFormat eFmt = SvxFileFormat::NameAndExt;
                     switch (nFmt)
                     {
-                        case text::FilenameDisplayFormat::FULL: eFmt = SVXFILEFORMAT_FULLPATH; break;
-                        case text::FilenameDisplayFormat::PATH: eFmt = SVXFILEFORMAT_PATH;     break;
-                        case text::FilenameDisplayFormat::NAME: eFmt = SVXFILEFORMAT_NAME;     break;
+                        case text::FilenameDisplayFormat::FULL: eFmt = SvxFileFormat::PathFull; break;
+                        case text::FilenameDisplayFormat::PATH: eFmt = SvxFileFormat::PathOnly;     break;
+                        case text::FilenameDisplayFormat::NAME: eFmt = SvxFileFormat::NameOnly;     break;
                         default:;
                     }
 
@@ -710,7 +710,7 @@ SV_IMPL_PERSIST1( SvxExtFileField );
 SvxExtFileField::SvxExtFileField()
 {
     eType = SVXFILETYPE_VAR;
-    eFormat = SVXFILEFORMAT_FULLPATH;
+    eFormat = SvxFileFormat::PathFull;
 }
 
 
@@ -767,22 +767,22 @@ OUString SvxExtFileField::GetFormatted() const
     {
         switch( eFormat )
         {
-            case SVXFILEFORMAT_FULLPATH:
+            case SvxFileFormat::PathFull:
                 aString = aURLObj.getFSysPath(FSysStyle::Detect);
             break;
 
-            case SVXFILEFORMAT_PATH:
+            case SvxFileFormat::PathOnly:
                 aURLObj.removeSegment(INetURLObject::LAST_SEGMENT, false);
                 // #101742# Leave trailing slash at the pathname
                 aURLObj.setFinalSlash();
                 aString = aURLObj.getFSysPath(FSysStyle::Detect);
             break;
 
-            case SVXFILEFORMAT_NAME:
+            case SvxFileFormat::NameOnly:
                 aString = aURLObj.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DecodeMechanism::Unambiguous);
             break;
 
-            case SVXFILEFORMAT_NAME_EXT:
+            case SvxFileFormat::NameAndExt:
                 aString = aURLObj.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DecodeMechanism::Unambiguous);
             break;
         }
@@ -791,22 +791,22 @@ OUString SvxExtFileField::GetFormatted() const
     {
         switch( eFormat )
         {
-            case SVXFILEFORMAT_FULLPATH:
+            case SvxFileFormat::PathFull:
                 aString = aURLObj.GetMainURL( INetURLObject::DecodeMechanism::ToIUri );
             break;
 
-            case SVXFILEFORMAT_PATH:
+            case SvxFileFormat::PathOnly:
                 aURLObj.removeSegment(INetURLObject::LAST_SEGMENT, false);
                 // #101742# Leave trailing slash at the pathname
                 aURLObj.setFinalSlash();
                 aString = aURLObj.GetMainURL( INetURLObject::DecodeMechanism::ToIUri );
             break;
 
-            case SVXFILEFORMAT_NAME:
+            case SvxFileFormat::NameOnly:
                 aString = aURLObj.getBase();
             break;
 
-            case SVXFILEFORMAT_NAME_EXT:
+            case SvxFileFormat::NameAndExt:
                 aString = aURLObj.getName();
             break;
         }
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 94bef5cdae11..9416300a6fa7 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -154,10 +154,10 @@ static sal_Int16 getFileNameDisplayFormat( SvxFileFormat nFormat )
 {
     switch( nFormat )
     {
-    case SVXFILEFORMAT_NAME_EXT:    return text::FilenameDisplayFormat::NAME_AND_EXT;
-    case SVXFILEFORMAT_FULLPATH:    return text::FilenameDisplayFormat::FULL;
-    case SVXFILEFORMAT_PATH:    return text::FilenameDisplayFormat::PATH;
-//  case SVXFILEFORMAT_NAME:
+    case SvxFileFormat::NameAndExt:    return text::FilenameDisplayFormat::NAME_AND_EXT;
+    case SvxFileFormat::PathFull:    return text::FilenameDisplayFormat::FULL;
+    case SvxFileFormat::PathOnly:    return text::FilenameDisplayFormat::PATH;
+//  case SvxFileFormat::NameOnly:
     default: return text::FilenameDisplayFormat::NAME;
     }
 }
@@ -166,12 +166,12 @@ static SvxFileFormat setFileNameDisplayFormat( sal_Int16 nFormat )
 {
     switch( nFormat )
     {
-    case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH;
-    case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH;
-    case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME;
+    case text::FilenameDisplayFormat::FULL: return SvxFileFormat::PathFull;
+    case text::FilenameDisplayFormat::PATH: return SvxFileFormat::PathOnly;
+    case text::FilenameDisplayFormat::NAME: return SvxFileFormat::NameOnly;
 //  case text::FilenameDisplayFormat::NAME_AND_EXT:
     default:
-        return SVXFILEFORMAT_NAME_EXT;
+        return SvxFileFormat::NameAndExt;
     }
 }