diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-26 15:39:28 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-26 15:39:53 +0100 |
| commit | c791bef561dcf38a4b47dd06534914f7c28ae67e (patch) | |
| tree | ec846aca9b401316b63f5f20ebf71b4efe9da7a2 | |
| parent | 080bd44f0b0300075ff18d377f31deebbc4009ed (diff) | |
sw tiled rendering: don't offer HTML paste for shape text
Change-Id: Icd6df15347c48a5e42860092f4ee664e3a3d5699
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index d41458214b58..52dfcc7fcc80 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3198,6 +3198,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); } |