bin/get-bugzilla-attachments-by-mimetype | 1 + sd/source/ui/tools/EventMultiplexer.cxx | 1 - xmloff/source/core/xmlimp.cxx | 2 +- xmloff/source/forms/formlayerimport.cxx | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-)
New commits: commit ab66fe65443af83216c51d310e0a341e40810d17 Author: David Tardon <dtar...@redhat.com> Date: Mon Aug 29 17:19:14 2016 +0200 remove useless (and wrong) comment Change-Id: I151945c4617a3fc0e68ef8e5ecf1949cb0ab5f53 diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx index 118317d..a8d8848 100644 --- a/xmloff/source/forms/formlayerimport.cxx +++ b/xmloff/source/forms/formlayerimport.cxx @@ -30,8 +30,6 @@ namespace xmloff using namespace ::com::sun::star::drawing; using namespace ::com::sun::star; - //= OFormLayerXMLExport - OFormLayerXMLImport::OFormLayerXMLImport(SvXMLImport& _rImporter) : m_pImpl( new OFormLayerXMLImport_Impl(_rImporter) ) { commit 151b7879bea2a48fb0868e446a9629ff8fe388ad Author: David Tardon <dtar...@redhat.com> Date: Mon Aug 29 15:27:49 2016 +0200 fix copypasta Change-Id: I26a94dcc6339eceee685a2340cef5ff5ba595037 diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index b7db468..cc59e91 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -603,7 +603,7 @@ void SAL_CALL SvXMLImport::endDocument() uno::RuntimeException, std::exception) { - SAL_INFO( "xmloff.core", "} SvXMLImport::startDocument" ); + SAL_INFO( "xmloff.core", "} SvXMLImport::endDocument" ); // #i9518# All the stuff that accesses the document has to be done here, not in the dtor, // because the SvXMLImport dtor might not be called until after the document has been closed. commit cb9cd7527fd8b71250f8d40017582b73e8a41ec5 Author: David Tardon <dtar...@redhat.com> Date: Mon Aug 29 14:31:39 2016 +0200 drop extraneous acquire Change-Id: I1f26d0994f5895f8bb8ccd6c2ddce7fc1ec24ecc diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 3b048ae..d6df067 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -159,7 +159,6 @@ const char aEditModePropertyName[] = "IsMasterPageMode"; EventMultiplexer::EventMultiplexer (ViewShellBase& rBase) : mpImpl (new EventMultiplexer::Implementation(rBase)) { - mpImpl->acquire(); } EventMultiplexer::~EventMultiplexer() commit d1479d311b5a69eb1bf352d2007224351ddd5f0f Author: David Tardon <dtar...@redhat.com> Date: Mon Aug 29 09:34:20 2016 +0200 add vsdx Change-Id: I85b6cdf6185efd8c11f393b1a30a9241be620749 diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype index bd47a1f..93bd5a7 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -425,6 +425,7 @@ mimetypes = { 'application/vnd.openxmlformats-officedocument.wordprocessingml.template': 'dotx', 'application/vnd.visio': 'vsd', 'application/visio.drawing': 'vsd', + 'application/vnd.visio2013': 'vsdx', 'application/vnd.visio.xml': 'vdx', 'application/x-mspublisher': 'pub', # W3C _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits