diff options
| author | Andras Timar <andras.timar@collabora.com> | 2016-11-26 19:41:35 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-12-10 14:54:09 +0000 |
| commit | 316f938d630d02e02887b2efa1d085fd96d3467d (patch) | |
| tree | 3ad7c3865a8069d9792852696c31ec5e440a9897 /cui | |
| parent | 8d52045853cecb716138d51b8b6ad0272a86af86 (diff) | |
Disable Basic IDE options, if experimental features are not enabled
Change-Id: I424abb618b4581bfb1e6dd97f59c32e91bca4cc6
Reviewed-on: https://gerrit.libreoffice.org/31241
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optbasic.cxx | 8 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 38324ea1a2f0..30b50463e8cc 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -19,7 +19,6 @@ #include "optbasic.hxx" #include <basic/codecompletecache.hxx> -#include <svtools/miscopt.hxx> #include <iostream> #include <officecfg/Office/BasicIDE.hxx> #include <cuires.hrc> @@ -27,12 +26,6 @@ SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet) { - SvtMiscOptions aMiscOpt; - if( ! aMiscOpt.IsExperimentalMode() ) - { - Disable(); - } - get(pCodeCompleteChk, "codecomplete_enable"); get(pAutocloseProcChk, "autoclose_proc"); get(pAutocloseParenChk, "autoclose_paren"); @@ -41,7 +34,6 @@ SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxI get(pUseExtendedTypesChk, "extendedtypes_enable"); LoadConfig(); - } SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage() diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 964f43b3018b..070d01612e46 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -85,6 +85,7 @@ #include <sfx2/viewsh.hxx> #include <svl/languageoptions.hxx> #include <svtools/helpopt.hxx> +#include <svtools/miscopt.hxx> #include <svx/drawitem.hxx> #include <svx/xtable.hxx> #include <svx/xpool.hxx> @@ -1482,6 +1483,15 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) continue; } } + + // Disable Basic IDE options, if experimental features are not enabled + if( RID_SVXPAGE_BASICIDE_OPTIONS == nPageId ) + { + SvtMiscOptions aMiscOpt; + if( ! aMiscOpt.IsExperimentalMode() ) + continue; + } + AddTabPage( nPageId, sNewTitle, nGroup ); } } |