diff options
| -rw-r--r-- | dtrans/source/X11/dtransX11.xml | 4 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/DataFmtTransl.cxx | 33 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/FetcList.cxx | 14 |
3 files changed, 31 insertions, 20 deletions
diff --git a/dtrans/source/X11/dtransX11.xml b/dtrans/source/X11/dtransX11.xml index 63c11b45ce30..77994d5287b5 100644 --- a/dtrans/source/X11/dtransX11.xml +++ b/dtrans/source/X11/dtransX11.xml @@ -12,8 +12,8 @@ <language> c++ </language> <status value="beta"/> <supported-service> com.sun.star.datatransfer.clipboard.SystemClipboard </supported-service> - <supported-service> com.sun.star.datatransfer.clipboard.dnd.X11DragSource </supported-service> - <supported-service> com.sun.star.datatransfer.clipboard.dnd.X11DropTarget </supported-service> + <supported-service> com.sun.star.datatransfer.dnd.X11DragSource </supported-service> + <supported-service> com.sun.star.datatransfer.dnd.X11DropTarget </supported-service> <service-dependency> ... </service-dependency> <type> com.sun.star.datatransfer.clipboard.XClipboardEx </type> <type> com.sun.star.datatransfer.XTransferable </type> diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index b5de5aa02624..9baa6a93583b 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataFmtTransl.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: tra $ $Date: 2001-03-20 13:39:33 $ + * last change: $Author: tra $ $Date: 2001-03-23 11:58:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -153,23 +153,26 @@ CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor& { Any aFormat = m_XDataFormatTranslator->getSystemDataTypeFromDataFlavor( aDataFlavor ); - if ( aFormat.getValueType( ) == CPPUTYPE_SALINT32 ) + if ( aFormat.hasValue( ) ) { - aFormat >>= cf; - OSL_ENSURE( CF_INVALID != cf, "Invalid Clipboard format delivered" ); - } - else if ( aFormat.getValueType( ) == CPPUTYPE_OUSTRING ) - { - OUString aClipFmtName; - aFormat >>= aClipFmtName; + if ( aFormat.getValueType( ) == CPPUTYPE_SALINT32 ) + { + aFormat >>= cf; + OSL_ENSURE( CF_INVALID != cf, "Invalid Clipboard format delivered" ); + } + else if ( aFormat.getValueType( ) == CPPUTYPE_OUSTRING ) + { + OUString aClipFmtName; + aFormat >>= aClipFmtName; - OSL_ASSERT( aClipFmtName.getLength( ) ); - cf = RegisterClipboardFormatW( aClipFmtName.getStr( ) ); + OSL_ASSERT( aClipFmtName.getLength( ) ); + cf = RegisterClipboardFormatW( aClipFmtName.getStr( ) ); - OSL_ENSURE( CF_INVALID != cf, "RegisterClipboardFormat failed" ); + OSL_ENSURE( CF_INVALID != cf, "RegisterClipboardFormat failed" ); + } + else + OSL_ENSURE( sal_False, "Wrong Any-Type detected" ); } - else - OSL_ENSURE( sal_False, "Wrong Any-Type detected" ); } catch( ... ) { diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx index 720ed816941f..b87bf6856add 100644 --- a/dtrans/source/win32/dtobj/FetcList.cxx +++ b/dtrans/source/win32/dtobj/FetcList.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FetcList.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: tra $ $Date: 2001-03-22 14:15:51 $ + * last change: $Author: tra $ $Date: 2001-03-23 11:58:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,10 @@ #include "..\misc\ImplHelper.hxx" #endif +#ifndef _WINCLIP_HXX_ +#include "..\misc\WinClip.hxx" +#endif + #include <algorithm> #include "MimeAttrib.hxx" @@ -272,6 +276,10 @@ void SAL_CALL CFormatRegistrar::RegisterFormats( aFlavor = aFlavorList[i]; CFormatEtc fetc = m_DataFormatTranslator.getFormatEtcFromDataFlavor( aFlavor ); + // maybe an internal format so we ignore it + if ( CF_INVALID == fetc.getClipformat( ) ) + continue; + if ( !needsToSynthesizeAccompanyFormats( fetc ) ) aFormatEtcContainer.addFormatEtc( fetc ); else @@ -323,7 +331,7 @@ void SAL_CALL CFormatRegistrar::RegisterFormats( } } } - else // Html (Hyper Text...) + else if ( m_DataFormatTranslator.isTextHtmlFormat( fetc.getClipformat( ) ) ) // Html (Hyper Text...) { // we add text/html ( HTML (HyperText Markup Language) ) aFormatEtcContainer.addFormatEtc( fetc ); |