summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
authorTino Rachui <tra@openoffice.org>2001-03-02 16:20:33 +0000
committerTino Rachui <tra@openoffice.org>2001-03-02 16:20:33 +0000
commitc1ced47500ba8c844366ab5c23d8cdb79a766cb8 (patch)
tree08bf31ddee79f979efbc3972ba9fd6a644fe029a /dtrans
parentdf03717c942999e470d7790da23c3656ed93df6a (diff)
*** empty log message ***
Diffstat (limited to 'dtrans')
-rw-r--r--dtrans/source/win32/dtobj/DtObjFactory.cxx13
-rw-r--r--dtrans/source/win32/dtobj/makefile.mk9
2 files changed, 13 insertions, 9 deletions
diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx
index a7528f034cd4..f8e0cff12766 100644
--- a/dtrans/source/win32/dtobj/DtObjFactory.cxx
+++ b/dtrans/source/win32/dtobj/DtObjFactory.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DtObjFactory.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: tra $ $Date: 2001-03-02 15:45:56 $
+ * last change: $Author: tra $ $Date: 2001-03-02 17:20:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,9 +75,11 @@
#include "DOTransferable.hxx"
#endif
+/*
#ifndef _WRPDOTRANSFERABLE_HXX_
#include "WrpDOTransferable.hxx"
#endif
+*/
//------------------------------------------------------------------------
// namespace directives
@@ -94,8 +96,11 @@ using namespace com::sun::star::lang;
IDataObjectPtr SAL_CALL CDTransObjFactory::createDataObjFromTransferable( const Reference< XMultiServiceFactory >& aServiceManager,
const Reference< XTransferable >& refXTransferable )
{
+ /*
Reference< XTransferable > wrpTransf( new CWrpDOTransferable( aServiceManager, refXTransferable, sal_False ) );
return ( IDataObjectPtr( new CXTDataObject( aServiceManager, wrpTransf ) ) );
+ */
+ return ( IDataObjectPtr( new CXTDataObject( aServiceManager, refXTransferable ) ) );
}
Reference< XTransferable > SAL_CALL CDTransObjFactory::createTransferableFromDataObj( const Reference< XMultiServiceFactory >& aServiceManager,
@@ -108,8 +113,8 @@ Reference< XTransferable > SAL_CALL CDTransObjFactory::createTransferableFromDat
pTransf->initFlavorList( );
pTransf->release( );
- return Reference< XTransferable >( new CWrpDOTransferable( aServiceManager, refDOTransf ) );
+ //return Reference< XTransferable >( new CWrpDOTransferable( aServiceManager, refDOTransf ) );
- //return refDOTransf;
+ return refDOTransf;
}
diff --git a/dtrans/source/win32/dtobj/makefile.mk b/dtrans/source/win32/dtobj/makefile.mk
index 34de17364176..48ec318dc973 100644
--- a/dtrans/source/win32/dtobj/makefile.mk
+++ b/dtrans/source/win32/dtobj/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: tra $ $Date: 2001-03-02 15:46:44 $
+# last change: $Author: tra $ $Date: 2001-03-02 17:18:18 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -85,9 +85,8 @@ SLOFILES=$(SLO)$/DtObjFactory.obj\
$(SLO)$/TxtCnvtHlp.obj\
$(SLO)$/DataFmtTransl.obj\
$(SLO)$/FmtFilter.obj\
- $(SLO)$/FetcList.obj\
- $(SLO)$/Fetc.obj\
- $(SLO)$/WrpDOTransferable.obj
+ $(SLO)$/FetcList.obj
+#$(SLO)$/WrpDOTransferable.obj
LIB1TARGET=$(SLB)$/$(TARGET).lib
LIB1OBJFILES=$(SLOFILES)