From a4c1fef85d4d97c934eb3927b3aef56a397bb80c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 26 Oct 2015 15:39:28 +0100 Subject: [PATCH 235/398] sw tiled rendering: don't offer HTML paste for shape text Change-Id: Icd6df15347c48a5e42860092f4ee664e3a3d5699 (cherry picked from commit c791bef561dcf38a4b47dd06534914f7c28ae67e) --- sw/source/uibase/uno/unotxdoc.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 68ec3df2a9c0..b50096bbbaa8 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3204,6 +3204,13 @@ bool SwXTextDocument::isMimeTypeSupported() return false; TransferableDataHelper aDataHelper(TransferableDataHelper::CreateFromSystemClipboard(&pWrtShell->GetView().GetEditWin())); + if (SdrView* pSdrView = pWrtShell->GetDrawView()) + { + if (pSdrView->GetTextEditObject()) + // Editing shape text + return EditEngine::HasValidData(aDataHelper.GetTransferable()); + } + return aDataHelper.GetXTransferable().is() && SwTransferable::IsPaste(*pWrtShell, aDataHelper); } -- 2.12.0