editeng/source/editeng/editeng.cxx | 3 +++ sc/source/ui/view/viewfun5.cxx | 3 ++- sw/source/filter/html/htmlplug.cxx | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-)
New commits: commit 3e27cea44ccb2a34bd96c03ed2f279324a145ea6 Author: Michael Meeks <michael.me...@collabora.com> AuthorDate: Fri May 31 14:38:34 2019 +0100 Commit: Michael Meeks <michael.me...@collabora.com> CommitDate: Fri Aug 2 15:33:51 2019 -0400 Avoid odd crash where OLE object can't generate an image preview. Change-Id: Ib77eca6907aa09383a96f3c9de6f7a7c4799c3bc diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index f71e81b9a8cc..1f1e50d3e489 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -1503,6 +1503,12 @@ Writer& OutHTML_FrameFormatOLENodeGrf( Writer& rWrt, const SwFrameFormat& rFrame return rWrt; } + if ( !pOLENd->GetGraphic() ) + { + SAL_WARN("sw.html", "Unexpected missing OLE fallback graphic"); + return rWrt; + } + Graphic aGraphic( *pOLENd->GetGraphic() ); SwDocShell* pDocSh = rHTMLWrt.m_pDoc->GetDocShell(); commit d553a16bb89e1b4860b4f1dbbb9bbad4f9137460 Author: Michael Meeks <michael.me...@collabora.com> AuthorDate: Wed May 29 17:53:35 2019 +0100 Commit: Michael Meeks <michael.me...@collabora.com> CommitDate: Fri Aug 2 15:33:43 2019 -0400 lok: disable calc char-set dialog for HTML when pasting. Change-Id: I3ec9e98549d06ae3e6b4ede89215a5137d01ccab diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index fc5d357704cf..0eca9685ad61 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -304,7 +304,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 commit 8a8affe9d4b4d33b10841f16f5121bcadfda9a99 Author: Michael Meeks <michael.me...@collabora.com> AuthorDate: Wed May 29 15:20:32 2019 +0100 Commit: Michael Meeks <michael.me...@collabora.com> CommitDate: Fri Aug 2 15:33:34 2019 -0400 lok: don't be prejudiced against a single missing mime-type. Change-Id: Ic5004c306cbd01071c397ed1a61ef094b439a48f diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index b8667061e42a..d547615299d2 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2720,6 +2720,9 @@ bool EditEngine::HasValidData( const css::uno::Reference< css::datatransfer::XTr { bool bValidData = false; + if ( comphelper::LibreOfficeKit::isActive()) + return true; + if ( rTransferable.is() ) { // Every application that copies rtf or any other text format also copies plain text into the clipboard.... _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits