mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge OOO330

Browse Source
This commit is contained in:
Hans-Joachim Lankenau
2010-12-14 15:42:18 +01:00
parent 5e5f328689 4a46e845c3
commit 9c5a2fb27f
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
connectivity/inc/connectivity/sqlnode.hxx
View File

@@ -231,6 +231,7 @@ namespace connectivity
character_string_type, character_string_type,
other_like_predicate_part_2, other_like_predicate_part_2,
between_predicate_part_2, between_predicate_part_2,
cast_spec,
rule_count, // letzter_wert rule_count, // letzter_wert
UNKNOWN_RULE // ID indicating that a node is no rule with a matching Rule-enum value (see getKnownRuleID) UNKNOWN_RULE // ID indicating that a node is no rule with a matching Rule-enum value (see getKnownRuleID)
}; };

10
connectivity/source/parse/sqlnode.cxx
View File

@@ -1425,7 +1425,8 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star:
{ OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression" }, { OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression" },
{ OSQLParseNode::character_string_type, "character_string_type" }, { OSQLParseNode::character_string_type, "character_string_type" },
{ OSQLParseNode::other_like_predicate_part_2, "other_like_predicate_part_2" }, { 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 = sizeof( aRuleDescriptions ) / sizeof( aRuleDescriptions[0] ); size_t nRuleMapCount = sizeof( aRuleDescriptions ) / sizeof( aRuleDescriptions[0] );
OSL_ENSURE( nRuleMapCount == size_t( OSQLParseNode::rule_count ), "OSQLParser::OSQLParser: added a new rule? Adjust this map!" ); OSL_ENSURE( nRuleMapCount == size_t( OSQLParseNode::rule_count ), "OSQLParser::OSQLParser: added a new rule? Adjust this map!" );
@@ -2511,6 +2512,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode
rString.append(m_aNodeValue); rString.append(m_aNodeValue);
rString.appendAscii("#"); rString.appendAscii("#");
break; break;
case SQL_NODE_INTNUM: case SQL_NODE_INTNUM:
case SQL_NODE_APPROXNUM: case SQL_NODE_APPROXNUM:
{ {
@@ -2523,6 +2525,12 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode
rString.append(aTmp); rString.append(aTmp);
} break; } 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 // fall through
default: default:
if (rString.getLength() && m_aNodeValue.toChar() != '.' && m_aNodeValue.toChar() != ':' ) if (rString.getLength() && m_aNodeValue.toChar() != '.' && m_aNodeValue.toChar() != ':' )

2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx
View File

@@ -2017,7 +2017,7 @@ namespace
if(nTextLength + nTextIndex > nStringLength) if(nTextLength + nTextIndex > nStringLength)
{ {
nTextLength = nStringLength - nTextIndex; nTextLength = nTextIndex > nStringLength ? 0 : nStringLength - nTextIndex;
} }
if(nTextLength && rPropertyHolders.Current().getTextColorActive()) if(nTextLength && rPropertyHolders.Current().getTextColorActive())