diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-09-03 10:54:49 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-09-03 10:56:57 +0300 |
| commit | 8b90ad8af9d72937109ded62609731033558dd84 (patch) | |
| tree | 8f62330ef595880530deae76e4d66e4f835ab05b /cui | |
| parent | 306dbe141da208fc3bfccd3186987ae480061448 (diff) | |
Bypass SvxBasicIDEOptionsPage when DISABLE_SCRIPTING
Change-Id: I687dc152a60d1f5ccdf8d8ca763040cbff74e3cf
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/Library_cui.mk | 3 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index a29801a27498..809319a04a38 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -138,7 +138,8 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optaboutconfig \ cui/source/options/optaccessibility \ cui/source/options/optasian \ - cui/source/options/optbasic \ + $(if $(DISABLE_SCRIPTING),, \ + cui/source/options/optbasic) \ cui/source/options/optchart \ cui/source/options/optcolor \ cui/source/options/optctl \ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 4fd3d8716a4e..920be54a1daa 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -320,7 +320,9 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break; case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break; case RID_SVXPAGE_ABOUT_CONFIG: fnCreate = &CuiAboutConfigTabPage::Create; break; +#ifndef DISABLE_SCRIPTING case RID_SVXPAGE_BASICIDE_OPTIONS: fnCreate = &SvxBasicIDEOptionsPage::Create; break; +#endif } SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL; |