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

[Tor Lillqvist]

 cui/Library_cui.mk             |    3 ++-
 cui/source/options/treeopt.cxx |    2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8b90ad8af9d72937109ded62609731033558dd84
Author: Tor Lillqvist <t...@iki.fi>
Date:   Tue Sep 3 10:54:49 2013 +0300

    Bypass SvxBasicIDEOptionsPage when DISABLE_SCRIPTING
    
    Change-Id: I687dc152a60d1f5ccdf8d8ca763040cbff74e3cf

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index a29801a..809319a 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 4fd3d87..920be54 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits