[Libreoffice-commits] core.git: cui/source

[Noel Grandin (via logerrit)]

 cui/source/options/optsave.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4e89b710c05cd1774072575330623cb5c6b2650f
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat Jul 24 13:39:40 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Jul 24 15:18:34 2021 +0200

    fix incorrect read-only check in save options
    
    ever since
        commit 14171010959a4ebf0f6373b6e7f20d1f0741d5a4
        Date:   Sat Nov 26 17:00:43 2016 +0100
    respect read-only config items in Options - Load/Save - General
    dialog
    
    Change-Id: Ib830fbee23a06e8788c9916f8d5a923139540e8d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119465
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 9ad1c1f5a4c5..cb67147bdbf1 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -38,6 +38,7 @@
 #include <unotools/optionsdlg.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
+#include <officecfg/Office/Common.hxx>
 
 #include <sfx2/fcontnr.hxx>
 
@@ -363,7 +364,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
     SvtSaveOptions aSaveOpt;
     m_xLoadUserSettingsCB->set_active(aSaveOpt.IsLoadUserSettings());
     m_xLoadUserSettingsCB->save_state();
-    m_xLoadUserSettingsCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::UseUserData));
+    m_xLoadUserSettingsCB->set_sensitive(!officecfg::Office::Common::Load::UserDefinedSettings::isReadOnly());
     m_xLoadDocPrinterCB->set_active( aSaveOpt.IsLoadDocumentPrinter() );
     m_xLoadDocPrinterCB->save_state();
     m_xLoadDocPrinterCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::LoadDocPrinter));