User: hr      
Date: 06/06/19 19:09:52

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

Log:
 INTEGRATION: CWS warnings01 (1.37.30); FILE MERGED
 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

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&r2=1.39
Delta lines:  +26 -27
---------------------
--- VCollection.cxx     19 Apr 2006 13:17:12 -0000      1.38
+++ VCollection.cxx     20 Jun 2006 02:09:50 -0000      1.39
@@ -81,6 +81,9 @@
                        : m_aNameMap(_bCase ? true : false)
                {
                }
+        virtual ~OHardRefMap()
+        {
+        }
 
                virtual void reserve(size_t nLength)
                {
@@ -251,10 +254,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 )
@@ -292,7 +295,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 )
@@ -358,7 +360,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)
@@ -398,13 +400,10 @@
 
                appendObject(descriptor);
                ObjectType xNewName = cloneObject(descriptor);
-               Reference<XUnoTunnel> xTunnel(xNewName,UNO_QUERY);
-               if(xTunnel.is())
-               {
-                       ODescriptor* pDescriptor = 
(ODescriptor*)xTunnel->getSomething(ODescriptor::getUnoTunnelImplementationId());
-                       if(pDescriptor)
-                               pDescriptor->setNew(sal_False);
-               }
+
+        ODescriptor* pDescriptor = ODescriptor::getImplementation( xNewName );
+        if ( pDescriptor )
+            pDescriptor->setNew( sal_False );
 
                if(xNewName.is())
                {
@@ -592,7 +591,7 @@
        throw SQLException();
 }
 // 
-----------------------------------------------------------------------------
-void OCollection::appendObject( const Reference< XPropertySet >& descriptor )
+void OCollection::appendObject( const Reference< XPropertySet >& 
/*descriptor*/ )
 {
 }
 // 
-----------------------------------------------------------------------------
@@ -601,7 +600,7 @@
        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*/)
 {
 }
 // 
-----------------------------------------------------------------------------




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

Reply via email to