strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dtransfix (1.18.100); FILE MERGED

Browse source 
2004/10/12 05:01:00 tra 1.18.100.2: #i32544#replaced MS COM auto pointer template with an own COM auto pointer template because MS COM auto pointers are not part of the .Net 2003 toolkit
2004/10/08 06:55:28 tra 1.18.100.1: #i28176#support for Windows shell link files added; Windows shell link files will be resolved now. When the clipboard format is CF_HDROP a double 0 terminated list of files where lnk files are resolved will be returned. Module sot\...\filelist.cxx has been adapted accordingly
This commit is contained in:
Rüdiger Timm 2004-10-22 06:56:05 +00:00
parent 9ccbb0ccc7
commit b93745f27b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dtrans/source/win32/dtobj/DOTransferable.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: DOTransferable.cxx,v $
*
* $Revision: 1.18 $
* $Revision: 1.19 $
*
* last change: $Author: rt $ $Date: 2003-04-24 14:55:07 $
* last change: $Author: rt $ $Date: 2004-10-22 07:56:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -408,6 +408,8 @@ CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFor
{
if ( CF_ENHMETAFILE == aFormatEtc.getClipformat() )
byteStream = WinENHMFPictToOOMFPict( stgmedium.hEnhMetaFile );
else if (CF_HDROP == aFormatEtc.getClipformat())
byteStream = CF_HDROPToFileList(stgmedium.hGlobal);
else
{
clipDataToByteStream( aFormatEtc.getClipformat( ), stgmedium, byteStream );
@ -652,11 +654,11 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
rtl_getGlobalProcessId(arId);
if( ! memcmp( arId, arProcCaller,16))
{
if( m_rDataObject)
if (m_rDataObject.is())
{
IDataObject * pObj= static_cast<IDataObject*>( m_rDataObject) ;
IDataObject* pObj= m_rDataObject.get();
pObj->AddRef();
retVal.setValue( & pObj, getCppuType( (sal_uInt32*)0));
retVal.setValue( &pObj, getCppuType((sal_uInt32*)0));
}
}
return retVal;