include/xmloff/xmlimp.hxx | 3 ++-
writerfilter/source/dmapper/FontTable.cxx | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 01e75b9b5c4459a5a8fbc86cd37635161efa093d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Dec 1 14:09:25 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Dec 1 20:36:01 2020 +0100
cid#1401328 Uncaught exception
and
cid#1401334 Uncaught exception
Change-Id: I0d489a487c4c8148da4978cb613829b9cf69d14d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106985
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 73f35b90f631..674a535c5d7f 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -25,6 +25,7 @@
#include <set>
#include <stack>
+#include <o3tl/deleter.hxx>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
@@ -245,7 +246,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public
cppu::WeakImplHelper<
// tdf#69060 & tdf#137643 import embedded fonts and activate them in a
// batch in EmbeddedFontsHelper's dtor
- std::unique_ptr<EmbeddedFontsHelper> mxEmbeddedFontHelper;
+ std::unique_ptr<EmbeddedFontsHelper,
o3tl::default_delete<EmbeddedFontsHelper>> mxEmbeddedFontHelper;
protected:
bool mbIsFormsSupported;
diff --git a/writerfilter/source/dmapper/FontTable.cxx
b/writerfilter/source/dmapper/FontTable.cxx
index c98177db5959..2dd7b3d91221 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -18,6 +18,7 @@
*/
#include "FontTable.hxx"
+#include <o3tl/deleter.hxx>
#include <ooxml/resourceids.hxx>
#include <vector>
#include <sal/log.hxx>
@@ -32,7 +33,7 @@ namespace writerfilter::dmapper
struct FontTable_Impl
{
- std::unique_ptr<EmbeddedFontsHelper> xEmbeddedFontHelper;
+ std::unique_ptr<EmbeddedFontsHelper,
o3tl::default_delete<EmbeddedFontsHelper>> xEmbeddedFontHelper;
std::vector< FontEntry::Pointer_t > aFontEntries;
FontEntry::Pointer_t pCurrentEntry;
FontTable_Impl() {}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
