diff options
Diffstat (limited to 'sw/source/core/uibase/dochdl')
| -rw-r--r-- | sw/source/core/uibase/dochdl/swdtflvr.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx index 447dbfdb86fc..62938d50dc52 100644 --- a/sw/source/core/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx @@ -3203,8 +3203,8 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell ) bool bKillPaMs = false; - //Delete selected content, not at table-selection and table in Clipboard - if( rShell.HasSelection() && !( nSelection & nsSelectionType::SEL_TBL_CELLS)) + //Delete selected content, not at table-selection and table in Clipboard, and dont delete hovering graphics. + if( rShell.HasSelection() && !( nSelection & nsSelectionType::SEL_TBL_CELLS) && !( nSelection & nsSelectionType::SEL_DRW)) { bKillPaMs = true; rShell.SetRetainSelection( true ); @@ -3221,6 +3221,10 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell ) } rShell.SetRetainSelection( false ); } + if ( nSelection & nsSelectionType::SEL_DRW) //unselect hovering graphics + { + rShell.ResetSelect(NULL,false); + } bool bInWrd = false, bEndWrd = false, bSttWrd = false, bSmart = 0 != (TRNSFR_DOCUMENT_WORD & eBufferType); |