basic/source/runtime/methods.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit b5483b46f6190dd22d327313dfbee22897e8732b
Author: Eike Rathke <er...@redhat.com>
Date: Tue May 2 16:06:25 2017 +0200
SbiRuntime::isVBAEnabled() needs to be guarded with #if
HAVE_FEATURE_SCRIPTING
Change-Id: I7fab0c946c13a9779fad05f88be6ae6a9da93775
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 0b1698b9eabc..5996d1590903 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4935,7 +4935,11 @@ bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth,
sal_Int16 nDay, bool bUs
else
#endif
{
- if ( 0 <= nYear && nYear < 100 && (bUseTwoDigitYear ||
SbiRuntime::isVBAEnabled()) )
+ if ( 0 <= nYear && nYear < 100 && (bUseTwoDigitYear
+#if HAVE_FEATURE_SCRIPTING
+ || SbiRuntime::isVBAEnabled()
+#endif
+ ) )
{
nYear += 1900;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
