mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.37.30); FILE MERGED

Browse Source 
2006/05/23 23:35:01 sb 1.37.30.4: RESYNC: (1.37-1.38); FILE MERGED
2005/12/22 11:45:02 fs 1.37.30.3: #i57457# warning-free code
2005/11/16 12:59:31 fs 1.37.30.2: #i57457# warning free code
2005/11/07 14:44:15 fs 1.37.30.1: #i57457# warning-free code
This commit is contained in:
Jens-Heiner Rechtien
2006-06-20 01:09:50 +00:00
parent 0241fa0520
commit eaaa9ff4b2
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
connectivity/source/sdbcx/VCollection.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: VCollection.cxx,v $ * $RCSfile: VCollection.cxx,v $
* *
* $Revision: 1.38 $ * $Revision: 1.39 $
* *
* last change: $Author: hr $ $Date: 2006-04-19 13:17:12 $ * last change: $Author: hr $ $Date: 2006-06-20 02:09:50 $
* *
* 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.
@@ -81,6 +81,9 @@ namespace
: m_aNameMap(_bCase ? true : false) : m_aNameMap(_bCase ? true : false)
{ {
} }
virtual ~OHardRefMap()
{
}
virtual void reserve(size_t nLength) virtual void reserve(size_t nLength)
{ {
@@ -251,10 +254,10 @@ OCollection::OCollection(::cppu::OWeakObject& _rParent
, const TStringVector &_rVector , const TStringVector &_rVector
, sal_Bool _bUseIndexOnly , sal_Bool _bUseIndexOnly
, sal_Bool _bUseHardRef) , sal_Bool _bUseHardRef)
: m_rParent(_rParent) :m_aContainerListeners(_rMutex)
,m_rMutex(_rMutex)
,m_aContainerListeners(_rMutex)
,m_aRefreshListeners(_rMutex) ,m_aRefreshListeners(_rMutex)
,m_rParent(_rParent)
,m_rMutex(_rMutex)
,m_bUseIndexOnly(_bUseIndexOnly) ,m_bUseIndexOnly(_bUseIndexOnly)
{ {
if ( _bUseHardRef ) if ( _bUseHardRef )
@@ -292,7 +295,6 @@ Sequence< Type > SAL_CALL OCollection::getTypes() throw (RuntimeException)
::std::vector<Type> aOwnTypes; ::std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength()); aOwnTypes.reserve(aTypes.getLength());
Type aType = ::getCppuType(static_cast< Reference<XNameAccess> *>(NULL)); Type aType = ::getCppuType(static_cast< Reference<XNameAccess> *>(NULL));
sal_Int32 i=0;
for(;pBegin != pEnd; ++pBegin) for(;pBegin != pEnd; ++pBegin)
{ {
if ( *pBegin != aType ) if ( *pBegin != aType )
@@ -358,7 +360,7 @@ void SAL_CALL OCollection::refresh( ) throw(RuntimeException)
impl_refresh(); impl_refresh();
EventObject aEvt(static_cast<XTypeProvider*>(this)); EventObject aEvt(static_cast<XTypeProvider*>(this));
NOTIFY_LISTENERS(m_aRefreshListeners, XRefreshListener, refreshed, aEvt); m_aRefreshListeners.notifyEach( &XRefreshListener::refreshed, aEvt );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void OCollection::reFill(const TStringVector &_rVector) void OCollection::reFill(const TStringVector &_rVector)
@@ -398,13 +400,10 @@ void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >&
appendObject(descriptor); appendObject(descriptor);
ObjectType xNewName = cloneObject(descriptor); ObjectType xNewName = cloneObject(descriptor);
Reference<XUnoTunnel> xTunnel(xNewName,UNO_QUERY);
if(xTunnel.is()) ODescriptor* pDescriptor = ODescriptor::getImplementation( xNewName );
{ if ( pDescriptor )
ODescriptor* pDescriptor = (ODescriptor*)xTunnel->getSomething(ODescriptor::getUnoTunnelImplementationId()); pDescriptor->setNew( sal_False );
if(pDescriptor)
pDescriptor->setNew(sal_False);
}
if(xNewName.is()) if(xNewName.is())
{ {
@@ -592,7 +591,7 @@ Reference< XPropertySet > OCollection::createEmptyObject()
throw SQLException(); throw SQLException();
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void OCollection::appendObject( const Reference< XPropertySet >& descriptor ) void OCollection::appendObject( const Reference< XPropertySet >& /*descriptor*/ )
{ {
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@@ -601,7 +600,7 @@ ObjectType OCollection::cloneObject(const Reference< XPropertySet >& _xDescripto
return _xDescriptor.is() ? createObject(getNameForObject(_xDescriptor)) : sdbcx::ObjectType(); return _xDescriptor.is() ? createObject(getNameForObject(_xDescriptor)) : sdbcx::ObjectType();
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void OCollection::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) void OCollection::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString /*_sElementName*/)
{ {
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------