User: hr Date: 2007-11-01 15:30:30+0000 Modified: dba/dbaccess/source/ui/querydesign/QTableWindow.cxx
Log: INTEGRATION: CWS dba24b (1.21.28); FILE MERGED 2007/08/16 06:14:44 oj 1.21.28.1: #i56898# clean up of the class structure 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.21&r2=1.22 Delta lines: +4 -22 -------------------- --- QTableWindow.cxx 2007-07-06 08:39:02+0000 1.21 +++ QTableWindow.cxx 2007-11-01 15:30:28+0000 1.22 @@ -107,13 +107,12 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace dbaui; -TYPEINIT1(OQueryTableWindow, OTableWindow); //======================================================================== // class OQueryTableWindow //======================================================================== DBG_NAME(OQueryTableWindow); //------------------------------------------------------------------------------ -OQueryTableWindow::OQueryTableWindow( Window* pParent, OQueryTableWindowData* pTabWinData, sal_Unicode* pszInitialAlias) +OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias) :OTableWindow( pParent, pTabWinData ) ,m_nAliasNum(0) { @@ -121,7 +120,7 @@ if (pszInitialAlias != NULL) m_strInitialAlias = ::rtl::OUString(pszInitialAlias); else - m_strInitialAlias = pTabWinData->GetAliasName(); + m_strInitialAlias = GetAliasName(); // wenn der Tabellen- gleich dem Aliasnamen ist, dann darf ich das nicht an InitialAlias weiterreichen, denn das Anhaengen // eines eventuelle Tokens nicht klappen ... @@ -149,14 +148,13 @@ // zuerst Alias bestimmen ::rtl::OUString sAliasName; - OTableWindowData* pWinData = GetData(); - DBG_ASSERT(pWinData->ISA(OQueryTableWindowData), "OQueryTableWindow::Init() : habe keine OQueryTableWindowData"); + TTableWindowData::value_type pWinData = GetData(); if (m_strInitialAlias.getLength() ) // Der Alias wurde explizit mit angegeben sAliasName = m_strInitialAlias; else - GetTableOrQuery()->getPropertyValue( PROPERTY_NAME ) >>= sAliasName; + GetTable()->getPropertyValue( PROPERTY_NAME ) >>= sAliasName; // Alias mit fortlaufender Nummer versehen if (pContainer->CountTableAlias(sAliasName, m_nAliasNum)) @@ -205,22 +203,6 @@ 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) { delete static_cast<OTableFieldInfo*>(_pUserData); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
