diff options
| author | Varun Dhall <varun.dhall@studentpartner.com> | 2017-07-23 22:20:17 +0530 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-07 15:45:25 +0200 |
| commit | 8a8bcd65e8a0e177904f06fcd8a775456ff02eab (patch) | |
| tree | 336ced30954f0822e8d8065fe2d0764219d292b5 /sd/source/ui/view/sdview3.cxx | |
| parent | 9fa77d0cf0dbc0bcb627848263c417ba49e988d3 (diff) | |
EditEngine: Removing BIN format from sd
Change-Id: Iafd88cdb0d0a84b611deda3bd276fb4b16604b92
Reviewed-on: https://gerrit.libreoffice.org/40331
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sd/source/ui/view/sdview3.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 5f5d9f5f7c3c..de471ddca611 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1392,9 +1392,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, } } - char* ODF_XML_Env = getenv ("ODF_TEXT_FLAT_XML_ENV"); - - if(!bReturn && !bLink && CHECK_FORMAT_TRANS(SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT) && ODF_XML_Env == nullptr) + if(!bReturn && !bLink && CHECK_FORMAT_TRANS(SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT)) { ::tools::SvRef<SotStorageStream> xStm; if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT, xStm ) ) @@ -1422,34 +1420,6 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, } } - if(!bReturn && !bLink && CHECK_FORMAT_TRANS(SotClipboardFormatId::EDITENGINE) ) - { - ::tools::SvRef<SotStorageStream> xStm; - if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::EDITENGINE, xStm ) ) - { - OutlinerView* pOLV = GetTextEditOutlinerView(); - - xStm->Seek( 0 ); - - if( pOLV ) - { - ::tools::Rectangle aRect( pOLV->GetOutputArea() ); - Point aPos( pOLV->GetWindow()->PixelToLogic( maDropPos ) ); - - if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) - { - // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read( *xStm, EE_FORMAT_BIN, mpDocSh->GetHeaderAttributes() ); - bReturn = true; - } - } - - if( !bReturn ) - // mba: clipboard always must contain absolute URLs (could be from alien source) - bReturn = SdrView::Paste( *xStm, EE_FORMAT_BIN, maDropPos, pPage, nPasteOptions ); - } - } - bool bIsRTF = false; if(!bReturn && !bLink && (( bIsRTF = CHECK_FORMAT_TRANS(SotClipboardFormatId::RTF) ) || CHECK_FORMAT_TRANS(SotClipboardFormatId::RICHTEXT) )) { |