mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable Basic IDE options, if experimental features are not enabled

Browse Source 
Change-Id: I424abb618b4581bfb1e6dd97f59c32e91bca4cc6
Reviewed-on: https://gerrit.libreoffice.org/31241
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
Andras Timar
2016-11-26 19:41:35 +01:00
parent 8d52045853
commit 316f938d63
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cui/source/options/optbasic.cxx
View File

@@ -19,7 +19,6 @@
#include "optbasic.hxx" #include "optbasic.hxx"
#include <basic/codecompletecache.hxx> #include <basic/codecompletecache.hxx>
#include <svtools/miscopt.hxx>
#include <iostream> #include <iostream>
#include <officecfg/Office/BasicIDE.hxx> #include <officecfg/Office/BasicIDE.hxx>
#include <cuires.hrc> #include <cuires.hrc>
@@ -27,12 +26,6 @@
SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet) : SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet)
{ {
SvtMiscOptions aMiscOpt;
if( ! aMiscOpt.IsExperimentalMode() )
{
Disable();
}
get(pCodeCompleteChk, "codecomplete_enable"); get(pCodeCompleteChk, "codecomplete_enable");
get(pAutocloseProcChk, "autoclose_proc"); get(pAutocloseProcChk, "autoclose_proc");
get(pAutocloseParenChk, "autoclose_paren"); get(pAutocloseParenChk, "autoclose_paren");
@@ -41,7 +34,6 @@ SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxI
get(pUseExtendedTypesChk, "extendedtypes_enable"); get(pUseExtendedTypesChk, "extendedtypes_enable");
LoadConfig(); LoadConfig();
} }
SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage() SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage()

10
cui/source/options/treeopt.cxx
View File

@@ -85,6 +85,7 @@
#include <sfx2/viewsh.hxx> #include <sfx2/viewsh.hxx>
#include <svl/languageoptions.hxx> #include <svl/languageoptions.hxx>
#include <svtools/helpopt.hxx> #include <svtools/helpopt.hxx>
#include <svtools/miscopt.hxx>
#include <svx/drawitem.hxx> #include <svx/drawitem.hxx>
#include <svx/xtable.hxx> #include <svx/xtable.hxx>
#include <svx/xpool.hxx> #include <svx/xpool.hxx>
@@ -1482,6 +1483,15 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
continue; 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 ); AddTabPage( nPageId, sNewTitle, nGroup );
} }
} }