mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert SvtSaveOptions::EOption to scoped enum

Browse Source 
and remove unused
E_SAVEUNPACKED, E_USESHA1INODF12, E_USEBLOWFISHINODF12
enumerators

Change-Id: I7c384e0c30af5091a22beeda1c77e4b71fdde55e
This commit is contained in:
Noel Grandin
2017-02-09 11:53:32 +02:00
parent a4d0ec84da
commit aef704d807
4 changed files with 54 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cui/source/options/optsave.cxx
View File

@@ -392,10 +392,10 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
SvtSaveOptions aSaveOpt; SvtSaveOptions aSaveOpt;
aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings()); aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings());
aLoadUserSettingsCB->SaveValue(); aLoadUserSettingsCB->SaveValue();
aLoadUserSettingsCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USEUSERDATA)); aLoadUserSettingsCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::UseUserData));
aLoadDocPrinterCB->Check( aSaveOpt.IsLoadDocumentPrinter() ); aLoadDocPrinterCB->Check( aSaveOpt.IsLoadDocumentPrinter() );
aLoadDocPrinterCB->SaveValue(); aLoadDocPrinterCB->SaveValue();
aLoadDocPrinterCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_LOADDOCPRINTER)); aLoadDocPrinterCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::LoadDocPrinter));
if ( !pImpl->bInitialized ) if ( !pImpl->bInitialized )
{ {
@@ -468,33 +468,33 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
} }
aDocInfoCB->Check(aSaveOpt.IsDocInfoSave()); aDocInfoCB->Check(aSaveOpt.IsDocInfoSave());
aDocInfoCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE)); aDocInfoCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::DocInfSave));
aBackupCB->Check(aSaveOpt.IsBackup()); aBackupCB->Check(aSaveOpt.IsBackup());
aBackupCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP)); aBackupCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::Backup));
aAutoSaveCB->Check(aSaveOpt.IsAutoSave()); aAutoSaveCB->Check(aSaveOpt.IsAutoSave());
aAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE)); aAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::AutoSave));
aUserAutoSaveCB->Check(aSaveOpt.IsUserAutoSave()); aUserAutoSaveCB->Check(aSaveOpt.IsUserAutoSave());
aUserAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USERAUTOSAVE)); aUserAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::UserAutoSave));
aWarnAlienFormatCB->Check(aSaveOpt.IsWarnAlienFormat()); aWarnAlienFormatCB->Check(aSaveOpt.IsWarnAlienFormat());
aWarnAlienFormatCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT)); aWarnAlienFormatCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::WarnAlienFormat));
aAutoSaveEdit->SetValue(aSaveOpt.GetAutoSaveTime()); aAutoSaveEdit->SetValue(aSaveOpt.GetAutoSaveTime());
aAutoSaveEdit->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME)); aAutoSaveEdit->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::AutoSaveTime));
// save relatively // save relatively
aRelativeFsysCB->Check(aSaveOpt.IsSaveRelFSys()); aRelativeFsysCB->Check(aSaveOpt.IsSaveRelFSys());
aRelativeFsysCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS)); aRelativeFsysCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::SaveRelFsys));
aRelativeInetCB->Check(aSaveOpt.IsSaveRelINet()); aRelativeInetCB->Check(aSaveOpt.IsSaveRelINet());
aRelativeInetCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET)); aRelativeInetCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::SaveRelInet));
void* pDefaultVersion = reinterpret_cast<void*>( aSaveOpt.GetODFDefaultVersion() ); void* pDefaultVersion = reinterpret_cast<void*>( aSaveOpt.GetODFDefaultVersion() );
aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion ) ); aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion ) );
aODFVersionLB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_ODFDEFAULTVERSION)); aODFVersionLB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::OdfDefaultVersion));
AutoClickHdl_Impl( aAutoSaveCB ); AutoClickHdl_Impl( aAutoSaveCB );
ODFVersionHdl_Impl( *aODFVersionLB ); ODFVersionHdl_Impl( *aODFVersionLB );

35
include/unotools/saveopt.hxx
View File

@@ -29,26 +29,23 @@ class UNOTOOLS_DLLPUBLIC SvtSaveOptions: public utl::detail::Options
public: public:
enum EOption enum class EOption
{ {
E_AUTOSAVETIME, AutoSaveTime,
E_USEUSERDATA, UseUserData,
E_BACKUP, Backup,
E_AUTOSAVE, AutoSave,
E_AUTOSAVEPROMPT, AutoSavePrompt,
E_DOCINFSAVE, DocInfSave,
E_SAVEWORKINGSET, SaveWorkingSet,
E_SAVEDOCVIEW, SaveDocView,
E_SAVERELINET, SaveRelInet,
E_SAVERELFSYS, SaveRelFsys,
E_SAVEUNPACKED, DoPrettyPrinting,
E_DOPRETTYPRINTING, WarnAlienFormat,
E_WARNALIENFORMAT, LoadDocPrinter,
E_LOADDOCPRINTER, OdfDefaultVersion,
E_ODFDEFAULTVERSION, UserAutoSave,
E_USESHA1INODF12,
E_USEBLOWFISHINODF12,
E_USERAUTOSAVE,
}; };
/** Keep enum values sorted that a less or greater compare maps to older /** Keep enum values sorted that a less or greater compare maps to older

24
sfx2/source/appl/appcfg.cxx
View File

@@ -158,7 +158,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_BACKUP : case SID_ATTR_BACKUP :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_BACKUP)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::Backup))
if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BACKUP ),aSaveOptions.IsBackup()))) if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BACKUP ),aSaveOptions.IsBackup())))
bRet = false; bRet = false;
} }
@@ -166,7 +166,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_PRETTYPRINTING: case SID_ATTR_PRETTYPRINTING:
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::DoPrettyPrinting))
if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), aSaveOptions.IsPrettyPrinting()))) if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), aSaveOptions.IsPrettyPrinting())))
bRet = false; bRet = false;
} }
@@ -174,7 +174,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_WARNALIENFORMAT: case SID_ATTR_WARNALIENFORMAT:
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::WarnAlienFormat))
if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), aSaveOptions.IsWarnAlienFormat()))) if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), aSaveOptions.IsWarnAlienFormat())))
bRet = false; bRet = false;
} }
@@ -182,7 +182,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_AUTOSAVE : case SID_ATTR_AUTOSAVE :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVE)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::AutoSave))
if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVE ), aSaveOptions.IsAutoSave()))) if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVE ), aSaveOptions.IsAutoSave())))
bRet = false; bRet = false;
} }
@@ -190,7 +190,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_AUTOSAVEPROMPT : case SID_ATTR_AUTOSAVEPROMPT :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVEPROMPT)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::AutoSavePrompt))
if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVEPROMPT ), aSaveOptions.IsAutoSavePrompt()))) if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVEPROMPT ), aSaveOptions.IsAutoSavePrompt())))
bRet = false; bRet = false;
} }
@@ -198,7 +198,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_AUTOSAVEMINUTE : case SID_ATTR_AUTOSAVEMINUTE :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::AutoSaveTime))
if (!rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (sal_uInt16)aSaveOptions.GetAutoSaveTime()))) if (!rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (sal_uInt16)aSaveOptions.GetAutoSaveTime())))
bRet = false; bRet = false;
} }
@@ -206,7 +206,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_USERAUTOSAVE : case SID_ATTR_USERAUTOSAVE :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_USERAUTOSAVE)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::UserAutoSave))
if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_USERAUTOSAVE ), aSaveOptions.IsUserAutoSave()))) if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_USERAUTOSAVE ), aSaveOptions.IsUserAutoSave())))
bRet = false; bRet = false;
} }
@@ -214,7 +214,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_DOCINFO : case SID_ATTR_DOCINFO :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::DocInfSave))
if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_DOCINFO ), aSaveOptions.IsDocInfoSave()))) if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_DOCINFO ), aSaveOptions.IsDocInfoSave())))
bRet = false; bRet = false;
} }
@@ -222,7 +222,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_WORKINGSET : case SID_ATTR_WORKINGSET :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEWORKINGSET)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::SaveWorkingSet))
if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WORKINGSET ), aSaveOptions.IsSaveWorkingSet()))) if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WORKINGSET ), aSaveOptions.IsSaveWorkingSet())))
bRet = false; bRet = false;
} }
@@ -230,7 +230,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_SAVEDOCVIEW : case SID_ATTR_SAVEDOCVIEW :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEDOCVIEW)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::SaveDocView))
if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_SAVEDOCVIEW ), aSaveOptions.IsSaveDocView()))) if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_SAVEDOCVIEW ), aSaveOptions.IsSaveDocView())))
bRet = false; bRet = false;
} }
@@ -284,7 +284,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_SAVEREL_INET : case SID_SAVEREL_INET :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVERELINET)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::SaveRelInet))
if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_INET ), aSaveOptions.IsSaveRelINet() ))) if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_INET ), aSaveOptions.IsSaveRelINet() )))
bRet = false; bRet = false;
} }
@@ -292,7 +292,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_SAVEREL_FSYS : case SID_SAVEREL_FSYS :
{ {
bRet = true; bRet = true;
if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS)) if (!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::SaveRelFsys))
if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_FSYS ), aSaveOptions.IsSaveRelFSys() ))) if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_FSYS ), aSaveOptions.IsSaveRelFSys() )))
bRet = false; bRet = false;
} }

39
unotools/source/config/saveopt.cxx
View File

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