configure.in | 28 ---------------------------- idlc/inc/idlc/astexpression.hxx | 2 +- idlc/source/astexpression.cxx | 24 ++++++++++++------------ idlc/source/parser.y | 2 +- 4 files changed, 14 insertions(+), 42 deletions(-)
New commits: commit a8bb6d52f31e5aa12be828af0b36533216083ed4 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Sep 26 13:31:22 2012 +0200 No need to check for Mozilla sources in configure ...is automatically done by ./download if necessary. Change-Id: Ia51d33e6f589c9bc54570d62ab6704a751c0e5c1 diff --git a/configure.in b/configure.in index 66746a4..a1e6529 100644 --- a/configure.in +++ b/configure.in @@ -8073,34 +8073,6 @@ else fi fi - if test -z "$MOZILLA_VERSION"; then - MOZILLA_VERSION=1.1.14 - fi - MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" - MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst.in` - AC_MSG_CHECKING([for Mozilla sources]) - if test -z "$MOZILLA_FETCH_FILE"; then - AC_MSG_RESULT([not found]) - HAVE_MOZILLA_TARBALL=n - else - AC_MSG_CHECKING([for $MOZILLA_FETCH_FILE]) - if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then - if test -z "$DO_FETCH"; then - AC_MSG_RESULT([will be fetched]) - HAVE_MOZILLA_TARBALL=y - else - AC_MSG_RESULT([not found]) - HAVE_MOZILLA_TARBALL=n - fi - else - AC_MSG_RESULT([found]) - HAVE_MOZILLA_TARBALL=y - fi - fi - if test "$HAVE_MOZILLA_TARBALL" != "y"; then - AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found. -Use "./download" to download.]) - fi if test "$_os" = "WINNT"; then AC_MSG_CHECKING([for moztools binaries]) if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip"; then commit 6189ffc7ed709912a2439cdbd45d5e4af15d23e8 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Sep 26 12:30:20 2012 +0200 Fix bool -> byte coercion logic Change-Id: Iab6dba9484fb5ddb8a8d4efcd46d7b9c8d1acca8 diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 783ee66..b28cfed 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -667,7 +667,7 @@ coerce_value(AstExprValue *ev, ExprType t) ev->et = ET_byte; return ev; case ET_boolean: - ev->u.byval = (ev->u.bval == false) ? 1 : 0; + ev->u.byval = ev->u.bval ? 1 : 0; ev->et = ET_byte; return ev; case ET_float: commit 20b77f616a6f38b078901bc404feea600d7d4975 Author: Noel Grandin <n...@peralex.com> Date: Tue Sep 25 14:37:06 2012 +0200 sal_Bool -> bool Change-Id: I4fd6d247fdc0333ccdace4ebfa947c8d02e559bc diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx index 865eeb2..80b4ea0 100644 --- a/idlc/inc/idlc/astexpression.hxx +++ b/idlc/inc/idlc/astexpression.hxx @@ -81,7 +81,7 @@ struct AstExprValue sal_uInt32 ulval; // Contains unsigned long expr value sal_Int64 hval; // Contains hyper expression value sal_uInt64 uhval; // Contains unsigned hyper expr value - sal_Bool bval; // Contains boolean expression value + bool bval; // Contains boolean expression value float fval; // Contains 32-bit float expr value double dval; // Contains 64-bit float expr value sal_uInt32 eval; // Contains enumeration value diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 6b9e010..783ee66 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -490,41 +490,41 @@ coerce_value(AstExprValue *ev, ExprType t) switch (ev->et) { case ET_short: - ev->u.bval = (ev->u.sval == 0) ? sal_False : sal_True; + ev->u.bval = ev->u.sval != 0; ev->et = ET_boolean; return ev; case ET_ushort: - ev->u.bval = (ev->u.usval == 0) ? sal_False : sal_True; + ev->u.bval = ev->u.usval != 0; ev->et = ET_boolean; return ev; case ET_long: - ev->u.bval = (ev->u.lval == 0) ? sal_False : sal_True; + ev->u.bval = ev->u.lval != 0; ev->et = ET_boolean; return ev; case ET_ulong: - ev->u.bval = (ev->u.ulval == 0) ? sal_False : sal_True; + ev->u.bval = ev->u.ulval != 0; ev->et = ET_boolean; return ev; case ET_hyper: - ev->u.bval = (ev->u.hval == 0) ? sal_False : sal_True; + ev->u.bval = ev->u.hval != 0; ev->et = ET_boolean; return ev; case ET_uhyper: - ev->u.bval = (ev->u.uhval == 0) ? sal_False : sal_True; + ev->u.bval = ev->u.uhval != 0; ev->et = ET_boolean; return ev; case ET_boolean: return ev; case ET_float: - ev->u.bval = (ev->u.fval == 0.0) ? sal_False : sal_True; + ev->u.bval = ev->u.fval != 0.0; ev->et = ET_boolean; return ev; case ET_double: - ev->u.bval = (ev->u.dval == 0.0) ? sal_False : sal_True; + ev->u.bval = ev->u.dval != 0.0; ev->et = ET_boolean; return ev; case ET_byte: - ev->u.bval = (ev->u.byval == 0) ? sal_False : sal_True; + ev->u.bval = ev->u.byval != 0; ev->et = ET_boolean; return ev; default: @@ -561,7 +561,7 @@ coerce_value(AstExprValue *ev, ExprType t) ev->et = ET_float; return ev; case ET_boolean: - ev->u.fval = (ev->u.bval == sal_True) ? 1.0f : 0.0f; + ev->u.fval = ev->u.bval ? 1.0f : 0.0f; ev->et = ET_float; return ev; case ET_float: @@ -610,7 +610,7 @@ coerce_value(AstExprValue *ev, ExprType t) ev->et = ET_double; return ev; case ET_boolean: - ev->u.dval = (ev->u.bval == sal_True) ? 1.0 : 0.0; + ev->u.dval = ev->u.bval ? 1.0 : 0.0; ev->et = ET_double; return ev; case ET_float: @@ -667,7 +667,7 @@ coerce_value(AstExprValue *ev, ExprType t) ev->et = ET_byte; return ev; case ET_boolean: - ev->u.byval = (ev->u.bval == sal_False) ? 1 : 0; + ev->u.byval = (ev->u.bval == false) ? 1 : 0; ev->et = ET_byte; return ev; case ET_float: diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 1a6debd..e0bc51e 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -273,7 +273,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) { ::rtl::OString* sval; /* OString value */ std::vector< rtl::OString > * svals; sal_Char* strval; /* sal_Char* value */ - sal_Bool bval; /* sal_Boolean* value */ + bool bval; /* sal_Boolean* value */ sal_Int64 ival; /* sal_Int64 value */ sal_uInt64 uval; /* sal_uInt64 value */ sal_uInt32 ulval; /* sal_uInt32 value */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits