User: obo Date: 2006/07/10 08:40:48 Modified: dba/dbaccess/source/ui/querydesign/QTableWindow.cxx
Log: INTEGRATION: CWS qiq (1.15.122); FILE MERGED 2006/07/03 19:47:59 fs 1.15.122.2: #i51143# don't allow to add queries to the designer which do not produce a result set 2006/05/10 11:05:50 fs 1.15.122.1: #i51143# also allow for queries in queries File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QTableWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QTableWindow.cxx?r1=1.16&r2=1.17 Delta lines: +24 -16 --------------------- --- QTableWindow.cxx 20 Jun 2006 03:26:25 -0000 1.16 +++ QTableWindow.cxx 10 Jul 2006 15:40:46 -0000 1.17 @@ -147,35 +147,27 @@ OQueryTableView* pContainer = static_cast<OQueryTableView*>(getTableView()); // zuerst Alias bestimmen - ::rtl::OUString strAliasName; + ::rtl::OUString sAliasName; OTableWindowData* pWinData = GetData(); DBG_ASSERT(pWinData->ISA(OQueryTableWindowData), "OQueryTableWindow::Init() : habe keine OQueryTableWindowData"); if (m_strInitialAlias.getLength() ) // Der Alias wurde explizit mit angegeben - strAliasName = m_strInitialAlias; + sAliasName = m_strInitialAlias; else - { - ::rtl::OUString aInitialTitle = pWinData->GetTableName(); - if(GetTable().is()) - { - ::rtl::OUString sName; - GetTable()->getPropertyValue(PROPERTY_NAME) >>= sName; - strAliasName = sName.getStr(); - } - } + GetTableOrQuery()->getPropertyValue( PROPERTY_NAME ) >>= sAliasName; // Alias mit fortlaufender Nummer versehen - if (pContainer->CountTableAlias(strAliasName, m_nAliasNum)) + if (pContainer->CountTableAlias(sAliasName, m_nAliasNum)) { - strAliasName += ::rtl::OUString('_'); - strAliasName += ::rtl::OUString::valueOf(m_nAliasNum); + sAliasName += ::rtl::OUString('_'); + sAliasName += ::rtl::OUString::valueOf(m_nAliasNum); } - strAliasName = String(strAliasName).EraseAllChars('"'); - SetAliasName(strAliasName); + sAliasName = String(sAliasName).EraseAllChars('"'); + SetAliasName(sAliasName); // SetAliasName reicht das als WinName weiter, dadurch benutzt es die Basisklasse // reset the titel m_aTitle.SetText( pWinData->GetWinName() ); @@ -211,6 +203,22 @@ if ( _xColumn.is() ) pInfo->SetDataType(::comphelper::getINT32(_xColumn->getPropertyValue(PROPERTY_TYPE))); return pInfo; +} +// ----------------------------------------------------------------------------- +void OQueryTableWindow::onNoColumns_throw() +{ + if ( isQuery() ) + { + String sError( ModuleRes( STR_STATEMENT_WITHOUT_RESULT_SET ) ); + ::dbtools::throwSQLException( sError, ::dbtools::SQL_GENERAL_ERROR, NULL ); + } + OTableWindow::onNoColumns_throw(); +} + +// ----------------------------------------------------------------------------- +bool OQueryTableWindow::allowQueries() const +{ + return true; } // ----------------------------------------------------------------------------- void OQueryTableWindow::deleteUserData(void*& _pUserData) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
