summaryrefslogtreecommitdiff
path: root/dtrans/source/win32
diff options
context:
space:
mode:
authorKai Ahrens <ka@openoffice.org>2002-07-20 09:08:59 +0000
committerKai Ahrens <ka@openoffice.org>2002-07-20 09:08:59 +0000
commite4b59793a368348c8934e8e5f67387a16625e321 (patch)
tree7c6d03f154d12f4ad08d66d5c9069d0f8bf59e40 /dtrans/source/win32
parente6c99f698967596523f1ee74f7bf0f57c8162f70 (diff)
#101579#: added EMF format
Diffstat (limited to 'dtrans/source/win32')
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.cxx6
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.cxx13
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.hxx5
3 files changed, 18 insertions, 6 deletions
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index b0bf9261f836..8ba04a830b55 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.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: tra $ $Date: 2002-06-20 08:10:21 $
+ * last change: $Author: ka $ $Date: 2002-07-20 10:08:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -403,6 +403,8 @@ CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFor
byteStream = WinDIBToOOBMP( byteStream );
else if ( CF_METAFILEPICT == aFormatEtc.getClipformat() )
byteStream = WinMFPictToOOMFPict( byteStream );
+ else if ( CF_ENHMETAFILE == aFormatEtc.getClipformat() )
+ byteStream = WinENHMFPictToOOMFPict( byteStream );
ReleaseStgMedium( &stgmedium );
}
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 3dc4cb28d253..0acebf5858c5 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FmtFilter.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: ka $ $Date: 2002-07-20 08:41:19 $
+ * last change: $Author: ka $ $Date: 2002-07-20 10:08:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -167,6 +167,15 @@ Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( Sequence< sal_Int8 >& aMetaFi
return mfpictStream;
}
+//-------------------------------------------------------------
+// convert a windows enhanced metafile to a openoffice metafile
+//-------------------------------------------------------------
+
+Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( Sequence< sal_Int8 >& aEnhMetaFile )
+{
+ return aEnhMetaFile;
+}
+
//------------------------------------------------------------------------
// convert a openoffice metafile picture to a windows metafile picture
//------------------------------------------------------------------------
diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx
index 8f755bf13cb5..d17db87b72d3 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FmtFilter.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: ka $ $Date: 2002-07-20 08:41:20 $
+ * last change: $Author: ka $ $Date: 2002-07-20 10:08:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -78,6 +78,7 @@
aMetaFilePict - a sequence of bytes containing a METAFILEPICT struct
------------------------------------------------------------------------*/
com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( com::sun::star::uno::Sequence< sal_Int8 >& aMetaFilePict );
+com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( com::sun::star::uno::Sequence< sal_Int8 >& aEnhMetaFile );
/*------------------------------------------------------------------------
input: