diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-21 08:38:52 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-21 08:38:52 +0100 |
| commit | 374a5a44e6f5aa683cca913d5379739f41331f7c (patch) | |
| tree | cf3ae0545b98911468543920a99589e33a25d882 /dbaccess | |
| parent | 6b654608285809ed2f754987f94728c3870d25e3 (diff) | |
| parent | 5dc8221e42b776e02aa7ac3e04fa3faf3a3abe87 (diff) | |
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba33d
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index f8f2170da555..f85928cb6805 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -712,7 +712,7 @@ namespace // if we have a none numeric field, the table alias could be in the name // otherwise we are not allowed to do this (e.g. 0.1 * PRICE ) - if ( !pEntryField->isNumeric() ) + if ( !pEntryField->isOtherFunction() ) { // we have to look if we have alias.* here but before we have to check if the column doesn't already exist String sTemp = rFieldName; @@ -1226,7 +1226,7 @@ namespace if (pParseNode.get()) { ::rtl::OUString sGroupBy; - pParseNode->parseNodeToStr( sGroupBy, + pParseNode->getChild(0)->parseNodeToStr( sGroupBy, xConnection, &rController.getParser().getContext(), sal_False, |