diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 11:23:18 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 11:23:18 +0000 |
| commit | a433fbfbbb9ff0c9145d4397922c1d0a87a960a8 (patch) | |
| tree | 44cb511e5107c4f4218e7a7044c1b8b5e2a9c8e2 /sc/source/ui/view/viewfun3.cxx | |
| parent | 7f58be2bfb9ec0c99c151f80bdfd51915dfdf2c9 (diff) | |
INTEGRATION: CWS mav18 (1.29.262); FILE MERGED
2005/06/01 14:18:12 mav 1.29.262.1: #i49460# add handling for EMBEDDED_OBJ format
Diffstat (limited to 'sc/source/ui/view/viewfun3.cxx')
| -rw-r--r-- | sc/source/ui/view/viewfun3.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 8591a2419..577b98ecc 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun3.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2004-10-04 20:27:34 $ + * last change: $Author: kz $ $Date: 2005-07-12 12:23:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -488,6 +488,9 @@ void ScViewFunc::PasteFromSystem() } else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE )) PasteFromSystem( SOT_FORMATSTR_ID_LINK_SOURCE ); + // the following format can not affect scenario from #89579# + else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE )) + PasteFromSystem( SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ); // FORMAT_PRIVATE no longer here (can't work if pOwnClip is NULL) else if (aDataHelper.HasFormat(nBiff8)) // before xxx_OLE formats PasteFromSystem(nBiff8); |