Tag: cws_src680_dba23a User: fs Date: 2007/03/22 03:46:04 Modified: dba/connectivity/source/parse/PColumn.cxx
Log: #i74800# proper implementation of the IsSearchable property File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: PColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/PColumn.cxx?r1=1.14.74.1&r2=1.14.74.2 Delta lines: +11 -13 --------------------- --- PColumn.cxx 23 Feb 2007 10:44:44 -0000 1.14.74.1 +++ PColumn.cxx 22 Mar 2007 10:46:01 -0000 1.14.74.2 @@ -4,9 +4,9 @@ * * $RCSfile: PColumn.cxx,v $ * - * $Revision: 1.14.74.1 $ + * $Revision: 1.14.74.2 $ * - * last change: $Author: oj $ $Date: 2007/02/23 10:44:44 $ + * last change: $Author: fs $ $Date: 2007/03/22 10:46:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,6 +74,7 @@ , m_bFunction(sal_False) , m_bDbasePrecisionChanged(sal_False) , m_bAggregateFunction(sal_False) + , m_bIsSearchable( sal_True ) { construct(); } @@ -103,6 +104,7 @@ , m_bFunction(sal_False) , m_bDbasePrecisionChanged(sal_False) , m_bAggregateFunction(sal_False) + , m_bIsSearchable( sal_True ) { construct(); } @@ -143,7 +145,7 @@ sal_False, eComplete ) ); - pColumn->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE),makeAny(_rxResMetaData->isSearchable( _nColumnPos ))); + pColumn->setIsSearchable( _rxResMetaData->isSearchable( _nColumnPos ) ); return pColumn; } @@ -154,16 +156,12 @@ // ------------------------------------------------------------------------- void OParseColumn::construct() { - sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0,&m_bFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0,&m_bAggregateFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, nAttrib,&m_aTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0,&m_aRealName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, nAttrib,&m_bDbasePrecisionChanged, ::getCppuType(reinterpret_cast<sal_Bool*>(NULL))); - - sal_Bool bSearchable = sal_True; - registerPropertyNoMember(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)),&bSearchable); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(reinterpret_cast<sal_Bool*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
