summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2016-11-26 17:00:43 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-11-28 11:22:43 +0000
commite2b709dda52bc9850bf6893aa24fe53578359d6d (patch)
tree1b0c0fd62c054e381bd99ea03bf390b29cdc97a4
parent09b714195bc61773c6021a78247478e86ee90d41 (diff)
respect read-only config items in Options - Load/Save - General dialog
Change-Id: I110e8eb2b858c8b86b01d46bec40873939ae53d8 Reviewed-on: https://gerrit.libreoffice.org/31237 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 5f9bd7677047abfc9d3bde0db78f74ff23204f0d) Reviewed-on: https://gerrit.libreoffice.org/31239 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--cui/source/options/optsave.cxx20
1 files changed, 15 insertions, 5 deletions
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 1130bb882ee6..88e8b12659e8 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -398,8 +398,10 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
SvtSaveOptions aSaveOpt;
aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings());
aLoadUserSettingsCB->SaveValue();
+ aLoadUserSettingsCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USEUSERDATA));
aLoadDocPrinterCB->Check( aSaveOpt.IsLoadDocumentPrinter() );
aLoadDocPrinterCB->SaveValue();
+ aLoadDocPrinterCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_LOADDOCPRINTER));
if ( !pImpl->bInitialized )
{
@@ -472,25 +474,33 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
}
aDocInfoCB->Check(aSaveOpt.IsDocInfoSave());
+ aDocInfoCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE));
aBackupCB->Check(aSaveOpt.IsBackup());
- bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP);
- aBackupCB->Enable(!bBackupRO);
+ aBackupCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP));
aAutoSaveCB->Check(aSaveOpt.IsAutoSave());
+ aAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE));
+
aUserAutoSaveCB->Check(aSaveOpt.IsUserAutoSave());
+ aUserAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USERAUTOSAVE));
+
aWarnAlienFormatCB->Check(aSaveOpt.IsWarnAlienFormat());
aWarnAlienFormatCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
- aAutoSaveEdit->SetValue( aSaveOpt.GetAutoSaveTime() );
+ aAutoSaveEdit->SetValue(aSaveOpt.GetAutoSaveTime());
+ aAutoSaveEdit->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME));
// save relatively
- aRelativeFsysCB->Check( aSaveOpt.IsSaveRelFSys() );
+ aRelativeFsysCB->Check(aSaveOpt.IsSaveRelFSys());
+ aRelativeFsysCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS));
- aRelativeInetCB->Check( aSaveOpt.IsSaveRelINet() );
+ aRelativeInetCB->Check(aSaveOpt.IsSaveRelINet());
+ aRelativeInetCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET));
void* pDefaultVersion = reinterpret_cast<void*>( aSaveOpt.GetODFDefaultVersion() );
aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion ) );
+ aODFVersionLB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_ODFDEFAULTVERSION));
AutoClickHdl_Impl( aAutoSaveCB );
ODFVersionHdl_Impl( *aODFVersionLB );