sw/source/core/undo/undobj.cxx | 3 +-- xmloff/source/text/txtparae.cxx | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 17d7f2971061a9e0b68da6d433835c64b946169a Author: Michael Stahl <mst...@redhat.com> Date: Fri Jan 26 14:56:37 2018 +0100 sw: remove misleading comment from SwUndoSaveContent::DelContentIndex() "Directories" weren't handled in the initial CVS import already. Change-Id: Ic96921d8e3e8aa5a5e65e07391236f0a7747c867 diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 449479da46e9..bb6e1c50af90 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -837,7 +837,6 @@ void SwUndoSaveContent::MovePtForward( SwPaM& rPam, bool bMvBkwrd ) // - Footnotes // - Flys // - Bookmarks -// - Directories // #i81002# - extending method // delete certain (not all) cross-reference bookmarks at text node of <rMark> @@ -1210,7 +1209,7 @@ void SwUndoSaveSection::SaveSection( { SwPaM aPam( rRange.aStart, rRange.aEnd ); - // delete all footnotes, fly frames, bookmarks and indexes + // delete all footnotes, fly frames, bookmarks DelContentIndex( *aPam.GetMark(), *aPam.GetPoint() ); { // move certain indexes out of deleted range commit 55650f65de478bcee65fe1e1cf19f106e407f999 Author: Michael Stahl <mst...@redhat.com> Date: Fri Jan 26 14:24:02 2018 +0100 xmloff: ODF export: don't write LO_EXT attribute unless ODF expended The loext namespace is not defined when exporting standard ODF versions, which triggers an assert() in SvXMLNamespaceMap. (regression from 4469b29faeb8dbf7793a5d81d9c5ddebacf3015f) Change-Id: Ic93fb0ea8fe092463d3fd18a0fbf4429d8652642 diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 656c33a6cbb2..c5baccfe79fc 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -3141,7 +3141,11 @@ void XMLTextParagraphExport::_exportTextGraphic( const OString aExt( OUStringToOString( aSourceMimeType, RTL_TEXTENCODING_ASCII_US ) ); aSourceMimeType = comphelper::GraphicMimeTypeHelper::GetMimeTypeForExtension( aExt ); } + + if (GetExport().getDefaultVersion() > SvtSaveOptions::ODFVER_012) + { GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, "mime-type", aSourceMimeType); + } { SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_DRAW, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits