diff options
| author | Carsten Driesner <cd@openoffice.org> | 2002-11-26 14:56:21 +0000 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2002-11-26 14:56:21 +0000 |
| commit | 989d4e87986e5102ac4b8b45a7e480771865a039 (patch) | |
| tree | 047ef4cea27267a9c38c65e2e7b335bee0648b03 /sw/source/ui/dochdl | |
| parent | 58672090a27758b210a5e3d602938abf0f71c1fb (diff) | |
#103556# Don't add GDIMETALFILE & BITMAP for selections with form elements
Diffstat (limited to 'sw/source/ui/dochdl')
| -rw-r--r-- | sw/source/ui/dochdl/swdtflvr.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index d4a2f7aa2efb..a5facfaf7360 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swdtflvr.cxx,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: os $ $Date: 2002-11-15 09:59:23 $ + * last change: $Author: cd $ $Date: 2002-11-26 15:56:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -946,8 +946,11 @@ int SwTransferable::Copy( BOOL bIsCut ) if( nSelection & ( SwWrtShell::SEL_DRW | SwWrtShell::SEL_DRW_FORM )) { AddFormat( SOT_FORMATSTR_ID_DRAWING ); - AddFormat( FORMAT_GDIMETAFILE ); - AddFormat( FORMAT_BITMAP ); + if ( nSelection & SwWrtShell::SEL_DRW ) + { + AddFormat( FORMAT_GDIMETAFILE ); + AddFormat( FORMAT_BITMAP ); + } eBufferType = (TransferBufferType)( TRNSFR_GRAPHIC | eBufferType ); pClpGraphic = new Graphic; @@ -2915,8 +2918,11 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) if( nSelection & ( SwWrtShell::SEL_DRW | SwWrtShell::SEL_DRW_FORM )) { AddFormat( SOT_FORMATSTR_ID_DRAWING ); - AddFormat( FORMAT_GDIMETAFILE ); - AddFormat( FORMAT_BITMAP ); + if ( nSelection & SwWrtShell::SEL_DRW ) + { + AddFormat( FORMAT_GDIMETAFILE ); + AddFormat( FORMAT_BITMAP ); + } eBufferType = (TransferBufferType)( TRNSFR_GRAPHIC | eBufferType ); pClpGraphic = new Graphic; |