Tag: cws_src680_dba30 User: fs Date: 2006/07/19 06:13:14 Modified: dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
Log: RESYNC: (1.66-1.68); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: SelectionBrowseBox.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx?r1=1.64.12.2&r2=1.64.12.3 Delta lines: +66 -81 --------------------- --- SelectionBrowseBox.cxx 21 Mar 2006 18:42:02 -0000 1.64.12.2 +++ SelectionBrowseBox.cxx 19 Jul 2006 13:13:11 -0000 1.64.12.3 @@ -163,13 +163,13 @@ } } -DBG_NAME(OSelectionBrowseBox); +DBG_NAME(OSelectionBrowseBox) //------------------------------------------------------------------------------ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION | BROWSER_HIDESELECT | BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL ) - ,m_nVisibleCount(0) ,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS)) + ,m_nVisibleCount(0) ,m_bOrderByUnRelated(sal_True) ,m_bGroupByUnRelated(sal_True) ,m_bStopTimer(sal_False) @@ -188,10 +188,10 @@ m_pTextCell = new Edit(&GetDataWindow(), 0); // m_pTextCell->EnableSpecialCheck(sal_False); m_pVisibleCell = new CheckBoxControl(&GetDataWindow()); - m_pTableCell = new ListBoxControl(&GetDataWindow()); - m_pFieldCell = new ComboBoxControl(&GetDataWindow()); + m_pTableCell = new ListBoxControl(&GetDataWindow()); m_pTableCell->SetDropDownLineCount( 20 ); + m_pFieldCell = new ComboBoxControl(&GetDataWindow()); m_pFieldCell->SetDropDownLineCount( 20 ); m_pOrderCell = new ListBoxControl(&GetDataWindow()); - m_pFunctionCell = new ListBoxControl(&GetDataWindow()); + m_pFunctionCell = new ListBoxControl(&GetDataWindow()); m_pFunctionCell->SetDropDownLineCount( 20 ); m_pVisibleCell->SetHelpId(HID_QRYDGN_ROW_VISIBLE); m_pTableCell->SetHelpId(HID_QRYDGN_ROW_TABLE); @@ -244,13 +244,13 @@ Reference< XConnection> xConnection = static_cast<OQueryController*>(getDesignView()->getController())->getConnection(); if(xConnection.is()) { - const IParseContext& rContext = static_cast<OQueryController*>(getDesignView()->getController())->getParser()->getContext(); + const IParseContext& rContext = static_cast<OQueryController*>(getDesignView()->getController())->getParser().getContext(); IParseContext::InternationalKeyCode eFunctions[] = { IParseContext::KEY_AVG,IParseContext::KEY_COUNT,IParseContext::KEY_MAX,IParseContext::KEY_MIN,IParseContext::KEY_SUM }; String sGroup = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount() - 1); m_aFunctionStrings = m_aFunctionStrings.GetToken(0); - for (sal_Int32 i = 0; i < sizeof(eFunctions)/sizeof(eFunctions[0]) ; ++i) + for (size_t i = 0; i < sizeof(eFunctions)/sizeof(eFunctions[0]) ; ++i) { m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";")); m_aFunctionStrings += String(ByteString(rContext.getIntlKeywordAscii(eFunctions[i])),RTL_TEXTENCODING_UTF8); @@ -340,7 +340,7 @@ } // ----------------------------------------------------------------------------- -BrowserHeader* OSelectionBrowseBox::imp_CreateHeaderBar(BrowseBox* pParent) +BrowserHeader* OSelectionBrowseBox::imp_CreateHeaderBar(BrowseBox* /*pParent*/) { return new OSelectionBrwBoxHeader(this); } @@ -388,16 +388,12 @@ EditBrowseBox::Init(); // set the header bar - BrowserHeader* pHeader = CreateHeaderBar(this); - pHeader->SetMouseTransparent(sal_False); + BrowserHeader* pNewHeaderBar = CreateHeaderBar(this); + pNewHeaderBar->SetMouseTransparent(sal_False); - SetHeaderBar(pHeader); + SetHeaderBar(pNewHeaderBar); SetMode(m_nMode); - - SetMapMode( MapMode(MAP_TWIP) ); - GetDataWindow().SetMapMode( GetMapMode() ); - Font aFont( GetDataWindow().GetFont() ); aFont.SetWeight( WEIGHT_NORMAL ); GetDataWindow().SetFont( aFont ); @@ -446,8 +442,6 @@ pController->clearFields(); - sal_uInt16 nCurCol = GetCurColumnId(); - long nCurRow = GetCurRow(); DeactivateCell(); RemoveColumns(); @@ -460,13 +454,14 @@ DBG_CHKTHIS(OSelectionBrowseBox,NULL); SetUpdateMode(sal_False); - OQueryController* pController = static_cast<OQueryController*>(static_cast<OQueryController*>(getDesignView()->getController())); - OTableFields::reverse_iterator aIter = getFields().rbegin(); - for(sal_uInt16 nId=getFields().size();aIter != getFields().rend();++aIter,--nId) + for ( ;aIter != getFields().rend(); ++aIter ) { - if(!(*aIter)->IsEmpty()) - RemoveField(GetColumnId(nId)); + if ( !(*aIter)->IsEmpty() ) + { + RemoveField( (*aIter)->GetColumnId() ); + aIter = getFields().rbegin(); + } } SetUpdateMode(sal_True); } @@ -491,8 +486,8 @@ CellController* OSelectionBrowseBox::GetController(long nRow, sal_uInt16 nColId) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); - OQueryController* pController = static_cast<OQueryController*>(static_cast<OQueryController*>(getDesignView()->getController())); - + if ( nColId >= getFields().size() ) + return NULL; OTableFieldDescRef pEntry = getFields()[nColId-1]; DBG_ASSERT(pEntry.isValid(), "OSelectionBrowseBox::GetController : keine FieldDescription !"); @@ -521,16 +516,14 @@ } //------------------------------------------------------------------------------ -void OSelectionBrowseBox::InitController(CellControllerRef& rController, long nRow, sal_uInt16 nColId) +void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColId) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); OSL_ENSURE(nColId != BROWSER_INVALIDID,"An Invalid Id was set!"); if ( nColId == BROWSER_INVALIDID ) return; - OQueryController* pController = static_cast<OQueryController*>(static_cast<OQueryController*>(getDesignView()->getController())); - USHORT nPos = GetColumnPos(nColId); - if ( nPos == 0 || nPos == BROWSER_ENDOFSELECTION || nPos > getFields().size() ) + if ( nPos == 0 || nPos == BROWSER_INVALIDID || nPos > getFields().size() ) return; OTableFieldDescRef pEntry = getFields()[nPos-1]; DBG_ASSERT(pEntry.isValid(), "OSelectionBrowseBox::InitController : keine FieldDescription !"); @@ -560,7 +553,7 @@ { m_pTableCell->Clear(); enableControl(pEntry,m_pTableCell); - if ( !pEntry->isCondition() && !pEntry->isNumeric() ) + if ( !pEntry->isCondition() ) { OJoinTableView::OTableWindowMap* pTabWinList = getDesignView()->getTableView()->GetTabWinMap(); if (pTabWinList) @@ -641,7 +634,6 @@ if ( !sOldLocalizedFunctionName.Equals(sFunctionName) || _pEntry->IsGroupBy() ) { // append undo action for the function field - ::rtl::OUString sOldLocalizedFunctionName = _pEntry->GetFunction(); _pEntry->SetFunctionType(FKT_NONE); _pEntry->SetFunction(::rtl::OUString()); _pEntry->SetGroupBy(sal_False); @@ -732,11 +724,11 @@ sSql += _sFieldName; sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x")); - ::connectivity::OSQLParser* pParser = pController->getParser(); + ::connectivity::OSQLParser& rParser( pController->getParser() ); // first try the international version - OSQLParseNode* pParseNode = pParser->parseTree(sErrorMsg, sSql,sal_True); + OSQLParseNode* pParseNode = rParser.parseTree(sErrorMsg, sSql,sal_True); if ( !pParseNode ) // if that doesn't work try the english one - pParseNode = pParser->parseTree(sErrorMsg, sSql,sal_False); + pParseNode = rParser.parseTree(sErrorMsg, sSql,sal_False); if ( pParseNode ) // we got a valid select column { @@ -780,10 +772,10 @@ ::rtl::OUString sColumnAlias = OSQLParseTreeIterator::getColumnAlias(pChild); if ( sColumnAlias.getLength() ) // we found an as clause { - String sOldAlias = aSelEntry->GetFieldAlias(); + String aSelectionAlias = aSelEntry->GetFieldAlias(); aSelEntry->SetFieldAlias( sColumnAlias ); // append undo - appendUndoAction(sOldAlias,aSelEntry->GetFieldAlias(),BROW_COLUMNALIAS_ROW,_bListAction); + appendUndoAction(aSelectionAlias,aSelEntry->GetFieldAlias(),BROW_COLUMNALIAS_ROW,_bListAction); if ( m_bVisibleRow[BROW_COLUMNALIAS_ROW] ) RowModified(GetBrowseRow(BROW_COLUMNALIAS_ROW), nColumnId); } @@ -833,8 +825,8 @@ // now parse the parameters ::rtl::OUString sParameters; - for(sal_uInt32 i = 2; i < nFunCount; ++i) // we only want to parse the parameters of the function - pColumnRef->getChild(i)->parseNodeToStr(sParameters,xMetaData,&pParser->getContext(),sal_True,bQuote); + for(sal_uInt32 function = 2; function < nFunCount; ++function) // we only want to parse the parameters of the function + pColumnRef->getChild(function)->parseNodeToStr(sParameters,xMetaData,&rParser.getContext(),sal_True,bQuote); aSelEntry->SetFunctionType(nFunctionType); aSelEntry->SetField(sParameters); @@ -875,19 +867,19 @@ nDataType = OSQLParser::getFunctionReturnType( sFunctionName - ,&pController->getParser()->getContext()); + ,&pController->getParser().getContext()); aSelEntry->SetDataType(nDataType); } } - // now parse the hole statement + // now parse the whole statement sal_uInt32 nFunCount = pColumnRef->count(); ::rtl::OUString sParameters; - for(sal_uInt32 i = 0; i < nFunCount; ++i) - pColumnRef->getChild(i)->parseNodeToStr(sParameters,xMetaData,&pParser->getContext(),sal_True,bQuote); + for(sal_uInt32 function = 0; function < nFunCount; ++function) + pColumnRef->getChild(function)->parseNodeToStr(sParameters,xMetaData,&rParser.getContext(),sal_True,bQuote); - ::rtl::OUString sOldAlias = aSelEntry->GetAlias(); + ::rtl::OUString aSelectionAlias = aSelEntry->GetAlias(); aSelEntry->SetAlias(::rtl::OUString()); sal_Int32 nNewFunctionType = aSelEntry->GetFunctionType() | FKT_NUMERIC | FKT_OTHER; @@ -899,7 +891,7 @@ aSelEntry->SetTabWindow(NULL); aSelEntry->SetField(sParameters); - notifyTableFieldChanged(sOldAlias,aSelEntry->GetAlias(),_bListAction, nColumnId); + notifyTableFieldChanged(aSelectionAlias,aSelEntry->GetAlias(),_bListAction, nColumnId); } else { @@ -908,7 +900,7 @@ ::rtl::OUString aColumns; pColumnRef->parseNodeToStr( aColumns, xMetaData, - &pController->getParser()->getContext(), + &pController->getParser().getContext(), sal_True, sal_True); // get the type out of the funtion name @@ -926,10 +918,11 @@ } if ( i > 0 && InsertField(aSelEntry,BROWSER_INVALIDID,sal_True,sal_False).isEmpty() ) // may we have to append more than one field { // the field could not be isnerted - String sTitle(ModuleRes(STR_STAT_WARNING)); - String sErrorMsg(ModuleRes(RID_STR_FIELD_DOESNT_EXIST)); - sErrorMsg.SearchAndReplaceAscii("$name$",aSelEntry->GetField()); - OSQLMessageBox aDlg(this,sTitle,sErrorMsg,WB_OK | WB_DEF_OK,OSQLMessageBox::Warning); + String sErrorMessage( ModuleRes( RID_STR_FIELD_DOESNT_EXIST ) ); + sErrorMessage.SearchAndReplaceAscii("$name$",aSelEntry->GetField()); + OSQLMessageBox aDlg( this, + String( ModuleRes( STR_STAT_WARNING ) ), sErrorMessage, + WB_OK | WB_DEF_OK, OSQLMessageBox::Warning ); aDlg.Execute(); bError = sal_True; } @@ -939,10 +932,11 @@ } else // something different which we have to check (may be a select statement) { - String sTitle(ModuleRes(STR_STAT_WARNING)); - String sErrorMsg(ModuleRes(STR_QRY_COLUMN_NOT_FOUND)); - sErrorMsg.SearchAndReplaceAscii("$name$",_sFieldName); - OSQLMessageBox aDlg(this,sTitle,sErrorMsg,WB_OK | WB_DEF_OK,OSQLMessageBox::Warning); + String sErrorMessage( ModuleRes( STR_QRY_COLUMN_NOT_FOUND ) ); + sErrorMessage.SearchAndReplaceAscii("$name$",_sFieldName); + OSQLMessageBox aDlg( this, + String( ModuleRes( STR_STAT_WARNING ) ), sErrorMessage, + WB_OK | WB_DEF_OK, OSQLMessageBox::Warning ); aDlg.Execute(); bError = sal_True; } @@ -955,9 +949,9 @@ DBG_CHKTHIS(OSelectionBrowseBox,NULL); OTableFieldDescRef pEntry = NULL; OQueryController* pController = static_cast<OQueryController*>(getDesignView()->getController()); - USHORT nPos = GetColumnPos(GetCurColumnId()); - if(getFields().size() > static_cast<USHORT>(nPos - 1)) - pEntry = getEntry(nPos - 1); + USHORT nCurrentColumnPos = GetColumnPos(GetCurColumnId()); + if(getFields().size() > static_cast<USHORT>(nCurrentColumnPos - 1)) + pEntry = getEntry(nCurrentColumnPos - 1); sal_Bool bWasEmpty = pEntry.isValid() ? pEntry->IsEmpty() : sal_False; sal_Bool bError = sal_False; @@ -1168,7 +1162,7 @@ xColumn, getDesignView()->getLocale(), static_cast<sal_Char>(getDesignView()->getDecimalSeparator().toChar()), - &(static_cast<OQueryController*>(getDesignView()->getController())->getParser()->getContext())); + &(static_cast<OQueryController*>(getDesignView()->getController())->getParser().getContext())); delete pParseNode; } else @@ -1193,8 +1187,8 @@ default: ; } - ::connectivity::OSQLParser* pParser = static_cast<OQueryController*>(getDesignView()->getController())->getParser(); - pParseNode = pParser->predicateTree(aErrorMsg, + ::connectivity::OSQLParser& rParser = static_cast<OQueryController*>(getDesignView()->getController())->getParser(); + pParseNode = rParser.predicateTree(aErrorMsg, aText, static_cast<OQueryController*>(getDesignView()->getController())->getNumberFormatter(), xColumn); @@ -1206,7 +1200,7 @@ xColumn, getDesignView()->getLocale(), static_cast<sal_Char>(getDesignView()->getDecimalSeparator().toChar()), - &(static_cast<OQueryController*>(getDesignView()->getController())->getParser()->getContext())); + &(static_cast<OQueryController*>(getDesignView()->getController())->getParser().getContext())); delete pParseNode; } else @@ -1342,7 +1336,7 @@ // ColId ist bei mir gleichbedeutend mit Position, und da sollte die Bedingung natuerlich zutreffen sal_uInt16 nCurCol = GetCurColumnId(); - long nCurRow = GetCurRow(); + long nCurrentRow = GetCurRow(); DeactivateCell(); @@ -1358,7 +1352,7 @@ Rectangle aInvalidRect = GetInvalidRect( _nColumnId ); Invalidate( aInvalidRect ); - ActivateCell( nCurRow, nCurCol ); + ActivateCell( nCurrentRow, nCurCol ); pController->setModified(); @@ -1366,7 +1360,7 @@ } //------------------------------------------------------------------------------ -void OSelectionBrowseBox::RemoveField(sal_uInt16 nColumnId, sal_Bool bActivate) +void OSelectionBrowseBox::RemoveField(sal_uInt16 nColumnId ) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); OQueryController* pController = static_cast<OQueryController*>(getDesignView()->getController()); @@ -1464,9 +1458,7 @@ { DBG_CHKTHIS(OSelectionBrowseBox,NULL); sal_Int8 nDropAction = DND_ACTION_NONE; - if ( (rEvt.GetColumnId() >= 0) - && (rEvt.GetRow() >= -1) - ) + if ( rEvt.GetRow() >= -1 ) { if ( IsEditing() ) { @@ -1543,7 +1535,7 @@ { pEntry = *aIter; if (pEntry->GetAlias() == ::rtl::OUString(rAliasName) ) - RemoveField(GetColumnId(nPos), sal_False); + RemoveField( GetColumnId( nPos ) ); } if (bWasEditing) @@ -1609,13 +1601,12 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColumnPostion) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); - OQueryController* pController = static_cast<OQueryController*>(getDesignView()->getController()); // das Control sollte immer genau eine Spalte mehr haben, naemlich die HandleColumn DBG_ASSERT(_nColumnPostion == BROWSER_INVALIDID || (_nColumnPostion <= (long)getFields().size()), "OSelectionBrowseBox::InsertColumn : invalid parameter nColId."); // -1 heisst ganz hinten, Count heisst ganz hinten, der Rest bezeichnet eine richtige Position sal_uInt16 nCurCol = GetCurColumnId(); - long nCurRow = GetCurRow(); + long nCurrentRow = GetCurRow(); DeactivateCell(); @@ -1653,7 +1644,7 @@ Rectangle aInvalidRect = GetInvalidRect( pEntry->GetColumnId() ); Invalidate( aInvalidRect ); - ActivateCell( nCurRow, nCurCol ); + ActivateCell( nCurrentRow, nCurCol ); static_cast<OQueryController*>(getDesignView()->getController())->setModified(); invalidateUndoRedo(); @@ -1724,8 +1715,6 @@ sal_uInt16 OSelectionBrowseBox::FieldsCount() { DBG_CHKTHIS(OSelectionBrowseBox,NULL); - OQueryController* pController = static_cast<OQueryController*>(getDesignView()->getController()); - OTableFields::iterator aIter = getFields().begin(); sal_uInt16 nCount = 0; @@ -1743,8 +1732,6 @@ OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(USHORT& _rColumnPosition ) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); - OQueryController* pController = static_cast<OQueryController*>(getDesignView()->getController()); - OTableFields::iterator aIter = getFields().begin(); OTableFields::iterator aEnd = getFields().end(); @@ -1827,7 +1814,7 @@ } } //------------------------------------------------------------------------------ -void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const String& rValue, const sal_uInt16 nLevel, const char* pOp ) +void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const String& rValue, const sal_uInt16 nLevel ) { Reference< XConnection> xConnection = static_cast<OQueryController*>(getDesignView()->getController())->getConnection(); if(!xConnection.is()) @@ -1968,8 +1955,6 @@ { OTableFieldDescRef pEntry = getEntry(GetColumnPos(GetCurColumnId()) - 1); - sal_Bool bOldValue = pEntry->IsVisible(); - sal_uInt16 nIdx = m_pOrderCell->GetSelectEntryPos(); if(!m_bOrderByUnRelated && nIdx > 0 && nIdx != sal_uInt16(-1) && @@ -2109,7 +2094,7 @@ //------------------------------------------------------------------------------ sal_Bool OSelectionBrowseBox::IsRowVisible(sal_uInt16 _nWhich) const { - DBG_ASSERT(_nWhich>=0 && _nWhich<(m_bVisibleRow.size()), "OSelectionBrowseBox::IsRowVisible : invalid parameter !"); + DBG_ASSERT(_nWhich<(m_bVisibleRow.size()), "OSelectionBrowseBox::IsRowVisible : invalid parameter !"); return m_bVisibleRow[_nWhich]; } @@ -2117,7 +2102,7 @@ void OSelectionBrowseBox::SetRowVisible(sal_uInt16 _nWhich, sal_Bool _bVis) { DBG_CHKTHIS(OSelectionBrowseBox,NULL); - DBG_ASSERT(_nWhich>=0 && _nWhich<m_bVisibleRow.size(), "OSelectionBrowseBox::SetRowVisible : invalid parameter !"); + DBG_ASSERT(_nWhich<m_bVisibleRow.size(), "OSelectionBrowseBox::SetRowVisible : invalid parameter !"); sal_Bool bWasEditing = IsEditing(); if (bWasEditing) @@ -2456,7 +2441,7 @@ } //------------------------------------------------------------------------------ -sal_uInt16 OSelectionBrowseBox::GetDefaultColumnWidth(const String& rName) const +sal_uInt16 OSelectionBrowseBox::GetDefaultColumnWidth(const String& /*rName*/) const { DBG_CHKTHIS(OSelectionBrowseBox,NULL); // die Baissklasse macht das von dem Text abhaengig, ich habe aber keine Spaltenueberschriften, daher haette ich @@ -2684,7 +2669,7 @@ return ::rtl::OUString(aLabel.GetToken(nToken)); } // ----------------------------------------------------------------------------- -::rtl::OUString OSelectionBrowseBox::GetAccessibleName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const +::rtl::OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const { ::rtl::OUString sRetText; switch( _eObjType ) @@ -2693,7 +2678,7 @@ sRetText = GetRowDescription(_nPosition); break; default: - sRetText = EditBrowseBox::GetAccessibleDescription(_eObjType,_nPosition); + sRetText = EditBrowseBox::GetAccessibleObjectDescription(_eObjType,_nPosition); } return sRetText; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
