*** empty log message ***

8 files changed, 203 insertions, 116 deletions

diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst
index ae94615d0705..0e7ddc951458 100644
--- a/dtrans/prj/build.lst
+++ b/dtrans/prj/build.lst
@@ -1,10 +1,11 @@
 dr	dtrans	:	offapi rdbmaker NULL
 dr	dtrans									usr1	-	all	dr_mkout NULL
-dr	dtrans\source\cnttype					nmake	-	all	dr_cnttype NULL
+dr	dtrans\source\cnttype					nmake	-	all	dr_cnttype	NULL
 dr	dtrans\source\win32\misc				nmake	-	w	dr_win32_misc NULL
 dr	dtrans\source\win32\mtaole				nmake	-	w	dr_win32_mtaole NULL
-dr	dtrans\source\win32\ftransl				nmake	-	w	dr_win32_ftransl dr_win32_misc NULL 
-dr	dtrans\source\win32\dtobj				nmake	-	w	dr_win32_dtobj dr_win32_misc dr_win32_ftransl NULL
-dr	dtrans\source\win32\clipb				nmake	-	w	dr_win32_clipb dr_win32_dtobj NULL
-dr	dtrans\source\win32\dnd					nmake	-	w	dr_win32_dnd dr_win32_misc dr_win32_dtobj NULL
+dr	dtrans\source\win32\ftransl				nmake	-	w	dr_win32_ftransl dr_cnttype dr_win32_misc NULL 
+dr	dtrans\source\win32\clipb				nmake	-	w	dr_win32_clipb dr_win32_misc NULL
+dr	dtrans\source\win32\dnd					nmake	-	w	dr_win32_dnd dr_cnttype dr_win32_misc dr_win32_dtobj NULL
+dr	dtrans\source\win32\dtobj				nmake	-	w	dr_win32_dtobj dr_win32_clipb dr_win32_misc dr_win32_ftransl NULL
+dr	dtrans\util								nmake	-	all	dr_util dr_cnttype dr_win32_misc dr_win32_mtaole dr_win32_ftransl dr_win32_clipb dr_win32_dnd dr_win32_dtobj NULL
 dr	dtrans\source\X11						nmake	-	u	dr_X11 NULL
diff --git a/dtrans/source/cnttype/makefile.mk b/dtrans/source/cnttype/makefile.mk
index 01747735d4a0..4c9737da7ff0 100644
--- a/dtrans/source/cnttype/makefile.mk
+++ b/dtrans/source/cnttype/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: tra $ $Date: 2001-03-02 06:57:10 $
+#   last change: $Author: tra $ $Date: 2001-05-11 10:31:28 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -65,7 +65,6 @@ PRJ=..$/..
 PRJNAME=dtrans
 TARGET=mcnttype
 ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
 COMP1TYPELIST=$(TARGET)
 COMPRDB=$(SOLARBINDIR)$/applicat.rdb
 USE_BOUNDCHK=
@@ -87,23 +86,6 @@ SLOFILES=$(SLO)$/mctfentry.obj \
          $(SLO)$/mcnttfactory.obj \
          $(SLO)$/mcnttype.obj
 
-SHL1TARGET=$(TARGET)
-
-SHL1STDLIBS= \
-        $(SALLIB)	\
-        $(CPPULIB) 	\
-        $(CPPUHELPERLIB)
-
-SHL1IMPLIB=i$(SHL1TARGET) 
-
-#--- comment -----------------
-
-SHL1OBJS=		$(SLOFILES)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/dtrans/source/win32/clipb/makefile.mk b/dtrans/source/win32/clipb/makefile.mk
index 9c2aafeab954..005253b8d0e5 100644
--- a/dtrans/source/win32/clipb/makefile.mk
+++ b/dtrans/source/win32/clipb/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: tra $ $Date: 2001-03-14 14:43:42 $
+#   last change: $Author: tra $ $Date: 2001-05-11 10:32:06 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -65,7 +65,6 @@ PRJ=..$/..$/..
 PRJNAME=dtrans
 TARGET=sysdtrans
 ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
 COMP1TYPELIST=$(TARGET)
 COMPRDB=$(SOLARBINDIR)$/applicat.rdb
 USE_BOUNDCHK=
@@ -87,37 +86,8 @@ CFLAGS+=/GR -DUNICODE -D_UNICODE
 
 SLOFILES=$(SLO)$/WinClipboard.obj \
          $(SLO)$/WinClipbImpl.obj \
-         $(SLO)$/wcbentry.obj\
-         $(SLO)$/APNDataObject.obj
+         $(SLO)$/wcbentry.obj
 
-SHL1TARGET=$(TARGET)
-
-SHL1STDLIBS= \
-        $(SALLIB)	\
-        $(CPPULIB) 	\
-        $(CPPUHELPERLIB) \
-        ole32.lib\
-        comsupp.lib\
-        oleaut32.lib\
-        gdi32.lib
-
-SHL1DEPN=
-SHL1IMPLIB=i$(SHL1TARGET) 
-
-#--- comment -----------------
-
-SHL1LIBS=	\
-            $(SOLARLIBDIR)$/user9x.lib\
-            $(SOLARLIBDIR)$/tools32.lib\
-            $(SLB)$/dtutils.lib\
-            $(SLB)$/dtobjfact.lib\
-            $(SLB)$/mtaolecb.lib
-
-SHL1OBJS=		$(SLOFILES)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
 
 # --- Targets ------------------------------------------------------
 
diff --git a/dtrans/source/win32/clipb/sysdtrans.xml b/dtrans/source/win32/clipb/sysdtrans.xml
index 4753a67fc426..a6dec8a03a42 100644
--- a/dtrans/source/win32/clipb/sysdtrans.xml
+++ b/dtrans/source/win32/clipb/sysdtrans.xml
@@ -4,7 +4,7 @@
     <module-name>   sysdtrans   </module-name>
     <component-description>
         <author> Tino Rachui </author>
-        <name>  com.sun.star.comp.datatransfer.clipboard </name>
+        <name>  com.sun.star.comp.datatransfer.SystemClipboard </name>
         <description>
     The win32 implementation of the datatransfer service.
 </description>
@@ -19,6 +19,8 @@
         <type>   com.sun.star.datatransfer.clipboard.XClipboardOwner</type>
         <type>   com.sun.star.datatransfer.clipboard.XClipboardListener</type>
         <type>   com.sun.star.datatransfer.clipboard.XClipboardNotifier</type>
+        <type>   com.sun.star.datatransfer.clipboard.XFlushableClipboard</type>
+        <type>   com.sun.star.datatransfer.clipboard.RenderingCapabilities</type>
         <type>   com.sun.star.datatransfer.XTransferDataAccess      </type>
         <type>   com.sun.star.lang.XComponent                       </type>
         <type>   com.sun.star.lang.XMultiServiceFactory             </type>
diff --git a/dtrans/source/win32/dnd/makefile.mk b/dtrans/source/win32/dnd/makefile.mk
index 93ead278f9ef..3057702a19b3 100644
--- a/dtrans/source/win32/dnd/makefile.mk
+++ b/dtrans/source/win32/dnd/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: tra $ $Date: 2001-03-08 12:38:59 $
+#   last change: $Author: tra $ $Date: 2001-05-11 10:32:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,9 +64,7 @@ PRJ=..$/..$/..
 
 PRJNAME=dtrans
 TARGET=dnd
-# sysdtrans
 ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
 COMP1TYPELIST=$(TARGET)
 COMPRDB=$(SOLARBINDIR)$/applicat.rdb
 USE_BOUNDCHK=
@@ -101,38 +99,6 @@ SLOFILES=	$(SLO)$/dndentry.obj	\
             $(SLO)$/sourcecontext.obj
 
 
-
-
-#$(SLO)$/mimehlp.obj
-
-SHL1TARGET=$(TARGET)
-
-SHL1STDLIBS= \
-        $(SALLIB)	\
-        $(CPPULIB) 	\
-        $(CPPUHELPERLIB) \
-        ole32.lib\
-        comsupp.lib\
-        oleaut32.lib\
-        gdi32.lib
-
-SHL1DEPN=
-SHL1IMPLIB=i$(SHL1TARGET) 
-
-#--- comment -----------------
-# for src614 
-
-SHL1LIBS=	\
-            $(SLB)$/dtobjfact.lib\
-            $(SLB)$/dtutils.lib\
-            $(SOLARLIBDIR)$/user9x.lib\
-
-SHL1OBJS=		$(SLOFILES)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/dtrans/source/win32/ftransl/makefile.mk b/dtrans/source/win32/ftransl/makefile.mk
index 3d74b701362c..4ea367861af8 100644
--- a/dtrans/source/win32/ftransl/makefile.mk
+++ b/dtrans/source/win32/ftransl/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: tra $ $Date: 2001-03-16 09:02:00 $
+#   last change: $Author: tra $ $Date: 2001-05-11 10:33:01 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -61,11 +61,9 @@
 #*************************************************************************
 
 PRJ=..$/..$/..
-
 PRJNAME=dtrans
 TARGET=ftransl
 ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
 COMP1TYPELIST=$(TARGET)
 COMPRDB=$(SOLARBINDIR)$/applicat.rdb
 USE_BOUNDCHK=
@@ -86,23 +84,6 @@ stoponerror=tr
 SLOFILES=$(SLO)$/ftranslentry.obj \
          $(SLO)$/ftransl.obj
 
-SHL1OBJS=$(SLOFILES)\
-         $(SLO)$/ImplHelper.obj
-
-SHL1STDLIBS= \
-        $(SALLIB)	\
-        $(CPPULIB) 	\
-        $(CPPUHELPERLIB)\
-        ole32.lib\
-        gdi32.lib
-
-SHL1TARGET=$(TARGET)
-SHL1IMPLIB=i$(SHL1TARGET) 
-
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/dtrans/util/exports.dxp b/dtrans/util/exports.dxp
new file mode 100644
index 000000000000..028ac4175990
--- /dev/null
+++ b/dtrans/util/exports.dxp
@@ -0,0 +1,3 @@
+component_getImplementationEnvironment
+component_writeInfo	
+component_getFactory
diff --git a/dtrans/util/makefile.mk b/dtrans/util/makefile.mk
new file mode 100644
index 000000000000..1550ac5505a8
--- /dev/null
+++ b/dtrans/util/makefile.mk
@@ -0,0 +1,182 @@
+#*************************************************************************
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.1 $
+#
+#   last change: $Author: tra $ $Date: 2001-05-11 10:34:32 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=dtrans
+TARGET=dtrans
+TARGET1=mcnttype
+TARGET2=ftransl
+TARGET3=sysdtrans
+TARGET4=dnd
+USE_LDUMP2=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+
+# --- mcnttype dynlib ----------------------------------------------
+
+SHL1TARGET=$(TARGET1)
+
+SHL1LIBS=$(SLB)$/mcnttype.lib
+
+SHL1STDLIBS= \
+        $(SALLIB)	\
+        $(CPPULIB) 	\
+        $(CPPUHELPERLIB)
+
+SHL1IMPLIB=i$(SHL1TARGET) 
+
+#--- comment -----------------
+
+SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=		$(SHL1TARGET)
+DEF1EXPORTFILE=	exports.dxp
+
+
+.IF "$(GUI)"!="WIN"
+
+# --- ftransl dll ---
+
+SHL2TARGET=$(TARGET2)
+
+SHL2LIBS=$(SLB)$/ftransl.lib\
+         $(SLB)$/dtutils.lib
+
+SHL2STDLIBS= \
+        $(SALLIB)	\
+        $(CPPULIB) 	\
+        $(CPPUHELPERLIB)\
+        ole32.lib\
+        gdi32.lib
+
+SHL2TARGET=$(TARGET2)
+SHL2IMPLIB=i$(SHL2TARGET) 
+
+SHL2DEF=		$(MISC)$/$(SHL2TARGET).def
+DEF2NAME=		$(SHL2TARGET)
+DEF2EXPORTFILE=	exports.dxp
+
+
+# --- sysdtrans dll ---
+
+SHL3TARGET=$(TARGET3)
+
+SHL3LIBS=$(SLB)$/sysdtrans.lib\
+         $(SLB)$/dtutils.lib\
+         $(SLB)$/dtobjfact.lib\
+         $(SLB)$/mtaolecb.lib\
+         $(SOLARLIBDIR)$/user9x.lib
+
+SHL3STDLIBS= \
+        $(SALLIB)	\
+        $(CPPULIB) 	\
+        $(CPPUHELPERLIB)\
+        ole32.lib\
+        comsupp.lib\
+        oleaut32.lib\
+        gdi32.lib
+        
+SHL3TARGET=$(TARGET3)
+SHL3IMPLIB=i$(SHL3TARGET) 
+
+SHL3DEF=		$(MISC)$/$(SHL3TARGET).def
+DEF3NAME=		$(SHL3TARGET)
+DEF3EXPORTFILE=	exports.dxp
+
+
+# --- dnd dll ---
+
+
+SHL4TARGET=$(TARGET4)
+
+SHL4STDLIBS= \
+        $(SALLIB)	\
+        $(CPPULIB) 	\
+        $(CPPUHELPERLIB) \
+        ole32.lib\
+        comsupp.lib\
+        oleaut32.lib\
+        gdi32.lib
+
+SHL4DEPN=
+SHL4IMPLIB=i$(SHL4TARGET) 
+
+SHL4LIBS=	\
+            $(SLB)$/dnd.lib\
+            $(SLB)$/dtobjfact.lib\
+            $(SLB)$/dtutils.lib\
+            $(SOLARLIBDIR)$/user9x.lib
+
+SHL4OBJS=		$(SLOFILES)
+SHL4DEF=		$(MISC)$/$(SHL4TARGET).def
+
+DEF4NAME=		$(SHL4TARGET)
+DEF4EXPORTFILE=	exports.dxp
+
+.ENDIF
+
+
+.INCLUDE :  target.mk
+