diff options
| author | Ocke.Janssen <Ocke.Janssen@oracle.com> | 2010-11-17 11:57:13 +0100 |
|---|---|---|
| committer | Ocke.Janssen <Ocke.Janssen@oracle.com> | 2010-11-17 11:57:13 +0100 |
| commit | fe4fa5749bd68d1e5b5ebaa985a068d756eb71c9 (patch) | |
| tree | 841aa3295f2a6ab2c34c1f124b621b55bd4ba10f /dbaccess/source/ui/querydesign | |
| parent | 607456e9c086d66bbf5699340402df16f30b3845 (diff) | |
| parent | 11bc42b1f7465068945d8e217e35fb7eff094b4d (diff) | |
Automated merge with http://hg.services.openoffice.org/cws/dba34b
Diffstat (limited to 'dbaccess/source/ui/querydesign')
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 0eb7c09f29e9..67385fd02d67 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -1957,7 +1957,7 @@ namespace pJoinType = pNode->getChild(2); } - if (SQL_ISRULE(pJoinType,join_type) && SQL_ISTOKEN(pJoinType->getChild(0),INNER)) + if (SQL_ISRULE(pJoinType,join_type) && (!pJoinType->count() || SQL_ISTOKEN(pJoinType->getChild(0),INNER))) { eJoinType = INNER_JOIN; } |