Tag: cws_src680_dba202c User: oj Date: 05/12/09 01:58:41 Modified: /dba/dbaccess/source/core/api/ querydescriptor.cxx, RowSet.cxx
Log: #129042# create columns every time File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: querydescriptor.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/querydescriptor.cxx?r1=1.25&r2=1.25.58.1 Delta lines: +10 -13 --------------------- --- querydescriptor.cxx 8 Sep 2005 10:08:50 -0000 1.25 +++ querydescriptor.cxx 9 Dec 2005 09:58:39 -0000 1.25.58.1 @@ -4,9 +4,9 @@ * * $RCSfile: querydescriptor.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.58.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 10:08:50 $ + * last change: $Author: oj $ $Date: 2005/12/09 09:58:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -249,20 +249,17 @@ { MutexGuard aGuard(m_rMutex); - Reference< XNameAccess > xColumns; - if ( m_bEscapeProcessing ) - { if ( isColumnsOutOfDate() ) { // load the columns + if ( m_bEscapeProcessing ) refreshColumns(); setColumnsOutOfDate( sal_False ); m_pColumns->setInitialized(); } - xColumns = m_pColumns; - } - return xColumns; + + return m_pColumns; } //-------------------------------------------------------------------------- File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.137&r2=1.137.48.1 Delta lines: +3 -4 ------------------- --- RowSet.cxx 23 Sep 2005 14:36:38 -0000 1.137 +++ RowSet.cxx 9 Dec 2005 09:58:39 -0000 1.137.48.1 @@ -4,9 +4,9 @@ * * $RCSfile: RowSet.cxx,v $ * - * $Revision: 1.137 $ + * $Revision: 1.137.48.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 14:36:38 $ + * last change: $Author: oj $ $Date: 2005/12/09 09:58:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1820,7 +1820,6 @@ m_xColumns->getByName(aSeq.getConstArray()[i-1]) >>= xColumn; } } - DBG_ASSERT(xColumn.is(), "ORowSet::execute_NoApprove_NoNewConn: invalid column (NULL)!"); if(bReFetchName && xColumn.is()) xColumn->getPropertyValue(PROPERTY_NAME) >>= sName; aColumnMap.insert(::std::map< Reference<XPropertySet>,int>::value_type(xColumn,0)); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
