#89921# XSystemTransferable::getData has a changed signature

2 files changed, 21 insertions, 10 deletions

diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 3957d3ec6bde..b53e95196a42 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DOTransferable.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: jl $ $Date: 2001-08-07 11:09:47 $
+ *  last change: $Author: jl $ $Date: 2001-08-15 06:56:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,6 +67,10 @@
 #include <sal/types.h>
 #endif
 
+#ifndef _RTL_PROCESS_H_
+#include <rtl/process.h>
+#endif
+
 #ifndef _DOWRAPPERTRANSFERABLE_HXX_
 #include "DOTransferable.hxx"
 #endif
@@ -620,15 +624,22 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
     return bRet;
 }
 
-::com::sun::star::uno::Any SAL_CALL CDOTransferable::getData(  )
+::com::sun::star::uno::Any SAL_CALL CDOTransferable::getData( const Sequence< sal_Int8>& aProcessId  )
         throw (::com::sun::star::uno::RuntimeException)
 {
     Any retVal;
-    if( m_rDataObject)
+
+    sal_uInt8 * arProcCaller= (sal_uInt8*)(sal_Int8*) aProcessId.getConstArray();
+    sal_uInt8 arId[16];
+    rtl_getGlobalProcessId(arId);
+    if( ! memcmp( arId, arProcCaller,16))
     {
-        IDataObject * pObj= static_cast<IDataObject*>( m_rDataObject) ;
-        pObj->AddRef();
-        retVal.setValue( & pObj, getCppuType( (sal_uInt32*)0));
+        if( m_rDataObject)
+        {
+            IDataObject * pObj= static_cast<IDataObject*>( m_rDataObject) ;
+            pObj->AddRef();
+            retVal.setValue( & pObj, getCppuType( (sal_uInt32*)0));
+        }
     }
     return retVal;
 }
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index 547e99bdb37c..ab75039a0a2a 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DOTransferable.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jl $ $Date: 2001-08-07 11:09:47 $
+ *  last change: $Author: jl $ $Date: 2001-08-15 06:58:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -122,7 +122,7 @@ public:
     //------------------------------------------------------------------------
     // XSystemTransferable
     //------------------------------------------------------------------------
-    virtual ::com::sun::star::uno::Any SAL_CALL getData(  ) throw
+    virtual ::com::sun::star::uno::Any SAL_CALL getData( const com::sun::star::uno::Sequence<sal_Int8>& aProcessId  ) throw
     (::com::sun::star::uno::RuntimeException);