Tag: cws_src680_dba30 User: fs Date: 2006/07/19 06:11:57 Modified: dba/dbaccess/source/ui/querydesign/QTableWindow.cxx
Log: RESYNC: (1.15-1.17); FILE MERGED 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.15.12.1&r2=1.15.12.2 Delta lines: +27 -20 --------------------- --- QTableWindow.cxx 2 Jan 2006 09:17:14 -0000 1.15.12.1 +++ QTableWindow.cxx 19 Jul 2006 13:11:54 -0000 1.15.12.2 @@ -147,36 +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(); - sal_Bool bOwner = sal_False; - 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() ); @@ -212,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]
