[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - cui/source

[Andras Timar]

 cui/source/options/optsave.cxx |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 42f5548b0e3c6c843571a2cdf58bd9a70779495e
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Nov 26 17:00:43 2016 +0100

    respect read-only config items in Options - Load/Save - General dialog
    
    Change-Id: I110e8eb2b858c8b86b01d46bec40873939ae53d8

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index e1b63ce..f5cf2b2 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -399,8 +399,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 )
     {
@@ -473,25 +475,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 );