basic/source/comp/token.cxx | 3 ++- cppu/source/uno/data.cxx | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit c6dbbdf851911e0e3ae424245f1e088a3e689141 Author: Pedro Giffuni <p...@apache.org> Date: Wed Nov 25 16:55:51 2015 +0000 i125711 - Illumos port: generalize MAX_ALIGNMENT for Solaris GCC in Ilumos appears to behave exactly like the Solaris SUNPRO compiler so generalize the case for Solaris. (cherry picked from commit e1da117c49fc02af9543e32526bf1c04657534c4) Change-Id: I3fa619f34c35608b187c3aa394552ac78c3f0c20 diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index ed0ebdd..f0da767 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -333,8 +333,10 @@ namespace cppu { // <sal/typesizes.h> ? #if (defined(INTEL) \ - && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)) \ - || defined(MACOSX) || defined(DRAGONFLY))) \ + && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || \ + defined(NETBSD) || defined(OPENBSD) || \ + defined(DRAGONFLY) || defined(SOLARIS)) \ + || defined(MACOSX) )) \ || defined(IOS) #define MAX_ALIGNMENT_4 #endif commit d5443023effb6231496f1231026bcd040d311408 Author: Damjan Jovanovic <dam...@apache.org> Date: Tue Nov 24 18:56:10 2015 +0000 #i117960# Basic: Line Input doesn't work in single-line If i92642 added the ability to use certain keywords as variable names (eg. name = 1, line = "hi"), but also caused a regression where "Line Input" is broken in single-line If statements. This patch fixes that by allowing Then and Else to also be the start-of-line tokens expected to immediately preceed the "Line" token in order for that "Line" token to be recognized a keyword instead of a variable name. Also added FVT spreadsheet tests for "Line" as both a variable name and as "Line Input". Patch by: me (cherry picked from commit f8a51d0f5a645704bc2bdc939474ac931d55559c) diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index 03f1a5a..8fb0aac 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -433,7 +433,8 @@ SbiToken SbiTokenizer::Next() } special: // #i92642 - bool bStartOfLine = (eCurTok == NIL || eCurTok == REM || eCurTok == EOLN); + bool bStartOfLine = (eCurTok == NIL || eCurTok == REM || eCurTok == EOLN || + eCurTok == THEN || eCurTok == ELSE); // single line If if( !bStartOfLine && (tp->t == NAME || tp->t == LINE) ) { return eCurTok = SYMBOL; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits