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

[Andras Timar]

 cui/source/options/optbasic.cxx |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

New commits:
commit d5be8dddc43e8a880d546fb9a6e8fbb45278eeca
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Nov 26 19:52:54 2016 +0100

    respect read-only config items in Basic IDE Options dialog
    
    Change-Id: I4a23b347c5fed948045427bc440e7a821b95b63c
    Reviewed-on: https://gerrit.libreoffice.org/31242
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 3feb235a..38324ea 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -62,19 +62,18 @@ void SvxBasicIDEOptionsPage::dispose()
 
 void SvxBasicIDEOptionsPage::LoadConfig()
 {
-    bool bProcClose = officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get();
-    bool bExtended = officecfg::Office::BasicIDE::Autocomplete::UseExtended::get();
-    bool bCodeCompleteOn = officecfg::Office::BasicIDE::Autocomplete::CodeComplete::get();
-    bool bParenClose = officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::get();
-    bool bQuoteClose = officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::get();
-    bool bCorrect = officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::get();
-
-    pCodeCompleteChk->Check( bCodeCompleteOn );
-    pAutocloseProcChk->Check( bProcClose );
-    pAutocloseQuotesChk->Check( bQuoteClose );
-    pAutocloseParenChk->Check( bParenClose );
-    pAutoCorrectChk->Check( bCorrect );
-    pUseExtendedTypesChk->Check( bExtended );
+    pCodeCompleteChk->Check( officecfg::Office::BasicIDE::Autocomplete::CodeComplete::get() );
+    pCodeCompleteChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::CodeComplete::isReadOnly() );
+    pAutocloseProcChk->Check( officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get() );
+    pAutocloseProcChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::isReadOnly() );
+    pAutocloseQuotesChk->Check( officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::get() );
+    pAutocloseQuotesChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::isReadOnly() );
+    pAutocloseParenChk->Check( officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::get() );
+    pAutocloseParenChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::isReadOnly() );
+    pAutoCorrectChk->Check( officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::get() );
+    pAutoCorrectChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::isReadOnly() );
+    pUseExtendedTypesChk->Check( officecfg::Office::BasicIDE::Autocomplete::UseExtended::get() );
+    pUseExtendedTypesChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::UseExtended::isReadOnly() );
 }
 
 bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )