diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-07 14:29:08 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-07 14:29:08 +0100 |
| commit | 5cef76ee88349a9add7b011c46f94124a4f37ffe (patch) | |
| tree | 9bad77da15dc651e42e2a669e8c16fd816d9229b /connectivity | |
| parent | b926321f4b3e4386e0d1ed4a2795477bd0f2e727 (diff) | |
| parent | cbcec4a8a16a62438238b41470eba33ed5dfc780 (diff) | |
dba34c: merge
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/prj/build.lst | 2 | ||||
| -rw-r--r-- | connectivity/prj/d.lst | 1 | ||||
| -rw-r--r-- | connectivity/source/drivers/hsqldb/makefile.mk | 1 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index e9b99383780f..8d16197961fa 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity : shell l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL +cn connectivity : shell l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst index 01d82ba9177e..22bffa638254 100644 --- a/connectivity/prj/d.lst +++ b/connectivity/prj/d.lst @@ -2,6 +2,7 @@ ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib +..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib ..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.* ..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt* ..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk index 5be6fa08cd7b..d0e22fde8970 100644 --- a/connectivity/source/drivers/hsqldb/makefile.mk +++ b/connectivity/source/drivers/hsqldb/makefile.mk @@ -103,6 +103,7 @@ SHL1STDLIBS=\ SHL1DEPN= +SHL1CREATEJNILIB=TRUE SHL1IMPLIB= i$(HSQLDB_TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 77c7118a1d38..9a3abb0d4fc2 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -2525,9 +2525,8 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode rString.append(aTmp); } break; - case SQL_NODE_PUNCTUATION: - if ( getParent() && SQL_ISRULE(getParent(),cast_spec) && m_aNodeValue.toChar() == '(' ) // no spaces in front of '(' or after ')' + if ( getParent() && SQL_ISRULE(getParent(),cast_spec) && m_aNodeValue.toChar() == '(' ) // no spaces in front of '(' { rString.append(m_aNodeValue); break; |