From aef704d8077226b13a28e664db59d27017241afe Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 9 Feb 2017 11:53:32 +0200
Subject: convert SvtSaveOptions::EOption to scoped enum

and remove unused
E_SAVEUNPACKED, E_USESHA1INODF12, E_USEBLOWFISHINODF12
enumerators

Change-Id: I7c384e0c30af5091a22beeda1c77e4b71fdde55e
---
 unotools/source/config/saveopt.cxx | 39 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

(limited to 'unotools/source/config')

diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 18e3e3922f8b..64db684a7ff1 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -283,60 +283,51 @@ bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const
     bool bReadOnly = CFG_READONLY_DEFAULT;
     switch(eOption)
     {
-        case SvtSaveOptions::E_AUTOSAVETIME :
+        case SvtSaveOptions::EOption::AutoSaveTime :
             bReadOnly = bROAutoSaveTime;
             break;
-        case SvtSaveOptions::E_USEUSERDATA :
+        case SvtSaveOptions::EOption::UseUserData :
             bReadOnly = bROUseUserData;
             break;
-        case SvtSaveOptions::E_BACKUP :
+        case SvtSaveOptions::EOption::Backup :
             bReadOnly = bROBackup;
             break;
-        case SvtSaveOptions::E_AUTOSAVE :
+        case SvtSaveOptions::EOption::AutoSave :
             bReadOnly = bROAutoSave;
             break;
-        case SvtSaveOptions::E_AUTOSAVEPROMPT :
+        case SvtSaveOptions::EOption::AutoSavePrompt :
             bReadOnly = bROAutoSavePrompt;
             break;
-        case SvtSaveOptions::E_USERAUTOSAVE :
+        case SvtSaveOptions::EOption::UserAutoSave :
             bReadOnly = bROUserAutoSave;
             break;
-        case SvtSaveOptions::E_DOCINFSAVE :
+        case SvtSaveOptions::EOption::DocInfSave :
             bReadOnly = bRODocInfSave;
             break;
-        case SvtSaveOptions::E_SAVEWORKINGSET :
+        case SvtSaveOptions::EOption::SaveWorkingSet :
             bReadOnly = bROSaveWorkingSet;
             break;
-        case SvtSaveOptions::E_SAVEDOCVIEW :
+        case SvtSaveOptions::EOption::SaveDocView :
             bReadOnly = bROSaveDocView;
             break;
-        case SvtSaveOptions::E_SAVERELINET :
+        case SvtSaveOptions::EOption::SaveRelInet :
             bReadOnly = bROSaveRelINet;
             break;
-        case SvtSaveOptions::E_SAVERELFSYS :
+        case SvtSaveOptions::EOption::SaveRelFsys :
             bReadOnly = bROSaveRelFSys;
             break;
-        case SvtSaveOptions::E_SAVEUNPACKED :
-            bReadOnly = bROSaveUnpacked;
-            break;
-        case SvtSaveOptions::E_DOPRETTYPRINTING :
+        case SvtSaveOptions::EOption::DoPrettyPrinting :
             bReadOnly = bRODoPrettyPrinting;
             break;
-        case SvtSaveOptions::E_WARNALIENFORMAT :
+        case SvtSaveOptions::EOption::WarnAlienFormat :
             bReadOnly = bROWarnAlienFormat;
             break;
-        case SvtSaveOptions::E_LOADDOCPRINTER :
+        case SvtSaveOptions::EOption::LoadDocPrinter :
             bReadOnly = bROLoadDocPrinter;
             break;
-        case SvtSaveOptions::E_ODFDEFAULTVERSION :
+        case SvtSaveOptions::EOption::OdfDefaultVersion :
             bReadOnly = bROLoadDocPrinter;
             break;
-        case SvtSaveOptions::E_USESHA1INODF12:
-            bReadOnly = bROUseSHA1InODF12;
-            break;
-        case SvtSaveOptions::E_USEBLOWFISHINODF12:
-            bReadOnly = bROUseBlowfishInODF12;
-            break;
     }
     return bReadOnly;
 }
-- 
cgit