diff options
Diffstat (limited to 'dbaccess/source/ui/querydesign/querycontroller.cxx')
| -rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 5b6be38be4a9..ca1bc56f01ef 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -717,6 +717,8 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& pNodeTmp = pTemp->getChild(1); ::connectivity::OSQLParseNode::absorptions(pNodeTmp); pNodeTmp = pTemp->getChild(1); + OSQLParseNode::compress(pNodeTmp); + pNodeTmp = pTemp->getChild(1); } // if ( pCondition ) // no where clause ::rtl::OUString sTemp; pNode->parseNodeToStr(sTemp,getConnection()); @@ -1098,8 +1100,9 @@ void OQueryController::reconnect(sal_Bool _bUI) void OQueryController::saveViewSettings(Sequence<PropertyValue>& _rViewProps) { OTableFields::const_iterator aFieldIter = m_vTableFieldDesc.begin(); + OTableFields::const_iterator aFieldEnd = m_vTableFieldDesc.end(); sal_Int32 nCount = 0; - for(;aFieldIter != m_vTableFieldDesc.end();++aFieldIter) + for(;aFieldIter != aFieldEnd;++aFieldIter) { if(!(*aFieldIter)->IsEmpty()) ++nCount; @@ -1118,7 +1121,7 @@ void OQueryController::saveViewSettings(Sequence<PropertyValue>& _rViewProps) PropertyValue *pFieldsIter = aFields.getArray(); // the fielddata aFieldIter = m_vTableFieldDesc.begin(); - for(sal_Int32 i = 1;aFieldIter != m_vTableFieldDesc.end();++aFieldIter,++i) + for(sal_Int32 i = 1;aFieldIter !=aFieldEnd;++aFieldIter,++i) { if ( !(*aFieldIter)->IsEmpty() ) { |