Tag: cws_src680_qiq
User: fs      
Date: 2006/06/27 08:11:51

Modified:
   dba/connectivity/source/sdbcx/VCollection.cxx

Log:
 RESYNC: (1.38-1.39); FILE MERGED

File Changes:

Directory: /dba/connectivity/source/sdbcx/
==========================================

File [changed]: VCollection.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VCollection.cxx?r1=1.38.20.1&r2=1.38.20.2
Delta lines:  +12 -10
---------------------
--- VCollection.cxx     16 Jun 2006 11:32:40 -0000      1.38.20.1
+++ VCollection.cxx     27 Jun 2006 15:11:49 -0000      1.38.20.2
@@ -84,6 +84,9 @@
                        : m_aNameMap(_bCase ? true : false)
                {
                }
+        virtual ~OHardRefMap()
+        {
+        }
 
                virtual void reserve(size_t nLength)
                {
@@ -254,10 +257,10 @@
                                                 , const TStringVector &_rVector
                                                 , sal_Bool _bUseIndexOnly
                                                 , sal_Bool _bUseHardRef)
-                                        : m_rParent(_rParent)
-                                        ,m_rMutex(_rMutex)
-                                        ,m_aContainerListeners(_rMutex)
+                     :m_aContainerListeners(_rMutex)
                                         ,m_aRefreshListeners(_rMutex)
+                                        ,m_rParent(_rParent)
+                                        ,m_rMutex(_rMutex)
                                         ,m_bUseIndexOnly(_bUseIndexOnly)
 {
        if ( _bUseHardRef )
@@ -295,7 +298,6 @@
                ::std::vector<Type> aOwnTypes;
                aOwnTypes.reserve(aTypes.getLength());
                Type aType = ::getCppuType(static_cast< Reference<XNameAccess> 
*>(NULL));
-               sal_Int32 i=0;
                for(;pBegin != pEnd; ++pBegin)
                {
                        if ( *pBegin != aType )
@@ -361,7 +363,7 @@
 
        impl_refresh();
        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)
@@ -590,12 +592,12 @@
        return xNewDescriptor;
 }
 // 
-----------------------------------------------------------------------------
-ObjectType OCollection::appendObject( const ::rtl::OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+ObjectType OCollection::appendObject( const ::rtl::OUString& /*_rForName*/, 
const Reference< XPropertySet >& descriptor )
 {
     return cloneDescriptor( descriptor );
 }
 // 
-----------------------------------------------------------------------------
-void OCollection::dropObject(sal_Int32 _nPos,const ::rtl::OUString 
_sElementName)
+void OCollection::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString 
/*_sElementName*/)
 {
 }
 // 
-----------------------------------------------------------------------------




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to