diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 11:23:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 11:23:04 +0000 |
| commit | 917c18332402ae0dae207f91b8f3a1fd4a991e8e (patch) | |
| tree | 46746e521d4e0da01c2fadc778bfcac5313a7347 /sc | |
| parent | b1f91060384af48f389965a12b6c8f874295f031 (diff) | |
INTEGRATION: CWS mav18 (1.68.62); FILE MERGED
2005/06/01 14:18:11 mav 1.68.62.1: #i49460# add handling for EMBEDDED_OBJ format
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 5811a6a1cf8e..e8b75134512e 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gridwin.cxx,v $ * - * $Revision: 1.68 $ + * $Revision: 1.69 $ * - * last change: $Author: vg $ $Date: 2005-03-08 15:44:57 $ + * last change: $Author: kz $ $Date: 2005-07-12 12:23:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3435,6 +3435,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) IsDropFormatSupported( SOT_FORMATSTR_ID_LINK_SOURCE ) || IsDropFormatSupported( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ) || IsDropFormatSupported( SOT_FORMATSTR_ID_LINK_SOURCE_OLE ) || + IsDropFormatSupported( SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ) || IsDropFormatSupported( SOT_FORMAT_STRING ) || IsDropFormatSupported( SOT_FORMATSTR_ID_SYLK ) || IsDropFormatSupported( SOT_FORMATSTR_ID_LINK ) || @@ -3559,6 +3560,8 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT nFormatId = SOT_FORMATSTR_ID_BIFF_5; else if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ) ) nFormatId = SOT_FORMATSTR_ID_EMBED_SOURCE_OLE; + else if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ) ) + nFormatId = SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE; else if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE_OLE ) ) nFormatId = SOT_FORMATSTR_ID_LINK_SOURCE_OLE; else if ( aDataHelper.HasFormat( SOT_FORMAT_RTF ) ) |