Tag: cws_src680_qiq User: fs Date: 2006/06/27 05:52:49 Modified: dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx
Log: RESYNC: (1.78-1.79); 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.78.16.4&r2=1.78.16.5 Delta lines: +23 -86 --------------------- --- QueryDesignView.cxx 24 May 2006 06:49:29 -0000 1.78.16.4 +++ QueryDesignView.cxx 27 Jun 2006 12:52:46 -0000 1.78.16.5 @@ -670,7 +670,7 @@ pConn->RecalcLines(); // fuer das unten folgende Invalidate muss ich dieser neuen Connection erst mal die Moeglichkeit geben, // ihr BoundingRect zu ermitteln - pConn->Invalidate(); + pConn->InvalidateConnection(); } } @@ -740,11 +740,11 @@ // 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; OTableFieldDescRef aInfo = new OTableFieldDesc(); - OJoinTableView::OTableWindowMap::iterator aIter = pTabList->begin(); + OJoinTableView::OTableWindowMap::iterator tableIter = pTabList->begin(); sal_Bool bFound = sal_False; - for(;!bFound && aIter != pTabList->end() ;++aIter) + for(;!bFound && tableIter != pTabList->end() ;++tableIter) { - OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second); + OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(tableIter->second); if ( bFound = pTabWin->ExistsField( rFieldName, aInfo ) ) { @@ -882,8 +882,8 @@ ::rtl::OUString sHavingStr = aHavingStr; sal_uInt32 nCount = pParseNode->count(); - for( sal_uInt32 i = 1 ; i < nCount ; ++i) - pParseNode->getChild(i)->parseNodeToStr( sHavingStr, + for( sal_uInt32 node = 1 ; node < nCount ; ++node) + pParseNode->getChild(node)->parseNodeToStr( sHavingStr, xMetaData, &rContext, sal_False, @@ -1067,49 +1067,6 @@ } //------------------------------------------------------------------------------ - - ::rtl::OUString BuildACriteria( const OQueryDesignView* _pView,const ::rtl::OUString& _rVal, sal_Int32 aType ) - { - - ::rtl::OUString aRetStr; - String aVal,rVal; - String aOpList;aOpList.AssignAscii("<>;>=;<=;<;>;=;LIKE"); - xub_StrLen nOpListCnt = aOpList.GetTokenCount(); - - String aToken; - for( xub_StrLen nIdx=0 ; nIdx < nOpListCnt ; nIdx++ ) - { - aToken = aOpList.GetToken(nIdx); - if (rVal.Search( aToken ) == 0) - { - aRetStr = ::rtl::OUString(' '); - aRetStr += aToken; - aRetStr += ::rtl::OUString(' '); - aVal = rVal.Copy( aToken.Len() ); - aVal.EraseLeadingChars( ' ' ); - if( aVal.Search( '\'' ) == STRING_NOTFOUND )//XXX O'Brien??? - { - aVal = QuoteField(_pView, aVal, aType ); - } - aRetStr += aVal; - break; - } - } - - if( !aRetStr.getLength()) // == 0 - { - aRetStr = rVal.Search( '%' ) == STRING_NOTFOUND ? ::rtl::OUString::createFromAscii(" = ") : ::rtl::OUString::createFromAscii(" LIKE "); - aVal = rVal; - if( aVal.Search( '\'' ) == STRING_NOTFOUND )//XXX O'Brien??? - { - aVal = QuoteField( _pView,aVal, aType ); - } - aRetStr += aVal; - } - - return aRetStr;//XXX - } - //------------------------------------------------------------------------------ void GenerateInnerJoinCriterias(const Reference< XConnection>& _xConnection, ::rtl::OUString& _rJoinCrit, const ::std::vector<OTableConnection*>* _pConnList) @@ -1287,8 +1244,7 @@ SqlParseError GetSelectionCriteria( OQueryDesignView* _pView, OSelectionBrowseBox* _pSelectionBrw, const ::connectivity::OSQLParseNode* pNode, - int& rLevel, - sal_Bool bJoinWhere = sal_False) + int& rLevel ) { if (!SQL_ISRULE(pNode, select_statement)) return eNoSelectStatement; @@ -1654,6 +1610,8 @@ i--; aCondition = aCondition + ::rtl::OUString::createFromAscii("<="); break; + default: + break; } // go backward @@ -1870,7 +1828,6 @@ ::connectivity::OSQLParseTreeIterator& aIterator = pController->getParseIterator(); const ::connectivity::OSQLParseNode* pParseTree = aIterator.getParseTree(); - const ::connectivity::OSQLParseNode* pTableRefCommaList = 0; do { @@ -1900,8 +1857,6 @@ break; } - ::connectivity::OSQLParseNode* pTree = pParseTree->getChild(1); - const OSQLTables& aMap = aIterator.getTables(); ::comphelper::UStringMixLess aTmp(aMap.key_comp()); ::comphelper::UStringMixEqual aKeyComp( aTmp.isCaseSensitive() ); @@ -1983,10 +1938,10 @@ } if ( (eErrorCode = InstallFields(_pView,pParseTree, pTableView->GetTabWinMap())) == eOk ) { - // GetSelectionCriteria mu"s vor GetHavingCriteria aufgerufen werden + // GetSelectionCriteria must be called before GetHavingCriteria int nLevel=0; - if ( eOk == (eErrorCode = GetSelectionCriteria(_pView,_pSelectionBrw,pParseTree,nLevel,sal_True)) ) + if ( eOk == (eErrorCode = GetSelectionCriteria(_pView,_pSelectionBrw,pParseTree,nLevel)) ) { if ( eOk == (eErrorCode = GetGroupCriteria(_pView,_pSelectionBrw,pParseTree)) ) { @@ -2435,12 +2390,11 @@ DBG_DTOR(OQueryDesignView,NULL); } //------------------------------------------------------------------------------ -IMPL_LINK( OQueryDesignView, SplitHdl, void*, p ) +IMPL_LINK( OQueryDesignView, SplitHdl, void*, /*p*/ ) { if (!getController()->isReadOnly()) { m_bInSplitHandler = sal_True; - long nTest = m_aSplitter.GetPosPixel().Y(); m_aSplitter.SetPosPixel( Point( m_aSplitter.GetPosPixel().X(),m_aSplitter.GetSplitPosPixel() ) ); static_cast<OQueryController*>(getController())->setSplitPos(m_aSplitter.GetSplitPosPixel()); static_cast<OQueryController*>(getController())->setModified(); @@ -2550,7 +2504,7 @@ m_pTableView->ClearAll(); } // ----------------------------------------------------------------------------- -void OQueryDesignView::setStatement(const ::rtl::OUString& _rsStatement) +void OQueryDesignView::setStatement(const ::rtl::OUString& /*_rsStatement*/) { } // ----------------------------------------------------------------------------- @@ -2568,42 +2522,24 @@ sal_Bool OQueryDesignView::isCutAllowed() { sal_Bool bAllowed = sal_False; - switch(m_eChildFocus) - { - case SELECTION: + if ( SELECTION == m_eChildFocus ) bAllowed = m_pSelectionBox->isCutAllowed(); - break; - case TABLEVIEW: - break; - } return bAllowed; } // ----------------------------------------------------------------------------- sal_Bool OQueryDesignView::isPasteAllowed() { sal_Bool bAllowed = sal_False; - switch(m_eChildFocus) - { - case SELECTION: + if ( SELECTION == m_eChildFocus ) bAllowed = m_pSelectionBox->isPasteAllowed(); - break; - case TABLEVIEW: - break; - } return bAllowed; } // ----------------------------------------------------------------------------- sal_Bool OQueryDesignView::isCopyAllowed() { sal_Bool bAllowed = sal_False; - switch(m_eChildFocus) - { - case SELECTION: + if ( SELECTION == m_eChildFocus ) bAllowed = m_pSelectionBox->isCopyAllowed(); - break; - case TABLEVIEW: - break; - } return bAllowed; } // ----------------------------------------------------------------------------- @@ -2719,6 +2655,7 @@ #if OSL_DEBUG_LEVEL > 0 { Window* pFocus = Application::GetFocusWindow(); + (void)pFocus; } #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
