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/inc | |
| parent | a0f911669be348a5539687e4ebe25446d526b2a8 (diff) | |
| parent | 066ee33f2754e36cf7b6c39d2c2bff3b31f55951 (diff) | |
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/inc')
| -rw-r--r-- | connectivity/inc/connectivity/sqlnode.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx index 9a4ade8fefc9..a05384b3ae4c 100644 --- a/connectivity/inc/connectivity/sqlnode.hxx +++ b/connectivity/inc/connectivity/sqlnode.hxx @@ -232,6 +232,7 @@ namespace connectivity character_string_type, other_like_predicate_part_2, between_predicate_part_2, + cast_spec, rule_count, // letzter_wert UNKNOWN_RULE // ID indicating that a node is no rule with a matching Rule-enum value (see getKnownRuleID) }; |