Tag: cws_src680_qiq
User: fs      
Date: 2006/06/27 05:04:53

Modified:
   dba/dbaccess/source/core/misc/PropertyForward.cxx

Log:
 RESYNC: (1.4-1.6); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/core/misc/
==========================================

File [changed]: PropertyForward.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/PropertyForward.cxx?r1=1.4.124.1&r2=1.4.124.2
Delta lines:  +15 -12
---------------------
--- PropertyForward.cxx 16 Jun 2006 11:47:41 -0000      1.4.124.1
+++ PropertyForward.cxx 27 Jun 2006 12:04:50 -0000      1.4.124.2
@@ -69,9 +69,9 @@
                                                                ,const 
Reference< XNameAccess>& _xDestContainer
                                                                ,const 
::rtl::OUString& _sName
                                                                ,const 
::std::vector< ::rtl::OUString>& _aPropertyList)
-                                                               : 
m_xDestContainer(_xDestContainer)
+                                                               : 
m_xSource(_xSource)
+                                                               , 
m_xDestContainer(_xDestContainer)
                                                                , 
m_sName(_sName)
-                                                               , 
m_xSource(_xSource)
                                                                , 
m_bInInsert(sal_False)
 {
        DBG_CTOR(OPropertyForward,NULL);        
@@ -116,6 +116,8 @@
                        if ( xFactory.is() )
                        {
                                m_xDest = xFactory->createDataDescriptor();
+                               if ( m_xDest.is() )
+                               {
                                ::comphelper::copyProperties(m_xSource,m_xDest);
                                m_bInInsert = sal_True;
                                Reference<XAppend> 
xAppend(m_xDestContainer,UNO_QUERY);
@@ -124,6 +126,7 @@
                                m_bInInsert = sal_False;
                        }
                }
+               }
                if ( m_xDest.is() )
                        m_xDestInfo = m_xDest->getPropertySetInfo();
        }
@@ -134,7 +137,7 @@
        }
 }
 // 
-----------------------------------------------------------------------------
-void SAL_CALL OPropertyForward::disposing( const 
::com::sun::star::lang::EventObject& _rSource ) throw (RuntimeException)
+void SAL_CALL OPropertyForward::disposing( const 
::com::sun::star::lang::EventObject& /*_rSource*/ ) throw (RuntimeException)
 {
        ::osl::MutexGuard aGuard(m_aMutex);
        if ( m_xSource.is() )




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

Reply via email to