diff options
| author | Varun Dhall <varun.dhall@studentpartner.com> | 2017-06-07 21:31:01 +0530 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-08 20:36:50 +0200 |
| commit | 112a82566453fcf85ce3619965ca6e11fa9d29c5 (patch) | |
| tree | 1cf7b4775433b3fe10b35c18399f9b8e213aaad5 /sd/source/ui/view/sdview2.cxx | |
| parent | b0f0096fbbccc212931501c5c879b65f9b0d7477 (diff) | |
EditEngine: Added ODF_TEXT_FLAT copy/paste for sd
Change-Id: I23777477d31f30ee18ee8926a8f3170505f74264
Reviewed-on: https://gerrit.libreoffice.org/38535
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sd/source/ui/view/sdview2.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 1865f01cc674..8199ba385cb9 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -574,6 +574,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge { const bool bSBAFormat = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::SVX_FORMFIELDEXCH ); const bool bEditEngine = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::EDITENGINE ); + const bool bEditEngineODF = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ); const bool bString = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::STRING ); const bool bRTF = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::RTF ); const bool bFile = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ); @@ -588,7 +589,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if( bBookmark && bFile && ( nDropAction & DND_ACTION_MOVE ) && mpViewSh && SlideShow::IsRunning(mpViewSh->GetViewShellBase()) ) bBookmark = false; - if( bDrawing || bGraphic || bMtf || bBitmap || bBookmark || bFile || bFileList || bXFillExchange || bSBAFormat || bEditEngine || bString || bRTF ) + if( bDrawing || bGraphic || bMtf || bBitmap || bBookmark || bFile || bFileList || bXFillExchange || bSBAFormat || bEditEngine || bEditEngineODF || bString || bRTF ) nRet = nDropAction; // For entries from the navigator, change action copy. |