Tag: cws_src680_dba27 User: fs Date: 05/03/15 03:52:42 Modified: /dba/dbaccess/source/ui/querydesign/ QueryDesignView.cxx
Log: RESYNC: (1.71-1.72); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx?r1=1.71.20.1&r2=1.71.20.2 Delta lines: +9 -9 ------------------- --- QueryDesignView.cxx 10 Mar 2005 14:39:42 -0000 1.71.20.1 +++ QueryDesignView.cxx 15 Mar 2005 11:52:39 -0000 1.71.20.2 @@ -1027,7 +1027,7 @@ // nur wenn eine Sortierung und ein Tabellenname vorhanden ist-> erzeugen // sonst werden die Expressions vom Order By im GenerateCriteria mit erzeugt - if (eOrder != ORDER_NONE && pEntryField->GetTable().getLength()) + if ( eOrder != ORDER_NONE ) { aColumnName = pEntryField->GetField(); if(aColumnName.toChar() == '*') @@ -2228,8 +2228,6 @@ { ::connectivity::OSQLParseNode* pNode = pParseRoot->getChild(3)->getChild(4)->getChild(2); ::connectivity::OSQLParseNode* pParamRef = NULL; - ::rtl::OUString aField, aAlias; - sal_uInt16 nPos = 0; EOrderDir eOrderDir; OTableFieldDescRef aDragLeft = new OTableFieldDesc(); @@ -2244,7 +2242,7 @@ if(SQL_ISRULE(pChild->getChild(0),column_ref)) { if( eOk == FillDragInfo(_pView,pChild->getChild(0),aDragLeft)) - _pSelectionBrw->AddOrder( aDragLeft, eOrderDir, nPos); + _pSelectionBrw->AddOrder( aDragLeft, eOrderDir, i); else // it could be a alias name for a field { ::rtl::OUString aTableRange,aColumnName; @@ -2266,7 +2264,7 @@ else if(SQL_ISRULE(pChild->getChild(0),general_set_fct) && SQL_ISRULE(pParamRef = pChild->getChild(0)->getChild(pChild->getChild(0)->count()-2),column_ref) && eOk == FillDragInfo(_pView,pParamRef,aDragLeft)) - _pSelectionBrw->AddOrder( aDragLeft, eOrderDir, nPos); + _pSelectionBrw->AddOrder( aDragLeft, eOrderDir, i ); else eErrorCode = eColumnNotFound; } @@ -2302,7 +2300,7 @@ if ( eOk == (eErrorCode = FillDragInfo(_pView,pColumnRef,aDragInfo)) ) { aDragInfo->SetGroupBy(sal_True); - _pSelectionBrw->AddGroupBy(aDragInfo); + _pSelectionBrw->AddGroupBy(aDragInfo,i); } } } @@ -2397,6 +2395,8 @@ // ----------------------------------------------------------------------------- OQueryDesignView::~OQueryDesignView() { + if ( m_pTableView ) + ::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); ::std::auto_ptr<Window> aTemp(m_pSelectionBox); m_pSelectionBox = NULL; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
