strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS warnings01 (1.25.50); FILE MERGED

Browse source 
2006/06/14 10:57:11 fs 1.25.50.2: #i66367# reverted previous changes related to replacing IdPropertyArrayHelper with PropertyArrayHelper - there's a subtle difference between both ids ...
2006/03/24 15:35:47 fs 1.25.50.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro)
This commit is contained in:
Jens-Heiner Rechtien 2006-06-20 01:38:18 +00:00
parent 4554d2dea3
commit c177b5cb98
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
dbaccess/source/core/api/TableDeco.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: TableDeco.cxx,v $ * $RCSfile: TableDeco.cxx,v $
* *
* $Revision: 1.25 $ * $Revision: 1.26 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 10:04:30 $ * last change: $Author: hr $ $Date: 2006-06-20 02:38:18 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -127,15 +127,15 @@ ODBTableDecorator::ODBTableDecorator(
) throw(SQLException) ) throw(SQLException)
:OTableDescriptor_BASE(m_aMutex) :OTableDescriptor_BASE(m_aMutex)
,ODataSettings(OTableDescriptor_BASE::rBHelper) ,ODataSettings(OTableDescriptor_BASE::rBHelper)
,m_nPrivileges(-1)
,m_xMetaData(_rxMetaData)
,m_xTable(_rxNewTable) ,m_xTable(_rxNewTable)
,m_xNumberFormats( _rxNumberFormats )
,m_xColumnDefinitions(_xColumnDefinitions) ,m_xColumnDefinitions(_xColumnDefinitions)
,m_xMetaData(_rxMetaData)
,m_xNumberFormats( _rxNumberFormats )
,m_nPrivileges(-1)
,m_pColumns(NULL) ,m_pColumns(NULL)
{ {
DBG_CTOR(ODBTableDecorator, NULL); DBG_CTOR(ODBTableDecorator, NULL);
ODataSettings::registerProperties(this); ODataSettings::registerPropertiesFor(this);
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
ODBTableDecorator::~ODBTableDecorator() ODBTableDecorator::~ODBTableDecorator()
@ -392,7 +392,7 @@ void ODBTableDecorator::construct()
&m_nPrivileges, ::getCppuType(static_cast<sal_Int32*>(NULL))); &m_nPrivileges, ::getCppuType(static_cast<sal_Int32*>(NULL)));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* ODBTableDecorator::createArrayHelper(sal_Int32 _nId) const ::cppu::IPropertyArrayHelper* ODBTableDecorator::createArrayHelper(sal_Int32 /*_nId*/) const
{ {
Reference<XPropertySet> xProp(m_xTable,UNO_QUERY); Reference<XPropertySet> xProp(m_xTable,UNO_QUERY);
Reference<XPropertySetInfo> xInfo = xProp->getPropertySetInfo(); Reference<XPropertySetInfo> xInfo = xProp->getPropertySetInfo();
@ -431,9 +431,19 @@ void ODBTableDecorator::setTable(const ::com::sun::star::uno::Reference< ::com::
::cppu::IPropertyArrayHelper & SAL_CALL ODBTableDecorator::getInfoHelper() ::cppu::IPropertyArrayHelper & SAL_CALL ODBTableDecorator::getInfoHelper()
{ {
Reference<XPropertySet> xProp(m_xTable,UNO_QUERY); Reference<XPropertySet> xProp(m_xTable,UNO_QUERY);
Reference<XPropertySetInfo> xInfo = xProp->getPropertySetInfo();
return *ODBTableDecorator_PROP::getArrayHelper((xInfo->getPropertyByName(PROPERTY_NAME).Attributes & PropertyAttribute::READONLY) == PropertyAttribute::READONLY ? 1 : 0); Reference<XPropertySetInfo> xInfo = xProp->getPropertySetInfo();
bool bIsDescriptor = (xInfo->getPropertyByName(PROPERTY_NAME).Attributes & PropertyAttribute::READONLY) == 0;
return *ODBTableDecorator_PROP::getArrayHelper( bIsDescriptor ? 0 : 1 );
// TODO: this is a HACK, and prone to errors
// The OIdPropertyArrayUsageHelper is intended for classes where there exists a known, limited
// number of different property set infos (distinguished by the ID), all implemented by this very
// same class.
// However, in this case here we have an unknown, potentially unlimited number of different
// property set infos: Depending on the table for which we act as decorator, different property
// sets might exist.
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// XServiceInfo // XServiceInfo
@ -601,7 +611,7 @@ void ODBTableDecorator::fillPrivileges() const
} }
catch(const SQLException& e) catch(const SQLException& e)
{ {
UNUSED(e); (void)e;
DBG_ERROR("ODBTableDecorator::ODBTableDecorator : could not collect the privileges !"); DBG_ERROR("ODBTableDecorator::ODBTableDecorator : could not collect the privileges !");
} }
} }
@ -698,6 +708,12 @@ void ODBTableDecorator::columnDropped(const ::rtl::OUString& _sName)
xDrop->dropByName(_sName); xDrop->dropByName(_sName);
} }
} }
// -----------------------------------------------------------------------------
void ODBTableDecorator::columnCloned(const Reference< XPropertySet >& /*_xClone*/)
{
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
Reference< XPropertySet > ODBTableDecorator::createEmptyObject() Reference< XPropertySet > ODBTableDecorator::createEmptyObject()
{ {
@ -721,8 +737,9 @@ void SAL_CALL ODBTableDecorator::release() throw()
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void SAL_CALL ODBTableDecorator::setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException) void SAL_CALL ODBTableDecorator::setName( const ::rtl::OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException)
{ {
throwFunctionNotSupportedException( "XNamed::setName", *this );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------