User: vg Date: 05/03/10 08:52:59 Modified: /dba/dbaccess/source/ui/querydesign/ QueryDesignView.cxx
Log: INTEGRATION: CWS dba24 (1.70.50); FILE MERGED 2005/02/22 06:34:55 oj 1.70.50.3: RESYNC: (1.70-1.71); FILE MERGED 2005/02/21 08:28:19 oj 1.70.50.2: #i42522# check if entry must added when order crit behind current position 2005/02/10 10:38:51 oj 1.70.50.1: #i42067# remove table view from task list before destroying it 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&r2=1.72 Delta lines: +6 -6 ------------------- --- QueryDesignView.cxx 17 Feb 2005 11:08:56 -0000 1.71 +++ QueryDesignView.cxx 10 Mar 2005 16:52:55 -0000 1.72 @@ -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() == '*') @@ -2216,8 +2216,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(); @@ -2232,7 +2230,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; @@ -2254,7 +2252,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; } @@ -2290,7 +2288,7 @@ if ( eOk == (eErrorCode = FillDragInfo(_pView,pColumnRef,aDragInfo)) ) { aDragInfo->SetGroupBy(sal_True); - _pSelectionBrw->AddGroupBy(aDragInfo); + _pSelectionBrw->AddGroupBy(aDragInfo,i); } } } @@ -2385,6 +2383,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]
