Tag: cws_src680_qiq User: fs Date: 06/05/10 04:05:53 Modified: /dba/dbaccess/source/ui/querydesign/ QTableWindow.cxx, QTableWindow.hxx
Log: #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.15&r2=1.15.122.1 Delta lines: +16 -20 --------------------- --- QTableWindow.cxx 8 Sep 2005 16:22:09 -0000 1.15 +++ QTableWindow.cxx 10 May 2006 11:05:50 -0000 1.15.122.1 @@ -4,9 +4,9 @@ * * $RCSfile: QTableWindow.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.122.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 16:22:09 $ + * last change: $Author: fs $ $Date: 2006/05/10 11:05:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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,11 @@ if ( _xColumn.is() ) pInfo->SetDataType(::comphelper::getINT32(_xColumn->getPropertyValue(PROPERTY_TYPE))); return pInfo; +} +// ----------------------------------------------------------------------------- +bool OQueryTableWindow::allowQueries() const +{ + return true; } // ----------------------------------------------------------------------------- void OQueryTableWindow::deleteUserData(void*& _pUserData) File [changed]: QTableWindow.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QTableWindow.hxx?r1=1.6&r2=1.6.122.1 Delta lines: +4 -3 ------------------- --- QTableWindow.hxx 8 Sep 2005 16:22:29 -0000 1.6 +++ QTableWindow.hxx 10 May 2006 11:05:50 -0000 1.6.122.1 @@ -4,9 +4,9 @@ * * $RCSfile: QTableWindow.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.122.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 16:22:29 $ + * last change: $Author: fs $ $Date: 2006/05/10 11:05:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -103,6 +103,7 @@ ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bPrimaryKey); + virtual bool allowQueries() const; }; } #endif // DBAUI_QUERY_TABLEWINDOW_HXX --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
