diff options
author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
commit | c939070f709143482ce749603c0e1f0d84df443c (patch) | |
tree | c7ed48d5fa87e8ec699f006f49404ce6aa538925 /connectivity/source | |
parent | cppcheck: the scope of this variable can be reduced (diff) | |
parent | Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) (diff) | |
download | core-c939070f709143482ce749603c0e1f0d84df443c.tar.gz core-c939070f709143482ce749603c0e1f0d84df443c.zip |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
sfx2/source/appl/sfxhelp.cxx
sfx2/source/appl/shutdowniconunx.cxx
sfx2/source/menu/virtmenu.cxx
sysui/desktop/share/create_tree.sh
Diffstat (limited to 'connectivity/source')
-rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 76978d4134d9..15ebb8f956d7 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1427,7 +1427,8 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star: { OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression" }, { OSQLParseNode::character_string_type, "character_string_type" }, { OSQLParseNode::other_like_predicate_part_2, "other_like_predicate_part_2" }, - { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" } + { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" }, + { OSQLParseNode::cast_spec, "cast_spec" } }; size_t nRuleMapCount = SAL_N_ELEMENTS( aRuleDescriptions ); OSL_ENSURE( nRuleMapCount == size_t( OSQLParseNode::rule_count ), "OSQLParser::OSQLParser: added a new rule? Adjust this map!" ); @@ -2513,6 +2514,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode rString.append(m_aNodeValue); rString.appendAscii("#"); break; + case SQL_NODE_INTNUM: case SQL_NODE_APPROXNUM: { @@ -2525,6 +2527,12 @@ 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 '(' + { + rString.append(m_aNodeValue); + break; + } // fall through default: if (rString.getLength() && m_aNodeValue.toChar() != '.' && m_aNodeValue.toChar() != ':' ) |