diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2019-05-29 17:53:35 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-08-02 11:41:47 -0400 |
| commit | 57edeebb72a69d4cee1dc2cc2e5a93b8f0410624 (patch) | |
| tree | 831d73484b4d77cc6e130ca292ff727d794eb272 | |
| parent | cd72cd052fdf8b106b84aac03e0e7d35356b31a2 (diff) | |
lok: disable calc char-set dialog for HTML when pasting.
Change-Id: I3ec9e98549d06ae3e6b4ede89215a5137d01ccab
| -rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index a02dbd0e60c9..c4a936bba2fc 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -306,7 +306,8 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, tools::SvRef<SotStorageStream> xStream; if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && xStream.is() ) { - if (nFormatId == SotClipboardFormatId::HTML) + if (nFormatId == SotClipboardFormatId::HTML && + !comphelper::LibreOfficeKit::isActive()) { // Launch the text import options dialog. For now, we do // this for html pasting only, but in the future it may |