[Libreoffice-commits] core.git: 2 commits - sc/source sd/source
Varun Dhall
varun.dhall at studentpartner.com
Mon Aug 7 13:45:52 UTC 2017
sc/source/ui/app/seltrans.cxx | 1 -
sc/source/ui/app/transobj.cxx | 4 +---
sc/source/ui/view/viewfun4.cxx | 3 +--
sc/source/ui/view/viewfun5.cxx | 3 +--
sd/source/ui/func/fuinsert.cxx | 1 -
sd/source/ui/view/drviews7.cxx | 1 -
sd/source/ui/view/sdview2.cxx | 3 +--
sd/source/ui/view/sdview3.cxx | 32 +-------------------------------
8 files changed, 5 insertions(+), 43 deletions(-)
New commits:
commit 8a8bcd65e8a0e177904f06fcd8a775456ff02eab
Author: Varun Dhall <varun.dhall at studentpartner.com>
Date: Sun Jul 23 22:20:17 2017 +0530
EditEngine: Removing BIN format from sd
Change-Id: Iafd88cdb0d0a84b611deda3bd276fb4b16604b92
Reviewed-on: https://gerrit.libreoffice.org/40331
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e672179bb474..e1e4c1e42e8f 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -253,7 +253,6 @@ void FuInsertClipboard::DoExecute( SfxRequest& )
pDlg->Insert( SotClipboardFormatId::HTML, OUString() );
pDlg->Insert( SotClipboardFormatId::RTF, OUString() );
pDlg->Insert( SotClipboardFormatId::RICHTEXT, OUString() );
- pDlg->Insert( SotClipboardFormatId::EDITENGINE, OUString() );
pDlg->Insert( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT, OUString() );
//TODO/MBA: testing
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 99f5bd398c48..ab318a97f436 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -167,7 +167,6 @@ using namespace ::com::sun::star::linguistic2;
case SotClipboardFormatId::HTML:
case SotClipboardFormatId::RTF:
case SotClipboardFormatId::RICHTEXT:
- case SotClipboardFormatId::EDITENGINE:
case SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT:
pResult->AddClipbrdFormat(nTestFormat);
break;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index ad13321ba146..22f248c3cef6 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -572,7 +572,6 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge
if( !nRet )
{
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 );
@@ -588,7 +587,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 || bEditEngineODF || bString || bRTF )
+ if( bDrawing || bGraphic || bMtf || bBitmap || bBookmark || bFile || bFileList || bXFillExchange || bSBAFormat || bEditEngineODF || bString || bRTF )
nRet = nDropAction;
// For entries from the navigator, change action copy.
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) ))
{
commit 9fa77d0cf0dbc0bcb627848263c417ba49e988d3
Author: Varun Dhall <varun.dhall at studentpartner.com>
Date: Sun Jul 23 21:26:34 2017 +0530
EditEngine: Removing BIN format from sc
Change-Id: I4d6b796439b90cab6a480f0bb8dc2c931e36cbe9
Reviewed-on: https://gerrit.libreoffice.org/40329
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index eaa4d9388791..eeca1a4f613f 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -194,7 +194,6 @@ void ScSelectionTransferObj::AddSupportedFormats()
AddFormat( SotClipboardFormatId::RICHTEXT );
if ( eMode == SC_SELTRANS_CELL )
{
- AddFormat( SotClipboardFormatId::EDITENGINE );
AddFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT );
}
break;
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 30fc5a1ed204..cedac34ed374 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -243,7 +243,6 @@ void ScTransferObj::AddSupportedFormats()
AddFormat( SotClipboardFormatId::RICHTEXT );
if ( aBlock.aStart == aBlock.aEnd )
{
- AddFormat( SotClipboardFormatId::EDITENGINE );
AddFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT );
}
}
@@ -260,8 +259,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
bOK = SetTransferableObjectDescriptor( aObjDesc );
}
else if ( ( nFormat == SotClipboardFormatId::RTF || nFormat == SotClipboardFormatId::RICHTEXT ||
- nFormat == SotClipboardFormatId::EDITENGINE || nFormat == SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT )
- && aBlock.aStart == aBlock.aEnd )
+ nFormat == SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) && aBlock.aStart == aBlock.aEnd )
{
// RTF from a single cell is handled by EditEngine
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 49631800c989..fa6510754e29 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -79,8 +79,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable )
{
TransferableDataHelper aDataHelper( rxTransferable );
- if ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) ||
- aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) )
+ if ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) )
{
HideAllCursors();
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 75f1c2d99830..2c2b431b85b9 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -285,8 +285,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
else if ( ScImportExport::IsFormatSupported( nFormatId ) || nFormatId == SotClipboardFormatId::RTF ||
nFormatId == SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT )
{
- if ( nFormatId == SotClipboardFormatId::RTF && ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) ||
- aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) ) )
+ if ( nFormatId == SotClipboardFormatId::RTF && ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) ) )
{
// use EditView's PasteSpecial / Drop
PasteRTF( nPosX, nPosY, rxTransferable );
More information about the Libreoffice-commits
mailing list